[Libreoffice-commits] .: sc/source unusedcode.easy
Caolán McNamara
caolan at kemper.freedesktop.org
Sun Apr 8 08:41:55 PDT 2012
sc/source/filter/inc/richstring.hxx | 2
sc/source/filter/inc/workbooksettings.hxx | 3 -
sc/source/filter/inc/worksheethelper.hxx | 8 ---
sc/source/filter/oox/richstring.cxx | 9 ----
sc/source/filter/oox/workbooksettings.cxx | 5 --
sc/source/filter/oox/worksheethelper.cxx | 67 ------------------------------
unusedcode.easy | 3 -
7 files changed, 97 deletions(-)
New commits:
commit b68c42fd68760cbce0a0ca4ac81d4aeaf777e7fa
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Apr 8 16:29:57 2012 +0100
callcatcher: reduce WorksheetHelper
diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx
index 588deae..07a645a 100644
--- a/sc/source/filter/inc/richstring.hxx
+++ b/sc/source/filter/inc/richstring.hxx
@@ -164,8 +164,6 @@ public:
void importPhoneticPr( const AttributeList& rAttribs );
/** Imports phonetic settings from the PHONETICPR record. */
void importPhoneticPr( SequenceInputStream& rStrm );
- /** Imports phonetic settings from the PHONETICPR record. */
- void importPhoneticPr( BiffInputStream& rStrm );
/** Imports phonetic settings from a rich string. */
void importStringData( SequenceInputStream& rStrm );
diff --git a/sc/source/filter/inc/workbooksettings.hxx b/sc/source/filter/inc/workbooksettings.hxx
index ed47d54..2346708 100644
--- a/sc/source/filter/inc/workbooksettings.hxx
+++ b/sc/source/filter/inc/workbooksettings.hxx
@@ -109,9 +109,6 @@ public:
/** Imports the CALCPR record containing workbook calculation settings. */
void importCalcPr( SequenceInputStream& rStrm );
- /** Sets the save external linked values flag, e.g. from the WSBOOL record. */
- void setSaveExtLinkValues( bool bSaveExtLinks );
-
/** Converts the imported workbook settings. */
void finalizeImport();
diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx
index facb12e..93d8089 100644
--- a/sc/source/filter/inc/worksheethelper.hxx
+++ b/sc/source/filter/inc/worksheethelper.hxx
@@ -248,19 +248,13 @@ public:
SheetViewSettings& getSheetViewSettings() const;
/** Returns the VML drawing page for this sheet (OOXML/BIFF12 only). */
VmlDrawing& getVmlDrawing() const;
- /** Returns the BIFF drawing page for this sheet (BIFF2-BIFF8 only). */
- BiffSheetDrawing& getBiffDrawing() const;
- /** Changes the current sheet type. */
- void setSheetType( WorksheetType eSheetType );
/** Sets a column or row page break described in the passed struct. */
void setPageBreak( const PageBreakModel& rModel, bool bRowBreak );
/** Inserts the hyperlink URL into the spreadsheet. */
void setHyperlink( const HyperlinkModel& rModel );
/** Inserts the data validation settings into the spreadsheet. */
void setValidation( const ValidationModel& rModel );
- /** Sets the passed label ranges to the current sheet. */
- void setLabelRanges( const ApiCellRangeList& rColRanges, const ApiCellRangeList& rRowRanges );
/** Sets the path to the DrawingML fragment of this sheet. */
void setDrawingPath( const ::rtl::OUString& rDrawingPath );
/** Sets the path to the legacy VML drawing fragment of this sheet. */
@@ -279,8 +273,6 @@ public:
/** Sets default width for all columns. This function overrides the base
width set with the setBaseColumnWidth() function. */
void setDefaultColumnWidth( double fWidth );
- /** Converts default cell formatting for a range of columns. */
- void setDefaultColumnFormat( sal_Int32 nFirstCol, sal_Int32 nLastCol, sal_Int32 nXfId );
/** Sets column settings for a specific range of columns.
@descr Column default formatting is converted directly, other settings
are cached and converted in the finalizeWorksheetImport() call. */
diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx
index 28c0d0c..823d9de 100644
--- a/sc/source/filter/oox/richstring.cxx
+++ b/sc/source/filter/oox/richstring.cxx
@@ -251,15 +251,6 @@ void PhoneticSettings::importPhoneticPr( SequenceInputStream& rStrm )
maModel.setBiffData( nType, nAlignment );
}
-void PhoneticSettings::importPhoneticPr( BiffInputStream& rStrm )
-{
- sal_uInt16 nFontId, nFlags;
- rStrm >> nFontId >> nFlags;
- maModel.mnFontId = nFontId;
- maModel.setBiffData( extractValue< sal_Int32 >( nFlags, 0, 2 ), extractValue< sal_Int32 >( nFlags, 2, 2 ) );
- // following: range list with cells showing phonetic text
-}
-
void PhoneticSettings::importStringData( SequenceInputStream& rStrm )
{
sal_uInt16 nFontId, nFlags;
diff --git a/sc/source/filter/oox/workbooksettings.cxx b/sc/source/filter/oox/workbooksettings.cxx
index 5d0048f..eec444f 100644
--- a/sc/source/filter/oox/workbooksettings.cxx
+++ b/sc/source/filter/oox/workbooksettings.cxx
@@ -190,11 +190,6 @@ void WorkbookSettings::importCalcPr( SequenceInputStream& rStrm )
maCalcSettings.mbConcurrent = getFlag( nFlags, BIFF12_CALCPR_CONCURRENT );
}
-void WorkbookSettings::setSaveExtLinkValues( bool bSaveExtLinks )
-{
- maBookSettings.mbSaveExtLinkValues = bSaveExtLinks;
-}
-
void WorkbookSettings::finalizeImport()
{
// default settings
diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx
index 27e8eab..3a3abc2 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -1473,16 +1473,6 @@ VmlDrawing& WorksheetHelper::getVmlDrawing() const
return mrSheetGlob.getVmlDrawing();
}
-BiffSheetDrawing& WorksheetHelper::getBiffDrawing() const
-{
- return mrSheetGlob.getBiffDrawing();
-}
-
-void WorksheetHelper::setSheetType( WorksheetType eSheetType )
-{
- mrSheetGlob.setSheetType( eSheetType );
-}
-
void WorksheetHelper::setPageBreak( const PageBreakModel& rModel, bool bRowBreak )
{
mrSheetGlob.setPageBreak( rModel, bRowBreak );
@@ -1498,58 +1488,6 @@ void WorksheetHelper::setValidation( const ValidationModel& rModel )
mrSheetGlob.setValidation( rModel );
}
-void WorksheetHelper::setLabelRanges( const ApiCellRangeList& rColRanges, const ApiCellRangeList& rRowRanges )
-{
- const CellAddress& rMaxPos = getAddressConverter().getMaxApiAddress();
- PropertySet aPropSet( getSheet() );
-
- if( !rColRanges.empty() )
- {
- Reference< XLabelRanges > xLabelRanges( aPropSet.getAnyProperty( PROP_ColumnLabelRanges ), UNO_QUERY );
- if( xLabelRanges.is() )
- {
- for( ApiCellRangeList::const_iterator aIt = rColRanges.begin(), aEnd = rColRanges.end(); aIt != aEnd; ++aIt )
- {
- CellRangeAddress aDataRange = *aIt;
- if( aDataRange.EndRow < rMaxPos.Row )
- {
- aDataRange.StartRow = aDataRange.EndRow + 1;
- aDataRange.EndRow = rMaxPos.Row;
- }
- else if( aDataRange.StartRow > 0 )
- {
- aDataRange.EndRow = aDataRange.StartRow - 1;
- aDataRange.StartRow = 0;
- }
- xLabelRanges->addNew( *aIt, aDataRange );
- }
- }
- }
-
- if( !rRowRanges.empty() )
- {
- Reference< XLabelRanges > xLabelRanges( aPropSet.getAnyProperty( PROP_RowLabelRanges ), UNO_QUERY );
- if( xLabelRanges.is() )
- {
- for( ApiCellRangeList::const_iterator aIt = rRowRanges.begin(), aEnd = rRowRanges.end(); aIt != aEnd; ++aIt )
- {
- CellRangeAddress aDataRange = *aIt;
- if( aDataRange.EndColumn < rMaxPos.Column )
- {
- aDataRange.StartColumn = aDataRange.EndColumn + 1;
- aDataRange.EndColumn = rMaxPos.Column;
- }
- else if( aDataRange.StartColumn > 0 )
- {
- aDataRange.EndColumn = aDataRange.StartColumn - 1;
- aDataRange.StartColumn = 0;
- }
- xLabelRanges->addNew( *aIt, aDataRange );
- }
- }
- }
-}
-
void WorksheetHelper::setDrawingPath( const OUString& rDrawingPath )
{
mrSheetGlob.setDrawingPath( rDrawingPath );
@@ -1585,11 +1523,6 @@ void WorksheetHelper::setDefaultColumnWidth( double fWidth )
mrSheetGlob.setDefaultColumnWidth( fWidth );
}
-void WorksheetHelper::setDefaultColumnFormat( sal_Int32 nFirstCol, sal_Int32 nLastCol, sal_Int32 nXfId )
-{
- mrSheetGlob.convertColumnFormat( nFirstCol, nLastCol, nXfId );
-}
-
void WorksheetHelper::setColumnModel( const ColumnModel& rModel )
{
mrSheetGlob.setColumnModel( rModel );
diff --git a/unusedcode.easy b/unusedcode.easy
index eb7fa0a..6fe8ca6 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -819,9 +819,6 @@ oox::xls::WorkbookGlobals::createBuffersPerSheet(short)
oox::xls::WorkbookGlobals::setCodePage(unsigned short)
oox::xls::WorkbookGlobals::setIsWorkbookFile()
oox::xls::WorkbookHelper::setAppFontEncoding(unsigned short)
-oox::xls::WorksheetHelper::getBiffDrawing() const
-oox::xls::WorksheetHelper::setDefaultColumnFormat(int, int, int)
-oox::xls::WorksheetHelper::setLabelRanges(oox::xls::ApiCellRangeList const&, oox::xls::ApiCellRangeList const&)
oox::xls::Xf::importXf(oox::xls::BiffInputStream&)
psp::PrinterGfx::DrawBitmap(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterBmp const&)
psp::PrinterGfx::DrawMask(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterColor&)
More information about the Libreoffice-commits
mailing list