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

[Markus Mohrhard]

 sc/source/filter/oox/drawingbase.cxx  |    7 -------
 sc/source/ui/inc/gridwin.hxx          |    3 ++-
 sc/source/ui/view/gridwin.cxx         |    6 +++++-
 sc/source/ui/view/gridwin_dbgutil.cxx |   14 +++++++++++++-
 4 files changed, 20 insertions(+), 10 deletions(-)

New commits:
commit 039eb8c314fe24e7855980dcefd90e164c3b51eb
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat May 23 05:43:50 2015 +0200

    remove hack that results in mispositioning of shapes, tdf#91266
    
    Change-Id: Iecdd0553ec8984966b2fef5fe45d9bdd0a80dd5a

diff --git a/sc/source/filter/oox/drawingbase.cxx b/sc/source/filter/oox/drawingbase.cxx
index 1755d2d..c07d5ea 100644
--- a/sc/source/filter/oox/drawingbase.cxx
+++ b/sc/source/filter/oox/drawingbase.cxx
@@ -238,13 +238,6 @@ EmuRectangle ShapeAnchor::calcAnchorRectEmu( const css::awt::Size& rPageSizeHmm
         break;
     }
 
-    // add 0.75 mm (27,000 EMUs) in X direction to correct display error
-    if( aAnchorRect.X >= 0 )
-        aAnchorRect.X += 27000;
-    // remove 0.25 mm (9,000 EMUs) in Y direction to correct display error
-    if( aAnchorRect.Y >= 9000 )
-        aAnchorRect.Y -= 9000;
-
     return aAnchorRect;
 }
 
commit e4c42413f11745760cfeb26f915d7cf7cc922264
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat May 23 05:43:22 2015 +0200

    add dump for column width in hmm
    
    Change-Id: I0be3bfc7e8f8085c1c8e88d535cbb4142968ad28

diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index bfc9a9d..0c940e9 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -439,7 +439,8 @@ protected:
 private:
 
 #ifdef DBG_UTIL
-    void dumpColumnInformation();
+    void dumpColumnInformationPixel();
+    void dumpColumnInformationHmm();
     void dumpGraphicInformation();
 #endif
 
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 89d9b11..7a9f81f 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -3513,12 +3513,16 @@ void ScGridWindow::KeyInput(const KeyEvent& rKEvt)
     {
         if (rKeyCode.GetCode() == KEY_F12)
         {
-            dumpColumnInformation();
+            dumpColumnInformationPixel();
         }
         else if (rKeyCode.GetCode() == KEY_F11)
         {
             dumpGraphicInformation();
         }
+        else if (rKeyCode.GetCode() == KEY_F10)
+        {
+            dumpColumnInformationHmm();
+        }
     }
 
 #endif
diff --git a/sc/source/ui/view/gridwin_dbgutil.cxx b/sc/source/ui/view/gridwin_dbgutil.cxx
index 77bb398..494edfc 100644
--- a/sc/source/ui/view/gridwin_dbgutil.cxx
+++ b/sc/source/ui/view/gridwin_dbgutil.cxx
@@ -35,7 +35,7 @@ void dumpScDrawObjData(ScGridWindow& rWindow, ScDrawObjData& rData, MapUnit eMap
 
 }
 
-void ScGridWindow::dumpColumnInformation()
+void ScGridWindow::dumpColumnInformationPixel()
 {
     ScDocument* pDoc = pViewData->GetDocument();
     SCTAB nTab = pViewData->GetTabNo();
@@ -47,6 +47,18 @@ void ScGridWindow::dumpColumnInformation()
     }
 }
 
+void ScGridWindow::dumpColumnInformationHmm()
+{
+    ScDocument* pDoc = pViewData->GetDocument();
+    SCTAB nTab = pViewData->GetTabNo();
+    for (SCCOL nCol = 0; nCol <= 20; ++nCol)
+    {
+        sal_uInt16 nWidth = pDoc->GetColWidth(nCol, nTab, true);
+        long nPixel = LogicToLogic(Point(nWidth, 0), MAP_TWIP, MAP_100TH_MM).getX();
+        std::cout << "Column: " << nCol << ", Width: " << nPixel << "hmm" << std::endl;
+    }
+}
+
 void ScGridWindow::dumpGraphicInformation()
 {
     ScDocument* pDoc = pViewData->GetDocument();