[Libreoffice-commits] core.git: 2 commits - sc/source

[Jan Holesovsky]

 sc/source/ui/cctrl/dpcontrol.cxx |    8 +++++---
 sc/source/ui/view/gridwin4.cxx   |   11 ++++++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

New commits:
commit c6dab8e7ba427df1cdc25ed4077dc0e443197bba
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Jun 10 10:35:58 2015 +0200

    Enablaed -> Enabled.
    
    Change-Id: Ia73ae54068d208d6b2db3439f38402664bfa8d29

diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx
index b39a3cf..90d8783 100644
--- a/sc/source/ui/cctrl/dpcontrol.cxx
+++ b/sc/source/ui/cctrl/dpcontrol.cxx
@@ -95,7 +95,7 @@ void ScDPFieldButton::setPopupLeft(bool b)
 
 void ScDPFieldButton::draw()
 {
-    bool bOldMapEnablaed = mpOutDev->IsMapModeEnabled();
+    bool bOldMapEnabled = mpOutDev->IsMapModeEnabled();
 
     if (mpOutDev->GetMapMode().GetMapUnit() != MAP_PIXEL )
         mpOutDev->EnableMapMode(false);
@@ -147,7 +147,7 @@ void ScDPFieldButton::draw()
     if (mbPopupButton)
         drawPopupButton();
 
-    mpOutDev->EnableMapMode(bOldMapEnablaed);
+    mpOutDev->EnableMapMode(bOldMapEnabled);
 }
 
 void ScDPFieldButton::getPopupBoundingBox(Point& rPos, Size& rSize) const
commit 9c947faeae438df99a14e701b12a62b3a250f13d
Author: Henry Castro <hcastro at collabora.com>
Date:   Thu May 14 14:53:23 2015 -0400

    sc tiled editing: Corrected dropdown button offset
    
    Change-Id: Ieff88d5de119db30c3fbd2f58ba52696eeb3d327

diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx
index e2c3457..b39a3cf 100644
--- a/sc/source/ui/cctrl/dpcontrol.cxx
+++ b/sc/source/ui/cctrl/dpcontrol.cxx
@@ -96,7 +96,9 @@ void ScDPFieldButton::setPopupLeft(bool b)
 void ScDPFieldButton::draw()
 {
     bool bOldMapEnablaed = mpOutDev->IsMapModeEnabled();
-    mpOutDev->EnableMapMode(false);
+
+    if (mpOutDev->GetMapMode().GetMapUnit() != MAP_PIXEL )
+        mpOutDev->EnableMapMode(false);
 
     if (mbBaseButton)
     {
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index b9894c8..c8f234b 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -762,7 +762,16 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI
     if ( bLogicText )
         aOutputData.DrawStrings(true);      // in logic MapMode if bLogicText is set
     aOutputData.DrawEdit(true);
-    pContentDev->SetMapMode(MAP_PIXEL);
+
+    if (bIsTiledRendering)
+    {
+        // Tiled offset nScrX, nScrY
+        MapMode aMap( MAP_PIXEL );
+        aMap.SetOrigin(Point(nScrX, nScrY));
+        pContentDev->SetMapMode(aMap);
+    }
+    else
+        pContentDev->SetMapMode(MAP_PIXEL);
 
         // Autofilter- und Pivot-Buttons