[Libreoffice-commits] core.git: 2 commits - solenv/bin sw/source

[Tor Lillqvist]

 solenv/bin/native-code.py      |    3 +++
 sw/source/core/view/viewsh.cxx |   12 ++++++++++++
 2 files changed, 15 insertions(+)

New commits:
commit e5a6c3230e0593cc581267a4badb3409d4f01675
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Mar 20 09:32:21 2014 +0200

    After Tsahi's "connect tile device to DrawLayer" we need some more components
    
    Change-Id: I4a5784a63d3bcc8af3b50e51e410744d8b185be9

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index a1c7098..a6a21ce 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -26,6 +26,7 @@ core_factory_list = [
     ("libconfigmgrlo.a", "configmgr_component_getFactory"),
     ("libdrawinglayerlo.a", "drawinglayer_component_getFactory"),
     ("libfilterconfiglo.a", "filterconfig1_component_getFactory"),
+    ("libfrmlo.a", "frm_component_getFactory"),
     ("libfsstoragelo.a", "fsstorage_component_getFactory"),
     ("libhyphenlo.a", "hyphen_component_getFactory"),
     ("libi18npoollo.a", "i18npool_component_getFactory"),
@@ -103,6 +104,8 @@ core_constructor_list = [
 # stoc/source/inspect/introspection.component
     "com_sun_star_comp_stoc_Introspection_get_implementation",
 # toolkit/util/tk.component
+    "stardiv_Toolkit_UnoControlContainer_get_implementation",
+    "stardiv_Toolkit_UnoControlContainerModel_get_implementation",
     "stardiv_Toolkit_VCLXToolkit_get_implementation",
 # uui/util/uui.component
     "com_sun_star_comp_uui_UUIInteractionHandler_get_implementation",
commit f04907b4dd843a202a951f23d15532265605dac5
Author: tsahi glik <tsahi.glik at cloudon.com>
Date:   Mon Mar 10 17:24:34 2014 -0700

    connect tile device to DrawLayer
    
    Change-Id: I4a2a7683a218103fc25d9b55786a5e77e49570fc

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index aad5f47..8c144f9 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1768,12 +1768,24 @@ void SwViewShell::PaintTile(VirtualDevice &rDevice, int contextWidth, int contex
     aMapMode.SetScaleY(scaleY);
     rDevice.SetMapMode(aMapMode);
 
+    // Update this device in DrawLayer
+    if (Imp()->GetDrawView())
+    {
+        Imp()->GetDrawView()->AddWindowToPaintView(&rDevice);
+    }
+
     // scroll the requested area into view if necessary
     MakeVisible(SwRect(Point(tilePosX, tilePosY), rDevice.PixelToLogic(Size(contextWidth, contextHeight))));
 
     // draw - works in logic coordinates
     Paint(Rectangle(Point(tilePosX, tilePosY), rDevice.PixelToLogic(Size(contextWidth, contextHeight))));
 
+    // Remove this device in DrawLayer
+    if (Imp()->GetDrawView())
+    {
+        Imp()->GetDrawView()->DeleteWindowFromPaintView(&rDevice);
+    }
+
     // SwViewShell's output device tear down
     mpOut = pSaveOut;
     mbTiledRendering = false;