[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                               |    1 +
 patches/dev300/draw-load-layer-visibility-fix.diff |   13 +++++++++++++
 2 files changed, 14 insertions(+)

New commits:
commit 0b593b4a890a27ba3643896ad9668dd70c76e5fb
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Thu Jun 3 17:13:17 2010 -0400

    Properly mark invisible layers upon document load.
    
    * patches/dev300/apply:
    * patches/dev300/draw-load-layer-visibility-fix.diff: call
      ResetActualLayer() after the view settings are read to mark
      invisible layers properly. (n#606434)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index d9a7e7b..d0759aa 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -4036,6 +4036,7 @@ sled10-splash.diff, i#123456, pmladek
 [ Fixes ]
 win32-monitor-fix.diff, n#580562, i#111824, thorsten
 #svx-ppt-bullet-offset-fix.diff, n#593609, rodo
+draw-load-layer-visibility-fix.diff, n#606434, kohei
 
 [ EMFPlus ]
 emf+-canvas-vcl-clear.diff, rodo
diff --git a/patches/dev300/draw-load-layer-visibility-fix.diff b/patches/dev300/draw-load-layer-visibility-fix.diff
new file mode 100644
index 0000000..51eed05
--- /dev/null
+++ b/patches/dev300/draw-load-layer-visibility-fix.diff
@@ -0,0 +1,13 @@
+diff --git sd/source/ui/view/drviews5.cxx sd/source/ui/view/drviews5.cxx
+index 01e1c54..5ab8cf9 100644
+--- sd/source/ui/view/drviews5.cxx
++++ sd/source/ui/view/drviews5.cxx
+@@ -638,7 +638,7 @@ void DrawViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence
+     }
+ 
+     ChangeEditMode (meEditMode, ! IsLayerModeActive());
+-    ChangeEditMode (meEditMode, ! IsLayerModeActive());
++    ResetActualLayer();
+ }
+ 
+ void DrawViewShell::VisAreaChanged(const Rectangle& rRect)