[Libreoffice-commits] .: Branch 'libreoffice-3-3-1' - patches/dev300

[Petr Mladek]

 patches/dev300/apply                     |   32 +++++++++++++++++--------------
 patches/dev300/sd-blank-first-slide.diff |   29 ++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 14 deletions(-)

New commits:
commit 893ed4c4f15d99532ad1f0cdf9fe1ad75dbc4e04
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Feb 22 18:10:50 2011 +0100

    NovellHotFixes: fixed occasional blank first slide in presentation (fdo#34533)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c47179f..d6ac64f 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -52,17 +52,17 @@ UnstableWP : UnstableLibwpd
 NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix, \
 	     NotDebian, Split, Shrink, \
 	     CustomUserConfig
-SUSE-9.1  : NovellBase, DisableGCJ
-SUSE-9.2  : NovellBase, DisableGCJ
-SUSE-9.3  : NovellBase, DisableGCJ
-SUSE-10.0 : NovellBase, DisableGCJ
-SUSE-10.1 : NovellBase, DisableGCJ, BerkeleyDB43, Java14, BrokenSystemNSS, Cairo10, SUSE101
-SUSE-10.2 : NovellBase, DisableGCJ, BerkeleyDB43, Java14, OpenGLTransitionsMesa703
-SUSE-10.3 : NovellBase, DisableGCJ, BerkeleyDB43, Java14, GCC41
-SUSE-11.0 : NovellBase, DisableGCJ, BerkeleyDB43, PostgreSQL
-SUSE-11.1 : NovellBase, DisableGCJ, BerkeleyDB43, ImpressFontSize, PostgreSQL
-SUSE-11.2 : NovellBase, DisableGCJ, BerkeleyDB43, ImpressFontSize, PostgreSQL, SUSE112
-SUSE      : NovellBase, DisableGCJ, BerkeleyDB43, ImpressFontSize, PostgreSQL, SUSE112
+SUSE-9.1  : NovellBase, NovellHotFixes, DisableGCJ
+SUSE-9.2  : NovellBase, NovellHotFixes, DisableGCJ
+SUSE-9.3  : NovellBase, NovellHotFixes, DisableGCJ
+SUSE-10.0 : NovellBase, NovellHotFixes, DisableGCJ
+SUSE-10.1 : NovellBase, NovellHotFixes, DisableGCJ, BerkeleyDB43, Java14, BrokenSystemNSS, Cairo10, SUSE101
+SUSE-10.2 : NovellBase, NovellHotFixes, DisableGCJ, BerkeleyDB43, Java14, OpenGLTransitionsMesa703
+SUSE-10.3 : NovellBase, NovellHotFixes, DisableGCJ, BerkeleyDB43, Java14, GCC41
+SUSE-11.0 : NovellBase, NovellHotFixes, DisableGCJ, BerkeleyDB43, PostgreSQL
+SUSE-11.1 : NovellBase, NovellHotFixes, DisableGCJ, BerkeleyDB43, ImpressFontSize, PostgreSQL
+SUSE-11.2 : NovellBase, NovellHotFixes, DisableGCJ, BerkeleyDB43, ImpressFontSize, PostgreSQL, SUSE112
+SUSE      : NovellBase, NovellHotFixes, DisableGCJ, BerkeleyDB43, ImpressFontSize, PostgreSQL, SUSE112
 # Slackware
 Slackware : LinuxCommon, SlackwareOnly, NotDebian, Mono, msaccess
 # Debian
@@ -114,9 +114,9 @@ translate-org-za-win32: translate-org-za-common, Win32Common, Common
 NovellLikeWin32: Win32Common, NovellOnly, NovellLikeOnlyWin32, MultilanguageWin32Only, \
 	CustomUserConfig, LiberationFontsOnWindows
 # Novell
-NovellWin32: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids
-NovellWin32Eval: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellEvaluation
-NovellWin32ISO: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids
+NovellWin32: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids, NovellHotFixes
+NovellWin32Eval: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellEvaluation, NovellHotFixes
+NovellWin32ISO: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids, NovellHotFixes
 # go-oo.org Win32
 GoOoWin32: NovellLikeWin32, GoOoOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids, GoOoSplash
 # Mac OS X
@@ -2350,6 +2350,10 @@ build-sled10-autoconf.diff
 #       boost.m4 can't be procced by it
 build-sled10-ixion-with-internal-boost.diff
 
+[ NovellHotFixes ]
+# occasional blank first slide in presentation
+sd-blank-first-slide.diff, fdo#34533, michael
+
 [ Fixes ]
 svx-ppt-bullet-offset-fix.diff, n#593609, rodo
 
diff --git a/patches/dev300/sd-blank-first-slide.diff b/patches/dev300/sd-blank-first-slide.diff
new file mode 100644
index 0000000..819db29
--- /dev/null
+++ b/patches/dev300/sd-blank-first-slide.diff
@@ -0,0 +1,29 @@
+commit 89fe9346a5292ddb1ac19ba734034b61e4b628b2
+Author: Michael Meeks <michael.meeks at novell.com>
+Date:   Tue Feb 22 11:23:46 2011 +0000
+
+    fix fdo#34533 - occasional blank first slide in presentation
+
+diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx
+index 2000ae0..fa293b2 100644
+--- sd/source/ui/slideshow/slideshowviewimpl.cxx
++++ sd/source/ui/slideshow/slideshowviewimpl.cxx
+@@ -500,7 +500,17 @@ void SlideShowView::updateimpl( ::osl::ClearableMutexGuard& rGuard, SlideshowImp
+     if( pSlideShow )
+     {
+         ::rtl::Reference< SlideshowImpl > aSLGuard( pSlideShow );
+-        rGuard.clear();
++
++        if( mbFirstPaint )
++        {
++            mbFirstPaint = false;
++            SlideshowImpl* pSlideShow = mpSlideShow;
++            rGuard.clear();
++            if( pSlideShow )
++                pSlideShow->onFirstPaint();
++        } else
++            rGuard.clear();
++
+         pSlideShow->startUpdateTimer();
+     }
+ }