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

[Jan Holesovsky]

 bin/run                        |    6 +++---
 sc/source/ui/view/gridwin4.cxx |   15 +++++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

New commits:
commit 98a430db21e55adc113224b51b057cc1e25c69e2
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Apr 7 16:45:46 2015 +0200

    sc tiled editing: Better setup of drawinglayer, so that images are swapped in.
    
    Change-Id: I6f28ab1e4af91b12005ddfb9e64e984c783081ff

diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 269d12e..a14c04e 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -971,15 +971,18 @@ void ScGridWindow::PaintTile( VirtualDevice& rDevice,
             -fTilePosXPixel, -fTilePosYPixel, nStartCol, nStartRow, nEndCol, nEndRow,
             fPPTX, fPPTY);
 
-    // create a temporary SdrPaintWindow to avoid warnings
-    SdrPaintWindow aTemporaryPaintWindow(*pViewData->GetScDrawView(), rDevice);
-    SdrPageView* pSdrPageView = pViewData->GetScDrawView()->GetSdrPageView();
-    pSdrPageView->AddPaintWindowToPageView(aTemporaryPaintWindow);
+    // setup the SdrPage so that drawinglayer works correctly
+    ScDrawLayer* pModel = pDoc->GetDrawLayer();
+    boost::scoped_ptr<FmFormView> pDrawView;
+    if (pModel)
+    {
+        pDrawView.reset(new FmFormView(pModel, &rDevice));
+        pDrawView->ShowSdrPage(pDrawView->GetModel()->GetPage(nTab));
+        aOutputData.SetDrawView( pDrawView.get() );
+    }
 
     // draw the content
     DrawContent(rDevice, aTabInfo, aOutputData, true, SC_UPDATE_ALL);
-
-    pSdrPageView->RemovePaintWindowFromPageView(aTemporaryPaintWindow);
 }
 
 void ScGridWindow::LogicInvalidate(const Rectangle* pRectangle)
commit 85c7b1c4aea78e4ac183427d91791b47630f78ce
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Apr 7 16:45:12 2015 +0200

    bin/run: Survive files with spaces in filenames.
    
    Change-Id: Ifeeb839f82891057fe8e3e8fd6d537861d99f69f

diff --git a/bin/run b/bin/run
index e9bcb5c..c1b3f93 100755
--- a/bin/run
+++ b/bin/run
@@ -29,7 +29,7 @@ if uname | grep -i CYGWIN >/dev/null; then
     echo "setting search path to: ${PATH}"
     echo "execing: ${exedir}/$1"
 
-    exec ${LO_TRACE} "${exedir}"/$@
+    exec ${LO_TRACE} "${exedir}/$@"
 
 elif [ $(uname) = Darwin ]; then
 
@@ -51,7 +51,7 @@ elif [ $(uname) = Darwin ]; then
     echo "setting search path to: ${DYLD_LIBRARY_PATH}"
     echo "execing: ${exedir}/$1"
 
-    exec ${LO_TRACE} "${exedir}"/$@
+    exec ${LO_TRACE} "${exedir}/$@"
 
 else
 
@@ -73,7 +73,7 @@ else
     echo "setting search path to: ${LD_LIBRARY_PATH}"
     echo "execing: ${exedir}/$1"
 
-    exec ${LO_TRACE} "${exedir}"/$@
+    exec ${LO_TRACE} "${exedir}/$@"
 
 fi