diff options
author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-06-25 05:20:47 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-06-25 05:41:10 +0200 |
commit | 37e6631cc5d4147e9d0a4ebefbd0c9d2a8137d24 (patch) | |
tree | 060cf0aafda3f205b3e12508465a5403826d014d /sc/source/filter/excel | |
parent | ed6b8a100c1aabb342573f252509573bbe124d29 (diff) |
remove whitespace
Change-Id: Ib15413e73409cc33de01fa92a47b9d1237cfc4b2
Diffstat (limited to 'sc/source/filter/excel')
44 files changed, 0 insertions, 273 deletions
diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx index 40ed956b624e..4b60de0238db 100644 --- a/sc/source/filter/excel/excdoc.cxx +++ b/sc/source/filter/excel/excdoc.cxx @@ -84,7 +84,6 @@ static OUString lcl_GetVbaTabName( SCTAB n ) return aRet; } - static void lcl_AddBookviews( XclExpRecordList<>& aRecList, ExcTable& self ) { aRecList.AppendNewRecord( new XclExpXmlStartElementRecord( XML_bookViews ) ); @@ -131,7 +130,6 @@ static void lcl_AddScenariosAndFilters( XclExpRecordList<>& aRecList, const XclE aRecList.AppendRecord( rRoot.GetFilterManager().CreateRecord( nScTab ) ); } - ExcTable::ExcTable( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), mnScTab( SCTAB_GLOBAL ), @@ -141,7 +139,6 @@ ExcTable::ExcTable( const XclExpRoot& rRoot ) : { } - ExcTable::ExcTable( const XclExpRoot& rRoot, SCTAB nScTab ) : XclExpRoot( rRoot ), mnScTab( nScTab ), @@ -151,20 +148,17 @@ ExcTable::ExcTable( const XclExpRoot& rRoot, SCTAB nScTab ) : { } - ExcTable::~ExcTable() { delete pTabNames; } - void ExcTable::Add( XclExpRecordBase* pRec ) { OSL_ENSURE( pRec, "-ExcTable::Add(): pRec is NULL!" ); aRecList.AppendNewRecord( pRec ); } - void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList ) { InitializeGlobals(); @@ -322,7 +316,6 @@ void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList ) aRecList.AppendRecord( CreateRecord( EXC_ID_PALETTE ) ); } - if( GetBiff() <= EXC_BIFF5 ) { // Bundlesheet @@ -397,7 +390,6 @@ void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList ) Add( new ExcEof ); } - void ExcTable::FillAsTable( SCTAB nCodeNameIdx ) { InitializeTable( mnScTab ); @@ -433,7 +425,6 @@ void ExcTable::FillAsTable( SCTAB nCodeNameIdx ) return; } - // WSBOOL needs data from page settings, create it here, add it later boost::shared_ptr< XclExpPageSettings > xPageSett( new XclExpPageSettings( GetRoot() ) ); bool bFitToPages = xPageSett->GetPageData().mbFitToPages; @@ -653,7 +644,6 @@ void ExcTable::FillAsXmlTable( SCTAB nCodeNameIdx ) Add( new ExcEof ); } - void ExcTable::FillAsEmptyTable( SCTAB nCodeNameIdx ) { InitializeTable( mnScTab ); @@ -675,7 +665,6 @@ void ExcTable::FillAsEmptyTable( SCTAB nCodeNameIdx ) } } - void ExcTable::Write( XclExpStream& rStrm ) { SetCurrScTab( mnScTab ); @@ -684,7 +673,6 @@ void ExcTable::Write( XclExpStream& rStrm ) aRecList.Save( rStrm ); } - void ExcTable::WriteXml( XclExpXmlStream& rStrm ) { if (GetTabInfo().IsExportTab( mnScTab ) ) @@ -714,7 +702,6 @@ void ExcTable::WriteXml( XclExpXmlStream& rStrm ) } } - ExcDocument::ExcDocument( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), aHeader( rRoot ), @@ -722,14 +709,12 @@ ExcDocument::ExcDocument( const XclExpRoot& rRoot ) : { } - ExcDocument::~ExcDocument() { maTableList.RemoveAllRecords(); //! for the following assertion delete pExpChangeTrack; } - void ExcDocument::ReadDoc( void ) { InitializeConvert(); @@ -767,7 +752,6 @@ void ExcDocument::ReadDoc( void ) } } - void ExcDocument::Write( SvStream& rSvStrm ) { if( !maTableList.IsEmpty() ) diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx index 9d574cbb591b..88d1d6e07e44 100644 --- a/sc/source/filter/excel/excel.cxx +++ b/sc/source/filter/excel/excel.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sfx2/docfile.hxx> #include <sfx2/objsh.hxx> #include <sfx2/app.hxx> @@ -142,7 +141,6 @@ FltError ScFormatFilterPluginImpl::ScImportExcel( SfxMedium& rMedium, ScDocument return eRet; } - static FltError lcl_ExportExcelBiff( SfxMedium& rMedium, ScDocument *pDocument, SvStream* pMedStrm, bool bBiff8, rtl_TextEncoding eNach ) { diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx index ccc38e574dc3..0e5eacc0301f 100644 --- a/sc/source/filter/excel/excform.cxx +++ b/sc/source/filter/excel/excform.cxx @@ -42,7 +42,6 @@ using ::std::vector; const sal_uInt16 ExcelToSc::nRowMask = 0x3FFF; const sal_uInt16 ExcelToSc::nLastInd = 399; - void ImportExcel::Formula25() { XclAddress aXclPos; @@ -78,13 +77,11 @@ void ImportExcel::Formula25() Formula( aXclPos, nXF, nFormLen, fCurVal, bShrFmla ); } - void ImportExcel::Formula3() { Formula4(); } - void ImportExcel::Formula4() { XclAddress aXclPos; @@ -99,7 +96,6 @@ void ImportExcel::Formula4() Formula( aXclPos, nXF, nFormLen, fCurVal, false ); } - void ImportExcel::Formula( const XclAddress& rXclPos, sal_uInt16 nXF, sal_uInt16 nFormLen, double fCurVal, bool bShrFmla) { @@ -182,7 +178,6 @@ void ImportExcel::Formula( GetXFRangeBuffer().SetXF(aScPos, nXF); } - ExcelToSc::ExcelToSc( XclImpRoot& rRoot ) : ExcelConverterBase(rRoot.GetDocImport().getDoc().GetSharedStringPool(), 512), XclImpRoot( rRoot ), @@ -203,7 +198,6 @@ void ExcelToSc::GetDummy( const ScTokenArray*& pErgebnis ) pErgebnis = aPool[ aStack.Get() ]; } - // if bAllowArrays is false stream seeks to first byte after <nFormulaLen> // otherwise it will seek to the first byte after the additional content (eg // inline arrays) following <nFormulaLen> @@ -897,7 +891,6 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s return eRet; } - // stream seeks to first byte after <nFormulaLen> ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal_Size nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT ) @@ -1606,7 +1599,6 @@ void ExcelToSc::DoMulArgs( DefTokenId eId, sal_uInt8 nAnz ) aPool >> aStack; } - void ExcelToSc::ExcRelToScRel( sal_uInt16 nRow, sal_uInt8 nCol, ScSingleRefData &rSRD, const bool bName ) { if( bName ) @@ -1658,7 +1650,6 @@ void ExcelToSc::ExcRelToScRel( sal_uInt16 nRow, sal_uInt8 nCol, ScSingleRefData } } - const ScTokenArray* ExcelToSc::GetBoolErr( XclBoolError eType ) { sal_uInt16 nError; @@ -1742,7 +1733,6 @@ void ExcelToSc::SetError( ScFormulaCell &rCell, const ConvErr eErr ) rCell.SetErrCode( nInd ); } - void ExcelToSc::SetComplCol( ScComplexRefData &rCRD ) { ScSingleRefData &rSRD = rCRD.Ref2; @@ -1752,7 +1742,6 @@ void ExcelToSc::SetComplCol( ScComplexRefData &rCRD ) rSRD.SetAbsCol(MAXCOL); } - void ExcelToSc::SetComplRow( ScComplexRefData &rCRD ) { ScSingleRefData &rSRD = rCRD.Ref2; diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx index a056dc121f6b..3686671f57ca 100644 --- a/sc/source/filter/excel/excform8.cxx +++ b/sc/source/filter/excel/excform8.cxx @@ -85,7 +85,6 @@ ExcelToSc8::ExcelToSc8( XclImpRoot& rRoot ) : { } - ExcelToSc8::~ExcelToSc8() { } @@ -839,7 +838,6 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, ScSingleRefData &rR1 = aCRD.Ref1; ScSingleRefData &rR2 = aCRD.Ref2; - rR1.SetAbsTab(nTabFirst); rR2.SetAbsTab(nTabLast); rR1.SetFlag3D(true); @@ -920,7 +918,6 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, return eRet; } - // stream seeks to first byte after <nFormulaLen> ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal_Size nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT ) @@ -1437,7 +1434,6 @@ void ExcelToSc8::ExcRelToScRel8( sal_uInt16 nRow, sal_uInt16 nC, ScSingleRefData } } - // stream seeks to first byte after <nLen> bool ExcelToSc8::GetAbsRefs( ScRangeList& r, XclImpStream& aIn, sal_Size nLen ) { diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 53d0a1d0c199..9a3d312ae290 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -187,7 +187,6 @@ public: } }; - namespace { /** Future Record Type header. @@ -202,7 +201,6 @@ bool readFrtHeader( XclImpStream& rStrm, sal_uInt16 nRecordID ) } - ImportExcel8::ImportExcel8( XclImpRootData& rImpData, SvStream& rStrm ) : ImportExcel( rImpData, rStrm ) { @@ -211,12 +209,10 @@ ImportExcel8::ImportExcel8( XclImpRootData& rImpData, SvStream& rStrm ) : pFormConv = pExcRoot->pFmlaConverter = new ExcelToSc8( GetRoot() ); } - ImportExcel8::~ImportExcel8() { } - void ImportExcel8::Calccount( void ) { ScDocOptions aOpt = pD->GetDocOptions(); @@ -224,7 +220,6 @@ void ImportExcel8::Calccount( void ) pD->SetDocOptions( aOpt ); } - void ImportExcel8::Precision( void ) { ScDocOptions aOpt = pD->GetDocOptions(); @@ -232,7 +227,6 @@ void ImportExcel8::Precision( void ) pD->SetDocOptions( aOpt ); } - void ImportExcel8::Delta( void ) { ScDocOptions aOpt = pD->GetDocOptions(); @@ -240,7 +234,6 @@ void ImportExcel8::Delta( void ) pD->SetDocOptions( aOpt ); } - void ImportExcel8::Iteration( void ) { ScDocOptions aOpt = pD->GetDocOptions(); @@ -248,7 +241,6 @@ void ImportExcel8::Iteration( void ) pD->SetDocOptions( aOpt ); } - void ImportExcel8::Boundsheet( void ) { sal_uInt8 nLen; @@ -281,7 +273,6 @@ void ImportExcel8::Boundsheet( void ) nBdshtTab++; } - void ImportExcel8::Scenman( void ) { sal_uInt16 nLastDispl; @@ -292,13 +283,11 @@ void ImportExcel8::Scenman( void ) maScenList.nLastScenario = nLastDispl; } - void ImportExcel8::Scenario( void ) { maScenList.aEntries.push_back( new ExcScenario( aIn, *pExcRoot ) ); } - void ImportExcel8::Labelsst( void ) { XclAddress aXclPos; @@ -317,7 +306,6 @@ void ImportExcel8::Labelsst( void ) } } - void ImportExcel8::FeatHdr( void ) { if (!readFrtHeader( aIn, 0x0867)) @@ -335,7 +323,6 @@ void ImportExcel8::FeatHdr( void ) GetSheetProtectBuffer().ReadOptions( aIn, GetCurrScTab() ); } - void ImportExcel8::Feat( void ) { if (!readFrtHeader( aIn, 0x0868)) @@ -384,7 +371,6 @@ void ImportExcel8::Feat( void ) GetSheetProtectBuffer().AppendEnhancedProtection( aProt, GetCurrScTab() ); } - void ImportExcel8::ReadBasic( void ) { SfxObjectShell* pShell = GetDocShell(); @@ -438,7 +424,6 @@ void ImportExcel8::ReadBasic( void ) } } - void ImportExcel8::EndSheet( void ) { ImportExcel::EndSheet(); @@ -446,7 +431,6 @@ void ImportExcel8::EndSheet( void ) GetValidationManager().Apply(); } - void ImportExcel8::PostDocLoad( void ) { #ifndef DISABLE_SCRIPTING @@ -498,7 +482,6 @@ void ImportExcel8::LoadDocumentProperties() } } - // autofilter void ImportExcel8::FilterMode( void ) diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index 36a3254a3760..0ea43ff47ab7 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -49,7 +49,6 @@ #include <svl/zformat.hxx> #include <svtools/ctrltool.hxx> - #include <string.h> #include "global.hxx" @@ -140,20 +139,17 @@ void ExcRecord::SaveXml( XclExpXmlStream& /*rStrm*/ ) { } - //--------------------------------------------------------- class ExcEmptyRec - void ExcEmptyRec::Save( XclExpStream& /*rStrm*/ ) { } - sal_uInt16 ExcEmptyRec::GetNum() const { return 0; } - sal_Size ExcEmptyRec::GetLen() const { return 0; @@ -166,7 +162,6 @@ void ExcDummyRec::Save( XclExpStream& rStrm ) rStrm.Write( GetData(), GetLen() ); // raw write mode } - sal_uInt16 ExcDummyRec::GetNum( void ) const { return 0x0000; @@ -179,13 +174,11 @@ void ExcBoolRecord::SaveCont( XclExpStream& rStrm ) rStrm << (sal_uInt16)(bVal ? 0x0001 : 0x0000); } - sal_Size ExcBoolRecord::GetLen( void ) const { return 2; } - //--------------------------------------------------------- class ExcBof_Base - ExcBof_Base::ExcBof_Base() @@ -204,19 +197,16 @@ ExcBof::ExcBof( void ) nVers = 0x0500; } - void ExcBof::SaveCont( XclExpStream& rStrm ) { rStrm << nVers << nDocType << nRupBuild << nRupYear; } - sal_uInt16 ExcBof::GetNum( void ) const { return 0x0809; } - sal_Size ExcBof::GetLen( void ) const { return 8; @@ -230,7 +220,6 @@ ExcBofW::ExcBofW( void ) nVers = 0x0500; } - void ExcBofW::SaveCont( XclExpStream& rStrm ) { rStrm << nVers << nDocType << nRupBuild << nRupYear; @@ -253,7 +242,6 @@ sal_uInt16 ExcEof::GetNum( void ) const return 0x000A; } - sal_Size ExcEof::GetLen( void ) const { return 0; @@ -266,7 +254,6 @@ sal_Size ExcDummy_00::GetLen( void ) const return nMyLen; } - const sal_uInt8* ExcDummy_00::GetData( void ) const { return pMyData; @@ -279,19 +266,16 @@ sal_Size ExcDummy_040::GetLen( void ) const return nMyLen; } - const sal_uInt8* ExcDummy_040::GetData( void ) const { return pMyData; } - sal_Size ExcDummy_041::GetLen( void ) const { return nMyLen; } - const sal_uInt8* ExcDummy_041::GetData( void ) const { return pMyData; @@ -306,13 +290,11 @@ Exc1904::Exc1904( ScDocument& rDoc ) bDateCompatibility = pDate && !( *pDate == Date( 30, 12, 1899 )); } - sal_uInt16 Exc1904::GetNum( void ) const { return 0x0022; } - void Exc1904::SaveXml( XclExpXmlStream& rStrm ) { bool bISOIEC = ( rStrm.getVersion() == oox::core::ISOIEC_29500_2008 ); @@ -342,7 +324,6 @@ ExcBundlesheetBase::ExcBundlesheetBase( RootData& rRootData, SCTAB nTabNum ) : { } - ExcBundlesheetBase::ExcBundlesheetBase() : m_nStrPos( STREAM_SEEK_TO_END ), m_nOwnPos( STREAM_SEEK_TO_END ), @@ -351,7 +332,6 @@ ExcBundlesheetBase::ExcBundlesheetBase() : { } - void ExcBundlesheetBase::UpdateStreamPos( XclExpStream& rStrm ) { rStrm.SetSvStreamPos( m_nOwnPos ); @@ -360,13 +340,11 @@ void ExcBundlesheetBase::UpdateStreamPos( XclExpStream& rStrm ) rStrm.EnableEncryption(); } - sal_uInt16 ExcBundlesheetBase::GetNum( void ) const { return 0x0085; } - ExcBundlesheet::ExcBundlesheet( RootData& rRootData, SCTAB _nTab ) : ExcBundlesheetBase( rRootData, _nTab ) { @@ -375,7 +353,6 @@ ExcBundlesheet::ExcBundlesheet( RootData& rRootData, SCTAB _nTab ) : aName = OUStringToOString(sTabName, rRootData.pER->GetTextEncoding()); } - void ExcBundlesheet::SaveCont( XclExpStream& rStrm ) { m_nOwnPos = rStrm.GetSvStreamPos(); @@ -384,13 +361,11 @@ void ExcBundlesheet::SaveCont( XclExpStream& rStrm ) rStrm.WriteByteString(aName); // 8 bit length, max 255 chars } - sal_Size ExcBundlesheet::GetLen() const { return 7 + std::min( aName.getLength(), (sal_Int32) 255 ); } - //--------------------------------------------------------- class ExcDummy_02 - sal_Size ExcDummy_02a::GetLen( void ) const @@ -459,7 +434,6 @@ void XclExpXmlSheetPr::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_sheetPr ); } - // XclExpWindowProtection =============================================================== XclExpWindowProtection::XclExpWindowProtection(bool bValue) : @@ -552,7 +526,6 @@ void XclExpSheetProtection::SaveXml( XclExpXmlStream& rStrm ) } } - XclExpPassHash::XclExpPassHash(const Sequence<sal_Int8>& aHash) : XclExpRecord(EXC_ID_PASSWORD, 2), mnHash(0x0000) diff --git a/sc/source/filter/excel/exctools.cxx b/sc/source/filter/excel/exctools.cxx index 780b943e73e2..cf6d867a853c 100644 --- a/sc/source/filter/excel/exctools.cxx +++ b/sc/source/filter/excel/exctools.cxx @@ -76,7 +76,6 @@ RootData::~RootData() delete pPrintTitles; } - XclImpOutlineBuffer::XclImpOutlineBuffer( SCSIZE nNewSize ) : maLevels(0, nNewSize, 0), mpOutlineArray(NULL), diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx index f1453e945695..ade579405587 100644 --- a/sc/source/filter/excel/expop2.cxx +++ b/sc/source/filter/excel/expop2.cxx @@ -41,7 +41,6 @@ #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> - ExportBiff5::ExportBiff5( XclExpRootData& rExpData, SvStream& rStrm ): ExportTyp( rStrm, &rExpData.mrDoc, rExpData.meTextEnc ), XclExpRoot( rExpData ) @@ -53,13 +52,11 @@ ExportBiff5::ExportBiff5( XclExpRootData& rExpData, SvStream& rStrm ): pExcDoc = new ExcDocument( *this ); } - ExportBiff5::~ExportBiff5() { delete pExcDoc; } - FltError ExportBiff5::Write() { SfxObjectShell* pDocShell = GetDocShell(); @@ -122,7 +119,6 @@ ExportBiff8::ExportBiff8( XclExpRootData& rExpData, SvStream& rStrm ) : pExcRoot->eDateiTyp = Biff8; } - ExportBiff8::~ExportBiff8() { } diff --git a/sc/source/filter/excel/fontbuff.cxx b/sc/source/filter/excel/fontbuff.cxx index 75859817b74e..580a5132c987 100644 --- a/sc/source/filter/excel/fontbuff.cxx +++ b/sc/source/filter/excel/fontbuff.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "lotfntbf.hxx" #include "scitems.hxx" @@ -80,7 +79,6 @@ void LotusFontBuffer::Fill( const sal_uInt8 nIndex, SfxItemSet& rItemSet ) } } - void LotusFontBuffer::SetName( const sal_uInt16 nIndex, const OUString& rName ) { OSL_ENSURE( nIndex < nSize, "*LotusFontBuffer::SetName(): Array too small!" ); @@ -94,7 +92,6 @@ void LotusFontBuffer::SetName( const sal_uInt16 nIndex, const OUString& rName ) } } - void LotusFontBuffer::SetHeight( const sal_uInt16 nIndex, const sal_uInt16 nHeight ) { OSL_ENSURE( nIndex < nSize, "*LotusFontBuffer::SetHeight(): Array too small!" ); @@ -102,7 +99,6 @@ void LotusFontBuffer::SetHeight( const sal_uInt16 nIndex, const sal_uInt16 nHeig pData[ nIndex ].Height( *( new SvxFontHeightItem( ( sal_uLong ) nHeight * 20, 100, ATTR_FONT_HEIGHT ) ) ); } - void LotusFontBuffer::SetType( const sal_uInt16 nIndex, const sal_uInt16 nType ) { OSL_ENSURE( nIndex < nSize, "*LotusFontBuffer::SetType(): Array too small!" ); @@ -116,7 +112,6 @@ void LotusFontBuffer::SetType( const sal_uInt16 nIndex, const sal_uInt16 nType ) } } - void LotusFontBuffer::MakeFont( ENTRY* pEntry ) { FontFamily eFamily = FAMILY_DONTKNOW; diff --git a/sc/source/filter/excel/frmbase.cxx b/sc/source/filter/excel/frmbase.cxx index d2179e0fe1d2..08b0b4e16847 100644 --- a/sc/source/filter/excel/frmbase.cxx +++ b/sc/source/filter/excel/frmbase.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "formel.hxx" _ScRangeListTabs::_ScRangeListTabs() @@ -28,7 +27,6 @@ _ScRangeListTabs::~_ScRangeListTabs() { } - void _ScRangeListTabs::Append( const ScAddress& aSRD, SCTAB nTab, const bool b ) { ScAddress a = aSRD; @@ -189,7 +187,6 @@ void ConverterBase::Reset() aStack.Reset(); } - ExcelConverterBase::ExcelConverterBase( svl::SharedStringPool& rSPool, sal_uInt16 nNewBuffer ) : ConverterBase(rSPool, nNewBuffer) { @@ -211,7 +208,6 @@ void ExcelConverterBase::Reset() aEingPos.Set( 0, 0, 0 ); } - LotusConverterBase::LotusConverterBase( SvStream &rStr, svl::SharedStringPool& rSPool, sal_uInt16 nNewBuffers ) : ConverterBase(rSPool, nNewBuffers), aIn( rStr ), diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index dfbd0dbcb11e..0967cbe3ea67 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -85,29 +85,24 @@ using namespace ::com::sun::star; - const double ImportExcel::fExcToTwips = ( double ) TWIPS_PER_CHAR / 256.0; - ImportTyp::ImportTyp( ScDocument* pDoc, rtl_TextEncoding eQ ) { eQuellChar = eQ; pD = pDoc; } - ImportTyp::~ImportTyp() { } - FltError ImportTyp::Read() { return eERR_INTERN; } - ImportExcel::ImportExcel( XclImpRootData& rImpData, SvStream& rStrm ): ImportTyp( &rImpData.mrDoc, rImpData.meTextEnc ), XclImpRoot( rImpData ), @@ -157,7 +152,6 @@ ImportExcel::ImportExcel( XclImpRootData& rImpData, SvStream& rStrm ): pD->SetDocOptions( aDocOpt ); } - ImportExcel::~ImportExcel( void ) { GetDoc().SetSrcCharSet( GetTextEncoding() ); @@ -409,13 +403,11 @@ void ImportExcel::ReadRk() } } - void ImportExcel::Window1() { GetDocViewSettings().ReadWindow1( maStrm ); } - void ImportExcel::Row25( void ) { sal_uInt16 nRow, nRowHeight; @@ -446,7 +438,6 @@ void ImportExcel::Row25( void ) } } - void ImportExcel::Bof2( void ) { sal_uInt16 nSubType; @@ -462,7 +453,6 @@ void ImportExcel::Bof2( void ) pExcRoot->eDateiTyp = Biff2; } - void ImportExcel::Eof( void ) { // POST: darf nur nach einer GUELTIGEN Tabelle gerufen werden! @@ -470,7 +460,6 @@ void ImportExcel::Eof( void ) IncCurrScTab(); } - void ImportExcel::SheetPassword( void ) { if (GetRoot().GetBiff() != EXC_BIFF8) @@ -479,7 +468,6 @@ void ImportExcel::SheetPassword( void ) GetRoot().GetSheetProtectBuffer().ReadPasswordHash( aIn, GetCurrScTab() ); } - void ImportExcel::Externsheet( void ) { OUString aUrl, aTabName; @@ -489,7 +477,6 @@ void ImportExcel::Externsheet( void ) mnLastRefIdx = pExcRoot->pExtSheetBuff->Add( aUrl, aTabName, bSameWorkBook ); } - void ImportExcel:: WinProtection( void ) { if (GetRoot().GetBiff() != EXC_BIFF8) @@ -498,7 +485,6 @@ void ImportExcel:: WinProtection( void ) GetRoot().GetDocProtectBuffer().ReadWinProtect( aIn ); } - void ImportExcel::Columndefault( void ) {// Default Cell Attributes sal_uInt16 nColMic, nColMac; @@ -524,7 +510,6 @@ void ImportExcel::Columndefault( void ) } } - void ImportExcel::Array25( void ) { sal_uInt16 nFirstRow, nLastRow, nFormLen; @@ -560,7 +545,6 @@ void ImportExcel::Array25( void ) } } - void ImportExcel::Rec1904( void ) { sal_uInt16 n1904; @@ -576,7 +560,6 @@ void ImportExcel::Rec1904( void ) } } - void ImportExcel::Externname25( void ) { sal_uInt32 nRes; @@ -601,7 +584,6 @@ void ImportExcel::Externname25( void ) } } - void ImportExcel::Colwidth( void ) {// Column Width sal_uInt8 nColFirst, nColLast; @@ -617,7 +599,6 @@ void ImportExcel::Colwidth( void ) pColRowBuff->SetWidthRange( nColFirst, nColLast, nScWidth ); } - void ImportExcel::Defrowheight2( void ) { sal_uInt16 nDefHeight; @@ -626,7 +607,6 @@ void ImportExcel::Defrowheight2( void ) pColRowBuff->SetDefHeight( nDefHeight, EXC_DEFROW_UNSYNCED ); } - void ImportExcel::SheetProtect( void ) { if (GetRoot().GetBiff() != EXC_BIFF8) @@ -656,13 +636,11 @@ void ImportExcel::Codepage( void ) SetCodePage( maStrm.ReaduInt16() ); } - void ImportExcel::Ixfe( void ) { maStrm >> mnIxfeIndex; } - void ImportExcel::DefColWidth( void ) { // stored as entire characters -> convert to 1/256 of characters (as in COLINFO) @@ -676,12 +654,10 @@ void ImportExcel::DefColWidth( void ) pColRowBuff->SetDefWidth( nScWidth ); } - void ImportExcel::Builtinfmtcnt( void ) { } - void ImportExcel::Colinfo( void ) {// Column Formatting Information sal_uInt16 nColFirst, nColLast, nColWidth, nXF; @@ -708,7 +684,6 @@ void ImportExcel::Colinfo( void ) pColRowBuff->SetDefaultXF( nColFirst, nColLast, nXF ); } - void ImportExcel::Wsbool( void ) { sal_uInt16 nFlags; @@ -720,7 +695,6 @@ void ImportExcel::Wsbool( void ) GetPageSettings().SetFitToPages( ::get_flag( nFlags, EXC_WSBOOL_FITTOPAGE ) ); } - void ImportExcel::Boundsheet( void ) { sal_uInt16 nGrbit = 0; @@ -754,7 +728,6 @@ void ImportExcel::Boundsheet( void ) nBdshtTab++; } - void ImportExcel::Country( void ) { sal_uInt16 nUICountry, nDocCountry; @@ -771,7 +744,6 @@ void ImportExcel::Country( void ) SetUILanguage( eLanguage ); } - void ImportExcel::ReadUsesElfs() { if( maStrm.ReaduInt16() != 0 ) @@ -782,7 +754,6 @@ void ImportExcel::ReadUsesElfs() } } - void ImportExcel::Hideobj( void ) { sal_uInt16 nHide; @@ -818,19 +789,16 @@ void ImportExcel::Hideobj( void ) pD->SetViewOptions( aOpts ); } - void ImportExcel::Bundleheader( void ) { } - void ImportExcel::Standardwidth( void ) { sal_uInt16 nScWidth = XclTools::GetScColumnWidth( maStrm.ReaduInt16(), GetCharWidth() ); pColRowBuff->SetDefWidth( nScWidth, true ); } - void ImportExcel::Shrfmla( void ) { switch (mnLastRecId) @@ -888,7 +856,6 @@ void ImportExcel::Shrfmla( void ) mpLastFormula->mpCell = pCell; } - void ImportExcel::Mulrk( void ) { XclAddress aXclPos; @@ -910,7 +877,6 @@ void ImportExcel::Mulrk( void ) } } - void ImportExcel::Mulblank( void ) { XclAddress aXclPos; @@ -928,7 +894,6 @@ void ImportExcel::Mulblank( void ) } } - void ImportExcel::Rstring( void ) { XclAddress aXclPos; @@ -957,7 +922,6 @@ void ImportExcel::Rstring( void ) } } - void ImportExcel::Cellmerging() { XclImpAddressConverter& rAddrConv = GetAddressConverter(); @@ -975,7 +939,6 @@ void ImportExcel::Cellmerging() } } - void ImportExcel::Olesize( void ) { XclRange aXclOleSize( ScAddress::UNINITIALIZED ); @@ -986,7 +949,6 @@ void ImportExcel::Olesize( void ) GetAddressConverter().ConvertRange( maScOleSize, aXclOleSize, nScTab, nScTab, false ); } - void ImportExcel::Row34( void ) { sal_uInt16 nRow, nRowHeight, nGrbit, nXF; @@ -1016,7 +978,6 @@ void ImportExcel::Row34( void ) } } - void ImportExcel::Bof3( void ) { sal_uInt16 nSubType; @@ -1035,7 +996,6 @@ void ImportExcel::Bof3( void ) pExcRoot->eDateiTyp = Biff3; } - void ImportExcel::Array34( void ) { sal_uInt16 nFirstRow, nLastRow, nFormLen; @@ -1062,12 +1022,10 @@ void ImportExcel::Array34( void ) } } - void ImportExcel::Externname34( void ) { } - void ImportExcel::Defrowheight345( void ) { sal_uInt16 nFlags, nDefHeight; @@ -1075,7 +1033,6 @@ void ImportExcel::Defrowheight345( void ) pColRowBuff->SetDefHeight( nDefHeight, nFlags ); } - void ImportExcel::TableOp( void ) { sal_uInt16 nFirstRow, nLastRow; @@ -1151,7 +1108,6 @@ void ImportExcel::TableOp( void ) } } - void ImportExcel::Bof4( void ) { sal_uInt16 nSubType; @@ -1169,7 +1125,6 @@ void ImportExcel::Bof4( void ) pExcRoot->eDateiTyp = Biff4; } - void ImportExcel::Bof5( void ) { //POST: eDateiTyp = Typ der zu lesenden Datei @@ -1210,7 +1165,6 @@ void ImportExcel::EndSheet( void ) FinalizeTable(); } - void ImportExcel::NewTable( void ) { SCTAB nTab = GetCurrScTab(); @@ -1238,13 +1192,11 @@ void ImportExcel::NewTable( void ) pRowOutlineBuff = pNewItem->GetRowOutline(); } - const ScTokenArray* ImportExcel::ErrorToFormula( bool bErrOrVal, sal_uInt8 nError, double& rVal ) { return pFormConv->GetBoolErr( XclTools::ErrorToEnum( rVal, bErrOrVal, nError ) ); } - void ImportExcel::AdjustRowHeight() { /* Speed up chart import: import all sheets without charts, then @@ -1255,7 +1207,6 @@ void ImportExcel::AdjustRowHeight() pDocObj->UpdateAllRowHeights(); } - void ImportExcel::PostDocLoad( void ) { /* Set automatic page numbering in Default page style (default is "page number = 1"). diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx index 85dfb194cc4a..ab0981cc84be 100644 --- a/sc/source/filter/excel/namebuff.cxx +++ b/sc/source/filter/excel/namebuff.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "namebuff.hxx" #include "document.hxx" @@ -48,7 +47,6 @@ sal_uInt32 StringHashEntry::MakeHashCode( const OUString& r ) return n; } - NameBuffer::~NameBuffer() { std::vector<StringHashEntry*>::iterator pIter; @@ -56,7 +54,6 @@ NameBuffer::~NameBuffer() delete *pIter; } - //void NameBuffer::operator <<( const SpString &rNewString ) void NameBuffer::operator <<( const OUString &rNewString ) { @@ -105,7 +102,6 @@ sal_Int16 ExtSheetBuffer::Add( const OUString& rFPAN, const OUString& rTN, const return static_cast< sal_Int16 >( maEntries.size() ); } - bool ExtSheetBuffer::GetScTabIndex( sal_uInt16 nExcIndex, sal_uInt16& rScIndex ) { OSL_ENSURE( nExcIndex, @@ -161,7 +157,6 @@ bool ExtSheetBuffer::GetScTabIndex( sal_uInt16 nExcIndex, sal_uInt16& rScIndex ) return false; } - bool ExtSheetBuffer::IsLink( const sal_uInt16 nExcIndex ) const { OSL_ENSURE( nExcIndex > 0, "*ExtSheetBuffer::IsLink(): Index has to be >0!" ); @@ -172,7 +167,6 @@ bool ExtSheetBuffer::IsLink( const sal_uInt16 nExcIndex ) const return maEntries[ nExcIndex -1 ].bLink; } - bool ExtSheetBuffer::GetLink( const sal_uInt16 nExcIndex, OUString& rAppl, OUString& rDoc ) const { OSL_ENSURE( nExcIndex > 0, "*ExtSheetBuffer::GetLink(): Index has to be >0!" ); @@ -188,38 +182,32 @@ bool ExtSheetBuffer::GetLink( const sal_uInt16 nExcIndex, OUString& rAppl, OUStr return true; } - void ExtSheetBuffer::Reset( void ) { maEntries.clear(); } - bool ExtName::IsDDE( void ) const { return ( nFlags & 0x0001 ) != 0; } - bool ExtName::IsOLE( void ) const { return ( nFlags & 0x0002 ) != 0; } - ExtNameBuff::ExtNameBuff( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) { } - void ExtNameBuff::AddDDE( const OUString& rName, sal_Int16 nRefIdx ) { ExtName aNew( rName, 0x0001 ); maExtNames[ nRefIdx ].push_back( aNew ); } - void ExtNameBuff::AddOLE( const OUString& rName, sal_Int16 nRefIdx, sal_uInt32 nStorageId ) { ExtName aNew( rName, 0x0002 ); @@ -227,14 +215,12 @@ void ExtNameBuff::AddOLE( const OUString& rName, sal_Int16 nRefIdx, sal_uInt32 n maExtNames[ nRefIdx ].push_back( aNew ); } - void ExtNameBuff::AddName( const OUString& rName, sal_Int16 nRefIdx ) { ExtName aNew( GetScAddInName( rName ), 0x0004 ); maExtNames[ nRefIdx ].push_back( aNew ); } - const ExtName* ExtNameBuff::GetNameByIndex( sal_Int16 nRefIdx, sal_uInt16 nNameIdx ) const { OSL_ENSURE( nNameIdx > 0, "ExtNameBuff::GetNameByIndex() - invalid name index" ); @@ -242,11 +228,9 @@ const ExtName* ExtNameBuff::GetNameByIndex( sal_Int16 nRefIdx, sal_uInt16 nNameI return ((aIt != maExtNames.end()) && (0 < nNameIdx) && (nNameIdx <= aIt->second.size())) ? &aIt->second[ nNameIdx - 1 ] : 0; } - void ExtNameBuff::Reset( void ) { maExtNames.clear(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx index 7c4d7bd09d3b..4aee5ba55f9b 100644 --- a/sc/source/filter/excel/read.cxx +++ b/sc/source/filter/excel/read.cxx @@ -766,7 +766,6 @@ FltError ImportExcel::Read( void ) return eLastErr; } - FltError ImportExcel8::Read( void ) { #ifdef EXC_INCL_DUMPER @@ -978,7 +977,6 @@ FltError ImportExcel8::Read( void ) } break; - // prefetch for workbook globals case EXC_STATE_GLOBALS_PRE: { @@ -1019,7 +1017,6 @@ FltError ImportExcel8::Read( void ) } break; - // workbook globals case EXC_STATE_GLOBALS: { @@ -1079,7 +1076,6 @@ FltError ImportExcel8::Read( void ) } break; - // prefetch for worksheet case EXC_STATE_SHEET_PRE: { @@ -1146,7 +1142,6 @@ FltError ImportExcel8::Read( void ) } break; - // worksheet case EXC_STATE_SHEET: { @@ -1237,7 +1232,6 @@ FltError ImportExcel8::Read( void ) } break; - default:; } } diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx index 9522e3bfaeb4..4c4550a62e83 100644 --- a/sc/source/filter/excel/tokstack.cxx +++ b/sc/source/filter/excel/tokstack.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tokstack.hxx" #include "compiler.hxx" #include "global.hxx" @@ -30,7 +29,6 @@ const sal_uInt16 TokenPool::nScTokenOff = 8192; - TokenStack::TokenStack( sal_uInt16 nNewSize ) { pStack = new TokenId[ nNewSize ]; @@ -39,20 +37,15 @@ TokenStack::TokenStack( sal_uInt16 nNewSize ) nSize = nNewSize; } - TokenStack::~TokenStack() { delete[] pStack; } - - - // !ACHTUNG!: nach Aussen hin beginnt die Nummerierung mit 1! // !ACHTUNG!: SC-Token werden mit einem Offset nScTokenOff abgelegt // -> Unterscheidung von anderen Token - TokenPool::TokenPool( svl::SharedStringPool& rSPool ) : mrStringPool(rSPool) { @@ -106,7 +99,6 @@ TokenPool::TokenPool( svl::SharedStringPool& rSPool ) : Reset(); } - TokenPool::~TokenPool() { sal_uInt16 n; @@ -144,7 +136,6 @@ TokenPool::~TokenPool() delete pScToken; } - /** Returns the new number of elements, or 0 if overflow. */ static sal_uInt16 lcl_canGrow( sal_uInt16 nOld, sal_uInt16 nByMin = 1 ) { @@ -161,7 +152,6 @@ static sal_uInt16 lcl_canGrow( sal_uInt16 nOld, sal_uInt16 nByMin = 1 ) return static_cast<sal_uInt16>(nNew); } - bool TokenPool::GrowString( void ) { sal_uInt16 nP_StrNew = lcl_canGrow( nP_Str); @@ -186,14 +176,12 @@ bool TokenPool::GrowString( void ) return true; } - bool TokenPool::GrowDouble( void ) { sal_uInt16 nP_DblNew = lcl_canGrow( nP_Dbl); if (!nP_DblNew) return false; - double* pP_DblNew = new (::std::nothrow) double[ nP_DblNew ]; if (!pP_DblNew) return false; @@ -208,7 +196,6 @@ bool TokenPool::GrowDouble( void ) return true; } - /* TODO: in case we had FormulaTokenArray::AddError() */ #if 0 void TokenPool::GrowError( void ) @@ -217,7 +204,6 @@ void TokenPool::GrowError( void ) if (!nP_ErrNew) return false; - sal_uInt16* pP_ErrNew = new (::std::nothrow) sal_uInt16[ nP_ErrNew ]; if (!pP_ErrNew) return false; @@ -233,7 +219,6 @@ void TokenPool::GrowError( void ) } #endif - bool TokenPool::GrowTripel( sal_uInt16 nByMin ) { sal_uInt16 nP_RefTrNew = lcl_canGrow( nP_RefTr, nByMin); @@ -258,14 +243,12 @@ bool TokenPool::GrowTripel( sal_uInt16 nByMin ) return true; } - bool TokenPool::GrowId( void ) { sal_uInt16 nP_IdNew = lcl_canGrow( nP_Id); if (!nP_IdNew) return false; - sal_uInt16* pP_IdNew = new (::std::nothrow) sal_uInt16[ nP_IdNew ]; if (!pP_IdNew) return false; @@ -280,14 +263,12 @@ bool TokenPool::GrowId( void ) return true; } - bool TokenPool::GrowElement( void ) { sal_uInt16 nElementNew = lcl_canGrow( nElement); if (!nElementNew) return false; - sal_uInt16* pElementNew = new (::std::nothrow) sal_uInt16[ nElementNew ]; E_TYPE* pTypeNew = new (::std::nothrow) E_TYPE[ nElementNew ]; sal_uInt16* pSizeNew = new (::std::nothrow) sal_uInt16[ nElementNew ]; @@ -317,7 +298,6 @@ bool TokenPool::GrowElement( void ) return true; } - bool TokenPool::GrowExt( void ) { sal_uInt16 nNewSize = lcl_canGrow( nP_Ext); @@ -337,7 +317,6 @@ bool TokenPool::GrowExt( void ) return true; } - bool TokenPool::GrowNlf( void ) { sal_uInt16 nNewSize = lcl_canGrow( nP_Nlf); @@ -357,7 +336,6 @@ bool TokenPool::GrowNlf( void ) return true; } - bool TokenPool::GrowMatrix( void ) { sal_uInt16 nNewSize = lcl_canGrow( nP_Matrix); @@ -537,7 +515,6 @@ bool TokenPool::GetElement( const sal_uInt16 nId ) return bRet; } - bool TokenPool::GetElementRek( const sal_uInt16 nId ) { #ifdef DBG_UTIL @@ -565,7 +542,6 @@ bool TokenPool::GetElementRek( const sal_uInt16 nId ) return false; } - bool bRet = true; sal_uInt16 nAnz = pSize[ nId ]; sal_uInt16 nFirstId = pElement[ nId ]; @@ -603,14 +579,12 @@ bool TokenPool::GetElementRek( const sal_uInt16 nId ) pScToken->AddOpCode( ( DefTokenId ) ( *pAkt - nScTokenOff ) ); } - #ifdef DBG_UTIL m_nRek--; #endif return bRet; } - void TokenPool::operator >>( TokenId& rId ) { rId = ( TokenId ) ( nElementAkt + 1 ); @@ -628,7 +602,6 @@ void TokenPool::operator >>( TokenId& rId ) nP_IdLast = nP_IdAkt; } - const TokenId TokenPool::Store( const double& rDouble ) { if( nElementAkt >= nElement ) @@ -652,13 +625,11 @@ const TokenId TokenPool::Store( const double& rDouble ) return ( const TokenId ) nElementAkt; // Ausgabe von altem Wert + 1! } - const TokenId TokenPool::Store( const sal_uInt16 nIndex ) { return StoreName(nIndex, true); } - const TokenId TokenPool::Store( const OUString& rString ) { // weitgehend nach Store( const sal_Char* ) kopiert, zur Vermeidung @@ -667,12 +638,10 @@ const TokenId TokenPool::Store( const OUString& rString ) if (!GrowElement()) return (const TokenId) nElementAkt+1; - if( nP_StrAkt >= nP_Str ) if (!GrowString()) return (const TokenId) nElementAkt+1; - pElement[ nElementAkt ] = nP_StrAkt; // Index in String-Array pType[ nElementAkt ] = T_Str; // Typinfo String eintragen @@ -696,7 +665,6 @@ const TokenId TokenPool::Store( const OUString& rString ) return ( const TokenId ) nElementAkt; // Ausgabe von altem Wert + 1! } - const TokenId TokenPool::Store( const ScSingleRefData& rTr ) { if( nElementAkt >= nElement ) @@ -721,7 +689,6 @@ const TokenId TokenPool::Store( const ScSingleRefData& rTr ) return ( const TokenId ) nElementAkt; // Ausgabe von altem Wert + 1! } - const TokenId TokenPool::Store( const ScComplexRefData& rTr ) { if( nElementAkt >= nElement ) @@ -752,7 +719,6 @@ const TokenId TokenPool::Store( const ScComplexRefData& rTr ) return ( const TokenId ) nElementAkt; // Ausgabe von altem Wert + 1! } - const TokenId TokenPool::Store( const DefTokenId e, const OUString& r ) { if( nElementAkt >= nElement ) @@ -780,7 +746,6 @@ const TokenId TokenPool::Store( const DefTokenId e, const OUString& r ) return ( const TokenId ) nElementAkt; // Ausgabe von altem Wert + 1! } - const TokenId TokenPool::StoreNlf( const ScSingleRefData& rTr ) { if( nElementAkt >= nElement ) @@ -919,7 +884,6 @@ void TokenPool::Reset( void ) maExtAreaRefs.clear(); } - bool TokenPool::IsSingleOp( const TokenId& rId, const DefTokenId eId ) const { sal_uInt16 nId = (sal_uInt16) rId; diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index 5d10e380fc80..11a29a22c8de 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "xechart.hxx" #include <com/sun/star/i18n/XBreakIterator.hpp> @@ -1698,7 +1697,6 @@ bool XclExpChSerTrendLine::Convert( Reference< XRegressionCurve > xRegCurve, sal if (bIsForceIntercept) aCurveProp.GetProperty(maData.mfIntercept, EXC_CHPROP_INTERCEPT_VALUE); - // line formatting XclChDataPointPos aPointPos( nSeriesIdx ); mxDataFmt.reset( new XclExpChDataFormat( GetChRoot(), aPointPos, 0 ) ); diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index d91e15d03cd4..51f8781364be 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "xeescher.hxx" #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx index 0231faf207fb..1cd20563001e 100644 --- a/sc/source/filter/excel/xeformula.cxx +++ b/sc/source/filter/excel/xeformula.cxx @@ -313,7 +313,6 @@ public: bool IsRef2D( const ScSingleRefData& rRefData, bool bCheck3DFlag ) const; bool IsRef2D( const ScComplexRefData& rRefData, bool bCheck3DFlag ) const; - private: const XclExpCompConfig* GetConfigForType( XclFormulaType eType ) const; inline sal_uInt16 GetSize() const { return static_cast< sal_uInt16 >( mxData->maTokVec.size() ); } @@ -449,7 +448,6 @@ private: void AppendExt( double fData ); void AppendExt( const OUString& rString ); - private: typedef ::std::map< XclFormulaType, XclExpCompConfig > XclExpCompConfigMap; typedef boost::shared_ptr< XclExpCompData > XclExpCompDataRef; diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index 944a0723cf9b..a856cf56b4a2 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -36,10 +36,8 @@ using ::std::find_if; using ::std::vector; using ::com::sun::star::uno::Any; - // *** Helper classes *** - // External names ============================================================= /** This is a base class for any external name (i.e. add-in names or DDE links). @@ -609,10 +607,8 @@ private: XclExpXtiVec maXtiVec; /// List of XTI structures for the EXTERNSHEET record. }; - // *** Implementation *** - // Excel sheet indexes ======================================================== const sal_uInt8 EXC_TABBUF_IGNORE = 0x01; /// Sheet will be ignored completely. @@ -1370,7 +1366,6 @@ XclExpSupbook::XclExpSupbook( const XclExpRoot& rRoot, const OUString& rUrl, Xcl SetRecSize( 2 + maUrlEncoded.GetSize() ); } - XclExpSupbook::XclExpSupbook( const XclExpRoot& rRoot, const OUString& rUrl ) : XclExpExternSheetBase( rRoot, EXC_ID_SUPBOOK ), maUrl( rUrl ), @@ -1970,7 +1965,6 @@ bool XclExpLinkManagerImpl5::InsertEuroTool( return false; } - bool XclExpLinkManagerImpl5::InsertDde( sal_uInt16& /*rnExtSheet*/, sal_uInt16& /*rnExtName*/, const OUString& /*rApplic*/, const OUString& /*rTopic*/, const OUString& /*rItem*/ ) @@ -2172,7 +2166,6 @@ bool XclExpLinkManagerImpl8::InsertEuroTool( return false; } - bool XclExpLinkManagerImpl8::InsertDde( sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, const OUString& rApplic, const OUString& rTopic, const OUString& rItem ) diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx index 005ec4bfab0b..8c8a010fd951 100644 --- a/sc/source/filter/excel/xename.cxx +++ b/sc/source/filter/excel/xename.cxx @@ -36,7 +36,6 @@ using namespace ::oox; // *** Helper classes *** - /** Represents an internal defined name, supports writing it to a NAME record. */ class XclExpName : public XclExpRecord, protected XclExpRoot { @@ -57,7 +56,6 @@ public: @param bFunc true = Macro function; false = Macro procedure. */ void SetMacroCall( bool bVBasic, bool bFunc ); - /** Sets the name's symbol value @param sValue the name's symbolic value */ void SetSymbol( const OUString& rValue ); @@ -185,10 +183,8 @@ private: size_t mnFirstUserIdx; /// List index of first user-defined NAME record. }; - // *** Implementation *** - XclExpName::XclExpName( const XclExpRoot& rRoot, const OUString& rName ) : XclExpRecord( EXC_ID_NAME ), XclExpRoot( rRoot ), diff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx index 8db13be1d52c..69e9b1107e42 100644 --- a/sc/source/filter/excel/xepage.cxx +++ b/sc/source/filter/excel/xepage.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "xepage.hxx" #include <svl/itemset.hxx> #include "scitems.hxx" diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index 4b8ca1384e29..444cc5aa1b4f 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -58,7 +58,6 @@ using ::com::sun::star::sheet::DataPilotFieldReference; // Pivot cache - namespace { // constants to track occurrence of specific data types @@ -899,10 +898,8 @@ void XclExpPivotCache::WriteSxindexlistList( XclExpStream& rStrm ) const } } - // Pivot table - namespace { /** Returns a display string for a data field containing the field name and aggregation function. */ diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx index 683f9097804b..1cab39a7b60f 100644 --- a/sc/source/filter/excel/xeroot.cxx +++ b/sc/source/filter/excel/xeroot.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <rtl/random.h> #include <sfx2/docfile.hxx> #include <sfx2/request.hxx> diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 345d08674caa..362ba34e398c 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -924,7 +924,6 @@ sax_fastparser::FSHelperPtr XclXmlUtils::WriteFontData( sax_fastparser::FSHelper return pStream; } - XclExpXmlStream::XclExpXmlStream( const Reference< XComponentContext >& rCC ) : XmlFilterBase( rCC ), mpRoot( NULL ) diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx index 0f052a70a867..2e4cb8104ab8 100644 --- a/sc/source/filter/excel/xestring.cxx +++ b/sc/source/filter/excel/xestring.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <algorithm> #include <stdio.h> #include "xlstyle.hxx" @@ -27,7 +26,6 @@ using namespace ::oox; - namespace { // compare vectors diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index c27fd95a2c9a..ed4b1377c0d8 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -37,13 +37,10 @@ using namespace ::oox; - namespace ApiScriptType = ::com::sun::star::i18n::ScriptType; - // Helper records for cell records - XclExpStringRec::XclExpStringRec( const XclExpRoot& rRoot, const OUString& rResult ) : XclExpRecord( EXC_ID3_STRING ), mxResult( XclExpStringHelper::CreateString( rRoot, rResult ) ) @@ -522,10 +519,8 @@ XclExpTableopRef XclExpTableopBuffer::TryCreate( const ScAddress& rScPos, const return xRec; } - // Cell records - XclExpCellBase::XclExpCellBase( sal_uInt16 nRecId, sal_Size nContSize, const XclAddress& rXclPos ) : XclExpRecord( nRecId, nContSize + 4 ), @@ -1329,10 +1324,8 @@ void XclExpRkCell::WriteContents( XclExpStream& rStrm, sal_uInt16 nRelCol ) rStrm << maRkValues[ nRelCol ]; } - // Rows and Columns - XclExpOutlineBuffer::XclExpOutlineBuffer( const XclExpRoot& rRoot, bool bRows ) : mpScOLArray( 0 ), maLevelInfos( SC_OL_MAXDEPTH ), @@ -2163,7 +2156,6 @@ void XclExpRowBuffer::Save( XclExpStream& rStrm ) RowMap::iterator itrBlkStart = maRowMap.begin(), itrBlkEnd = maRowMap.begin(); sal_uInt16 nStartXclRow = (nSize == 0) ? 0 : itrBeg->second->GetXclRow(); - for (itr = itrBeg; itr != itrEnd; ++itr) { // find end of row block @@ -2205,7 +2197,6 @@ void XclExpRowBuffer::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_sheetData ); } - XclExpRow& XclExpRowBuffer::GetOrCreateRow( sal_uInt32 nXclRow, bool bRowAlwaysEmpty ) { RowMap::iterator itr = maRowMap.begin(); @@ -2230,10 +2221,8 @@ XclExpRow& XclExpRowBuffer::GetOrCreateRow( sal_uInt32 nXclRow, bool bRowAlwaysE } - // Cell Table - XclExpCellTable::XclExpCellTable( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), maColInfoBfr( rRoot ), diff --git a/sc/source/filter/excel/xeview.cxx b/sc/source/filter/excel/xeview.cxx index 08e12169e5af..82d69efee523 100644 --- a/sc/source/filter/excel/xeview.cxx +++ b/sc/source/filter/excel/xeview.cxx @@ -26,7 +26,6 @@ using namespace ::oox; - // Workbook view settings records ============================================= XclExpWindow1::XclExpWindow1( const XclExpRoot& rRoot ) @@ -515,5 +514,4 @@ void XclExpTabViewSettings::WriteTabBgColor( XclExpStream& rStrm ) const XclExpTabBgColor( maData ).Save( rStrm ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index fb8d326b0631..b0ec5bdfdf22 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -2801,7 +2801,6 @@ void XclImpChTypeGroup::ReadChDataFormat( XclImpStream& rStrm ) mxGroupFmt = xDataFmt; } - void XclImpChTypeGroup::InsertDataSeries( Reference< XChartType > xChartType, Reference< XDataSeries > xSeries, sal_Int32 nApiAxesSetIdx ) const { diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index 221ac467a8a6..d572ae709449 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -64,7 +64,6 @@ using ::com::sun::star::uno::Sequence; using ::std::auto_ptr; - // Shared string table ======================================================== XclImpSst::XclImpSst( const XclImpRoot& rRoot ) : @@ -760,7 +759,6 @@ void XclImpValidationManager::ReadDV( XclImpStream& rStrm ) // Not enough bytes left in the record. Bail out. return; - // first formula // string list is single tStr token with NUL separators -> replace them with LF rStrm.SetNulSubstChar( '\n' ); @@ -847,7 +845,6 @@ void XclImpValidationManager::ReadDV( XclImpStream& rStrm ) // No valid validation found. Bail out. return; - // first range for base address for relative references const ScRange& rScRange = *aScRanges.front(); // aScRanges is not empty diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 29897285cee8..ad655952fe44 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -1923,7 +1923,6 @@ void XclImpControlHelper::ProcessControl( const XclImpDrawObjBase& rDrawObj ) co aPropSet.SetBoolProperty( "EnableVisible", rDrawObj.IsVisible() ); aPropSet.SetBoolProperty( "Printable", rDrawObj.IsPrintable() ); - // virtual call for type specific processing DoProcessControl( aPropSet ); } @@ -3211,7 +3210,6 @@ XclImpDffConverter::XclImpDffConvData::XclImpDffConvData( { } - XclImpDffConverter::XclImpDffConverter( const XclImpRoot& rRoot, SvStream& rDffStrm ) : XclImpSimpleDffConverter( rRoot, rDffStrm ), oox::ole::MSConvertOCXControls( rRoot.GetDocShell()->GetModel() ), diff --git a/sc/source/filter/excel/xiformula.cxx b/sc/source/filter/excel/xiformula.cxx index ccc47475a9f9..865a7834de83 100644 --- a/sc/source/filter/excel/xiformula.cxx +++ b/sc/source/filter/excel/xiformula.cxx @@ -38,7 +38,6 @@ public: const ScTokenArray* CreateFormula( XclFormulaType eType, const XclTokenArray& rXclTokArr ); - private: XclFunctionProvider maFuncProv; /// Excel function data provider. const XclBiff meBiff; /// Cached BIFF version to save GetBiff() calls. diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx index 774d24479854..0af9836bc931 100644 --- a/sc/source/filter/excel/xihelper.cxx +++ b/sc/source/filter/excel/xihelper.cxx @@ -811,7 +811,6 @@ XclImpCachedValue::~XclImpCachedValue() { } - sal_uInt16 XclImpCachedValue::GetScError() const { return (mnType == EXC_CACHEDVAL_ERROR) ? XclTools::GetScErrorCode( mnBoolErr ) : 0; diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index 49e2acb55fb9..c2b23270f307 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -38,7 +38,6 @@ using ::std::vector; // *** Helper classes *** - // Cached external cells ====================================================== /** @@ -212,10 +211,8 @@ private: XclImpSupbookList maSupbookList; /// List of external documents. }; - // *** Implementation *** - // Excel sheet indexes ======================================================== // original Excel sheet names ------------------------------------------------- @@ -544,7 +541,6 @@ XclImpCrn::XclImpCrn( XclImpStream& rStrm, const XclAddress& rXclPos ) : { } - // Sheet in an external document ============================================== XclImpSupbookTab::XclImpSupbookTab( const OUString& rTabName ) : diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx index 3cda3814c0aa..4a1ef2096b94 100644 --- a/sc/source/filter/excel/xiname.cxx +++ b/sc/source/filter/excel/xiname.cxx @@ -27,7 +27,6 @@ // *** Implementation *** - XclImpName::TokenStrmData::TokenStrmData( XclImpStream& rStrm ) : mrStrm(rStrm), mnStrmPos(0), mnStrmSize(0) {} diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx index 966abdf2f073..6fb756f09f6f 100644 --- a/sc/source/filter/excel/xipivot.cxx +++ b/sc/source/filter/excel/xipivot.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "xipivot.hxx" #include <com/sun/star/sheet/DataPilotFieldSortInfo.hpp> @@ -62,10 +61,8 @@ using ::com::sun::star::sheet::DataPilotFieldLayoutInfo; using ::com::sun::star::sheet::DataPilotFieldReference; using ::std::vector; - // Pivot cache - XclImpPCItem::XclImpPCItem( XclImpStream& rStrm ) { switch( rStrm.GetRecId() ) @@ -876,10 +873,8 @@ bool XclImpPivotCache::IsValid() const return maSrcRange.IsValid(); } - // Pivot table - XclImpPTItem::XclImpPTItem( const XclImpPCField* pCacheField ) : mpCacheField( pCacheField ) { diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index 6fc2651f2cad..8e98ff3e6a45 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -735,7 +735,6 @@ void XclImpCellProt::FillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs ) c ScfTools::PutItem( rItemSet, ScProtectionAttr( mbLocked, mbHidden ), bSkipPoolDefs ); } - void XclImpCellAlign::FillFromXF2( sal_uInt8 nFlags ) { mnHorAlign = ::extract_value< sal_uInt8 >( nFlags, 0, 3 ); @@ -1069,7 +1068,6 @@ void XclImpCellArea::FillToItemSet( SfxItemSet& rItemSet, const XclImpPalette& r } } - XclImpXF::XclImpXF( const XclImpRoot& rRoot ) : XclXFBase( true ), // default is cell XF XclImpRoot( rRoot ), diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx index 58ccbaea5c2d..de9b15711333 100644 --- a/sc/source/filter/excel/xlchart.cxx +++ b/sc/source/filter/excel/xlchart.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "xlchart.hxx" #include <com/sun/star/container/XNameContainer.hpp> diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx index 2d6d29e29c8b..986d77cf8a51 100644 --- a/sc/source/filter/excel/xlescher.cxx +++ b/sc/source/filter/excel/xlescher.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "xlescher.hxx" #include <com/sun/star/drawing/XControlShape.hpp> diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index ff3d1c714ece..3944c5706bbd 100644 --- a/sc/source/filter/excel/xlformula.cxx +++ b/sc/source/filter/excel/xlformula.cxx @@ -381,7 +381,6 @@ static const XclFunctionInfo saFuncTable_8[] = { ocEuroConvert, 255, 4, 6, V, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY, "EUROCONVERT" } }; - #define EXC_FUNCENTRY_V_VR( opcode, minparam, maxparam, flags, asciiname ) \ { opcode, NOID, minparam, maxparam, V, { VR }, EXC_FUNCFLAG_IMPORTONLY|(flags), EXC_FUNCNAME( asciiname ) }, \ { opcode, 255, (minparam)+1, (maxparam)+1, V, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY|(flags), EXC_FUNCNAME( asciiname ) } @@ -406,7 +405,6 @@ static const XclFunctionInfo saFuncTable_Oox[] = EXC_FUNCENTRY_V_VR( ocCeil_ISO, 2, 2, 0, "ISO.CEILING" ) }; - #define EXC_FUNCENTRY_V_VR_IMPORT( opcode, minparam, maxparam, flags, asciiname ) \ { opcode, NOID, minparam, maxparam, V, { VR }, EXC_FUNCFLAG_IMPORTONLY|(flags), EXC_FUNCNAME( asciiname ) } @@ -571,7 +569,6 @@ static const XclFunctionInfo saFuncTable_2013[] = EXC_FUNCENTRY_V_RX( ocXor, 1, MX, 0, "XOR" ) }; - #define EXC_FUNCENTRY_ODF( opcode, minparam, maxparam, flags, asciiname ) \ { opcode, NOID, minparam, maxparam, V, { VR }, EXC_FUNCFLAG_IMPORTONLY|(flags), EXC_FUNCNAME_ODF( asciiname ) }, \ { opcode, 255, (minparam)+1, (maxparam)+1, V, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY|(flags), EXC_FUNCNAME_ODF( asciiname ) } @@ -585,7 +582,6 @@ static const XclFunctionInfo saFuncTable_Odf[] = #undef EXC_FUNCENTRY_ODF - #define EXC_FUNCENTRY_OOO( opcode, minparam, maxparam, flags, asciiname ) \ { opcode, NOID, minparam, maxparam, V, { VR }, EXC_FUNCFLAG_IMPORTONLY|(flags), EXC_FUNCNAME( asciiname ) }, \ { opcode, 255, (minparam)+1, (maxparam)+1, V, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY|(flags), EXC_FUNCNAME( asciiname ) } diff --git a/sc/source/filter/excel/xlpage.cxx b/sc/source/filter/excel/xlpage.cxx index 0cccec7f7349..36232de41425 100644 --- a/sc/source/filter/excel/xlpage.cxx +++ b/sc/source/filter/excel/xlpage.cxx @@ -42,7 +42,6 @@ struct XclPaperSize #define MM2TWIPS( v ) ((long)((v) * EXC_TWIPS_PER_INCH / CM_PER_INCH / 10.0 + 0.5)) #define TWIPS2MM( v ) ((long)((v - 0.5) / EXC_TWIPS_PER_INCH * CM_PER_INCH * 10.0)) - static const XclPaperSize pPaperSizeTable[] = { /* 0*/ { PAPER_USER, 0, 0 }, // undefined diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx index 6682d46659de..4acdf8ae1fa5 100644 --- a/sc/source/filter/excel/xlpivot.cxx +++ b/sc/source/filter/excel/xlpivot.cxx @@ -34,10 +34,8 @@ namespace ScDPLayoutMode = ::com::sun::star::sheet::DataPilotFieldLayoutMode; namespace ScDPRefItemType = ::com::sun::star::sheet::DataPilotFieldReferenceItemType; namespace ScDPGroupBy = ::com::sun::star::sheet::DataPilotFieldGroupBy; - // Pivot cache - XclPCItem::XclPCItem() : meType( EXC_PCITEM_INVALID ), maDateTime( DateTime::EMPTY ) @@ -384,10 +382,8 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPCInfo& rInfo ) << XclExpString( rInfo.maUserName ); } - // Pivot table - // cached name ================================================================ XclImpStream& operator>>( XclImpStream& rStrm, XclPTCachedName& rCachedName ) diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx index d2bf5e4d48b0..69f27748853f 100644 --- a/sc/source/filter/excel/xlstyle.cxx +++ b/sc/source/filter/excel/xlstyle.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "xlstyle.hxx" #include <com/sun/star/awt/FontFamily.hpp> #include <com/sun/star/awt/FontSlant.hpp> @@ -329,7 +328,6 @@ void XclFontData::SetFontEncoding( rtl_TextEncoding eFontEnc ) mnCharSet = rtl_getBestWindowsCharsetFromTextEncoding( eFontEnc ); } - void XclFontData::SetScPosture( FontItalic eScPosture ) { mbItalic = (eScPosture == ITALIC_OBLIQUE) || (eScPosture == ITALIC_NORMAL); diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx index 468de5eac05b..0121b21d810e 100644 --- a/sc/source/filter/excel/xltoolbar.cxx +++ b/sc/source/filter/excel/xltoolbar.cxx @@ -417,7 +417,6 @@ bool ScCTBWrapper::ImportCustomToolBar( SfxObjectShell& rDocSh ) // such menus will be dealt with when they are encountered // as part of importing the appropriate MenuSpecific toolbar control ) - if ( !(*it).IsMenuToolbar() ) { if ( !(*it).ImportCustomToolBar( *this, helper ) ) diff --git a/sc/source/filter/excel/xltoolbar.hxx b/sc/source/filter/excel/xltoolbar.hxx index 4a99bf9495f4..b5481caccd3c 100644 --- a/sc/source/filter/excel/xltoolbar.hxx +++ b/sc/source/filter/excel/xltoolbar.hxx @@ -66,7 +66,6 @@ public: bool ImportMenuTB( ScCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& ); OUString GetName() { return tb.getName().getString(); } - }; class CTBS : public TBBase @@ -107,7 +106,6 @@ public: ScCTB* GetCustomizationData( const OUString& name ); }; - #endif // INCLUDED_SC_SOURCE_FILTER_EXCEL_XLTOOLBAR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx index 01c3b4890102..38b6dd07bed9 100644 --- a/sc/source/filter/excel/xltools.cxx +++ b/sc/source/filter/excel/xltools.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <algorithm> #include <math.h> #include <sal/mathconf.h> @@ -38,7 +37,6 @@ #include "xiroot.hxx" #include "xltools.hxx" - // GUID import/export XclGuid::XclGuid() |