diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2012-06-27 20:43:38 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2012-06-28 11:08:49 +0200 |
commit | 1b72dd9e1c3b981cb1863c3b2d0680045bf3bd07 (patch) | |
tree | 68450287e5fb5de76e42dcf92b6c469f5191da5a /sc | |
parent | 0f11f30ea96fcec8d7c648089fc223a6fbed6aef (diff) |
Remove some unused locals
Change-Id: I91282512f15122d0d7187fea7f6ab5a98933a07f
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/core/data/conditio.cxx | 59 | ||||
-rw-r--r-- | sc/source/core/data/drwlayer.cxx | 6 |
2 files changed, 0 insertions, 65 deletions
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index 60b470496c39..74448336ae2c 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -1425,65 +1425,6 @@ ScCondFormatData ScConditionalFormat::GetData( ScBaseCell* pCell, const ScAddres return aData; } -void lcl_Extend( ScRange& rRange, ScDocument* pDoc, bool bLines ) -{ - SCTAB nTab = rRange.aStart.Tab(); - OSL_ENSURE(rRange.aEnd.Tab() == nTab, "lcl_Extend - mehrere Tabellen?"); - - SCCOL nStartCol = rRange.aStart.Col(); - SCROW nStartRow = rRange.aStart.Row(); - SCCOL nEndCol = rRange.aEnd.Col(); - SCROW nEndRow = rRange.aEnd.Row(); - - bool bEx = pDoc->ExtendMerge( nStartCol, nStartRow, nEndCol, nEndRow, nTab ); - - if (bLines) - { - if (nStartCol > 0) --nStartCol; - if (nStartRow > 0) --nStartRow; - if (nEndCol < MAXCOL) ++nEndCol; - if (nEndRow < MAXROW) ++nEndRow; - } - - if ( bEx || bLines ) - { - rRange.aStart.Set( nStartCol, nStartRow, nTab ); - rRange.aEnd.Set( nEndCol, nEndRow, nTab ); - } -} - -bool lcl_CutRange( ScRange& rRange, const ScRange& rOther ) -{ - rRange.Justify(); - ScRange aCmpRange = rOther; - aCmpRange.Justify(); - - if ( rRange.aStart.Col() <= aCmpRange.aEnd.Col() && - rRange.aEnd.Col() >= aCmpRange.aStart.Col() && - rRange.aStart.Row() <= aCmpRange.aEnd.Row() && - rRange.aEnd.Row() >= aCmpRange.aStart.Row() && - rRange.aStart.Tab() <= aCmpRange.aEnd.Tab() && - rRange.aEnd.Tab() >= aCmpRange.aStart.Tab() ) - { - if ( rRange.aStart.Col() < aCmpRange.aStart.Col() ) - rRange.aStart.SetCol( aCmpRange.aStart.Col() ); - if ( rRange.aStart.Row() < aCmpRange.aStart.Row() ) - rRange.aStart.SetRow( aCmpRange.aStart.Row() ); - if ( rRange.aStart.Tab() < aCmpRange.aStart.Tab() ) - rRange.aStart.SetTab( aCmpRange.aStart.Tab() ); - if ( rRange.aEnd.Col() > aCmpRange.aEnd.Col() ) - rRange.aEnd.SetCol( aCmpRange.aEnd.Col() ); - if ( rRange.aEnd.Row() > aCmpRange.aEnd.Row() ) - rRange.aEnd.SetRow( aCmpRange.aEnd.Row() ); - if ( rRange.aEnd.Tab() > aCmpRange.aEnd.Tab() ) - rRange.aEnd.SetTab( aCmpRange.aEnd.Tab() ); - - return true; - } - - return false; // ausserhalb -} - void ScConditionalFormat::DoRepaint( const ScRange* pModified ) { if(pModified) diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index dbe0a9d61544..bc8a2b0e5e2b 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -193,12 +193,6 @@ inline void ReverseTwipsToMM( long& nVal ) nVal = HmmToTwips (nVal); } -void lcl_TwipsToMM( Point& rPoint ) -{ - TwipsToMM( rPoint.X() ); - TwipsToMM( rPoint.Y() ); -} - void lcl_ReverseTwipsToMM( Point& rPoint ) { ReverseTwipsToMM( rPoint.X() ); |