diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-04-11 10:08:16 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-11 12:06:24 +0100 |
commit | bb7d331ecdb3a0a4723f770a9f891c00f4a25dbf (patch) | |
tree | 0aba373af9d4e699a6ceee6c2d209da69b0297ed /sc | |
parent | 1ed856c2653a029846f31f190ca837824c704cac (diff) |
callcatcher: update list
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/dbdata.hxx | 1 | ||||
-rw-r--r-- | sc/source/core/tool/dbdata.cxx | 16 | ||||
-rw-r--r-- | sc/source/filter/inc/pivotcachebuffer.hxx | 2 | ||||
-rw-r--r-- | sc/source/filter/inc/stylesbuffer.hxx | 5 | ||||
-rw-r--r-- | sc/source/filter/oox/pivotcachebuffer.cxx | 8 | ||||
-rw-r--r-- | sc/source/filter/oox/stylesbuffer.cxx | 35 | ||||
-rw-r--r-- | sc/source/filter/oox/workbookhelper.cxx | 8 |
7 files changed, 0 insertions, 75 deletions
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx index cef02e1effcc..9dcd457b471d 100644 --- a/sc/inc/dbdata.hxx +++ b/sc/inc/dbdata.hxx @@ -243,7 +243,6 @@ public: ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Bool bStartOnly); const ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); - const ScDBData* GetFilterDBAtTable(SCTAB nTab) const; ScDBData* GetDBNearCursor(SCCOL nCol, SCROW nRow, SCTAB nTab ); void DeleteOnTab( SCTAB nTab ); diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx index 4c14735815fc..36d19143df6f 100644 --- a/sc/source/core/tool/dbdata.cxx +++ b/sc/source/core/tool/dbdata.cxx @@ -974,22 +974,6 @@ ScDBData* ScDBCollection::GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCO return NULL; } -const ScDBData* ScDBCollection::GetFilterDBAtTable(SCTAB nTab) const -{ - NamedDBs::DBsType::const_iterator itr = find_if( - maNamedDBs.begin(), maNamedDBs.end(), FindFilterDBByTable(nTab)); - - const ScDBData* pData = itr == maNamedDBs.end() ? NULL : &(*itr); - if (pData) - return pData; - - pData = pDoc->GetAnonymousDBData(nTab); - if (pData) - return pData; - - return getAnonDBs().findByTable(nTab); -} - void ScDBCollection::DeleteOnTab( SCTAB nTab ) { FindByTable func(nTab); diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx index 2fd32fe65648..cb57fef25e36 100644 --- a/sc/source/filter/inc/pivotcachebuffer.hxx +++ b/sc/source/filter/inc/pivotcachebuffer.hxx @@ -459,8 +459,6 @@ private: void importDConRef( BiffInputStream& rStrm ); /** Reads the defined name used for source data from the DCONNAME record. */ void importDConName( BiffInputStream& rStrm ); - /** Reads the built-in defined name used for source data from the DCONBINAME record. */ - void importDConBIName( BiffInputStream& rStrm ); /** Reads the sheet name and URL from the DCONREF, DCONNAME, or DCONBINAME records. */ void importDConUrl( BiffInputStream& rStrm ); diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index 01ce04970cb2..185ba98b732e 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -798,11 +798,6 @@ public: /** Writes all formatting attributes to the passed property set. */ void writeToPropertySet( PropertySet& rPropSet ) const; - /** Converts formatting information from BIFF2 cell record data directly. */ - static void writeBiff2CellFormatToPropertySet( - const WorkbookHelper& rHelper, PropertySet& rPropSet, - sal_uInt8 nFlags1, sal_uInt8 nFlags2, sal_uInt8 nFlags3 ); - const ::ScPatternAttr& createPattern( bool bSkipPoolDefs = false ); private: diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx index 94845df042ef..2a07a615e6e0 100644 --- a/sc/source/filter/oox/pivotcachebuffer.cxx +++ b/sc/source/filter/oox/pivotcachebuffer.cxx @@ -1349,14 +1349,6 @@ void PivotCache::importDConName( BiffInputStream& rStrm ) importDConUrl( rStrm ); } -void PivotCache::importDConBIName( BiffInputStream& rStrm ) -{ - sal_uInt8 nNameId = rStrm.readuInt8(); - rStrm.skip( 3 ); - maSheetSrcModel.maDefName = OUString( sal_Unicode( nNameId ) ); - importDConUrl( rStrm ); -} - void PivotCache::importDConUrl( BiffInputStream& rStrm ) { // the URL with sheet name and optional URL of an external document diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 57486c2226a9..5b11f7a6d23b 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -2627,41 +2627,6 @@ void Xf::writeToPropertySet( PropertySet& rPropSet ) const rPropSet.setProperties( aPropMap ); } -/*static*/ void Xf::writeBiff2CellFormatToPropertySet( const WorkbookHelper& rHelper, - PropertySet& rPropSet, sal_uInt8 nFlags1, sal_uInt8 nFlags2, sal_uInt8 nFlags3 ) -{ - /* Create an XF object and let it do the work. We will have access to its - private members here. Also, create temporary border and fill objects, - this prevents polluting the border and fill buffers with new temporary - objects per imported cell. */ - Xf aXf( rHelper ); - Border aBorder( rHelper, false ); - Fill aFill( rHelper, false ); - - // no used flags available in BIFF2 (always true) - aXf.setAllUsedFlags( true ); - - // set the attributes - aXf.maModel.mnFontId = extractValue< sal_Int32 >( nFlags2, 6, 2 ); - aXf.maModel.mnNumFmtId = extractValue< sal_Int32 >( nFlags2, 0, 6 ); - aXf.maAlignment.setBiff2Data( nFlags3 ); - aXf.maProtection.setBiff2Data( nFlags1 ); - aBorder.setBiff2Data( nFlags3 ); - aFill.setBiff2Data( nFlags3 ); - - // finalize the objects (convert model to API attributes) - aXf.finalizeImport(); - aBorder.finalizeImport(); - aFill.finalizeImport(); - - // write the properties to the property set - PropertyMap aPropMap; - aXf.writeToPropertyMap( aPropMap ); - aBorder.writeToPropertyMap( aPropMap ); - aFill.writeToPropertyMap( aPropMap ); - rPropSet.setProperties( aPropMap ); -} - void Xf::setBiffUsedFlags( sal_uInt8 nUsedFlags ) { /* Notes about finding the used flags: diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index 736c5bd7510a..627854ff72bb 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -233,8 +233,6 @@ public: inline rtl_TextEncoding getTextEncoding() const { return meTextEnc; } /** Sets the text encoding to import/export byte strings. */ void setTextEncoding( rtl_TextEncoding eTextEnc ); - /** Sets text encoding from the default application font, if CODEPAGE record is missing. */ - void setAppFontEncoding( rtl_TextEncoding eAppFontEnc ); /** Returns the codec helper that stores the encoder/decoder object. */ inline BiffCodecHelper& getCodecHelper() { return *mxCodecHelper; } @@ -511,12 +509,6 @@ void WorkbookGlobals::setTextEncoding( rtl_TextEncoding eTextEnc ) meTextEnc = eTextEnc; } -void WorkbookGlobals::setAppFontEncoding( rtl_TextEncoding eAppFontEnc ) -{ - if( !mbHasCodePage ) - setTextEncoding( eAppFontEnc ); -} - // private -------------------------------------------------------------------- void WorkbookGlobals::initialize( bool bWorkbookFile ) |