split column info dump and graphic object dumping

Change-Id: Ie78722790639f151453b4c0f6ab9e599abb4aa89

3 files changed, 17 insertions, 5 deletions

diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index ca41b94a93fd..b4d2ef76d1e2 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -441,7 +441,8 @@ protected:
 private:
 
 #ifdef DBG_UTIL
-    void dumpInformation();
+    void dumpColumnInformation();
+    void dumpGraphicInformation();
 #endif
 
 };
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 5ff13086bf99..f4c7010027a6 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -3509,9 +3509,16 @@ void ScGridWindow::KeyInput(const KeyEvent& rKEvt)
 
 #ifdef DBG_UTIL
 
-    if (rKeyCode.IsMod1() && rKeyCode.IsShift() && rKeyCode.GetCode() == KEY_F12)
+    if (rKeyCode.IsMod1() && rKeyCode.IsShift())
     {
-        dumpInformation();
+        if (rKeyCode.GetCode() == KEY_F12)
+        {
+            dumpColumnInformation();
+        }
+        else if (rKeyCode.GetCode() == KEY_F11)
+        {
+            dumpGraphicInformation();
+        }
     }
 
 #endif
diff --git a/sc/source/ui/view/gridwin_dbgutil.cxx b/sc/source/ui/view/gridwin_dbgutil.cxx
index fd57e703533d..e111e6cf48ab 100644
--- a/sc/source/ui/view/gridwin_dbgutil.cxx
+++ b/sc/source/ui/view/gridwin_dbgutil.cxx
@@ -22,7 +22,7 @@ std::ostream& operator<<(std::ostream& rStrm, const ScAddress& rAddr)
 
 }
 
-void ScGridWindow::dumpInformation()
+void ScGridWindow::dumpColumnInformation()
 {
     ScDocument* pDoc = pViewData->GetDocument();
     SCTAB nTab = pViewData->GetTabNo();
@@ -32,7 +32,11 @@ void ScGridWindow::dumpInformation()
         long nPixel = LogicToPixel(Point(nWidth, 0), MapMode(MAP_TWIP)).getX();
         std::cout << "Column: " << nCol << ", Width: " << nPixel << "px" << std::endl;
     }
+}
 
+void ScGridWindow::dumpGraphicInformation()
+{
+    ScDocument* pDoc = pViewData->GetDocument();
     ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();
     if (pDrawLayer)
     {
@@ -44,7 +48,7 @@ void ScGridWindow::dumpInformation()
             for (sal_uInt16 nObj = 0; nObj < nObjCount; ++nObj)
             {
                 SdrObject* pObj = pPage->GetObj(nObj);
-                std::cout << "Graphic Object";
+                std::cout << "Graphic Object" << std::endl;
                 ScDrawObjData* pObjData = ScDrawLayer::GetObjData(pObj);
                 if (pObjData)
                     std::cout << "Start Position: " << pObjData->maStart << ", EndPosition: " << pObjData->maEnd << std::endl;