[Libreoffice-commits] .: sc/inc sc/source

[Kohei Yoshida]

 sc/inc/document.hxx              |    1 -
 sc/inc/table.hxx                 |    1 -
 sc/source/core/data/document.cxx |    8 --------
 sc/source/core/data/table5.cxx   |    8 --------
 sc/source/ui/app/transobj.cxx    |    2 +-
 5 files changed, 1 insertion(+), 19 deletions(-)

New commits:
commit 261f56fa90796686709f5ae7de3fba96121c0709
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Thu Jul 26 20:46:40 2012 -0400

    Actually this method is totally redundant. Remove it.
    
    There is already an existing method that does the same thing.
    
    Change-Id: I627fa73cca8da35d703000bd27d33168612b4126

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 39fce78..9893e7a 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1371,7 +1371,6 @@ public:
     SCROW                       CountNonFilteredRows(SCROW nStartRow, SCROW nEndRow, SCTAB nTab);
 
     bool IsManualRowHeight(SCROW nRow, SCTAB nTab) const;
-    void SetRowHeightManual(SCROW nRow, SCTAB nTab, bool bManual);
 
     /**
      * Write all column row flags to table's flag data, because not all column
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 0f32c31..bb365db 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -747,7 +747,6 @@ public:
     SCROW       CountNonFilteredRows(SCROW nStartRow, SCROW nEndRow) const;
 
     bool IsManualRowHeight(SCROW nRow) const;
-    void SetRowHeightManual(SCROW nRow, bool bManual);
 
     void        SyncColRowFlags();
 
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index df18748..de977d8 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -3994,14 +3994,6 @@ bool ScDocument::IsManualRowHeight(SCROW nRow, SCTAB nTab) const
     return maTabs[nTab]->IsManualRowHeight(nRow);
 }
 
-void ScDocument::SetRowHeightManual(SCROW nRow, SCTAB nTab, bool bManual)
-{
-    if (!ValidTab(nTab) || nTab >= static_cast<SCTAB>(maTabs.size()) || !maTabs[nTab])
-        return;
-
-    maTabs[nTab]->SetRowHeightManual(nRow, bManual);
-}
-
 void ScDocument::SyncColRowFlags()
 {
     TableContainer::iterator it = maTabs.begin();
diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index 8356dc5..3e244c2 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -959,14 +959,6 @@ bool ScTable::IsManualRowHeight(SCROW nRow) const
     return (pRowFlags->GetValue(nRow) & CR_MANUALSIZE) != 0;
 }
 
-void ScTable::SetRowHeightManual(SCROW nRow, bool bManual)
-{
-    if (bManual)
-        pRowFlags->OrValue(nRow, CR_MANUALSIZE);
-    else
-        pRowFlags->AndValue(nRow, sal::static_int_cast<sal_uInt8>(~CR_MANUALSIZE));
-}
-
 namespace {
 
 void lcl_syncFlags(ScFlatBoolColSegments& rColSegments, ScFlatBoolRowSegments& rRowSegments,
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 9d53c7d..f0a609c 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -643,7 +643,7 @@ void ScTransferObj::InitDocShell()
 
                 //  if height was set manually, that flag has to be copied, too
                 bool bManual = pDoc->IsManualRowHeight(nRow, nSrcTab);
-                pDestDoc->SetRowHeightManual(nRow, 0, bManual);
+                pDestDoc->SetManualHeight(nRow, nRow, 0, bManual);
             }
         }