rpms/openoffice.org/devel openoffice.org-3.3.0.ooo74188.indiccursor.editeng.patch, 1.1, 1.2

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23027

Modified Files:
	openoffice.org-3.3.0.ooo74188.indiccursor.editeng.patch 
Log Message:
fix up patch

openoffice.org-3.3.0.ooo74188.indiccursor.editeng.patch:
 impedit2.cxx |   25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

Index: openoffice.org-3.3.0.ooo74188.indiccursor.editeng.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.3.0.ooo74188.indiccursor.editeng.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.3.0.ooo74188.indiccursor.editeng.patch	13 Jul 2010 10:16:52 -0000	1.1
+++ openoffice.org-3.3.0.ooo74188.indiccursor.editeng.patch	27 Jul 2010 15:16:30 -0000	1.2
@@ -1,10 +1,14 @@
 diff -r 03068afc23c6 svx/source/editeng/impedit2.cxx
 --- a/editeng/source/editeng/impedit2.cxx	Sun Apr 25 15:43:24 2010 +0100
 +++ b/editeng/source/editeng/impedit2.cxx	Mon Apr 26 15:08:39 2010 +0100
-@@ -4213,13 +4213,27 @@
+@@ -4209,8 +4209,33 @@
+ 					DBG_ERROR("svx::ImpEditEngine::GetXPos(), index out of range!");
+ 				}
+ 
++#if 0
+                 // old code restored see #i112788 (which leaves #i74188 unfixed again)
                  long nPosInPortion = pLine->GetCharPosArray().GetObject( nPos );
- #else
-                 // #i74188# (positioning the cursor after deleting components of combined indic characters)
++#else
 +                sal_uInt16 nStartCalc = 0;
 +                for (sal_uInt16 i = 0; i < nTextPortion; ++i)
 +                {
@@ -12,23 +16,22 @@ diff -r 03068afc23c6 svx/source/editeng/
 +                    nStartCalc += pTextPortion->GetLen();
 +                }
 +
-                 SvxFont aTmpFont( pParaPortion->GetNode()->GetCharAttribs().GetDefFont() );
++                SvxFont aTmpFont( pParaPortion->GetNode()->GetCharAttribs().GetDefFont() );
 +
 +                GetRefDevice()->Push( PUSH_ALL );
 +                ImplInitLayoutMode( GetRefDevice(), GetEditDoc().GetPos(pParaPortion->GetNode()), 0xFFFF );
 +                ImplInitDigitMode( GetRefDevice(), 0, 0, 0, aTmpFont.GetLanguage() );
 +                GetRefDevice()->SetMapMode( MAP_100TH_MM );
 +
-                 SeekCursor( pParaPortion->GetNode(), nPos+1, aTmpFont );
-                 aTmpFont.SetPhysFont( GetRefDevice() );
--                ImplInitDigitMode( GetRefDevice(), 0, 0, 0, aTmpFont.GetLanguage() );
--                String sSegment(*pParaPortion->GetNode(), pLine->GetStart(), nPos+1);
++                SeekCursor( pParaPortion->GetNode(), nPos+1, aTmpFont );
++                aTmpFont.SetPhysFont( GetRefDevice() );
 +                String sSegment(*pParaPortion->GetNode(), pLine->GetStart()+nStartCalc, nPos+1-nStartCalc);
-                 long nPosInPortion = aTmpFont.QuickGetTextSize( GetRefDevice(),
--                    sSegment, 0, nPos+1, NULL ).Width();
++                long nPosInPortion = aTmpFont.QuickGetTextSize( GetRefDevice(),
 +                    sSegment, 0, nPos+1-nStartCalc, NULL ).Width();
 +
-+               GetRefDevice()->Pop();
- #endif
++                GetRefDevice()->Pop();
++
++#endif
  
  				if ( !pPortion->IsRightToLeft() )
+ 				{