Mon Apr 20 21:38:42 UTC 2009

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15143/devel

Modified Files:
	openoffice.org.spec workspace.impress169.patch 
Added Files:
	workspace.hb18.patch workspace.impress170.patch 
	workspace.os130.patch workspace.sb109.patch 
	workspace.vcl101.patch 
Removed Files:
	openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch 
	openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch 
	openoffice.org-3.0.1.ooo98885.sw.safeindex.patch 
	openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch 
	openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch 
	openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch 
	openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch 
Log Message:
merge/rename upstream patches to accepted workspaces

workspace.hb18.patch:

--- NEW FILE workspace.hb18.patch ---
Index: source/core/bastyp/index.cxx
===================================================================
RCS file: /cvs/sw/sw/source/core/bastyp/index.cxx,v
retrieving revision 1.11
diff -u -r1.11 index.cxx
--- openoffice.org.orig/sw/source/core/bastyp/index.cxx	10 Apr 2008 12:51:37 -0000	1.11
+++ openoffice.org/sw/source/core/bastyp/index.cxx	4 Feb 2009 14:59:32 -0000
@@ -302,7 +302,7 @@
 			pArr->pFirst = pArr->pLast = this;
 			nIndex = nIdx;
 		}
-        else if( nIdx > ((pArr->pLast->nIndex - pArr->pFirst->nIndex) / 2) )
+        else if( pArr->pLast && (nIdx > ((pArr->pLast->nIndex - pArr->pFirst->nIndex) / 2)) )
 			ChgValue( *pArr->pLast, nIdx );
 		else
 			ChgValue( *pArr->pFirst, nIdx );

workspace.impress170.patch:

--- NEW FILE workspace.impress170.patch ---
diff -ru sd/inc/app.hrc sd/inc/app.hrc
--- openoffice.org.orig/sd/inc/app.hrc	2008-02-05 17:05:14.000000000 +0000
+++ openoffice.org/sd/inc/app.hrc	2008-02-05 20:29:11.000000000 +0000
@@ -470,5 +470,6 @@
 
 #define SID_ADD_MOTION_PATH					(SID_SD_START+441)
 #define SID_TABLE_TOOLBOX					(SID_SD_START+442)
+#define SID_TP_EDIT_MASTER                  (SID_SD_START+443)
 
 #endif
diff -ru sd/sdi/TaskPaneViewShell.sdi sd/sdi/TaskPaneViewShell.sdi
--- openoffice.org.orig/sd/sdi/TaskPaneViewShell.sdi	2008-02-05 17:05:16.000000000 +0000
+++ openoffice.org/sd/sdi/TaskPaneViewShell.sdi	2008-02-05 20:30:12.000000000 +0000
@@ -154,6 +154,31 @@
 	GroupId = GID_VIEW;
 ]
 
+SfxVoidItem TaskPaneEditMaster SID_TP_EDIT_MASTER
+[
+	/* flags: */
+	AutoUpdate = TRUE,
+	Cachable = Cachable,
+	FastCall = FALSE,
+	HasCoreId = FALSE,
+	HasDialog = FALSE,
+	ReadOnlyDoc = FALSE,
+	Toggle = FALSE,
+	Container = FALSE,
+	RecordAbsolute = FALSE,
+	RecordPerSet;
+	Synchron;
+
+	Readonly = FALSE,
+
+	/* config: */
+	AccelConfig = FALSE,
+	MenuConfig = FALSE,
+	StatusBarConfig = FALSE,
+	ToolBoxConfig = FALSE,
+	GroupId = GID_VIEW;
+]
+
 SfxVoidItem TaskPaneInsertPage SID_INSERTPAGE_LAYOUT_MENU
 [
 	/* flags: */  
@@ -207,6 +232,11 @@
 		ExecMethod = Execute ;
 		StateMethod = GetState ;
 	]
+    SID_TP_EDIT_MASTER
+	[
+		ExecMethod = Execute ;
+		StateMethod = GetState ;
+	]
 
     // The copy and paste slots are included here so that they later can be
     // disabled in order to remove them from context menus.
diff -ru sd/source/ui/app/popup.src sd/source/ui/app/popup.src
--- openoffice.org.orig/sd/source/ui/app/popup.src	2008-02-05 17:05:14.000000000 +0000
+++ openoffice.org/sd/source/ui/app/popup.src	2008-02-06 09:05:04.000000000 +0000
@@ -337,6 +337,12 @@
             HelpID = SID_TP_SHOW_SMALL_PREVIEW;
             Text[ en-US ] = "Show S~mall Preview";
         };
+        MenuItem
+        {
+            Identifier = SID_TP_EDIT_MASTER;
+            HelpID = SID_TP_EDIT_MASTER;
+            Text[ en-US ] = "~Edit Master...";
+        };
 	};
 };
 
diff -ru sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx
--- openoffice.org.orig/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx	2008-02-05 17:05:15.000000000 +0000
+++ openoffice.org/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.cxx	2008-02-06 14:01:07.000000000 +0000
@@ -44,6 +44,8 @@
 #include <tools/link.hxx>
 #include <set>
 
+#include "app.hrc"
+
 namespace {
 
 using namespace sd::toolpanel::controls;
@@ -202,4 +204,13 @@
 
 
 
+void AllMasterPagesSelector::GetState (SfxItemSet& rItemSet)
+{
+    MasterPagesSelector::GetState (rItemSet);
+    rItemSet.DisableItem (SID_TP_EDIT_MASTER);
+}
+
+
+
+
 } } } // end of namespace ::sd::toolpanel::controls
diff -ru sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx
--- openoffice.org.orig/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx	2008-02-05 17:05:15.000000000 +0000
+++ openoffice.org/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx	2008-02-06 13:56:51.000000000 +0000
@@ -63,6 +63,7 @@
     */
     virtual void Fill (ItemList& rItemList);
 
+    virtual void GetState (SfxItemSet& rItemSet);
 protected:
     virtual void NotifyContainerChangeEvent (const MasterPageContainerChangeEvent& rEvent);
 
diff -ru sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx
--- openoffice.org.orig/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx	2008-02-05 17:05:15.000000000 +0000
+++ openoffice.org/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx	2008-02-06 16:28:56.000000000 +0000
@@ -34,6 +34,7 @@
 #include "CurrentMasterPagesSelector.hxx"
 #include "PreviewValueSet.hxx"
 #include "ViewShellBase.hxx"
+#include "DrawViewShell.hxx"
 #include "drawdoc.hxx"
 #include "sdpage.hxx"
 #include "MasterPageContainer.hxx"
@@ -251,11 +252,14 @@
 {
     // Disable the SID_DELTE_MASTER slot when there is only one master page.
     if (mrDocument.GetMasterPageUserCount(GetSelectedMasterPage()) > 0)
-    {
         rItemSet.DisableItem(SID_DELETE_MASTER_PAGE);
-    }
 
     MasterPagesSelector::GetState(rItemSet);
+
+    DrawViewShell* pDrawViewShell = dynamic_cast<DrawViewShell*>(mrBase.GetMainViewShell().get());
+    if (pDrawViewShell && pDrawViewShell->GetEditMode() == EM_MASTERPAGE)
+        rItemSet.DisableItem (SID_TP_EDIT_MASTER);
+
 }
 
 
diff -ru sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
--- openoffice.org.orig/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx	2008-02-05 17:05:15.000000000 +0000
+++ openoffice.org/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx	2008-02-06 16:28:52.000000000 +0000
@@ -54,6 +54,9 @@
 #include "taskpane/ControlContainer.hxx"
 #include "controller/SlideSorterController.hxx"
 #include "controller/SlsPageSelector.hxx"
+#include "SlideSorter.hxx"
+#include "model/SlideSorterModel.hxx"
+#include "controller/SlsCurrentSlideManager.hxx"
 #include <sfx2/objface.hxx>
 #include "sdresid.hxx"
 #include "TemplateScanner.hxx"
@@ -561,6 +564,26 @@
             break;
         }
 
+        case SID_TP_EDIT_MASTER:
+            using namespace ::sd::slidesorter;
+            using namespace ::sd::slidesorter::controller;
+            if (SlideSorterViewShell* pSlideSorter = SlideSorterViewShell::GetSlideSorter(mrBase))
+            {
+                USHORT nIndex = mpPageSet->GetSelectItemId();
+                SlideSorter& rSorter = pSlideSorter->GetSlideSorter();
+                SlideSorterController& rController = rSorter.GetController();
+                rController.PrepareEditModeChange();
+                rController.ChangeEditMode ( EM_MASTERPAGE );
+                rController.FinishEditModeChange();
+                mpPageSet->SelectItem (nIndex);
+                SdPage *pPage = GetSelectedMasterPage();
+                int nPageIndex = (pPage->GetPageNum()-1) / 2;
+                model::SharedPageDescriptor pDescriptor = rSorter.GetModel().GetPageDescriptor( nPageIndex );
+                if (pDescriptor.get() != NULL)
+                    rController.GetCurrentSlideManager()->SwitchCurrentSlide(pDescriptor);
+            }
+            break;
+
         case SID_CUT:
         case SID_COPY:
         case SID_PASTE:
diff -ru sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx
--- openoffice.org.orig/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx	2008-02-05 17:05:15.000000000 +0000
+++ openoffice.org/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx	2008-02-06 14:01:57.000000000 +0000
@@ -47,6 +47,8 @@
 #include <vcl/bitmap.hxx>
 #include <tools/color.hxx>
 
+#include "app.hrc"
+
 namespace sd { namespace toolpanel { namespace controls {
 
 
@@ -150,4 +152,16 @@
     }
 }
 
+
+
+
+void RecentMasterPagesSelector::GetState (SfxItemSet& rItemSet)
+{
+    MasterPagesSelector::GetState (rItemSet);
+    rItemSet.DisableItem (SID_TP_EDIT_MASTER);
+}
+
+
+
+
 } } } // end of namespace ::sd::toolpanel::controls
diff -ru sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.hxx sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.hxx
--- openoffice.org.orig/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.hxx	2008-02-05 17:05:15.000000000 +0000
+++ openoffice.org/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.hxx	2008-02-06 13:57:15.000000000 +0000
@@ -56,6 +56,8 @@
 
     virtual void LateInit (void);
 
+    virtual void GetState (SfxItemSet& rItemSet);
+
 protected:
     DECL_LINK(MasterPageListListener, void*);
     virtual void Fill (ItemList& rItemList);

workspace.os130.patch:

--- NEW FILE workspace.os130.patch ---
Index: source/ui/dochdl/swdtflvr.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/dochdl/swdtflvr.cxx,v
retrieving revision 1.120
diff -u -r1.120 swdtflvr.cxx
--- sw.orig/source/ui/dochdl/swdtflvr.cxx	7 Jul 2008 07:25:25 -0000	1.120
+++ sw/source/ui/dochdl/swdtflvr.cxx	23 Feb 2009 12:34:35 -0000
@@ -569,8 +570,13 @@
 			break;
 
 		case SOT_FORMAT_STRING:
-			bOK = SetObject( pClpDocFac->GetDoc(),
+			{
+				SwDoc *pDoc = pClpDocFac->GetDoc();
+				ASSERT( pDoc, "Document not found" );
+				pDoc->SetClipBoard( true );
+				bOK = SetObject( pDoc,
 								SWTRANSFER_OBJECTTYPE_STRING, rFlavor );
+			}
 			break;
 
 		case SOT_FORMAT_RTF:
Index: source/ui/dbui/mmlayoutpage.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/dbui/mmlayoutpage.cxx,v
retrieving revision 1.21
diff -u -r1.21 mmlayoutpage.cxx
--- sw.orig/source/ui/dbui/mmlayoutpage.cxx	6 May 2008 12:55:06 -0000	1.21
+++ sw/source/ui/dbui/mmlayoutpage.cxx	23 Feb 2009 11:51:34 -0000
@@ -804,7 +804,8 @@
 {
     bool bDown = pButton == &m_aDownPB;
     BOOL bMoved = m_pExampleWrtShell->MoveParagraph( bDown ? 1 : -1 );
-    m_pWizard->GetConfigItem().MoveGreeting(bDown ? 1 : -1 );
+    if (bMoved || bDown)
+        m_pWizard->GetConfigItem().MoveGreeting(bDown ? 1 : -1 );
     if(!bMoved && bDown)
     {
         //insert a new paragraph before the greeting line
Index: source/core/doc/docnum.cxx
===================================================================
RCS file: /cvs/sw/sw/source/core/doc/docnum.cxx,v
retrieving revision 1.77.22.1
diff -u -r1.77.22.1 docnum.cxx
--- sw.orig/source/core/doc/docnum.cxx	14 Aug 2008 19:44:28 -0000	1.77.22.1
+++ sw/source/core/doc/docnum.cxx	23 Feb 2009 11:51:26 -0000
@@ -2073,6 +2073,10 @@
 	}
 	else
 	{
+        //Impossible to move to negative index
+        if (Abs(nOffset) > nStIdx)
+            return FALSE;
+
 		nInEndIdx = nStIdx - 1;
 		nStIdx += nOffset;
 	}

workspace.sb109.patch:

--- NEW FILE workspace.sb109.patch ---
Index: source/remote/urp/urp_environment.cxx
===================================================================
RCS file: /cvs/udk/bridges/source/remote/urp/urp_environment.cxx,v
retrieving revision 1.21
diff -u -r1.21 urp_environment.cxx
--- openoffice.org.orig/bridges/source/remote/urp/urp_environment.cxx	11 Apr 2008 11:14:42 -0000	1.21
+++ openoffice.org/bridges/source/remote/urp/urp_environment.cxx	12 Jan 2009 08:56:26 -0000
@@ -182,6 +182,7 @@
 {
 	~StaticSingleton()
 		{
+            ::osl::MutexGuard guard( ::osl::Mutex::getGlobalMutex() );
 			g_bStaticDestructorsCalled = sal_True;
 		}
 };
@@ -267,7 +268,13 @@
   	}
 	// in case, that the static destructors already have been called, no
 	// tiding up is done.
-	if( ! g_bStaticDestructorsCalled  && ! pContext->m_pBridgeImpl->m_bDisposed )
+    bool tidyUp;
+    {
+        ::osl::MutexGuard guard2( ::osl::Mutex::getGlobalMutex() );
+        tidyUp = ! g_bStaticDestructorsCalled &&
+            ! pContext->m_pBridgeImpl->m_bDisposed;
+    }
+	if( tidyUp )
 	{
 		// TODO : not threadsafe
 		// synchronization with dispatch methods needed !
@@ -335,9 +342,12 @@
             pImpl->m_pReader = 0;
 		}
 
-		// delete the stubs
-		releaseStubs( pEnvRemote );
-
+        ::osl::MutexGuard guard2( ::osl::Mutex::getGlobalMutex() );
+        if( ! g_bStaticDestructorsCalled )
+        {
+            // delete the stubs
+            releaseStubs( pEnvRemote );
+        }
 	}
 }
 

workspace.vcl101.patch:

--- NEW FILE workspace.vcl101.patch ---
Index: unx/source/app/saldisp.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/saldisp.cxx,v
retrieving revision 1.100
diff -u -r1.100 saldisp.cxx
--- openoffice.org.orig/vcl/unx/source/app/saldisp.cxx	2 Jul 2008 10:14:35 -0000	1.100
+++ openoffice.org/vcl/unx/source/app/saldisp.cxx	16 Apr 2009 16:22:53 -0000
@@ -832,6 +832,7 @@
     int nDisplayScreens = ScreenCount( pDisp_ );
     m_aScreens = std::vector<ScreenData>(nDisplayScreens);
 
+    mbExactResolution = false;
     const char *value;
     /*  #i15507#
      *  Xft resolution should take precedence since
@@ -841,15 +842,18 @@
     {
         rtl::OString str (value);
         long dpi = (long) str.toDouble();
-        aResolution_ = Pair( dpi, dpi );
-        mbExactResolution = true;
+        // Guard against insane resolution
+        if (dpi > 0)
+        {
+            aResolution_ = Pair( dpi, dpi );
+            mbExactResolution = true;
+        }
     }
-    else
+    if (mbExactResolution == false)
     {
         aResolution_     =
             Pair( DPI( WidthOfScreen( DefaultScreenOfDisplay( pDisp_ ) ), DisplayWidthMM ( pDisp_, m_nDefaultScreen ) ),
                   DPI( HeightOfScreen( DefaultScreenOfDisplay( pDisp_ ) ), DisplayHeightMM( pDisp_, m_nDefaultScreen ) ) );
-        mbExactResolution	= false;
     }
 
     nMaxRequestSize_    = XExtendedMaxRequestSize( pDisp_ ) * 4;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1886
retrieving revision 1.1887
diff -u -r1.1886 -r1.1887
--- openoffice.org.spec	19 Apr 2009 21:59:48 -0000	1.1886
+++ openoffice.org.spec	20 Apr 2009 21:38:12 -0000	1.1887
@@ -92,7 +92,7 @@
 Patch17: openoffice.org-2.3.0.ooo76649.httpencoding.patch
 Patch18: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
 Patch19: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch20: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
+Patch20: workspace.impress170.patch
 Patch21: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
 Patch22: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
 Patch23: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
@@ -107,14 +107,14 @@
 Patch32: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
 Patch33: workspace.transogl03redux.patch
 Patch34: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
-Patch35: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
+Patch35: workspace.sb109.patch
 Patch36: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
 Patch37: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
 Patch38: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
 Patch39: workspace.cmcfixes54.patch
 Patch40: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
 Patch41: workspace.fwk103.patch
-Patch42: openoffice.org-3.0.1.ooo98885.sw.safeindex.patch
+Patch42: workspace.hb18.patch
 Patch43: openoffice.org-3.0.1.ooo99050.sw.htmlload.patch
 Patch44: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
 Patch45: openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch
@@ -122,23 +122,21 @@
 Patch47: workspace.xmergeclean.patch
 Patch48: openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch
 Patch49: workspace.impress169.patch
-Patch50: openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch
-Patch51: openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch
-Patch52: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
-Patch53: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
-Patch54: workspace.cmcfixes57.patch
-Patch55: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
-Patch56: ooo-build.ooo2497.filter.svg.patch
-Patch57: openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch
-Patch58: openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch
-Patch59: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
-Patch60: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
-Patch61: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
-Patch62: openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
-Patch63: openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch
-Patch64: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
-Patch65: openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch
-Patch66: workspace.slideshow1.patch
+Patch50: workspace.os130.patch
+Patch51: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
+Patch52: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
+Patch53: workspace.cmcfixes57.patch
+Patch54: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
+Patch55: ooo-build.ooo2497.filter.svg.patch
+Patch56: openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch
+Patch57: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
+Patch58: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
+Patch59: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
+Patch60 openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
+Patch61: workspace.vcl101.patch
+Patch62: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
+Patch63: openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch
+Patch64: workspace.slideshow1.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1589,7 +1587,7 @@
 %patch17 -p1 -b .ooo76649.httpencoding.patch
 %patch18 -p1 -b .ooo83878.unopkg.enablelinking.patch
 %patch19 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch20 -p1 -b .ooo85921.sd.editmasterundermouse.patch
+%patch20 -p1 -b .workspace.impress170.patch
 %patch21 -p1 -b .ooo86080.unopkg.bodge.patch
 %patch22 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
 %patch23 -p1 -b .ooo88341.sc.verticalboxes.patch
@@ -1604,14 +1602,14 @@
 %patch32 -p1
 %patch33 -p0 -b .workspace.transogl03redux.patch
 %patch34 -p1 -b .oooXXXXX.extensions.npapi.patch
-%patch35 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
+%patch35 -p1 -b .workspace.sb109.patch
 %patch36 -p1 -b .ooo97488.sw.ww8toc.patch
 %patch37 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
 %patch38 -p1 -b .ooo98137.filter.redeclared-variables.patch
 %patch39 -p1 -b .workspace.cmcfixes54.patch
 %patch40 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 %patch41 -p1 -b .workspace.fwk103.patch
-%patch42 -p1 -b .ooo98885.sw.safeindex.patch
+%patch42 -p1 -b .workspace.hb18.patch
 %patch43 -p1 -R -b .ooo99050.sw.htmlload.patch
 %patch44 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
 %patch45 -p0 -b .ooo99250.sc.autooutline-reflists.patch
@@ -1619,23 +1617,21 @@
 %patch47 -p0 -b .workspace.xmergeclean.patch
 %patch48 -p0 -b .ooo99407.filter-detectsmalldevicefilters.patch
 %patch49 -p0 -b .workspace.impress169.patch
-%patch50 -p0 -b .ooo99526.sw.mailmergeup.outofrange.patch
-%patch51 -p0 -b .ooo99529.sw.notrailingnewline.patch
-%patch52 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
-%patch53 -p1 -b .oooXXXXX.solenv.allowmissing.patch
-%patch54 -p0 -b .workspace.cmcfixes57.patch
-%patch55 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
-%patch56 -p1 -b .ooo2497.filter.svg.patch
-%patch57 -p0 -b .ooo100353.svx.rtfbrackets.patch
-%patch58 -p1 -b .ooo100942.svtools.oversafeemf.patch
-%patch59 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
-%patch60 -p1 -b .ooo100991.pyuno-fix.patch
-%patch61 -p1 -b .ooo101074.sd.bad.nothrow.patch
-%patch62 -p0 -b .ooo101105.sw.reorder.boundscheck.patch
-%patch63 -p1 -b .ooo101145.vcl.safe.dpi.patch
-%patch64 -p1 -b .ooo101152.solenv.kn.patch
-%patch65 -p0 -b .ooo101184.vcl.dynamic.monitors.patch
-%patch66 -p2 -b .workspace.slideshow1.patch
+%patch50 -p0 -b .workspace.os130.patch
+%patch51 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
+%patch52 -p1 -b .oooXXXXX.solenv.allowmissing.patch
+%patch53 -p0 -b .workspace.cmcfixes57.patch
+%patch54 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
+%patch55 -p1 -b .ooo2497.filter.svg.patch
+%patch56 -p0 -b .ooo100353.svx.rtfbrackets.patch
+%patch57 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
+%patch58 -p1 -b .ooo100991.pyuno-fix.patch
+%patch59 -p1 -b .ooo101074.sd.bad.nothrow.patch
+%patch60 -p0 -b .ooo101105.sw.reorder.boundscheck.patch
+%patch61 -p1 -b .workspace.vcl101.patch
+%patch62 -p1 -b .ooo101152.solenv.kn.patch
+%patch63 -p0 -b .ooo101184.vcl.dynamic.monitors.patch
+%patch64 -p2 -b .workspace.slideshow1.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`

workspace.impress169.patch:

Index: workspace.impress169.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.impress169.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.impress169.patch	16 Mar 2009 20:32:54 -0000	1.1
+++ workspace.impress169.patch	20 Apr 2009 21:38:12 -0000	1.2
@@ -18,3 +18,99 @@
  				// #96551# trigger preview refresh
  				mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE );
  			}
+Index: source/filter.vcl/wmf/enhwmf.cxx
+===================================================================
+RCS file: /cvs/util/svtools/source/filter.vcl/wmf/enhwmf.cxx,v
+retrieving revision 1.39.114.1
+diff -u -r1.39.114.1 enhwmf.cxx
+--- svtools.orig/source/filter.vcl/wmf/enhwmf.cxx	26 Sep 2008 11:25:35 -0000	1.39.114.1
++++ svtools/source/filter.vcl/wmf/enhwmf.cxx	8 Apr 2009 11:25:53 -0000
+@@ -337,7 +337,7 @@
+ 				*pWMF >> nPoly >> i;
+ 
+ 				// taking the amount of points of each polygon, retrieving the total number of points
+-				if ( static_cast< sal_uInt32 >(nPoly) < SAL_MAX_UINT32 / sizeof(UINT16) )
++				if ( static_cast< sal_uInt32 >(nPoly) < SAL_MAX_SIZE / sizeof(UINT16) )
+ 				{
+ 					if ( ( static_cast< sal_uInt32 >( nPoly ) * sizeof(UINT16) ) <= ( nEndPos - pWMF->Tell() ) )
+ 					{
+@@ -378,7 +378,7 @@
+ 				// Anzahl der Polygone:
+ 				*pWMF >> nPoly >> nGesPoints;
+ 
+-				if ( ( nGesPoints < SAL_MAX_UINT32 / sizeof(Point) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
++				if ( ( nGesPoints < SAL_MAX_SIZE / sizeof(Point) ) && ( nPoly < SAL_MAX_SIZE / sizeof(UINT16) ) )
+ 				{
+ 					if ( ( nPoly * sizeof(UINT16) ) <= ( nEndPos - pWMF->Tell() ) )
+ 					{
+@@ -390,10 +390,10 @@
+ 							pnPoints[ i ] = (UINT16)nPoints;
+ 						}
+ 
+-						if ( ( nGesPoints * sizeof(Point) ) <= ( nEndPos - pWMF->Tell() ) )
++						if ( ( nGesPoints * (sizeof(sal_uInt32)+sizeof(sal_uInt32)) ) <= ( nEndPos - pWMF->Tell() ) )
+ 						{
+ 							// Polygonpunkte holen:
+-							pPtAry  = (Point*) new char[ nGesPoints * sizeof(Point) ];
++							pPtAry  = new Point[ nGesPoints ];
+ 			
+ 							for ( i = 0; i < nGesPoints; i++ )
+ 							{
+@@ -403,7 +403,7 @@
+ 							// PolyPolygon Actions erzeugen
+ 							PolyPolygon aPolyPoly( (UINT16)nPoly, pnPoints, pPtAry );
+ 							pOut->DrawPolyPolygon( aPolyPoly, bRecordPath );
+-							delete[] (char*) pPtAry;
++							delete[] pPtAry;
+ 						}
+ 						delete[] pnPoints;
+ 					}
+@@ -977,7 +977,7 @@
+ 				DBG_ASSERT( ( nOptions & ( ETO_PDY | ETO_GLYPH_INDEX ) ) == 0, "SJ: ETO_PDY || ETO_GLYPH_INDEX in EMF" );
+ 
+ 				Point aPos( ptlReferenceX, ptlReferenceY );
+-				if ( nLen && ( nLen < SAL_MAX_UINT32 / sizeof(sal_Int32) ) )
++				if ( nLen && ( nLen < SAL_MAX_SIZE / sizeof(sal_Int32) ) )
+ 				{
+ 					if ( offDx && (( nCurPos + offDx + nLen * 4 ) <= nNextPos ) )
+ 					{
+@@ -1111,7 +1111,7 @@
+ 				*pWMF >> nPoly >> nGesPoints;
+ 
+ 				// taking the amount of points of each polygon, retrieving the total number of points
+-				if ( static_cast< sal_uInt32 >(nPoly) < SAL_MAX_UINT32 / sizeof(UINT16) )
++				if ( static_cast< sal_uInt32 >(nPoly) < SAL_MAX_SIZE / sizeof(UINT16) )
+ 				{
+ 					if ( ( static_cast< sal_uInt32 >( nPoly ) * sizeof(UINT16) ) <= ( nEndPos - pWMF->Tell() ) )
+ 					{
+@@ -1147,7 +1147,7 @@
+ 				pWMF->SeekRel( 0x10 );
+ 				// Anzahl der Polygone:
+ 				*pWMF >> nPoly >> nGesPoints;
+-				if ( ( nGesPoints < SAL_MAX_UINT32 / sizeof(Point) ) && ( nPoly < SAL_MAX_UINT32 / sizeof(UINT16) ) )
++				if ( ( nGesPoints < SAL_MAX_SIZE / sizeof(Point) ) && ( nPoly < SAL_MAX_SIZE / sizeof(UINT16) ) )
+ 				{
+ 					if ( ( static_cast< sal_uInt32 >( nPoly ) * sizeof( UINT16 ) ) <= ( nEndPos - pWMF->Tell() ) )
+ 					{
+@@ -1157,10 +1157,10 @@
+ 							*pWMF >> nPoints;
+ 							pnPoints[ i ] = (UINT16)nPoints;
+ 						}
+-						if ( ( nGesPoints * sizeof(Point) ) <= ( nEndPos - pWMF->Tell() ) )
++						if ( ( nGesPoints * (sizeof(sal_uInt16)+sizeof(sal_uInt16)) ) <= ( nEndPos - pWMF->Tell() ) )
+ 						{
+ 							// Polygonpunkte holen:
+-							pPtAry  = (Point*) new char[ nGesPoints * sizeof(Point) ];
++							pPtAry  = new Point[ nGesPoints ];
+ 							for ( i = 0; i < nGesPoints; i++ )
+ 							{
+ 								*pWMF >> nX16 >> nY16;
+@@ -1170,7 +1170,7 @@
+ 							// PolyPolygon Actions erzeugen
+ 							PolyPolygon aPolyPoly( (UINT16)nPoly, pnPoints, pPtAry );
+ 							pOut->DrawPolyPolygon( aPolyPoly, bRecordPath );
+-							delete[] (char*) pPtAry;
++							delete[] pPtAry;
+ 						}
+ 						delete[] pnPoints;
+ 					}


--- openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch DELETED ---


--- openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch DELETED ---


--- openoffice.org-3.0.1.ooo98885.sw.safeindex.patch DELETED ---


--- openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch DELETED ---


--- openoffice.org-3.1.0.ooo101145.vcl.safe.dpi.patch DELETED ---


--- openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch DELETED ---


--- openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch DELETED ---


