[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 2 commits - sd/source solenv/bin

[Miklos Vajna]

 sd/source/ui/unoidl/unomodel.cxx |    7 +++++--
 solenv/bin/native-code.py        |   19 +++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

New commits:
commit dc9ec3081190bd7efc0e97a162ef88bce8a24f16
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Mar 18 13:58:49 2015 +0100

    sd tiled rendering: draw documents have no slides view
    
    With this, at least a simple .odg document is now loaded again without
    crashing.
    
    Change-Id: I47200ffec680aefc0ee7769f9311a550c0329dc7

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index ec29f84..d1781c5 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2351,8 +2351,11 @@ Size SdXImpressDocument::getDocumentSize()
 void SdXImpressDocument::initializeForTiledRendering()
 {
     SolarMutexGuard aGuard;
-    // tiled rendering works only when we are in the 'Normal' view, switch to that
-    mpDocShell->GetViewShell()->GetViewFrame()->GetDispatcher()->Execute(SID_VIEWSHELL0, SfxCallMode::SYNCHRON | SfxCallMode::RECORD);
+
+    if (mbImpressDoc)
+        // tiled rendering works only when we are in the 'Normal' view, switch to that
+        mpDocShell->GetViewShell()->GetViewFrame()->GetDispatcher()->Execute(SID_VIEWSHELL0, SfxCallMode::SYNCHRON | SfxCallMode::RECORD);
+
     mpDoc->setTiledRendering(true);
 }
 
commit c6e8b7a40457c973c88438ec830930e20e081e1d
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Mar 18 13:55:49 2015 +0100

    solenv: adapt native-code to partially split sd/util/sd.component
    
    Add constructors which are no longer part of sd_component_getFactory()
    as of commit 4dafecfe4a72204dd994a3f66c5d886ffcfc965a (sd: convert
    sd.component to constructor usage, 2015-02-28).
    
    Change-Id: I209fdd9bc8c8b81cb7e69796a2afb248df856fc9

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 5664182..f48c8e0 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -237,6 +237,25 @@ draw_constructor_list = [
     "com_sun_star_animations_ParallelTimeContainer_get_implementation",
     "com_sun_star_animations_SequenceTimeContainer_get_implementation",
     "com_sun_star_animations_TransitionFilter_get_implementation",
+# sd/util/sd.component -- TODO check if all of these are necessary
+    "com_sun_star_comp_Draw_DrawingModule_get_implementation",
+    "com_sun_star_comp_Draw_PresenterCanvasFactory_get_implementation",
+    "com_sun_star_comp_Draw_PresenterHelper_get_implementation",
+    "com_sun_star_comp_Draw_PresenterPreviewCache_get_implementation",
+    "com_sun_star_comp_Draw_PresenterTextView_get_implementation",
+    "com_sun_star_comp_Draw_SlideRenderer_get_implementation",
+    "com_sun_star_comp_Draw_SlideSorter_get_implementation",
+    "com_sun_star_comp_Draw_framework_BasicPaneFactory_get_implementation",
+    "com_sun_star_comp_Draw_framework_BasicToolBarFactory_get_implementation",
+    "com_sun_star_comp_Draw_framework_BasicViewFactory_get_implementation",
+    "com_sun_star_comp_Draw_framework_PresentationFactoryProvider_get_implementation",
+    "com_sun_star_comp_Draw_framework_ResourceID_get_implementation",
+    "com_sun_star_comp_Draw_framework_configuration_Configuration_get_implementation",
+    "com_sun_star_comp_Draw_framework_configuration_ConfigurationController_get_implementation",
+    "com_sun_star_comp_Draw_framework_module_ModuleController_get_implementation",
+    "com_sun_star_comp_draw_SdHtmlOptionsDialog_get_implementation",
+    "com_sun_star_comp_sd_InsertSlideController_get_implementation",
+    "com_sun_star_comp_sd_SlideLayoutController_get_implementation",
 # sd/util/sdd.component
     "com_sun_star_comp_draw_FormatDetector_get_implementation",
     ]