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

[Kohei Yoshida]

 sc/inc/docuno.hxx               |    2 +-
 sc/source/filter/excel/read.cxx |    3 ---
 sc/source/ui/unoobj/docuno.cxx  |   12 ++----------
 3 files changed, 3 insertions(+), 14 deletions(-)

New commits:
commit 5bf2a07f76d351a8964cb2ebe91be227e012010f
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Fri Mar 8 11:47:09 2013 -0500

    Removing this comment...
    
    Change-Id: Iaa1adc11063f9c2bd93ee25a2fcc23ac06d08f21

diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index f3bbaa8..a68ddb2 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -857,9 +857,6 @@ FltError ImportExcel8::Read( void )
                         eAkt = EXC_STATE_END;
                 }
 
-                // FIXME_REMOVE_WHEN_RE_BASE_COMPLETE
-                // a lamer approach to do the above from dr:
-
                 // import only 256 sheets
                 if( nScTab > GetScMaxPos().Tab() )
                 {
commit cba1509b63d9996431f95ab0b12882601d6621bf
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Fri Mar 8 11:37:03 2013 -0500

    A little cleanup.
    
    Change-Id: I244b32545548ad882a80f8b0d5128b8620d9fba0

diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 4aa8aab..8659d47 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -120,7 +120,7 @@ public:
     ScDocument*             GetDocument() const;
     SfxObjectShell*         GetEmbeddedObject() const;
 
-    void                    UpdateAllRowHeights( const ScMarkData* pTabMark = NULL, bool bCalcOutputFactor = false );
+    void UpdateAllRowHeights();
 
     void                    BeforeXMLLoading();
     void                    AfterXMLLoading(sal_Bool bRet);
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index feb3eb8..18b9e5b 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -412,18 +412,10 @@ SfxObjectShell* ScModelObj::GetEmbeddedObject() const
     return pDocShell;
 }
 
-void ScModelObj::UpdateAllRowHeights(const ScMarkData* pTabMark, bool bCalcOutputFactor)
+void ScModelObj::UpdateAllRowHeights()
 {
     if (pDocShell)
-    {
-#ifdef FIXME_REMOVE_WHEN_RE_BASE_COMPLETE
-        if (bCalcOutputFactor)
-            pDocShell->CalcOutputFactor();
-#else
-        (void)bCalcOutputFactor;
-#endif
-        pDocShell->UpdateAllRowHeights(pTabMark);
-    }
+        pDocShell->UpdateAllRowHeights(NULL);
 }
 
 void ScModelObj::BeforeXMLLoading()