rpms/openoffice.org/devel openoffice.org.spec, 1.2263, 1.2264 workspace.tl80.patch, 1.4, 1.5

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec workspace.tl80.patch 
Log Message:
clarify licence and fix up Indic cursor deleting mess a bit


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2263
retrieving revision 1.2264
diff -u -p -r1.2263 -r1.2264
--- openoffice.org.spec	1 Jul 2010 10:54:03 -0000	1.2263
+++ openoffice.org.spec	1 Jul 2010 15:08:42 -0000	1.2264
@@ -35,7 +35,7 @@ Name:           openoffice.org
 Version:        3.2.1
 Release:        %{ooomilestone}.%{rh_rpm_release}%{?dist}
 Epoch:          1
-License:        LGPLv3 and LGPLv2+ and MPLv1.1 and BSD
+License:        LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain
 Group:          Applications/Productivity
 URL:            http://www.openoffice.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

workspace.tl80.patch:
 linguistic/source/dicimp.cxx    |    4 ++--
 svx/source/editeng/impedit.cxx  |   13 ++++++++-----
 svx/source/editeng/impedit2.cxx |   26 +++++++++++++++++++++++++-
 3 files changed, 35 insertions(+), 8 deletions(-)

Index: workspace.tl80.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.tl80.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- workspace.tl80.patch	27 Apr 2010 08:43:17 -0000	1.4
+++ workspace.tl80.patch	1 Jul 2010 15:08:42 -0000	1.5
@@ -71,21 +71,37 @@
 diff -r 03068afc23c6 svx/source/editeng/impedit2.cxx
 --- a/svx/source/editeng/impedit2.cxx	Sun Apr 25 15:43:24 2010 +0100
 +++ b/svx/source/editeng/impedit2.cxx	Mon Apr 26 15:08:39 2010 +0100
-@@ -4198,7 +4198,17 @@
+@@ -4206,8 +4206,32 @@
+ 					nPos = pLine->GetCharPosArray().Count()-1;
  					DBG_ERROR("svx::ImpEditEngine::GetXPos(), index out of range!");
  				}
- 
+-
 +#if 0
  				long nPosInPortion = pLine->GetCharPosArray().GetObject( nPos );
 +#else
-+				SvxFont aTmpFont( pParaPortion->GetNode()->GetCharAttribs().GetDefFont() );
-+				SeekCursor( pParaPortion->GetNode(), nPos+1, aTmpFont );
-+				aTmpFont.SetPhysFont( GetRefDevice() );
-+				ImplInitDigitMode( GetRefDevice(), 0, 0, 0, aTmpFont.GetLanguage() );
-+				String sSegment(*pParaPortion->GetNode(), pLine->GetStart(), nPos+1);
-+				long nPosInPortion = aTmpFont.QuickGetTextSize( GetRefDevice(),
-+					sSegment, 0, nPos+1, NULL ).Width();
-+#endif
++                // #i74188# (positioning the cursor after deleting components of combined indic characters)
++                sal_uInt16 nStartCalc = 0;
++                for (sal_uInt16 i = 0; i < nTextPortion; ++i)
++                {
++                    TextPortion *pTextPortion = pParaPortion->GetTextPortions().GetObject( i );
++                    nStartCalc += pTextPortion->GetLen();
++                }
++
++                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() );
++                String sSegment(*pParaPortion->GetNode(), pLine->GetStart()+nStartCalc, nPos+1-nStartCalc);
++                long nPosInPortion = aTmpFont.QuickGetTextSize( GetRefDevice(),
++                    sSegment, 0, nPos+1-nStartCalc, NULL ).Width();
++
++               GetRefDevice()->Pop();
++ #endif
  
  				if ( !pPortion->IsRightToLeft() )
  				{