rpms/openoffice.org/devel openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch, 1.2, 1.3 pseudoworkspace.valgrind1.patch, 1.31, 1.32

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch 
	pseudoworkspace.valgrind1.patch 
Log Message:
update for sd changes

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

Index: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch	27 Mar 2008 15:13:50 -0000	1.2
+++ openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch	15 Apr 2008 13:56:23 -0000	1.3
@@ -147,7 +147,17 @@
 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
-@@ -599,6 +597,21 @@
+@@ -59,6 +59,9 @@
+ #include "taskpane/ControlContainer.hxx"
+ #include "controller/SlideSorterController.hxx"
+ #include "controller/SlsPageSelector.hxx"
++#include "SlideSorter.hxx"
++#include "model/SlideSorterModel.hxx"
++#include "controller/SlsCurrentSlideManager.hxx"
+ 
+ #ifndef	_SFXOBJFACE_HXX
+ #include <sfx2/objface.hxx>
+@@ -589,6 +592,26 @@
              break;
          }
  
@@ -157,12 +167,17 @@
 +            if (SlideSorterViewShell* pSlideSorter = SlideSorterViewShell::GetSlideSorter(mrBase))
 +            {
 +                USHORT nIndex = mpPageSet->GetSelectItemId();
-+                SlideSorterController& rController = pSlideSorter->GetSlideSorterController();
++                SlideSorter& rSorter = pSlideSorter->GetSlideSorter();
++                SlideSorterController& rController = rSorter.GetController();
 +                rController.PrepareEditModeChange();
 +                rController.ChangeEditMode ( EM_MASTERPAGE );
 +                rController.FinishEditModeChange();
 +                mpPageSet->SelectItem (nIndex);
-+                rController.GetPageSelector().SetCurrentPage ( GetSelectedMasterPage() );
++                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;
 +

pseudoworkspace.valgrind1.patch:

Index: pseudoworkspace.valgrind1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/pseudoworkspace.valgrind1.patch,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- pseudoworkspace.valgrind1.patch	7 Apr 2008 10:59:44 -0000	1.31
+++ pseudoworkspace.valgrind1.patch	15 Apr 2008 13:56:23 -0000	1.32
@@ -83,25 +83,6 @@
  {
  	DBG_TRACE1( "VirtualDevice::VirtualDevice( %hu )", nBitCount );
  
-Index: source/ui/slidesorter/cache/SlsPageCacheManager.cxx
-===================================================================
-RCS file: /cvs/graphics/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx,v
-retrieving revision 1.8
-diff -u -r1.8 SlsPageCacheManager.cxx
---- openoffice.org.orig/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx	12 Dec 2006 18:17:53 -0000	1.8
-+++ openoffice.org/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx	7 Apr 2008 10:16:55 -0000
-@@ -342,9 +342,10 @@
-             // Now, we can change the preview size of the existing one by
-             // removing the cache from the list and re-insert it with the
-             // updated size.
-+            SdDrawDocument* pDocument = iCacheToChange->first.mpDocument;
-             mpPageCaches->erase(iCacheToChange);
-             mpPageCaches->insert(PageCacheContainer::value_type(
--                CacheDescriptor(iCacheToChange->first.mpDocument,rNewPreviewSize),
-+                CacheDescriptor(pDocument,rNewPreviewSize),
-                 rpCache));
- 
-             pResult = rpCache;
 Index: source/glyphs/gcach_rbmp.cxx
 ===================================================================
 RCS file: /cvs/gsl/vcl/source/glyphs/gcach_rbmp.cxx,v