rpms/openoffice.org/devel openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch, 1.2, 1.3
Caolan McNamara
caolanm at fedoraproject.org
Sun Oct 11 11:52:10 UTC 2009
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13527
Modified Files:
openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
Log Message:
fix openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch:
frmcrsr.cxx | 32 +++++++++++++++++++++++++++++++-
1 file changed, 31 insertions(+), 1 deletion(-)
Index: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch 8 Jan 2008 14:51:51 -0000 1.2
+++ openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch 11 Oct 2009 11:52:10 -0000 1.3
@@ -5,7 +5,7 @@ retrieving revision 1.42
diff -u -r1.42 frmcrsr.cxx
--- openoffice.org.orig/sw/source/core/text/frmcrsr.cxx 16 Sep 2006 21:33:39 -0000 1.42
+++ openoffice.org/sw/source/core/text/frmcrsr.cxx 5 Feb 2007 13:42:51 -0000
-@@ -83,6 +83,10 @@
+@@ -60,6 +60,10 @@
#include "swfntcch.hxx" // SwFontAccess
#include "flyfrm.hxx"
@@ -16,7 +16,7 @@ diff -u -r1.42 frmcrsr.cxx
#if OSL_DEBUG_LEVEL > 1
#include "txtpaint.hxx"
#endif
-@@ -309,7 +313,33 @@
+@@ -289,7 +293,33 @@
nMaxY = pFrm->SwitchVerticalToHorizontal( nMaxY );
sal_Bool bGoOn = sal_True;
@@ -26,17 +26,17 @@ diff -u -r1.42 frmcrsr.cxx
+ // #i74188 Ensure that the cursor is not drawn inside a combined char
+ const SwTxtNode* pTxtNd = ((const SwTxtFrm*)this)->GetTxtNode();
+ if( pTxtNd && ::com::sun::star::i18n::ScriptType::COMPLEX ==
-+ pBreakIt->xBreak->getScriptType( pTxtNd->GetTxt(), nOffset ) )
++ pBreakIt->GetBreakIter()->getScriptType( pTxtNd->GetTxt(), nOffset ) )
+ {
+ sal_Int32 nCount = 1;
+ const ::com::sun::star::lang::Locale &rLocale =
+ pBreakIt->GetLocale( pTxtNd->GetLang( nOffset ) );
-+ xub_StrLen nRight = (xub_StrLen)pBreakIt->xBreak->nextCharacters(
++ xub_StrLen nRight = (xub_StrLen)pBreakIt->GetBreakIter()->nextCharacters(
+ pTxtNd->GetTxt(), nOffset, rLocale,
+ ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL,
+ nCount, nCount );
+
-+ xub_StrLen nLeft = (xub_StrLen)pBreakIt->xBreak->previousCharacters(
++ xub_StrLen nLeft = (xub_StrLen)pBreakIt->GetBreakIter()->previousCharacters(
+ pTxtNd->GetTxt(), nRight, rLocale,
+ ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL,
+ nCount, nCount );
More information about the scm-commits
mailing list