rpms/openoffice.org/devel openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch, NONE, 1.1 openoffice.org-2.3.0.ooo80722.sw.stlportism.patch, NONE, 1.1 openoffice.org.spec, 1.1245, 1.1246 openoffice.org-2.3.0.oooXXXXX.reportdesign.stlportism.patch, 1.1, NONE openoffice.org-2.3.0.oooXXXXX.sw.stlportism.patch, 1.1, NONE

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17174

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch 
	openoffice.org-2.3.0.ooo80722.sw.stlportism.patch 
Removed Files:
	openoffice.org-2.3.0.oooXXXXX.reportdesign.stlportism.patch 
	openoffice.org-2.3.0.oooXXXXX.sw.stlportism.patch 
Log Message:
upstream fixes

openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch:

--- NEW FILE openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch ---
Index: ViewsWindow.cxx
===================================================================
RCS file: /cvs/dba/reportdesign/source/ui/report/ViewsWindow.cxx,v
retrieving revision 1.4
diff -u -r1.4 ViewsWindow.cxx
--- openoffice.org.orig/reportdesign/source/ui/report/ViewsWindow.cxx	3 Aug 2007 12:46:04 -0000	1.4
+++ openoffice.org/reportdesign/source/ui/report/ViewsWindow.cxx	15 Aug 2007 18:40:58 -0000
@@ -866,7 +866,7 @@
 		        const SdrMark* pM = pView->GetSdrMarkByIndex(i);
 		        SdrObject* pObj = pM->GetMarkedSdrObj();
                 Rectangle aObjRect(_bBoundRects ? pObj->GetCurrentBoundRect() : pObj->GetSnapRect());
-                _rSortRectangles.insert(TRectangleMap::value_type(aObjRect,TRectangleMap::data_type(pObj,pView)));
+                _rSortRectangles.insert(TRectangleMap::value_type(aObjRect,TRectangleMap::mapped_type(pObj,pView)));
             }
         }
     }

openoffice.org-2.3.0.ooo80722.sw.stlportism.patch:

--- NEW FILE openoffice.org-2.3.0.ooo80722.sw.stlportism.patch ---
Index: source/core/undo/unattr.cxx
===================================================================
RCS file: /cvs/sw/sw/source/core/undo/unattr.cxx,v
retrieving revision 1.15
diff -u -r1.15 unattr.cxx
--- openoffice.org.orig/sw/source/core/undo/unattr.cxx	26 Jul 2007 08:20:06 -0000	1.15
+++ openoffice.org/sw/source/core/undo/unattr.cxx	15 Aug 2007 14:59:15 -0000
@@ -189,11 +189,11 @@
           mbIsCounted( bIsCounted )
     {}
 
-    const ULONG mnTxtNodeIdx;
-    const int mnNumLvl;
-    const bool mbIsRestart;
-    const SwNodeNum::tSwNumTreeNumber mnRestartVal;
-    const bool mbIsCounted;
+    ULONG mnTxtNodeIdx;
+    int mnNumLvl;
+    bool mbIsRestart;
+    SwNodeNum::tSwNumTreeNumber mnRestartVal;
+    bool mbIsCounted;
 };
 // <--
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1245
retrieving revision 1.1246
diff -u -r1.1245 -r1.1246
--- openoffice.org.spec	16 Aug 2007 07:19:05 -0000	1.1245
+++ openoffice.org.spec	16 Aug 2007 07:45:09 -0000	1.1246
@@ -126,8 +126,8 @@
 Patch61: workspace.unifysound01.patch
 Patch62: libtextcat.xcu
 Patch63: workspace.npower7.patch
-Patch64: openoffice.org-2.3.0.oooXXXXX.sw.stlportism.patch
-Patch65: openoffice.org-2.3.0.oooXXXXX.reportdesign.stlportism.patch
+Patch64: openoffice.org-2.3.0.ooo80722.sw.stlportism.patch
+Patch65: openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1047,8 +1047,8 @@
 tar xzf %{PATCH60}
 %patch61 -p1 -b .workspace.unifysound01.patch
 %patch63 -p1 -b .workspace.npower7.patch
-%patch64 -p1 -b .oooXXXXX.sw.stlportism.patch
-%patch65 -p1 -b .oooXXXXX.reportdesign.stlportism.patch
+%patch64 -p1 -b .ooo80722.sw.stlportism.patch
+%patch65 -p1 -b .ooo80721.reportdesign.stlportism.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl


--- openoffice.org-2.3.0.oooXXXXX.reportdesign.stlportism.patch DELETED ---


--- openoffice.org-2.3.0.oooXXXXX.sw.stlportism.patch DELETED ---