summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2012-04-09 13:00:31 +0200
committerJulien Nabet <serval2412@yahoo.fr>2012-04-09 13:00:31 +0200
commitb42c792f50ed11a3efc9c20a4e7eed5163fdaed7 (patch)
treea1b162d2127002b0590bee841c905886842d29e4 /sc
parentb3e2cbc68f3501d3925f8789b1addc8ad4f8e9c0 (diff)
Remove some unused methods
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/inc/numberformatsbuffer.hxx2
-rw-r--r--sc/source/filter/inc/pivotcachebuffer.hxx2
-rw-r--r--sc/source/filter/inc/scenariobuffer.hxx2
-rw-r--r--sc/source/filter/inc/stylesbuffer.hxx5
-rw-r--r--sc/source/filter/oox/numberformatsbuffer.cxx28
-rw-r--r--sc/source/filter/oox/pivotcachebuffer.cxx30
-rw-r--r--sc/source/filter/oox/scenariobuffer.cxx11
-rw-r--r--sc/source/filter/oox/stylesbuffer.cxx152
8 files changed, 0 insertions, 232 deletions
diff --git a/sc/source/filter/inc/numberformatsbuffer.hxx b/sc/source/filter/inc/numberformatsbuffer.hxx
index 6df95867f8d4..ac9a63bf94b5 100644
--- a/sc/source/filter/inc/numberformatsbuffer.hxx
+++ b/sc/source/filter/inc/numberformatsbuffer.hxx
@@ -111,8 +111,6 @@ public:
NumberFormatRef importNumFmt( const AttributeList& rAttribs );
/** Inserts a new number format code from a NUMFMT record. */
void importNumFmt( SequenceInputStream& rStrm );
- /** Inserts a new number format code from a FORMAT record. */
- void importFormat( BiffInputStream& rStrm );
/** Final processing after import of all style settings. */
void finalizeImport();
diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx
index 7e7c16f6a6de..2fd32fe65648 100644
--- a/sc/source/filter/inc/pivotcachebuffer.hxx
+++ b/sc/source/filter/inc/pivotcachebuffer.hxx
@@ -414,8 +414,6 @@ public:
/** Reads sheet source settings from the PCDSHEETSOURCE record. */
void importPCDSheetSource( SequenceInputStream& rStrm, const ::oox::core::Relations& rRelations );
- /** Reads cache source settings from the PCDSOURCE record. */
- void importPCDSource( BiffInputStream& rStrm );
/** Reads pivot cache global settings from the PCDEFINITION record. */
void importPCDefinition( BiffInputStream& rStrm );
diff --git a/sc/source/filter/inc/scenariobuffer.hxx b/sc/source/filter/inc/scenariobuffer.hxx
index dc996c71e30f..4205d8b0faec 100644
--- a/sc/source/filter/inc/scenariobuffer.hxx
+++ b/sc/source/filter/inc/scenariobuffer.hxx
@@ -114,8 +114,6 @@ public:
void importScenarios( const AttributeList& rAttribs );
/** Imports sheet scenario settings from a SCENARIOS record. */
void importScenarios( SequenceInputStream& rStrm );
- /** Imports sheet scenario settings from a SCENARIOS record. */
- void importScenarios( BiffInputStream& rStrm );
/** Creates and returns a new scenario in this collection. */
Scenario& createScenario();
diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx
index 409af4d971e6..07f2a7ad8d47 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -280,8 +280,6 @@ public:
/** Imports a font style flag from a DXF record. */
void importDxfFlag( sal_Int32 nElement, SequenceInputStream& rStrm );
- /** Imports the FONT record from the passed stream. */
- void importFont( BiffInputStream& rStrm );
/** Imports the FONTCOLOR record from the passed stream. */
void importFontColor( BiffInputStream& rStrm );
/** Sets the font attributes from the font block of a CFRULE record. */
@@ -783,9 +781,6 @@ public:
/** Imports the XF record from the passed stream. */
void importXf( SequenceInputStream& rStrm, bool bCellXf );
- /** Imports the XF record from the passed stream. */
- void importXf( BiffInputStream& rStrm );
-
/** Final processing after import of all style settings. */
void finalizeImport();
diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx
index 1eab9e50241e..5133a91e7ade 100644
--- a/sc/source/filter/oox/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -2019,34 +2019,6 @@ void NumberFormatsBuffer::importNumFmt( SequenceInputStream& rStrm )
createNumFmt( nNumFmtId, aFmtCode );
}
-void NumberFormatsBuffer::importFormat( BiffInputStream& rStrm )
-{
- OUString aFmtCode;
- switch( getBiff() )
- {
- case BIFF2:
- case BIFF3:
- aFmtCode = rStrm.readByteStringUC( false, getTextEncoding() );
- break;
- case BIFF4:
- rStrm.skip( 2 ); // in BIFF4 the index field exists, but is undefined
- aFmtCode = rStrm.readByteStringUC( false, getTextEncoding() );
- break;
- case BIFF5:
- mnNextBiffIndex = rStrm.readuInt16();
- aFmtCode = rStrm.readByteStringUC( false, getTextEncoding() );
- break;
- case BIFF8:
- mnNextBiffIndex = rStrm.readuInt16();
- aFmtCode = rStrm.readUniString();
- break;
- case BIFF_UNKNOWN: break;
- }
-
- createNumFmt( mnNextBiffIndex, aFmtCode );
- ++mnNextBiffIndex;
-}
-
void NumberFormatsBuffer::finalizeImport()
{
maNumFmts.forEach( NumberFormatFinalizer( *this ) );
diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx
index e51cd9d40b4b..94845df042ef 100644
--- a/sc/source/filter/oox/pivotcachebuffer.cxx
+++ b/sc/source/filter/oox/pivotcachebuffer.cxx
@@ -1188,36 +1188,6 @@ void PivotCache::importPCDSheetSource( SequenceInputStream& rStrm, const Relatio
maTargetUrl = rRelations.getExternalTargetFromRelId( maSheetSrcModel.maRelId );
}
-void PivotCache::importPCDSource( BiffInputStream& rStrm )
-{
- switch( rStrm.readuInt16() )
- {
- case BIFF_PCDSOURCE_WORKSHEET:
- {
- maSourceModel.mnSourceType = XML_worksheet;
- sal_uInt16 nNextRecId = rStrm.getNextRecId();
- switch( nNextRecId )
- {
- case BIFF_ID_DCONREF: if( rStrm.startNextRecord() ) importDConRef( rStrm ); break;
- case BIFF_ID_DCONNAME: if( rStrm.startNextRecord() ) importDConName( rStrm ); break;
- case BIFF_ID_DCONBINAME: if( rStrm.startNextRecord() ) importDConBIName( rStrm ); break;
- }
- }
- break;
- case BIFF_PCDSOURCE_EXTERNAL:
- maSourceModel.mnSourceType = XML_external;
- break;
- case BIFF_PCDSOURCE_CONSOLIDATION:
- maSourceModel.mnSourceType = XML_consolidation;
- break;
- case BIFF_PCDSOURCE_SCENARIO:
- maSourceModel.mnSourceType = XML_scenario;
- break;
- default:
- maSourceModel.mnSourceType = XML_TOKEN_INVALID;
- }
-}
-
void PivotCache::importPCDefinition( BiffInputStream& rStrm )
{
sal_uInt16 nFlags, nUserNameLen;
diff --git a/sc/source/filter/oox/scenariobuffer.cxx b/sc/source/filter/oox/scenariobuffer.cxx
index 0309bb6460e9..15fa2eac319b 100644
--- a/sc/source/filter/oox/scenariobuffer.cxx
+++ b/sc/source/filter/oox/scenariobuffer.cxx
@@ -239,17 +239,6 @@ void SheetScenarios::importScenarios( SequenceInputStream& rStrm )
maModel.mnShown = rStrm.readuInt16();
}
-void SheetScenarios::importScenarios( BiffInputStream& rStrm )
-{
- rStrm.skip( 2 ); // scenario count
- maModel.mnCurrent = rStrm.readuInt16();
- maModel.mnShown = rStrm.readuInt16();
-
- // read following SCENARIO records
- while( (rStrm.getNextRecId() == BIFF_ID_SCENARIO) && rStrm.startNextRecord() )
- createScenario().importScenario( rStrm );
-}
-
Scenario& SheetScenarios::createScenario()
{
ScenarioVector::value_type xScenario( new Scenario( *this, mnSheet ) );
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index 26b146a92e1a..4624a9d0a168 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -891,37 +891,6 @@ void Font::importDxfFlag( sal_Int32 nElement, SequenceInputStream& rStrm )
}
}
-void Font::importFont( BiffInputStream& rStrm )
-{
- OSL_ENSURE( !mbDxf, "Font::importFont - unexpected conditional formatting flag" );
- switch( getBiff() )
- {
- case BIFF2:
- importFontData2( rStrm );
- importFontName2( rStrm );
- break;
- case BIFF3:
- case BIFF4:
- importFontData2( rStrm );
- importFontColor( rStrm );
- importFontName2( rStrm );
- break;
- case BIFF5:
- importFontData2( rStrm );
- importFontColor( rStrm );
- importFontData5( rStrm );
- importFontName2( rStrm );
- break;
- case BIFF8:
- importFontData2( rStrm );
- importFontColor( rStrm );
- importFontData5( rStrm );
- importFontName8( rStrm );
- break;
- case BIFF_UNKNOWN: break;
- }
-}
-
void Font::importFontColor( BiffInputStream& rStrm )
{
OSL_ENSURE( !mbDxf, "Font::importFontColor - unexpected conditional formatting flag" );
@@ -2579,127 +2548,6 @@ void Xf::importXf( SequenceInputStream& rStrm, bool bCellXf )
maModel.mbAreaUsed = maModel.mbCellXf == getFlag( nUsedFlags, BIFF12_XF_AREA_USED );
}
-void Xf::importXf( BiffInputStream& rStrm )
-{
- BorderRef xBorder = getStyles().createBorder( &maModel.mnBorderId );
- FillRef xFill = getStyles().createFill( &maModel.mnFillId );
-
- switch( getBiff() )
- {
- case BIFF2:
- {
- sal_uInt8 nFontId, nNumFmtId, nFlags;
- rStrm >> nFontId;
- rStrm.skip( 1 );
- rStrm >> nNumFmtId >> nFlags;
-
- // only cell XFs in BIFF2, no parent style, used flags always true
- setAllUsedFlags( true );
-
- // attributes
- maAlignment.setBiff2Data( nFlags );
- maProtection.setBiff2Data( nNumFmtId );
- xBorder->setBiff2Data( nFlags );
- xFill->setBiff2Data( nFlags );
- maModel.mnFontId = static_cast< sal_Int32 >( nFontId );
- maModel.mnNumFmtId = static_cast< sal_Int32 >( nNumFmtId & BIFF2_XF_VALFMT_MASK );
- }
- break;
-
- case BIFF3:
- {
- sal_uInt32 nBorder;
- sal_uInt16 nTypeProt, nAlign, nArea;
- sal_uInt8 nFontId, nNumFmtId;
- rStrm >> nFontId >> nNumFmtId >> nTypeProt >> nAlign >> nArea >> nBorder;
-
- // XF type/parent
- maModel.mbCellXf = !getFlag( nTypeProt, BIFF_XF_STYLE ); // new in BIFF3
- maModel.mnStyleXfId = extractValue< sal_Int32 >( nAlign, 4, 12 ); // new in BIFF3
- // attribute used flags
- setBiffUsedFlags( extractValue< sal_uInt8 >( nTypeProt, 10, 6 ) ); // new in BIFF3
-
- // attributes
- maAlignment.setBiff3Data( nAlign );
- maProtection.setBiff3Data( nTypeProt );
- xBorder->setBiff3Data( nBorder );
- xFill->setBiff3Data( nArea );
- maModel.mnFontId = static_cast< sal_Int32 >( nFontId );
- maModel.mnNumFmtId = static_cast< sal_Int32 >( nNumFmtId );
- }
- break;
-
- case BIFF4:
- {
- sal_uInt32 nBorder;
- sal_uInt16 nTypeProt, nAlign, nArea;
- sal_uInt8 nFontId, nNumFmtId;
- rStrm >> nFontId >> nNumFmtId >> nTypeProt >> nAlign >> nArea >> nBorder;
-
- // XF type/parent
- maModel.mbCellXf = !getFlag( nTypeProt, BIFF_XF_STYLE );
- maModel.mnStyleXfId = extractValue< sal_Int32 >( nTypeProt, 4, 12 );
- // attribute used flags
- setBiffUsedFlags( extractValue< sal_uInt8 >( nAlign, 10, 6 ) );
-
- // attributes
- maAlignment.setBiff4Data( nAlign );
- maProtection.setBiff3Data( nTypeProt );
- xBorder->setBiff3Data( nBorder );
- xFill->setBiff3Data( nArea );
- maModel.mnFontId = static_cast< sal_Int32 >( nFontId );
- maModel.mnNumFmtId = static_cast< sal_Int32 >( nNumFmtId );
- }
- break;
-
- case BIFF5:
- {
- sal_uInt32 nArea, nBorder;
- sal_uInt16 nFontId, nNumFmtId, nTypeProt, nAlign;
- rStrm >> nFontId >> nNumFmtId >> nTypeProt >> nAlign >> nArea >> nBorder;
-
- // XF type/parent
- maModel.mbCellXf = !getFlag( nTypeProt, BIFF_XF_STYLE );
- maModel.mnStyleXfId = extractValue< sal_Int32 >( nTypeProt, 4, 12 );
- // attribute used flags
- setBiffUsedFlags( extractValue< sal_uInt8 >( nAlign, 10, 6 ) );
-
- // attributes
- maAlignment.setBiff5Data( nAlign );
- maProtection.setBiff3Data( nTypeProt );
- xBorder->setBiff5Data( nBorder, nArea );
- xFill->setBiff5Data( nArea );
- maModel.mnFontId = static_cast< sal_Int32 >( nFontId );
- maModel.mnNumFmtId = static_cast< sal_Int32 >( nNumFmtId );
- }
- break;
-
- case BIFF8:
- {
- sal_uInt32 nBorder1, nBorder2;
- sal_uInt16 nFontId, nNumFmtId, nTypeProt, nAlign, nMiscAttrib, nArea;
- rStrm >> nFontId >> nNumFmtId >> nTypeProt >> nAlign >> nMiscAttrib >> nBorder1 >> nBorder2 >> nArea;
-
- // XF type/parent
- maModel.mbCellXf = !getFlag( nTypeProt, BIFF_XF_STYLE );
- maModel.mnStyleXfId = extractValue< sal_Int32 >( nTypeProt, 4, 12 );
- // attribute used flags
- setBiffUsedFlags( extractValue< sal_uInt8 >( nMiscAttrib, 10, 6 ) );
-
- // attributes
- maAlignment.setBiff8Data( nAlign, nMiscAttrib );
- maProtection.setBiff3Data( nTypeProt );
- xBorder->setBiff8Data( nBorder1, nBorder2 );
- xFill->setBiff8Data( nBorder2, nArea );
- maModel.mnFontId = static_cast< sal_Int32 >( nFontId );
- maModel.mnNumFmtId = static_cast< sal_Int32 >( nNumFmtId );
- }
- break;
-
- case BIFF_UNKNOWN: break;
- }
-}
-
void Xf::finalizeImport()
{
// alignment and protection