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 | |
| parent | ed6b8a100c1aabb342573f252509573bbe124d29 (diff) | |
remove whitespace
Change-Id: Ib15413e73409cc33de01fa92a47b9d1237cfc4b2
Diffstat (limited to 'sc/source/filter')
217 files changed, 0 insertions, 993 deletions
diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx index e5a2fc785e51..6cc1c82a4916 100644 --- a/sc/source/filter/dif/difexp.cxx +++ b/sc/source/filter/dif/difexp.cxx @@ -47,7 +47,6 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rStream, ScDocument* p return ScExportDif( rStream, pDoc, ScRange( aStart, aEnd ), eNach, nDifOption ); } - FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc, const ScRange&rRange, const rtl_TextEncoding eCharSet, sal_uInt32 nDifOption ) { @@ -296,5 +295,4 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc return eRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx index 3d393549e711..243f6faefdf8 100644 --- a/sc/source/filter/dif/difimp.cxx +++ b/sc/source/filter/dif/difimp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <math.h> #include <svl/zforlist.hxx> @@ -47,7 +46,6 @@ const sal_Unicode pKeyNA[] = { 'N', 'A', 0 }; const sal_Unicode pKeyV[] = { 'V', 0 }; const sal_Unicode pKey1_0[] = { '1', ',', '0', 0 }; - FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc, const ScAddress& rInsPos, const rtl_TextEncoding eVon, sal_uInt32 nDifOption ) { @@ -122,7 +120,6 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc, } - if( eTopic == T_DATA ) { // Ab hier kommen die Daten SCCOL nBaseCol = rInsPos.Col(); @@ -233,7 +230,6 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc, return eERR_OK; } - DifParser::DifParser( SvStream& rNewIn, const sal_uInt32 nOption, ScDocument& rDoc, rtl_TextEncoding e ) : fVal(0.0) , nVector(0) @@ -257,7 +253,6 @@ DifParser::DifParser( SvStream& rNewIn, const sal_uInt32 nOption, ScDocument& rD pNumFormatter = rDoc.GetFormatTable(); } - TOPIC DifParser::GetNextTopic( void ) { enum STATE { S_VectorVal, S_Data, S_END, S_START, S_UNKNOWN, S_ERROR_L2 }; @@ -401,7 +396,6 @@ TOPIC DifParser::GetNextTopic( void ) return eRet; } - static void lcl_DeEscapeQuotesDif( OUString& rString ) { // Special handling for DIF import: Escaped (duplicated) quotes are resolved. @@ -607,7 +601,6 @@ DATASET DifParser::GetNextDataset( void ) return eRet; } - const sal_Unicode* DifParser::ScanIntVal( const sal_Unicode* pStart, sal_uInt32& rRet ) { // eat leading whitespace, not specified, but seen in the wild @@ -636,7 +629,6 @@ const sal_Unicode* DifParser::ScanIntVal( const sal_Unicode* pStart, sal_uInt32& return pStart; } - bool DifParser::ScanFloatVal( const sal_Unicode* pStart ) { bool bNeg = false; @@ -843,7 +835,6 @@ void DifColumn::SetLogical( SCROW nRow ) } } - void DifColumn::SetNumFormat( SCROW nRow, const sal_uInt32 nNumFormat ) { OSL_ENSURE( ValidRow(nRow), "*DifColumn::SetNumFormat(): Row too big!" ); @@ -869,7 +860,6 @@ void DifColumn::SetNumFormat( SCROW nRow, const sal_uInt32 nNumFormat ) pAkt = NULL; } - void DifColumn::NewEntry( const SCROW nPos, const sal_uInt32 nNumFormat ) { pAkt = new ENTRY; @@ -879,14 +869,12 @@ void DifColumn::NewEntry( const SCROW nPos, const sal_uInt32 nNumFormat ) aEntries.push_back(pAkt); } - void DifColumn::Apply( ScDocument& rDoc, const SCCOL nCol, const SCTAB nTab, const ScPatternAttr& rPattAttr ) { for (boost::ptr_vector<ENTRY>::const_iterator it = aEntries.begin(); it != aEntries.end(); ++it) rDoc.ApplyPatternAreaTab( nCol, it->nStart, nCol, it->nEnd, nTab, rPattAttr ); } - void DifColumn::Apply( ScDocument& rDoc, const SCCOL nCol, const SCTAB nTab ) { ScPatternAttr aAttr( rDoc.GetPool() ); @@ -905,7 +893,6 @@ void DifColumn::Apply( ScDocument& rDoc, const SCCOL nCol, const SCTAB nTab ) } } - DifAttrCache::DifAttrCache( const bool bNewPlain ) { bPlain = bNewPlain; @@ -914,7 +901,6 @@ DifAttrCache::DifAttrCache( const bool bNewPlain ) ppCols[ nCnt ] = NULL; } - DifAttrCache::~DifAttrCache() { for( SCCOL nCnt = 0 ; nCnt <= MAXCOL ; nCnt++ ) @@ -948,7 +934,6 @@ void DifAttrCache::SetNumFormat( const SCCOL nCol, const SCROW nRow, const sal_u ppCols[ nCol ]->SetNumFormat( nRow, nNumFormat ); } - void DifAttrCache::Apply( ScDocument& rDoc, SCTAB nTab ) { if( bPlain ) 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() diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index 92516b239fda..e602f01d6732 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -42,7 +42,6 @@ #include <stdio.h> - // ScFilterTools::ReadLongDouble() double ScfTools::ReadLongDouble( SvStream& rStrm ) diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index db086107dc89..7104f6096756 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -68,7 +68,6 @@ #include <editeng/borderline.hxx> #include <unotools/syslocale.hxx> - // Without sc.hrc: error C2679: binary '=' : no operator defined which takes a // right-hand operand of type 'const class String (__stdcall *)(class ScResId)' // at @@ -82,7 +81,6 @@ #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <rtl/strbuf.hxx> - using ::editeng::SvxBorderLine; using namespace ::com::sun::star; @@ -108,7 +106,6 @@ const sal_uInt16 ScHTMLExport::nCellSpacing = 0; const sal_Char ScHTMLExport::sIndentSource[nIndentMax+1] = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"; - // Macros for HTML export #define TAG_ON( tag ) HTMLOutFuncs::Out_AsciiTag( rStrm, tag ) @@ -126,8 +123,6 @@ const sal_Char ScHTMLExport::sIndentSource[nIndentMax+1] = #define GLOBSTR(id) ScGlobal::GetRscString( id ) - - FltError ScFormatFilterPluginImpl::ScExportHTML( SvStream& rStrm, const OUString& rBaseURL, ScDocument* pDoc, const ScRange& rRange, const rtl_TextEncoding /*eNach*/, bool bAll, const OUString& rStreamPath, OUString& rNonConvertibleChars, const OUString& rFilterOptions ) @@ -138,7 +133,6 @@ FltError ScFormatFilterPluginImpl::ScExportHTML( SvStream& rStrm, const OUString return nErr; } - static OString lcl_getColGroupString(sal_Int32 nSpan, sal_Int32 nWidth) { OStringBuffer aByteStr(OOO_STRING_SVTOOLS_HTML_colgroup); @@ -157,7 +151,6 @@ static OString lcl_getColGroupString(sal_Int32 nSpan, sal_Int32 nWidth) return aByteStr.makeStringAndClear(); } - static void lcl_AddStamp( OUString& rStr, const OUString& rName, const ::com::sun::star::util::DateTime& rDateTime, const LocaleDataWrapper& rLoc ) @@ -187,7 +180,6 @@ static void lcl_AddStamp( OUString& rStr, const OUString& rName, rStr += "???"; } - static OString lcl_makeHTMLColorTriplet(const Color& rColor) { OStringBuffer aStr( "\"#" ); @@ -263,13 +255,11 @@ ScHTMLExport::ScHTMLExport( SvStream& rStrmP, const OUString& rBaseURL, ScDocume } } - ScHTMLExport::~ScHTMLExport() { aGraphList.clear(); } - sal_uInt16 ScHTMLExport::GetFontSizeNumber( sal_uInt16 nHeight ) { sal_uInt16 nSize = 1; @@ -290,7 +280,6 @@ const char* ScHTMLExport::GetFontSizeCss( sal_uInt16 nHeight ) return pFontSizeCss[ nSize-1 ]; } - sal_uInt16 ScHTMLExport::ToPixel( sal_uInt16 nVal ) { if( nVal ) @@ -303,7 +292,6 @@ sal_uInt16 ScHTMLExport::ToPixel( sal_uInt16 nVal ) return nVal; } - Size ScHTMLExport::MMToPixel( const Size& rSize ) { Size aSize( rSize ); @@ -316,7 +304,6 @@ Size ScHTMLExport::MMToPixel( const Size& rSize ) return aSize; } - sal_uLong ScHTMLExport::Write() { rStrm.WriteChar( '<' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_doctype ).WriteChar( ' ' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_doctype40 ).WriteChar( '>' ) @@ -331,7 +318,6 @@ sal_uLong ScHTMLExport::Write() return rStrm.GetError(); } - void ScHTMLExport::WriteHeader() { IncIndent(1); TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_head ); @@ -351,7 +337,6 @@ void ScHTMLExport::WriteHeader() sIndent, eDestEnc, &aNonConvertibleChars ); OUT_LF(); - if (!xDocProps->getPrintedBy().isEmpty()) { OUT_COMMENT( GLOBSTR( STR_DOC_INFO ) ); @@ -401,7 +386,6 @@ void ScHTMLExport::WriteHeader() IncIndent(-1); OUT_LF(); TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_head ); } - void ScHTMLExport::WriteOverview() { if ( nUsedTables > 1 ) @@ -435,7 +419,6 @@ void ScHTMLExport::WriteOverview() } } - const SfxItemSet& ScHTMLExport::PageDefaults( SCTAB nTab ) { SfxStyleSheetBasePool* pStylePool = pDoc->GetStyleSheetPool(); @@ -483,7 +466,6 @@ const SfxItemSet& ScHTMLExport::PageDefaults( SCTAB nTab ) return rSet; } - OString ScHTMLExport::BorderToStyle(const char* pBorderName, const SvxBorderLine* pLine, bool& bInsertSemicolon) { @@ -635,7 +617,6 @@ void ScHTMLExport::WriteBody() TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_body ); } - void ScHTMLExport::WriteTables() { const SCTAB nTabCount = pDoc->GetTableCount(); @@ -835,7 +816,6 @@ void ScHTMLExport::WriteTables() } } - void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) { const ScPatternAttr* pAttr = pDoc->GetPattern( nCol, nRow, nTab ); @@ -1070,7 +1050,6 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) if ( bItalic ) TAG_ON( OOO_STRING_SVTOOLS_HTML_italic ); if ( bUnderline ) TAG_ON( OOO_STRING_SVTOOLS_HTML_underline ); - if ( bSetFont ) { OStringBuffer aStr(OOO_STRING_SVTOOLS_HTML_font); @@ -1175,7 +1154,6 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_tabledata ); } - bool ScHTMLExport::WriteFieldText( const EditTextObject* pData ) { bool bFields = false; @@ -1238,7 +1216,6 @@ bool ScHTMLExport::WriteFieldText( const EditTextObject* pData ) return bFields; } - bool ScHTMLExport::CopyLocalFileToINet( OUString& rFileNm, const OUString& rTargetNm, bool bFileToFile ) { @@ -1308,7 +1285,6 @@ bool ScHTMLExport::CopyLocalFileToINet( OUString& rFileNm, return bRet; } - void ScHTMLExport::MakeCIdURL( OUString& rURL ) { if( aCId.isEmpty() ) @@ -1324,7 +1300,6 @@ void ScHTMLExport::MakeCIdURL( OUString& rURL ) rURL = "cid:" + aLastName + "." + aCId; } - void ScHTMLExport::IncIndent( short nVal ) { sIndent[nIndent] = '\t'; diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx index 5710afbc1cbb..5894fc6d563f 100644 --- a/sc/source/filter/html/htmlexp2.cxx +++ b/sc/source/filter/html/htmlexp2.cxx @@ -64,7 +64,6 @@ void ScHTMLExport::PrepareGraphics( ScDrawLayer* pDrawLayer, SCTAB nTab, } } - void ScHTMLExport::FillGraphList( const SdrPage* pPage, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) { @@ -117,7 +116,6 @@ void ScHTMLExport::FillGraphList( const SdrPage* pPage, SCTAB nTab, } } - void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE ) { SdrObject* pObject = pE->pObject; @@ -178,7 +176,6 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE ) } } - void ScHTMLExport::WriteImage( OUString& rLinkName, const Graphic& rGrf, const OString& rImgOptions, sal_uLong nXOutFlags ) { @@ -235,5 +232,4 @@ void ScHTMLExport::WriteImage( OUString& rLinkName, const Graphic& rGrf, } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/html/htmlimp.cxx b/sc/source/filter/html/htmlimp.cxx index aae71d568564..9eec75befa74 100644 --- a/sc/source/filter/html/htmlimp.cxx +++ b/sc/source/filter/html/htmlimp.cxx @@ -42,7 +42,6 @@ #include "ftools.hxx" #include "tokenarray.hxx" - FltError ScFormatFilterPluginImpl::ScImportHTML( SvStream &rStream, const OUString& rBaseURL, ScDocument *pDoc, ScRange& rRange, double nOutputFactor, bool bCalcWidthHeight, SvNumberFormatter* pFormatter, bool bConvertDate ) @@ -99,7 +98,6 @@ ScHTMLImport::ScHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const S mpParser = new ScHTMLQueryParser( mpEngine, pDocP ); } - ScHTMLImport::~ScHTMLImport() { // Reihenfolge wichtig, sonst knallt's irgendwann irgendwo in irgendeinem Dtor! @@ -107,7 +105,6 @@ ScHTMLImport::~ScHTMLImport() delete (ScHTMLParser*) mpParser; // vor EditEngine! } - void ScHTMLImport::InsertRangeName( ScDocument* pDoc, const OUString& rName, const ScRange& rRange ) { ScComplexRefData aRefData; diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 40fb56e298e2..00ce6f1b7253 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <boost/shared_ptr.hpp> #include <comphelper/string.hxx> @@ -186,10 +185,8 @@ void ScHTMLStyles::insertProp( pProps->insert(PropsType::value_type(aProp, aValue)); } - // BASE class for HTML parser classes - ScHTMLParser::ScHTMLParser( EditEngine* pEditEngine, ScDocument* pDoc ) : ScEEParser( pEditEngine ), mpDoc( pDoc ) @@ -203,8 +200,6 @@ ScHTMLParser::~ScHTMLParser() { } - - ScHTMLLayoutParser::ScHTMLLayoutParser( EditEngine* pEditP, const OUString& rBaseURL, const Size& aPageSizeP, ScDocument* pDocP ) : @@ -234,7 +229,6 @@ ScHTMLLayoutParser::ScHTMLLayoutParser( MakeColNoRef( pColOffset, 0, 0, 0, 0 ); } - ScHTMLLayoutParser::~ScHTMLLayoutParser() { while ( !aTableStack.empty() ) @@ -267,7 +261,6 @@ ScHTMLLayoutParser::~ScHTMLLayoutParser() } } - sal_uLong ScHTMLLayoutParser::Read( SvStream& rStream, const OUString& rBaseURL ) { Link aOldLink = pEdit->GetImportHdl(); @@ -315,13 +308,11 @@ sal_uLong ScHTMLLayoutParser::Read( SvStream& rStream, const OUString& rBaseURL return nErr; } - const ScHTMLTable* ScHTMLLayoutParser::GetGlobalTable() const { return 0; } - void ScHTMLLayoutParser::NewActEntry( ScEEParseEntry* pE ) { ScEEParser::NewActEntry( pE ); @@ -337,7 +328,6 @@ void ScHTMLLayoutParser::NewActEntry( ScEEParseEntry* pE ) pActEntry->aSel.nEndPos = pActEntry->aSel.nStartPos; } - void ScHTMLLayoutParser::EntryEnd( ScEEParseEntry* pE, const ESelection& rSel ) { if ( rSel.nEndPara >= pE->aSel.nStartPara ) @@ -354,7 +344,6 @@ void ScHTMLLayoutParser::EntryEnd( ScEEParseEntry* pE, const ESelection& rSel ) } } - void ScHTMLLayoutParser::NextRow( ImportInfo* pInfo ) { if ( bInCell ) @@ -366,7 +355,6 @@ void ScHTMLLayoutParser::NextRow( ImportInfo* pInfo ) bFirstRow = false; } - bool ScHTMLLayoutParser::SeekOffset( ScHTMLColOffset* pOffset, sal_uInt16 nOffset, SCCOL* pCol, sal_uInt16 nOffsetTol ) { @@ -392,7 +380,6 @@ bool ScHTMLLayoutParser::SeekOffset( ScHTMLColOffset* pOffset, sal_uInt16 nOffse return false; } - void ScHTMLLayoutParser::MakeCol( ScHTMLColOffset* pOffset, sal_uInt16& nOffset, sal_uInt16& nWidth, sal_uInt16 nOffsetTol, sal_uInt16 nWidthTol ) { @@ -411,7 +398,6 @@ void ScHTMLLayoutParser::MakeCol( ScHTMLColOffset* pOffset, sal_uInt16& nOffset, } } - void ScHTMLLayoutParser::MakeColNoRef( ScHTMLColOffset* pOffset, sal_uInt16 nOffset, sal_uInt16 nWidth, sal_uInt16 nOffsetTol, sal_uInt16 nWidthTol ) { @@ -428,7 +414,6 @@ void ScHTMLLayoutParser::MakeColNoRef( ScHTMLColOffset* pOffset, sal_uInt16 nOff } } - void ScHTMLLayoutParser::ModifyOffset( ScHTMLColOffset* pOffset, sal_uInt16& nOldOffset, sal_uInt16& nNewOffset, sal_uInt16 nOffsetTol ) { @@ -466,7 +451,6 @@ void ScHTMLLayoutParser::ModifyOffset( ScHTMLColOffset* pOffset, sal_uInt16& nOl } } - void ScHTMLLayoutParser::SkipLocked( ScEEParseEntry* pE, bool bJoin ) { if ( ValidCol(pE->nCol) ) @@ -502,7 +486,6 @@ void ScHTMLLayoutParser::SkipLocked( ScEEParseEntry* pE, bool bJoin ) } } - void ScHTMLLayoutParser::Adjust() { xLockedList->RemoveAll(); @@ -654,7 +637,6 @@ void ScHTMLLayoutParser::Adjust() } } - sal_uInt16 ScHTMLLayoutParser::GetWidth( ScEEParseEntry* pE ) { if ( pE->nWidth ) @@ -669,7 +651,6 @@ sal_uInt16 ScHTMLLayoutParser::GetWidth( ScEEParseEntry* pE ) return 0; } - void ScHTMLLayoutParser::SetWidths() { ScEEParseEntry* pE; @@ -820,7 +801,6 @@ void ScHTMLLayoutParser::SetWidths() } } - void ScHTMLLayoutParser::Colonize( ScEEParseEntry* pE ) { if ( pE->nCol == SCCOL_MAX ) @@ -849,7 +829,6 @@ void ScHTMLLayoutParser::Colonize( ScEEParseEntry* pE ) nTableWidth = nColOffset - nColOffsetStart; } - void ScHTMLLayoutParser::CloseEntry( ImportInfo* pInfo ) { bInCell = false; @@ -901,7 +880,6 @@ void ScHTMLLayoutParser::CloseEntry( ImportInfo* pInfo ) NewActEntry( pActEntry ); // New free flying pActEntry } - IMPL_LINK( ScHTMLLayoutParser, HTMLImportHdl, ImportInfo*, pInfo ) { switch ( pInfo->eState ) @@ -948,7 +926,6 @@ IMPL_LINK( ScHTMLLayoutParser, HTMLImportHdl, ImportInfo*, pInfo ) return 0; } - // Greatest common divisor (Euclid) // Special case: 0 and something gives 1 static SCROW lcl_GGT( SCROW a, SCROW b ) @@ -965,7 +942,6 @@ static SCROW lcl_GGT( SCROW a, SCROW b ) return ((a != 0) ? a : b); } - // Lowest common multiple: a * b / GCD(a,b) static SCROW lcl_KGV( SCROW a, SCROW b ) { @@ -975,7 +951,6 @@ static SCROW lcl_KGV( SCROW a, SCROW b ) return (b / lcl_GGT(a,b)) * a; } - void ScHTMLLayoutParser::TableDataOn( ImportInfo* pInfo ) { if ( bInCell ) @@ -1069,7 +1044,6 @@ void ScHTMLLayoutParser::TableDataOn( ImportInfo* pInfo ) SvxHorJustifyItem( SVX_HOR_JUSTIFY_CENTER, ATTR_HOR_JUSTIFY) ); } - void ScHTMLLayoutParser::TableRowOn( ImportInfo* pInfo ) { if ( nColCnt > nColCntStart ) @@ -1077,20 +1051,17 @@ void ScHTMLLayoutParser::TableRowOn( ImportInfo* pInfo ) nColOffset = nColOffsetStart; } - void ScHTMLLayoutParser::TableRowOff( ImportInfo* pInfo ) { NextRow( pInfo ); } - void ScHTMLLayoutParser::TableDataOff( ImportInfo* pInfo ) { if ( bInCell ) CloseEntry( pInfo ); // Only if it really was one } - void ScHTMLLayoutParser::TableOn( ImportInfo* pInfo ) { OUString aTabName; @@ -1202,7 +1173,6 @@ void ScHTMLLayoutParser::TableOn( ImportInfo* pInfo ) MakeColNoRef( pLocalColOffset, nColOffsetStart, 0, 0, 0 ); } - void ScHTMLLayoutParser::TableOff( ImportInfo* pInfo ) { if ( bInCell ) @@ -1362,7 +1332,6 @@ void ScHTMLLayoutParser::TableOff( ImportInfo* pInfo ) } } - void ScHTMLLayoutParser::Image( ImportInfo* pInfo ) { ScHTMLImage* pImage = new ScHTMLImage; @@ -1457,7 +1426,6 @@ void ScHTMLLayoutParser::Image( ImportInfo* pInfo ) } } - void ScHTMLLayoutParser::ColOn( ImportInfo* pInfo ) { const HTMLOptions& rOptions = static_cast<HTMLParser*>(pInfo->pParser)->GetOptions(); @@ -1477,7 +1445,6 @@ void ScHTMLLayoutParser::ColOn( ImportInfo* pInfo ) } } - sal_uInt16 ScHTMLLayoutParser::GetWidthPixel( const HTMLOption& rOption ) { const OUString& rOptVal = rOption.GetString(); @@ -1498,7 +1465,6 @@ sal_uInt16 ScHTMLLayoutParser::GetWidthPixel( const HTMLOption& rOption ) } } - void ScHTMLLayoutParser::AnchorOn( ImportInfo* pInfo ) { const HTMLOptions& rOptions = static_cast<HTMLParser*>(pInfo->pParser)->GetOptions(); @@ -1516,7 +1482,6 @@ void ScHTMLLayoutParser::AnchorOn( ImportInfo* pInfo ) } } - bool ScHTMLLayoutParser::IsAtBeginningOfText( ImportInfo* pInfo ) { ESelection& rSel = pActEntry->aSel; @@ -1525,7 +1490,6 @@ bool ScHTMLLayoutParser::IsAtBeginningOfText( ImportInfo* pInfo ) pEdit->GetTextLen( rSel.nStartPara ) == 0; } - void ScHTMLLayoutParser::FontOn( ImportInfo* pInfo ) { if ( IsAtBeginningOfText( pInfo ) ) @@ -1580,7 +1544,6 @@ void ScHTMLLayoutParser::FontOn( ImportInfo* pInfo ) } } - void ScHTMLLayoutParser::ProcToken( ImportInfo* pInfo ) { bool bSetLastToken = true; @@ -1751,10 +1714,8 @@ void ScHTMLLayoutParser::ProcToken( ImportInfo* pInfo ) nLastToken = pInfo->nToken; } - // HTML DATA QUERY PARSER - template< typename Type > inline Type getLimitedValue( const Type& rValue, const Type& rMin, const Type& rMax ) { return ::std::max( ::std::min( rValue, rMax ), rMin ); } diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index 7149ba3eb851..18b040952b7a 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -29,7 +29,6 @@ #include "ftools.hxx" #include "excrecds.hxx" - // XclExpUserBView - one UserBView record for each user class XclExpUserBView : public ExcRecord @@ -49,7 +48,6 @@ public: virtual sal_Size GetLen() const SAL_OVERRIDE; }; - // XclExpUserBViewList - list of UserBView records class XclExpUserBViewList : public ExcEmptyRec @@ -76,7 +74,6 @@ public: virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; }; - // XclExpUsersViewBegin - begin of view block (one per sheet) class XclExpUsersViewBegin : public ExcRecord @@ -93,7 +90,6 @@ public: virtual sal_Size GetLen() const SAL_OVERRIDE; }; - // XclExpUsersViewEnd - end of view block (one per sheet) class XclExpUsersViewEnd : public ExcRecord @@ -106,7 +102,6 @@ public: virtual sal_Size GetLen() const SAL_OVERRIDE; }; - // dummy record for "User Names" stream class XclExpChTr0x0191 : public ExcRecord @@ -119,7 +114,6 @@ public: virtual sal_Size GetLen() const SAL_OVERRIDE; }; - // dummy record for "User Names" stream class XclExpChTr0x0198 : public ExcRecord @@ -132,7 +126,6 @@ public: virtual sal_Size GetLen() const SAL_OVERRIDE; }; - // dummy record for "User Names" stream class XclExpChTr0x0192 : public ExcRecord @@ -145,7 +138,6 @@ public: virtual sal_Size GetLen() const SAL_OVERRIDE; }; - // dummy record for "User Names" stream class XclExpChTr0x0197 : public ExcRecord @@ -158,7 +150,6 @@ public: virtual sal_Size GetLen() const SAL_OVERRIDE; }; - // dummy record without content class XclExpChTrEmpty : public ExcRecord @@ -174,7 +165,6 @@ public: virtual sal_Size GetLen() const SAL_OVERRIDE; }; - // dummy record for "Revision Log" stream class XclExpChTr0x0195 : public ExcRecord @@ -189,7 +179,6 @@ public: virtual sal_Size GetLen() const SAL_OVERRIDE; }; - // dummy record for "Revision Log" stream class XclExpChTr0x0194 : public ExcRecord @@ -214,7 +203,6 @@ inline XclExpChTr0x0194::XclExpChTr0x0194( const ScChangeTrack& rChangeTrack ) : { } - // XclExpChTrHeader - header record, includes action count class XclExpChTrHeader : public ExcRecord @@ -238,7 +226,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - // XclExpChTrInfo - header of action group of a user class XclExpChTrInfo : public ExcRecord @@ -273,7 +260,6 @@ inline XclExpChTrInfo::XclExpChTrInfo( const OUString& rUsername, const DateTime memcpy( aGUID, pGUID, 16 ); } - // XclExpChTrTabIdBuffer - buffer for tab id's class XclExpChTrTabIdBuffer @@ -301,7 +287,6 @@ public: { memcpy( pDest, pBuffer, sizeof(sal_uInt16) * GetBufferCount() ); } }; - // XclExpChTrTabId - tab id record class XclExpChTrTabId : public ExcRecord @@ -329,7 +314,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - // XclExpChTrAction - base class for action records class XclExpChTrAction : public ExcRecord @@ -425,7 +409,6 @@ inline void XclExpChTrAction::WriteTabId( XclExpStream& rStrm, SCTAB nTab ) cons rStrm << GetTabId( nTab ); } - // XclExpChTrData - cell content itself struct XclExpChTrData @@ -452,7 +435,6 @@ struct XclExpChTrData const XclExpChTrTabIdBuffer& rTabIdBuffer ); }; - // XclExpChTrCellContent - changed cell content class XclExpChTrCellContent : public XclExpChTrAction, protected XclExpRoot @@ -486,7 +468,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - // XclExpChTrInsert - insert/delete columns/rows class XclExpChTrInsert : public XclExpChTrAction @@ -515,7 +496,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - // XclExpChTrInsertTab - insert table class XclExpChTrInsertTab : public XclExpChTrAction, protected XclExpRoot @@ -539,7 +519,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - // XclExpChTrMoveRange - move cell range class XclExpChTrMoveRange : public XclExpChTrAction @@ -566,7 +545,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - // XclExpChTr0x019A - additional data for delete action class XclExpChTr0x014A : public XclExpChTrInsert @@ -584,7 +562,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - // XclExpChangeTrack - exports the "Revision Log" stream class XclExpChangeTrack : protected XclExpRoot diff --git a/sc/source/filter/inc/XclImpChangeTrack.hxx b/sc/source/filter/inc/XclImpChangeTrack.hxx index f39db6d338a5..0d1dc7003807 100644 --- a/sc/source/filter/inc/XclImpChangeTrack.hxx +++ b/sc/source/filter/inc/XclImpChangeTrack.hxx @@ -26,13 +26,11 @@ #include "excform.hxx" #include "imp_op.hxx" - struct ScCellValue; class ScChangeAction; class ScChangeTrack; class XclImpChTrFmlConverter; - struct XclImpChTrRecHeader { sal_uInt32 nSize; @@ -148,7 +146,6 @@ inline void XclImpChangeTrack::ReadString( OUString& rString ) rString = pStrm->ReadUniString(); } - // derived class for special 3D ref handling class XclImpChTrFmlConverter : public ExcelToSc8 diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx index e0e2ad7dbd7c..d7919bc361bc 100644 --- a/sc/source/filter/inc/addressconverter.hxx +++ b/sc/source/filter/inc/addressconverter.hxx @@ -30,7 +30,6 @@ namespace xls { class BiffInputStream; - /** A vector of com.sun.star.table.CellRangeAddress elements and additional functionality. */ class ApiCellRangeList : public ::std::vector< ::com::sun::star::table::CellRangeAddress > @@ -160,7 +159,6 @@ enum BiffTargetType BIFF_TARGETTYPE_UNKNOWN /// Unknown/unsupported target type. }; - /** Converter for cell addresses and cell ranges for OOXML and BIFF filters. */ class AddressConverter : public WorkbookHelper @@ -553,7 +551,6 @@ public: sal_Int16 nSheet, bool bTrackOverflow ); - private: void initializeMaxPos( sal_Int16 nMaxXlsTab, sal_Int32 nMaxXlsCol, sal_Int32 nMaxXlsRow ); diff --git a/sc/source/filter/inc/biff.hxx b/sc/source/filter/inc/biff.hxx index f0879bdf3a32..088382e34d19 100644 --- a/sc/source/filter/inc/biff.hxx +++ b/sc/source/filter/inc/biff.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_FILTER_INC_BIFF_HXX #define INCLUDED_SC_SOURCE_FILTER_INC_BIFF_HXX diff --git a/sc/source/filter/inc/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx index 53acf7dd8681..475e2eaf48ce 100644 --- a/sc/source/filter/inc/biffcodec.hxx +++ b/sc/source/filter/inc/biffcodec.hxx @@ -90,7 +90,6 @@ private: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) SAL_OVERRIDE; virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) SAL_OVERRIDE; - /** Implementation of decryption of a memory block. */ virtual void implDecode( sal_uInt8* pnDestData, diff --git a/sc/source/filter/inc/biffinputstream.hxx b/sc/source/filter/inc/biffinputstream.hxx index 411f16da7e4b..c392cd149604 100644 --- a/sc/source/filter/inc/biffinputstream.hxx +++ b/sc/source/filter/inc/biffinputstream.hxx @@ -25,7 +25,6 @@ #include "biffhelper.hxx" #include "biffcodec.hxx" - namespace oox { namespace xls { @@ -281,7 +280,6 @@ public: */ OUString readUniString( bool bAllowNulChars = false ); - private: /** Initializes all members after base stream has been sought to new record. */ void setupRecord(); diff --git a/sc/source/filter/inc/colrowst.hxx b/sc/source/filter/inc/colrowst.hxx index 78e471d34103..7d973920844a 100644 --- a/sc/source/filter/inc/colrowst.hxx +++ b/sc/source/filter/inc/colrowst.hxx @@ -71,7 +71,6 @@ private: bool mbDirty; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx index 08de8f9c9d22..e36ba5688a81 100644 --- a/sc/source/filter/inc/condformatbuffer.hxx +++ b/sc/source/filter/inc/condformatbuffer.hxx @@ -141,8 +141,6 @@ private: OUString maIconSetType; }; - - /** Represents a single rule in a conditional formatting. */ class CondFormatRule : public WorksheetHelper { diff --git a/sc/source/filter/inc/dif.hxx b/sc/source/filter/inc/dif.hxx index 66c4a3d229e8..8ed3448ad60e 100644 --- a/sc/source/filter/inc/dif.hxx +++ b/sc/source/filter/inc/dif.hxx @@ -191,5 +191,4 @@ private: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/drawingbase.hxx b/sc/source/filter/inc/drawingbase.hxx index 31c63cce7ca3..85f529af9ec6 100644 --- a/sc/source/filter/inc/drawingbase.hxx +++ b/sc/source/filter/inc/drawingbase.hxx @@ -105,7 +105,6 @@ private: private: - /** Specifies how cell positions from CellAnchorModel have to be processed. */ enum CellAnchorType { diff --git a/sc/source/filter/inc/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx index 58ce0bafb0e5..1afd26f20f35 100644 --- a/sc/source/filter/inc/drawingfragment.hxx +++ b/sc/source/filter/inc/drawingfragment.hxx @@ -40,10 +40,8 @@ namespace oox { namespace ole { namespace oox { namespace xls { - // DrawingML - class ShapeMacroAttacher : public ::oox::ole::VbaMacroAttacherBase { public: @@ -122,10 +120,8 @@ private: ShapeAnchorRef mxAnchor; /// Current anchor of top-level shape. }; - // VML - class VmlControlMacroAttacher : public ::oox::ole::VbaMacroAttacherBase { public: diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx index a70c9fabd4d6..7c5868f9f6fa 100644 --- a/sc/source/filter/inc/drawingmanager.hxx +++ b/sc/source/filter/inc/drawingmanager.hxx @@ -35,10 +35,8 @@ namespace xls { const sal_uInt16 BIFF_OBJ_INVALID_ID = 0; - // Model structures for BIFF OBJ record data - /** This structure contains line formatting attributes from an OBJ record. */ struct BiffObjLineModel { @@ -61,10 +59,8 @@ struct BiffObjFillModel explicit BiffObjFillModel(); }; - // BIFF drawing objects - class BiffDrawingBase; class BiffDrawingObjectBase; typedef ::boost::shared_ptr< BiffDrawingObjectBase > BiffDrawingObjectRef; @@ -153,10 +149,8 @@ private: bool mbCustomDff; /// True = recreate UNO shape in DFF import (BIFF8 only). }; - // BIFF drawing page - /** Base class for a container for all objects on a drawing page (in a spreadsheet or in an embedded chart object). diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx index a0df62796766..ccd5e685d545 100644 --- a/sc/source/filter/inc/eeparser.hxx +++ b/sc/source/filter/inc/eeparser.hxx @@ -94,7 +94,6 @@ struct ScEEParseEntry } }; - class EditEngine; typedef std::map<SCCOL, sal_uInt16> ColWidthsMap; diff --git a/sc/source/filter/inc/excelhandlers.hxx b/sc/source/filter/inc/excelhandlers.hxx index 581b750f6131..094dca7905ef 100644 --- a/sc/source/filter/inc/excelhandlers.hxx +++ b/sc/source/filter/inc/excelhandlers.hxx @@ -26,7 +26,6 @@ namespace oox { namespace xls { - /** Context handler derived from the WorkbookHelper helper class. Used to import contexts in global workbook fragments. @@ -75,7 +74,6 @@ public: const OUString& rFragmentPath ); }; - /** Base class for all BIFF context handlers. Derived handlers have to implement the importRecord() function that has to diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx index 229f614f7375..e057420bff04 100644 --- a/sc/source/filter/inc/excform.hxx +++ b/sc/source/filter/inc/excform.hxx @@ -29,7 +29,6 @@ class ScFormulaCell; class ScRangeList; - class ExcelToSc : public ExcelConverterBase, protected XclImpRoot { protected: @@ -43,7 +42,6 @@ protected: XclFunctionProvider maFuncProv; const XclBiff meBiff; - void DoMulArgs( DefTokenId eId, sal_uInt8 nNumArgs ); void ExcRelToScRel( sal_uInt16 nRow, sal_uInt8 nCol, ScSingleRefData&, const bool bName ); @@ -83,13 +81,11 @@ public: void ReadExtensionMemArea( XclImpStream& aIn ); }; - inline bool ExcelToSc::IsComplColRange( const sal_uInt16 nCol1, const sal_uInt16 nCol2 ) { return ( nCol1 == 0x00 ) && ( nCol2 == 0xFF ); } - inline bool ExcelToSc::IsComplRowRange( const sal_uInt16 nRow1, const sal_uInt16 nRow2 ) { return ( ( nRow1 & 0x3FFF ) == 0x0000 ) && ( ( nRow2 & 0x3FFF ) == 0x3FFF ); @@ -139,14 +135,11 @@ public: virtual bool GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen ) SAL_OVERRIDE; }; - inline bool ExcelToSc8::IsComplRowRange( const sal_uInt16 nRow1, const sal_uInt16 nRow2 ) { return ( nRow1 == 0x0000 ) && ( nRow2 == 0xFFFF ); } - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx index 160a0a563983..ef59b5fa89af 100644 --- a/sc/source/filter/inc/excimp8.hxx +++ b/sc/source/filter/inc/excimp8.hxx @@ -72,7 +72,6 @@ private: ExcScenarioList maScenList; }; - // classes AutoFilterData, AutoFilterBuffer class XclImpAutoFilterData : private ExcRoot @@ -113,7 +112,6 @@ public: void EnableRemoveFilter(); }; - class XclImpAutoFilterBuffer { public: diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx index 7017dc91ff12..292b83165926 100644 --- a/sc/source/filter/inc/excrecds.hxx +++ b/sc/source/filter/inc/excrecds.hxx @@ -27,7 +27,6 @@ #include <tools/color.hxx> #include <vcl/vclenum.hxx> - #include <vector> #include "olinetab.hxx" #include "filter.hxx" @@ -63,7 +62,6 @@ private: virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; - //--------------------------------------------------------- class ExcEmptyRec - class ExcEmptyRec : public ExcRecord @@ -87,7 +85,6 @@ public: virtual const sal_uInt8* GetData() const = 0; // byte data must contain header and body }; - //------------------------------------------------------- class ExcBoolRecord - // stores bool as 16bit val ( 0x0000 | 0x0001 ) @@ -107,7 +104,6 @@ public: virtual sal_Size GetLen( void ) const SAL_OVERRIDE; }; - //--------------------------------------------------------- class ExcBof_Base - class ExcBof_Base : public ExcRecord @@ -122,7 +118,6 @@ public: ExcBof_Base( void ); }; - //-------------------------------------------------------------- class ExcBof - // Header Record fuer WORKSHEETS @@ -137,7 +132,6 @@ public: virtual sal_Size GetLen( void ) const SAL_OVERRIDE; }; - //------------------------------------------------------------- class ExcBofW - // Header Record fuer WORKBOOKS @@ -152,7 +146,6 @@ public: virtual sal_Size GetLen( void ) const SAL_OVERRIDE; }; - //-------------------------------------------------------------- class ExcEof - class ExcEof : public ExcRecord @@ -163,7 +156,6 @@ public: virtual sal_Size GetLen( void ) const SAL_OVERRIDE; }; - //--------------------------------------------------------- class ExcDummy_00 - // INTERFACEHDR to FNGROUPCOUNT (see excrecds.cxx) @@ -214,7 +206,6 @@ private: sal_uInt16 mnHash; }; - //-------------------------------------------------------- class ExcDummy_04x - // PASSWORD to BOOKBOOL (see excrecds.cxx), no 1904 @@ -238,7 +229,6 @@ public: virtual const sal_uInt8* GetData( void ) const SAL_OVERRIDE; }; - //------------------------------------------------------------- class Exc1904 - class Exc1904 : public ExcBoolRecord @@ -252,7 +242,6 @@ private: bool bDateCompatibility; }; - //------------------------------------------------------ class ExcBundlesheet - class ExcBundlesheetBase : public ExcRecord @@ -299,7 +288,6 @@ public: virtual const sal_uInt8* GetData( void ) const SAL_OVERRIDE; }; - /** This record contains the Windows country IDs for the UI and document language. */ class XclExpCountry : public XclExpRecord { @@ -314,7 +302,6 @@ private: virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; - // XclExpWsbool =============================================================== class XclExpWsbool : public XclExpUInt16Record @@ -341,7 +328,6 @@ private: Color maTabColor; }; - class XclExpFiltermode : public XclExpEmptyRecord { public: @@ -467,7 +453,6 @@ private: XclExpTabFilterMap maFilterMap; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/exp_op.hxx b/sc/source/filter/inc/exp_op.hxx index ef47a98b53bc..7c25852da455 100644 --- a/sc/source/filter/inc/exp_op.hxx +++ b/sc/source/filter/inc/exp_op.hxx @@ -24,13 +24,11 @@ #include "root.hxx" #include "xeroot.hxx" - class ScDocument; class ScPatternAttr; class ScFormulaCell; class ExcDocument; - class ExportTyp { protected: @@ -64,7 +62,6 @@ public: FltError Write() SAL_OVERRIDE; }; - class ExportBiff8 : public ExportBiff5 { public: @@ -72,8 +69,6 @@ public: virtual ~ExportBiff8(); }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/externallinkfragment.hxx b/sc/source/filter/inc/externallinkfragment.hxx index 40e8ccbe5de1..4b67a319ac27 100644 --- a/sc/source/filter/inc/externallinkfragment.hxx +++ b/sc/source/filter/inc/externallinkfragment.hxx @@ -28,7 +28,6 @@ namespace xls { class ExternalLink; - /** This class implements importing the sheetData element in external sheets. The sheetData element embedded in the externalBook element contains cached diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx index a94f1494471c..fd2fd85d24ff 100644 --- a/sc/source/filter/inc/fapihelper.hxx +++ b/sc/source/filter/inc/fapihelper.hxx @@ -194,7 +194,6 @@ public: @param rValues The related property values. */ void SetProperties( const css::uno::Sequence< OUString > & rPropNames, const css::uno::Sequence< css::uno::Any >& rValues ); - private: css::uno::Reference< css::beans::XPropertySet > mxPropSet; /// The mandatory property set interface. css::uno::Reference< css::beans::XMultiPropertySet > mxMultiPropSet; /// The optional multi property set interface. @@ -254,7 +253,6 @@ public: /** Writes all values to the passed property set. */ void WriteToPropertySet( ScfPropertySet& rPropSet ) const; - private: /** Returns a pointer to the next Any to be written to. */ css::uno::Any* GetNextAny(); diff --git a/sc/source/filter/inc/formulabuffer.hxx b/sc/source/filter/inc/formulabuffer.hxx index 44ff29936e66..26a76db99856 100644 --- a/sc/source/filter/inc/formulabuffer.hxx +++ b/sc/source/filter/inc/formulabuffer.hxx @@ -138,7 +138,6 @@ public: void SetSheetCount( SCTAB nSheets ); }; - }} #endif diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx index d1ff1ebb008a..8f70b0d39486 100644 --- a/sc/source/filter/inc/htmlexp.hxx +++ b/sc/source/filter/inc/htmlexp.hxx @@ -88,7 +88,6 @@ struct ScHTMLGraphEntry {} }; - #define SC_HTML_FONTSIZES 7 const short nIndentMax = 23; diff --git a/sc/source/filter/inc/htmlimp.hxx b/sc/source/filter/inc/htmlimp.hxx index 380928eb0b9a..1e320c91a7f2 100644 --- a/sc/source/filter/inc/htmlimp.hxx +++ b/sc/source/filter/inc/htmlimp.hxx @@ -40,7 +40,6 @@ public: static OUString GetHTMLRangeNameList( ScDocument* pDoc, const OUString& rOrigName ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index c572c3913ab4..b24ab983d6f8 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -38,10 +38,8 @@ const sal_uInt32 SC_HTML_FONTSIZES = 7; // wie Export, HTML-Options const sal_uInt16 SC_HTML_OFFSET_TOLERANCE_SMALL = 1; // single table const sal_uInt16 SC_HTML_OFFSET_TOLERANCE_LARGE = 10; // nested - // BASE class for HTML parser classes - class ScHTMLTable; /** @@ -97,7 +95,6 @@ public: virtual const ScHTMLTable* GetGlobalTable() const = 0; }; - typedef o3tl::sorted_vector<sal_uLong> ScHTMLColOffset; struct ScHTMLTableStackEntry @@ -148,7 +145,6 @@ struct ScHTMLAdjustStackEntry }; typedef ::std::stack< ScHTMLAdjustStackEntry* > ScHTMLAdjustStack; - class EditEngine; class ScDocument; class HTMLOption; @@ -226,10 +222,8 @@ public: virtual const ScHTMLTable* GetGlobalTable() const SAL_OVERRIDE; }; - // HTML DATA QUERY PARSER - /** Declares the orientation in or for a table: column or row. */ enum ScHTMLOrient { tdCol = 0 , tdRow = 1 }; @@ -647,7 +641,6 @@ private: bool mbTitleOn; /// true = Inside of <title> </title>. }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx index 0587fd0dfb53..f492390b37c7 100644 --- a/sc/source/filter/inc/imp_op.hxx +++ b/sc/source/filter/inc/imp_op.hxx @@ -43,7 +43,6 @@ class ScDocument; class ExcelToSc; - class ImportTyp { protected: @@ -190,7 +189,6 @@ protected: void Bof4( void ); // 0x0409 void Bof5( void ); // 0x0809 - void Formula( const XclAddress& rXclPos, sal_uInt16 nXF, sal_uInt16 nFormLen, double fCurVal, bool bShrFmla); // -> excform.cxx diff --git a/sc/source/filter/inc/lotform.hxx b/sc/source/filter/inc/lotform.hxx index 9c810ea56c63..c356fcda32c0 100644 --- a/sc/source/filter/inc/lotform.hxx +++ b/sc/source/filter/inc/lotform.hxx @@ -56,7 +56,6 @@ enum FUNC_TYPE // fuer 'Problemfaelle' beim Import }; - class LotusToSc : public LotusConverterBase { private: @@ -98,7 +97,6 @@ private: using LotusConverterBase::Reset; }; - inline void LotusToSc::ReadCRD( ScComplexRefData& rCRD, sal_uInt8 nRelBit ) { // erster Teil @@ -108,7 +106,6 @@ inline void LotusToSc::ReadCRD( ScComplexRefData& rCRD, sal_uInt8 nRelBit ) ReadSRD( rCRD.Ref2, nRelBit >> 3 ); } - inline void LotusToSc::SetWK3( void ) { bWK3 = true; diff --git a/sc/source/filter/inc/lotimpop.hxx b/sc/source/filter/inc/lotimpop.hxx index 0116cd67259a..ab1aa6e2b287 100644 --- a/sc/source/filter/inc/lotimpop.hxx +++ b/sc/source/filter/inc/lotimpop.hxx @@ -31,7 +31,6 @@ class ScFormulaCell; class LotusFontBuffer; - class ImportLotus : public ImportTyp { private: @@ -57,7 +56,6 @@ private: void NamedSheet( void ); // 14000 void RowPresentation( sal_uInt16 nRecLen ); // 2007 - // in FM?-Datei void Font_Face( void ); // 174 void Font_Type( void ); // 176 @@ -86,7 +84,6 @@ public: FltError Read( SvStream& ); // special for *.fm3-Dateien }; - inline void ImportLotus::Read( ScAddress& rAddr ) { sal_uInt16 nRow; @@ -99,56 +96,47 @@ inline void ImportLotus::Read( ScAddress& rAddr ) rAddr.SetCol( static_cast<SCCOL>(nByte) ); } - inline void ImportLotus::Read( ScRange& rRange ) { Read( rRange.aStart ); Read( rRange.aEnd ); } - inline void ImportLotus::Read( sal_Char& r ) { pIn->ReadChar( r ); } - inline void ImportLotus::Read( sal_uInt8& r ) { pIn->ReadUChar( r ); } - inline void ImportLotus::Read( sal_uInt16& r ) { pIn->ReadUInt16( r ); } - inline void ImportLotus::Read( sal_Int16& r ) { pIn->ReadInt16( r ); } - inline void ImportLotus::Read( sal_uInt32& r ) { pIn->ReadUInt32( r ); } - inline void ImportLotus::Read( double& r ) { r = ScfTools::ReadLongDouble( *pIn ); } - inline void ImportLotus::Read( LotAttrWK3& r ) { pIn->ReadUChar( r.nFont ).ReadUChar( r.nFontCol ).ReadUChar( r.nBack ).ReadUChar( r.nLineStyle ); } - inline void ImportLotus::Skip( const sal_uInt16 n ) { pIn->SeekRel( n ); diff --git a/sc/source/filter/inc/lotrange.hxx b/sc/source/filter/inc/lotrange.hxx index f7c42b078907..59d1012b11dd 100644 --- a/sc/source/filter/inc/lotrange.hxx +++ b/sc/source/filter/inc/lotrange.hxx @@ -142,5 +142,4 @@ inline void LotusRangeList::SetEing( const SCCOL nCol, const SCROW nRow ) #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx index ef913123bff9..908e2703496c 100644 --- a/sc/source/filter/inc/namebuff.hxx +++ b/sc/source/filter/inc/namebuff.hxx @@ -34,7 +34,6 @@ class ScTokenArray; class NameBuffer; - class StringHashEntry { private: @@ -52,39 +51,33 @@ public: inline bool operator ==( const StringHashEntry& ) const; }; - inline StringHashEntry::StringHashEntry( void ) { } - inline StringHashEntry::StringHashEntry( const OUString& r ) : aString( r ) { nHash = MakeHashCode( r ); } - inline void StringHashEntry::operator =( const sal_Char* p ) { aString = OUString(p, strlen(p), RTL_TEXTENCODING_ASCII_US); nHash = MakeHashCode( aString ); } - inline void StringHashEntry::operator =( const OUString& r ) { aString = r; nHash = MakeHashCode( r ); } - inline void StringHashEntry::operator =( const StringHashEntry& r ) { nHash = r.nHash; aString = r.aString; } - inline bool StringHashEntry::operator ==( const StringHashEntry& r ) const { return ( nHash == r.nHash && aString == r.aString ); @@ -113,13 +106,11 @@ inline NameBuffer::NameBuffer( RootData* p ) : ExcRoot( p ) nBase = 0; } - inline NameBuffer::NameBuffer( RootData* p, sal_uInt16 nNewBase ) : ExcRoot( p ) { nBase = nNewBase; } - inline const OUString* NameBuffer::Get ( sal_uInt16 n ) const { if( n < nBase || n >= maHashes.size() ) @@ -128,7 +119,6 @@ inline const OUString* NameBuffer::Get ( sal_uInt16 n ) const return &(maHashes[n]->aString); } - inline sal_uInt16 NameBuffer::GetLastIndex () const { int size = maHashes.size() + nBase; @@ -138,7 +128,6 @@ inline sal_uInt16 NameBuffer::GetLastIndex () const return static_cast<sal_uInt16>( size ); } - inline void NameBuffer::SetBase( sal_uInt16 nNewBase ) { nBase = nNewBase; @@ -196,7 +185,6 @@ public: bool FindAbs( const OUString& rRef, sal_uInt16& rIndex ); }; - inline void RangeNameBufferWK3::Add( const OUString& rName, const ScRange& aScRange ) { ScComplexRefData aCRD; @@ -213,7 +201,6 @@ inline void RangeNameBufferWK3::Add( const OUString& rName, const ScRange& aScRa Add( rName, aCRD ); } - class ExtSheetBuffer : public ExcRoot { private: @@ -259,12 +246,10 @@ public: void Reset( void ); }; - inline ExtSheetBuffer::ExtSheetBuffer( RootData* p ) : ExcRoot( p ) { } - struct ExtName { OUString aName; @@ -277,7 +262,6 @@ struct ExtName bool IsOLE( void ) const; }; - class ExtNameBuff : protected XclImpRoot { public: @@ -298,8 +282,6 @@ private: ExtNameMap maExtNames; }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/pivotcachefragment.hxx b/sc/source/filter/inc/pivotcachefragment.hxx index 04a64ab0745c..6def209da0fd 100644 --- a/sc/source/filter/inc/pivotcachefragment.hxx +++ b/sc/source/filter/inc/pivotcachefragment.hxx @@ -88,7 +88,6 @@ private: bool mbInRecord; }; - class BiffPivotCacheFragment : public BiffWorkbookFragmentBase { public: diff --git a/sc/source/filter/inc/qproform.hxx b/sc/source/filter/inc/qproform.hxx index 3fbed1749d10..27bad9f26c8d 100644 --- a/sc/source/filter/inc/qproform.hxx +++ b/sc/source/filter/inc/qproform.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_FILTER_INC_QPROFORM_HXX #define INCLUDED_SC_SOURCE_FILTER_INC_QPROFORM_HXX diff --git a/sc/source/filter/inc/qprostyle.hxx b/sc/source/filter/inc/qprostyle.hxx index 1559adb6848c..09aa5ffc7bd5 100644 --- a/sc/source/filter/inc/qprostyle.hxx +++ b/sc/source/filter/inc/qprostyle.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_FILTER_INC_QPROSTYLE_HXX #define INCLUDED_SC_SOURCE_FILTER_INC_QPROSTYLE_HXX diff --git a/sc/source/filter/inc/root.hxx b/sc/source/filter/inc/root.hxx index fa5555c9abdf..e250b2c81b08 100644 --- a/sc/source/filter/inc/root.hxx +++ b/sc/source/filter/inc/root.hxx @@ -85,7 +85,6 @@ class LotusRangeList; class LotusFontBuffer; class LotAttrTable; - struct LOTUS_ROOT { ScDocument* pDoc; diff --git a/sc/source/filter/inc/rtfexp.hxx b/sc/source/filter/inc/rtfexp.hxx index 0089675abe7b..32eb33299413 100644 --- a/sc/source/filter/inc/rtfexp.hxx +++ b/sc/source/filter/inc/rtfexp.hxx @@ -22,7 +22,6 @@ #include "expbase.hxx" - class ScRTFExport : public ScExportBase { sal_uLong* pCellX; // kumulierte Zellbreiten einer Tabelle @@ -39,7 +38,6 @@ public: sal_uLong Write(); }; - #endif // INCLUDED_SC_SOURCE_FILTER_INC_RTFEXP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/rtfimp.hxx b/sc/source/filter/inc/rtfimp.hxx index 5203dcbc0ef3..fd60b23af2e7 100644 --- a/sc/source/filter/inc/rtfimp.hxx +++ b/sc/source/filter/inc/rtfimp.hxx @@ -29,7 +29,6 @@ public: virtual ~ScRTFImport(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/rtfparse.hxx b/sc/source/filter/inc/rtfparse.hxx index 644a33150317..6d3b8c417c42 100644 --- a/sc/source/filter/inc/rtfparse.hxx +++ b/sc/source/filter/inc/rtfparse.hxx @@ -75,7 +75,6 @@ public: virtual sal_uLong Read( SvStream&, const OUString& rBaseURL ) SAL_OVERRIDE; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx index 157fb7b0e144..e117a5ff8389 100644 --- a/sc/source/filter/inc/scflt.hxx +++ b/sc/source/filter/inc/scflt.hxx @@ -591,7 +591,6 @@ struct Sc10ChartTypeData sal_Char Reserved[4646]; }; - // FontAttribut class Sc10FontData : public ScDataObject { @@ -614,7 +613,6 @@ public: virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10FontData(*this); } }; - // Font-Collection class Sc10FontCollection : public ScCollection { @@ -628,7 +626,6 @@ private: using ScCollection::At; }; - //BereichsDaten class Sc10NameData : public ScDataObject { @@ -650,7 +647,6 @@ public : virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10NameData(*this); } }; - // Bereichs-Collection class Sc10NameCollection : public ScCollection { @@ -664,7 +660,6 @@ private: using ScCollection::At; }; - // Vorlage-Daten class Sc10PatternData : public ScDataObject { @@ -703,7 +698,6 @@ public: virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10PatternData(*this); } }; - // Vorlage-Collection class Sc10PatternCollection : public ScCollection { @@ -717,7 +711,6 @@ private: using ScCollection::At; }; - // DatenBank-Daten class Sc10DataBaseData : public ScDataObject { @@ -733,7 +726,6 @@ public: virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10DataBaseData(*this); } }; - // DatenBank-Collection class Sc10DataBaseCollection : public ScCollection { @@ -748,7 +740,6 @@ private: using ScCollection::At; }; - class Sc10PageData : public ScDataObject { public: @@ -771,7 +762,6 @@ private: using ScCollection::At; }; - class ScfStreamProgressBar; // Import-Klasse diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx b/sc/source/filter/inc/sheetdatabuffer.hxx index 1a3ae9ad0177..c2e7550d4856 100644 --- a/sc/source/filter/inc/sheetdatabuffer.hxx +++ b/sc/source/filter/inc/sheetdatabuffer.hxx @@ -92,7 +92,6 @@ private: sal_Int32 mnCurrRow; /// Current row index used for buffered cell import. }; - /** Manages the cell contents and cell formatting of a sheet. */ class SheetDataBuffer : public WorksheetHelper @@ -147,7 +146,6 @@ public: @param nNumFmtId If set, overrides number format of the cell XF. */ void setCellFormat( const CellModel& rModel, sal_Int32 nNumFmtId = -1 ); - /** Final processing after the sheet has been imported. */ void finalizeImport(); @@ -183,7 +181,6 @@ private: typedef ::std::pair< ::com::sun::star::table::CellRangeAddress, DataTableModel > TableOperation; typedef ::std::list< TableOperation > TableOperationList; - /** Stores information about a range of rows with equal cell formatting. */ struct XfIdRowRange { diff --git a/sc/source/filter/inc/sheetdatacontext.hxx b/sc/source/filter/inc/sheetdatacontext.hxx index 15d5ca748d71..2d02f20ece7f 100644 --- a/sc/source/filter/inc/sheetdatacontext.hxx +++ b/sc/source/filter/inc/sheetdatacontext.hxx @@ -129,7 +129,6 @@ private: sal_Int32 mnCol; /// column index (0-based) }; - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx index 2121b628e4f8..95d6e6ddd08d 100644 --- a/sc/source/filter/inc/tokstack.hxx +++ b/sc/source/filter/inc/tokstack.hxx @@ -58,7 +58,6 @@ struct TokenId struct ScComplexRefData; class TokenStack; - enum E_TYPE { T_Id, // Id-Folge @@ -77,7 +76,6 @@ enum E_TYPE T_Error // fuer Abfrage im Fehlerfall }; - class TokenPool { // !ACHTUNG!: externe Id-Basis ist 1, interne 0! @@ -226,7 +224,6 @@ public: ScMatrix* GetMatrix( unsigned int n ) const; }; - class TokenStack // Stack fuer Token-Ids: Id 0 sollte reserviert bleiben als // fehlerhafte Id, da z.B. Get() im Fehlerfall 0 liefert @@ -247,7 +244,6 @@ class TokenStack inline const TokenId Get( void ); }; - inline const TokenId TokenStack::Get( void ) { OSL_ENSURE( nPos > 0, @@ -266,7 +262,6 @@ inline const TokenId TokenStack::Get( void ) return nRet; } - inline TokenStack &TokenStack::operator <<( const TokenId nNewId ) {// Element auf Stack OSL_ENSURE( nPos < nSize, "*TokenStack::<<(): Stack overflow" ); @@ -279,7 +274,6 @@ inline TokenStack &TokenStack::operator <<( const TokenId nNewId ) return *this; } - inline void TokenStack::operator >>( TokenId& rId ) {// Element von Stack OSL_ENSURE( nPos > 0, @@ -291,13 +285,11 @@ inline void TokenStack::operator >>( TokenId& rId ) } } - inline void TokenStack::Reset( void ) { nPos = 0; } - inline TokenPool& TokenPool::operator <<( const TokenId nId ) { // POST: nId's werden hintereinander im Pool unter einer neuen Id @@ -316,7 +308,6 @@ inline TokenPool& TokenPool::operator <<( const TokenId nId ) return *this; } - inline TokenPool& TokenPool::operator <<( const DefTokenId eId ) { OSL_ENSURE( ( sal_uInt32 ) eId + nScTokenOff < 0xFFFF, @@ -332,7 +323,6 @@ inline TokenPool& TokenPool::operator <<( const DefTokenId eId ) return *this; } - inline TokenPool& TokenPool::operator <<( TokenStack& rStack ) { if( nP_IdAkt >= nP_Id ) @@ -345,7 +335,6 @@ inline TokenPool& TokenPool::operator <<( TokenStack& rStack ) return *this; } - inline void TokenPool::operator >>( TokenStack& rStack ) { TokenId nId; @@ -353,7 +342,6 @@ inline void TokenPool::operator >>( TokenStack& rStack ) rStack << nId; } - inline const TokenId TokenPool::Store( void ) { TokenId nId; @@ -361,19 +349,16 @@ inline const TokenId TokenPool::Store( void ) return nId; } - inline const TokenId TokenPool::Store( const sal_Int16 nWert ) { return Store( ( double ) nWert ); } - inline const TokenId TokenPool::LastId( void ) const { return ( TokenId ) nElementAkt; // stimmt, da Ausgabe mit Offset 1! } - const inline ScTokenArray* TokenPool::operator []( const TokenId nId ) { pScToken->Clear(); @@ -389,7 +374,6 @@ const inline ScTokenArray* TokenPool::operator []( const TokenId nId ) return pScToken; } - inline E_TYPE TokenPool::GetType( const TokenId& rId ) const { E_TYPE nRet; @@ -404,7 +388,6 @@ inline E_TYPE TokenPool::GetType( const TokenId& rId ) const return nRet; } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx index 892992543912..510474b55383 100644 --- a/sc/source/filter/inc/workbookhelper.hxx +++ b/sc/source/filter/inc/workbookhelper.hxx @@ -267,7 +267,6 @@ public: bool importOoxFragment( const rtl::Reference<oox::core::FragmentHandler>& rxHandler, oox::core::FastParser& rParser ); - // BIFF2-BIFF8 specific (MUST NOT be called in OOXML/BIFF12 filter) ------- /** Returns the BIFF type in binary filter. */ diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx index 26c69995f133..37179bb5b62d 100644 --- a/sc/source/filter/inc/worksheethelper.hxx +++ b/sc/source/filter/inc/worksheethelper.hxx @@ -163,7 +163,6 @@ struct ValidationModel void setBiffErrorStyle( sal_uInt8 nErrorStyle ); }; - class WorksheetGlobals; typedef ::boost::shared_ptr< WorksheetGlobals > WorksheetGlobalsRef; @@ -316,7 +315,6 @@ private: WorksheetGlobals& mrSheetGlob; }; - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx index cd3f53588ce5..795208c96f34 100644 --- a/sc/source/filter/inc/xcl97esc.hxx +++ b/sc/source/filter/inc/xcl97esc.hxx @@ -149,8 +149,6 @@ public: inline bool IsStackedGroup() const { return bStackedGroup; } }; - - // --- class XclEscherClientData ------------------------------------- class XclEscherClientData : public EscherExClientRecord_Base @@ -160,7 +158,6 @@ public: virtual void WriteData( EscherEx& rEx ) const SAL_OVERRIDE; }; - // --- class XclEscherClientTextbox ---------------------------------- class SdrTextObj; diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx index e4be5e58df55..4cc35769d6fc 100644 --- a/sc/source/filter/inc/xcl97rec.hxx +++ b/sc/source/filter/inc/xcl97rec.hxx @@ -81,7 +81,6 @@ private: std::vector<XclObj*> maObjs; }; - // --- class XclObj -------------------------------------------------- class XclTxo; @@ -176,12 +175,10 @@ public: void ProcessEscherObj( const XclExpRoot& rRoot, const Rectangle& rRect, SdrObject* pCaption, bool bVisible ); - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - // --- class XclObjDropDown ------------------------------------------ class XclObjDropDown : public XclObj @@ -197,7 +194,6 @@ public: virtual ~XclObjDropDown(); }; - // --- class XclTxo -------------------------------------------------- class SdrTextObj; @@ -227,7 +223,6 @@ private: sal_uInt8 mnVerAlign; /// Vertical alignment. }; - // --- class XclObjOle ----------------------------------------------- class XclObjOle : public XclObj @@ -246,7 +241,6 @@ public: virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; }; - // --- class XclObjAny ----------------------------------------------- class XclObjAny : public XclObj @@ -262,7 +256,6 @@ public: com::sun::star::uno::Reference< com::sun::star::drawing::XShape > GetShape() const { return mxShape; } - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; static void WriteFromTo( XclExpXmlStream& rStrm, const XclObjAny& rObj ); @@ -273,7 +266,6 @@ private: mxShape; }; - // --- class ExcBof8_Base -------------------------------------------- class ExcBof8_Base : public ExcBof_Base @@ -291,7 +283,6 @@ public: virtual sal_Size GetLen() const SAL_OVERRIDE; }; - // --- class ExcBofW8 ------------------------------------------------ // Header Record fuer WORKBOOKS @@ -301,7 +292,6 @@ public: ExcBofW8(); }; - // --- class ExcBof8 ------------------------------------------------- // Header Record fuer WORKSHEETS @@ -311,7 +301,6 @@ public: ExcBof8(); }; - // --- class ExcBundlesheet8 ----------------------------------------- class ExcBundlesheet8 : public ExcBundlesheetBase @@ -331,7 +320,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - // --- class XclObproj ----------------------------------------------- class XclObproj : public ExcRecord @@ -341,7 +329,6 @@ public: virtual sal_Size GetLen() const SAL_OVERRIDE; }; - // ---- class XclCodename -------------------------------------------- class XclCodename : public ExcRecord @@ -356,7 +343,6 @@ public: virtual sal_Size GetLen() const SAL_OVERRIDE; }; - // ---- Scenarios ---------------------------------------------------- // - ExcEScenarioCell a cell of a scenario range // - ExcEScenario all ranges of a scenario table @@ -443,7 +429,6 @@ private: sal_uInt16 mnOptions; /// Encoded sheet protection options. }; - /** Represents one EnhancedProtection feature in a FEAT record. To be written only if such feature exists. */ class XclExpSheetEnhancedProtection : public XclExpRecord @@ -474,7 +459,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - class XclIteration : public ExcRecord { private: @@ -490,7 +474,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - class XclDelta : public ExcRecord { private: @@ -506,7 +489,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - class XclRefmode : public XclExpBoolRecord { public: @@ -609,7 +591,6 @@ public: explicit XclExpBookExt(); }; - #endif // _XCL97REC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index 382653a440a5..b962e7699717 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -392,7 +392,6 @@ public: public: explicit XclExpChSourceLink( const XclExpChRoot& rRoot, sal_uInt8 nDestType ); - void ConvertString( const OUString& aString ); /** Converts the passed source link, returns the number of linked values. */ sal_uInt16 ConvertDataSequence( XDataSequenceRef xDataSeq, bool bSplitToColumns, sal_uInt16 nDefCount = 0 ); diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index 599cc5eb7838..7171046ab0b7 100644 --- a/sc/source/filter/inc/xeescher.hxx +++ b/sc/source/filter/inc/xeescher.hxx @@ -171,7 +171,6 @@ protected: void ConvertSheetLinks( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - /** Returns the Excel token array of the cell link, or 0, if no link present. */ inline const XclTokenArray* GetCellLinkTokArr() const { return mxCellLink.get(); } /** Returns the Excel token array of the source range, or 0, if no link present. */ diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx index fef451032b6b..f15a74acc23b 100644 --- a/sc/source/filter/inc/xehelper.hxx +++ b/sc/source/filter/inc/xehelper.hxx @@ -411,7 +411,6 @@ private: XclExpUrlHelper(); }; - class ScMatrix; /** Contains cached values in a 2-dimensional array. */ diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx index 9c645d78498b..2be764ff6f8f 100644 --- a/sc/source/filter/inc/xepivot.hxx +++ b/sc/source/filter/inc/xepivot.hxx @@ -33,10 +33,8 @@ class ScDPSaveGroupDimension; class ScDPSaveNumGroupDimension; struct ScDPNumGroupInfo; - // Pivot cache - /** Represents a data item in a pivot cache containing data of any type. */ class XclExpPCItem : public XclExpRecord, public XclPCItem { @@ -235,10 +233,8 @@ private: bool mbValid; /// true = The cache is valid for export. }; - // Pivot table - class XclExpPivotTable; /** Data field position specifying the pivot table field index (first) and data info index (second). */ @@ -279,7 +275,6 @@ public: */ sal_uInt16 GetFieldIndex() const { return maFieldInfo.mnCacheIdx; } - /** Returns the index of the last inserted data info struct. */ sal_uInt16 GetLastDataInfoIndex() const; @@ -307,7 +302,6 @@ public: /** Writes the entire pivot table field. */ virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - private: /** Returns an item by its name. */ XclExpPTItem* GetItemAcc( const OUString& rName ); @@ -358,7 +352,6 @@ public: virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; - private: /** Returns a pivot table field by its name. */ XclExpPTField* GetFieldAcc( const OUString& rName ); @@ -396,7 +389,6 @@ private: /** Writes the SX_AUTOFORMAT records with the autoformat id and header layout */ void WriteSxViewEx9( XclExpStream& rStrm ) const; - private: typedef XclExpRecordList< XclExpPTField > XclExpPTFieldList; typedef XclExpPTFieldList::RecordRefType XclExpPTFieldRef; diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index d5744f87f6de..e69e0c7d07f8 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -236,9 +236,6 @@ private: bool mbValid; }; - - - // `s.GetChar(0) != 0` needed because some strings on export only contain NULL. #define XESTRING_TO_PSZ(s) \ (s.Len() && s.GetChar( 0 ) != 0 ? XclXmlUtils::ToOString( s ).getStr() : NULL) diff --git a/sc/source/filter/inc/xestring.hxx b/sc/source/filter/inc/xestring.hxx index 1b2735a04409..f5fba100f7b5 100644 --- a/sc/source/filter/inc/xestring.hxx +++ b/sc/source/filter/inc/xestring.hxx @@ -171,7 +171,6 @@ public: void WriteXml( XclExpXmlStream& rStrm ) const; - private: /** Returns true, if the flag field should be written. */ bool IsWriteFlags() const; diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx index 422810bc0c8c..081bdb4ae0f8 100644 --- a/sc/source/filter/inc/xetable.hxx +++ b/sc/source/filter/inc/xetable.hxx @@ -44,10 +44,8 @@ Export of cell tables including row and column description. - Merged cell ranges. ============================================================================ */ - // Helper records for cell records - /** Represents a STRING record that contains the result of a string formula. */ class XclExpStringRec : public XclExpRecord { @@ -273,10 +271,8 @@ private: XclExpTableopList maTableopList; /// List of all TABLEOP records. }; - // Cell records - /** The base class of all cell records. */ class XclExpCellBase : public XclExpRecord { @@ -587,10 +583,8 @@ private: ScfInt32Vec maRkValues; /// The cell values. }; - // Rows and Columns - class ScOutlineArray; /** Base class for buffers containing row or column outline data. */ @@ -958,10 +952,8 @@ private: XclExpDimensions maDimensions; /// DIMENSIONS record for used area. }; - // Cell Table - class XclExpNote; class XclExpMergedcells; class XclExpHyperlink; diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index 6d2bc2e2ec0e..76847ce5ea3c 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -1188,7 +1188,6 @@ private: /** Returns the size of the progress bar shown while processing all objects. */ sal_Size GetProgressSize() const; - private: typedef ::std::map< sal_uInt16, OUString > DefObjNameMap; typedef boost::shared_ptr< XclImpSheetDrawing > XclImpSheetDrawingRef; diff --git a/sc/source/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx index bd3ef177e369..affc88370b99 100644 --- a/sc/source/filter/inc/xipivot.hxx +++ b/sc/source/filter/inc/xipivot.hxx @@ -28,10 +28,8 @@ class ScDPSaveData; class ScDPSaveDimension; - // Pivot cache - /** Represents a data item in a pivot cache. */ class XclImpPCItem : public XclPCItem { @@ -109,7 +107,6 @@ public: /** Inserts grouping information of this field into the passed ScDPSaveData. */ void ConvertGroupField( ScDPSaveData& rSaveData, const ScfStringVec& rVisNames ) const; - private: /** Inserts standard grouping information of this field into the passed ScDPSaveData. */ void ConvertStdGroupField( ScDPSaveData& rSaveData, const ScfStringVec& rVisNames ) const; @@ -197,10 +194,8 @@ private: typedef boost::shared_ptr< XclImpPivotCache > XclImpPivotCacheRef; - // Pivot table - class XclImpPivotTable; class XclImpPTItem @@ -276,7 +271,6 @@ public: void AddDataFieldInfo( const XclPTDataFieldInfo& rDataInfo ); void ConvertDataField( ScDPSaveData& rSaveData ) const; - private: ScDPSaveDimension* ConvertRCPField( ScDPSaveData& rSaveData ) const; void ConvertFieldInfo( ScDPSaveDimension& rSaveDim ) const; @@ -347,7 +341,6 @@ public: void ApplyMergeFlags(const ScRange& rOutRange, const ScDPSaveData& rSaveData); - private: typedef ::std::vector< XclImpPTFieldRef > XclImpPTFieldVec; @@ -371,7 +364,6 @@ private: typedef boost::shared_ptr< XclImpPivotTable > XclImpPivotTableRef; - /** The main class for pivot table import. This class contains functions to read all records related to pivot tables diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx index 4e639449a237..bcc29bad8b0e 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -34,10 +34,8 @@ Input stream class for Excel import - Decryption ============================================================================ */ - // Decryption - class XclImpDecrypter; typedef boost::shared_ptr< XclImpDecrypter > XclImpDecrypterRef; @@ -153,10 +151,8 @@ private: ::std::vector< sal_uInt8 > maVerifierHash; }; - // Stream - /** This class represents an Excel stream position. @descr It contains the relevant data for a stream position inside of a record (including CONTINUE records). */ diff --git a/sc/source/filter/inc/xladdress.hxx b/sc/source/filter/inc/xladdress.hxx index a55f5134f478..b6ae8aa91502 100644 --- a/sc/source/filter/inc/xladdress.hxx +++ b/sc/source/filter/inc/xladdress.hxx @@ -161,7 +161,6 @@ public: @return true = Sheet index in nScTab is valid. */ bool CheckScTab( SCTAB nScTab, bool bWarn ); - protected: XclTracer& mrTracer; /// Tracer for invalid addresses. ScAddress maMaxPos; /// Default maximum position. diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx index 15e417945b04..93e523f6e13e 100644 --- a/sc/source/filter/inc/xlchart.hxx +++ b/sc/source/filter/inc/xlchart.hxx @@ -737,10 +737,8 @@ const sal_uInt16 EXC_ID_CHPLOTGROWTH = 0x1064; const sal_uInt16 EXC_ID_CHSERINDEX = 0x1065; const sal_uInt16 EXC_ID_CHUNKNOWN = 0xFFFF; - // Structs and classes - // Common ===================================================================== struct XclChRectangle diff --git a/sc/source/filter/inc/xlcontent.hxx b/sc/source/filter/inc/xlcontent.hxx index 8b136c4022a8..6bb7b0b7475a 100644 --- a/sc/source/filter/inc/xlcontent.hxx +++ b/sc/source/filter/inc/xlcontent.hxx @@ -186,7 +186,6 @@ const sal_uInt16 EXC_ID_WQTABLES = 0x0804; const sal_uInt16 EXC_ID_EXTLST = 0x9988; /// it is just a random number - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xlescher.hxx b/sc/source/filter/inc/xlescher.hxx index 3e990ba7b0e3..a97882d5be40 100644 --- a/sc/source/filter/inc/xlescher.hxx +++ b/sc/source/filter/inc/xlescher.hxx @@ -303,7 +303,6 @@ struct XclObjAnchor : public XclRange const Rectangle& rRect, MapUnit eMapUnit, bool bDffAnchor ); }; - inline SvStream& operator>>( SvStream& rStrm, XclObjAnchor& rAnchor ) { sal_uInt16 tmpFirstRow, tmpTY, tmpLastRow, tmpBY; diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx index 48711e9b31ae..1fb8317fd4e6 100644 --- a/sc/source/filter/inc/xlpivot.hxx +++ b/sc/source/filter/inc/xlpivot.hxx @@ -363,10 +363,8 @@ const sal_uInt16 EXC_SXFDBTYPE_DEFAULT = 0x0000; // (0x0810) SXVIEWEX9 --------------------------------------------------------- const sal_uInt16 EXC_ID_SXVIEWEX9 = 0x0810; - // Pivot cache - /** Represents a data item of any type in a pivot cache. Supposed as base class for import and export. */ class XclPCItem { @@ -538,10 +536,8 @@ struct XclPCInfo XclImpStream& operator>>( XclImpStream& rStrm, XclPCInfo& rInfo ); XclExpStream& operator<<( XclExpStream& rStrm, const XclPCInfo& rInfo ); - // Pivot table - // cached name ================================================================ /** A name for various pivot table info structs. Includes 'use cache' state. */ @@ -763,7 +759,6 @@ struct XclPTViewEx9Info XclImpStream& operator>>( XclImpStream& rStrm, XclPTViewEx9Info& rInfo ); XclExpStream& operator<<( XclExpStream& rStrm, const XclPTViewEx9Info& rInfo ); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xltools.hxx b/sc/source/filter/inc/xltools.hxx index 0493ca2bd9ba..23aa9bf17c6d 100644 --- a/sc/source/filter/inc/xltools.hxx +++ b/sc/source/filter/inc/xltools.hxx @@ -231,7 +231,6 @@ public: /** Returns the Excel macro name from a full StarBasic macro URL. */ static OUString GetXclMacroName( const OUString& rSbMacroUrl ); - private: static const OUString maDefNamePrefix; /// Prefix for built-in defined names. static const OUString maDefNamePrefixXml; /// Prefix for built-in defined names for OOX diff --git a/sc/source/filter/inc/xltracer.hxx b/sc/source/filter/inc/xltracer.hxx index 62bf1e0d6d1c..8798597c65e9 100644 --- a/sc/source/filter/inc/xltracer.hxx +++ b/sc/source/filter/inc/xltracer.hxx @@ -69,7 +69,6 @@ struct XclTracerDetails const sal_Char* mpProblem; /// Description of problem }; - /** This class wraps an MSFilterTracer to create trace logs for import/export filters. */ class XclTracer { @@ -108,7 +107,6 @@ private: BoolVec maFirstTimes; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/lotus/filter.cxx b/sc/source/filter/lotus/filter.cxx index 79a74c815590..2fdb9e11353b 100644 --- a/sc/source/filter/lotus/filter.cxx +++ b/sc/source/filter/lotus/filter.cxx @@ -55,7 +55,6 @@ rtl_TextEncoding eCharVon; extern ScDocument* pDoc; // Aufhaenger zum Dokumentzugriff ScDocument* pDoc; - extern OPCODE_FKT pOpFkt[ FKT_LIMIT ]; // -> optab.cxx, Tabelle moeglicher Opcodes extern OPCODE_FKT pOpFkt123[ FKT_LIMIT123 ]; @@ -63,7 +62,6 @@ extern OPCODE_FKT pOpFkt123[ FKT_LIMIT123 ]; LOTUS_ROOT* pLotusRoot = NULL; - std::map<sal_uInt16, ScPatternAttr> aLotusPatternPool; static FltError @@ -223,5 +221,4 @@ FltError ScImportLotus123old( SvStream& aStream, ScDocument* pDocument, rtl_Text return generate_Opcodes( aStream, *pDoc, aPrgrsBar, eTyp ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/lotus/lotattr.cxx b/sc/source/filter/lotus/lotattr.cxx index e78209bf7cbe..b309f6a3a50e 100644 --- a/sc/source/filter/lotus/lotattr.cxx +++ b/sc/source/filter/lotus/lotattr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "lotattr.hxx" #include <boost/bind.hpp> @@ -35,10 +34,8 @@ #include "root.hxx" #include "scitems.hxx" - using namespace ::com::sun::star; - LotAttrCache::ENTRY::ENTRY (ScPatternAttr* p) : pPattAttr(p) , nHash0(0) @@ -76,7 +73,6 @@ LotAttrCache::LotAttrCache (LOTUS_ROOT* pLotRoot): pWhite = new SvxColorItem( Color( COL_WHITE ), ATTR_FONT_COLOR ); } - LotAttrCache::~LotAttrCache() { for( sal_uInt16 nCnt = 0 ; nCnt < 6 ; nCnt++ ) @@ -88,7 +84,6 @@ LotAttrCache::~LotAttrCache() delete[] pColTab; } - const ScPatternAttr& LotAttrCache::GetPattAttr( const LotAttrWK3& rAttr ) { sal_uInt32 nRefHash; @@ -157,7 +152,6 @@ const ScPatternAttr& LotAttrCache::GetPattAttr( const LotAttrWK3& rAttr ) return *pNewPatt; } - void LotAttrCache::LotusToScBorderLine( sal_uInt8 nLine, ::editeng::SvxBorderLine& aBL ) { nLine &= 0x03; @@ -224,7 +218,6 @@ void LotAttrCol::SetAttr( const SCROW nRow, const ScPatternAttr& rAttr ) } } - void LotAttrCol::Apply( const SCCOL nColNum, const SCTAB nTabNum ) { ScDocument* pDoc = pLotusRoot->pDoc; @@ -255,7 +248,6 @@ void LotAttrTable::SetAttr( const SCCOL nColFirst, const SCCOL nColLast, const S pCols[ nColCnt ].SetAttr( nRow, rPattAttr ); } - void LotAttrTable::Apply( const SCTAB nTabNum ) { SCCOL nColCnt; diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx index aeeff6e27aa5..59d8750d41f0 100644 --- a/sc/source/filter/lotus/lotform.cxx +++ b/sc/source/filter/lotus/lotform.cxx @@ -174,7 +174,6 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri } } - // Spezialfaelle... if( eOc == ocGetYear ) { @@ -269,7 +268,6 @@ void LotusToSc::LotusRelToScRel( sal_uInt16 nCol, sal_uInt16 nRow, ScSingleRefDa rSRD.SetAbsRow(static_cast<SCROW>(nRow)); } - void LotusToSc::ReadSRD( ScSingleRefData& rSRD, sal_uInt8 nRelBit ) { sal_uInt8 nTab, nCol; @@ -289,28 +287,24 @@ void LotusToSc::ReadSRD( ScSingleRefData& rSRD, sal_uInt8 nRelBit ) rSRD.SetAddress(ScAddress(nCol, nRow, nTab), aEingPos); } - void LotusToSc::IncToken( TokenId &rParam ) { aPool << ocOpen << rParam << nAddToken; rParam = aPool.Store(); } - void LotusToSc::DecToken( TokenId &rParam ) { aPool << ocOpen << rParam << nSubToken; rParam = aPool.Store(); } - void LotusToSc::NegToken( TokenId &rParam ) { aPool << ocNegSub << ocOpen << rParam << ocClose; rParam = aPool.Store(); } - void LotusToSc::Reset( const ScAddress& rEingPos ) { LotusConverterBase::Reset( rEingPos ); @@ -326,7 +320,6 @@ void LotusToSc::Reset( const ScAddress& rEingPos ) n0Token = aPool.Store( 0.0 ); } - LotusToSc::LotusToSc( SvStream &rStream, svl::SharedStringPool& rSPool, rtl_TextEncoding e, bool b ) : LotusConverterBase(rStream, rSPool, 128) { @@ -335,11 +328,9 @@ LotusToSc::LotusToSc( SvStream &rStream, svl::SharedStringPool& rSPool, rtl_Text bWK123 = b; } - typedef FUNC_TYPE ( FuncType1 ) ( sal_uInt8 ); typedef DefTokenId ( FuncType2 ) ( sal_uInt8 ); - ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, sal_Int32& rRest, const FORMULA_TYPE /*eFT*/ ) { @@ -625,7 +616,6 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, sal_Int32& rRest, return ConvOK; } - FUNC_TYPE LotusToSc::IndexToType( sal_uInt8 nIndex ) { static const FUNC_TYPE pType[ 256 ] = @@ -890,7 +880,6 @@ FUNC_TYPE LotusToSc::IndexToType( sal_uInt8 nIndex ) return pType[ nIndex ]; } - DefTokenId LotusToSc::IndexToToken( sal_uInt8 nIndex ) { static const DefTokenId pToken[ 256 ] = @@ -1156,7 +1145,6 @@ DefTokenId LotusToSc::IndexToToken( sal_uInt8 nIndex ) return pToken[ nIndex ]; } - FUNC_TYPE LotusToSc::IndexToTypeWK123( sal_uInt8 nIndex ) { static const FUNC_TYPE pType[ 256 ] = @@ -1421,7 +1409,6 @@ FUNC_TYPE LotusToSc::IndexToTypeWK123( sal_uInt8 nIndex ) return pType[ nIndex ]; } - DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex ) { static const DefTokenId pToken[ 256 ] = @@ -1687,7 +1674,6 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex ) return pToken[ nIndex ]; } - const sal_Char* GetAddInName( const sal_uInt8 n ) { static const sal_Char* pNames[ 256 ] = @@ -1953,7 +1939,6 @@ const sal_Char* GetAddInName( const sal_uInt8 n ) return pNames[ n ]; } - static DefTokenId lcl_KnownAddIn( const OString& rTest ) { DefTokenId eId = ocNoName; diff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxx index a17b94d4b8fa..60fa5a4880b0 100644 --- a/sc/source/filter/lotus/lotimpop.cxx +++ b/sc/source/filter/lotus/lotimpop.cxx @@ -52,7 +52,6 @@ LOTUS_ROOT::LOTUS_ROOT( ScDocument* pDocP, rtl_TextEncoding eQ ) { } - LOTUS_ROOT::~LOTUS_ROOT() { delete pRangeNames; @@ -61,7 +60,6 @@ LOTUS_ROOT::~LOTUS_ROOT() delete pAttrTable; } - static osl::Mutex aLotImpSemaphore; ImportLotus::ImportLotus( SvStream& aStream, ScDocument* pDoc, rtl_TextEncoding eQ ) @@ -86,7 +84,6 @@ ImportLotus::~ImportLotus() aLotImpSemaphore.release(); } - void ImportLotus::Bof( void ) { sal_uInt16 nFileCode, nFileSub, nSaveCnt; @@ -114,7 +111,6 @@ void ImportLotus::Bof( void ) } } - bool ImportLotus::BofFm3( void ) { sal_uInt16 nFileCode, nFileSub; @@ -125,7 +121,6 @@ bool ImportLotus::BofFm3( void ) return ( nFileCode == 0x8007 && ( nFileSub == 0x0000 || nFileSub == 0x00001 ) ); } - void ImportLotus::Columnwidth( sal_uInt16 nRecLen ) { OSL_ENSURE( nRecLen >= 4, "*ImportLotus::Columnwidth(): Record zu kurz!" ); @@ -157,7 +152,6 @@ void ImportLotus::Columnwidth( sal_uInt16 nRecLen ) } } - void ImportLotus::Hiddencolumn( sal_uInt16 nRecLen ) { OSL_ENSURE( nRecLen >= 4, "*ImportLotus::Hiddencolumn(): Record zu kurz!" ); @@ -184,7 +178,6 @@ void ImportLotus::Hiddencolumn( sal_uInt16 nRecLen ) } } - void ImportLotus::Userrange( void ) { sal_uInt16 nRangeType; @@ -202,7 +195,6 @@ void ImportLotus::Userrange( void ) pLotusRoot->pRngNmBffWK3->Add( aName, aScRange ); } - void ImportLotus::Errcell( void ) { ScAddress aA; @@ -215,7 +207,6 @@ void ImportLotus::Errcell( void ) pD->SetString(aA, "#ERR!", &aParam); } - void ImportLotus::Nacell( void ) { ScAddress aA; @@ -228,7 +219,6 @@ void ImportLotus::Nacell( void ) pD->SetString(aA, "#NA!", &aParam); } - void ImportLotus::Labelcell( void ) { ScAddress aA; @@ -245,7 +235,6 @@ void ImportLotus::Labelcell( void ) pD->SetString(aA, aLabel, &aParam); } - void ImportLotus::Numbercell( void ) { ScAddress aAddr; @@ -258,7 +247,6 @@ void ImportLotus::Numbercell( void ) pD->SetValue(aAddr, fVal); } - void ImportLotus::Smallnumcell( void ) { ScAddress aAddr; @@ -271,7 +259,6 @@ void ImportLotus::Smallnumcell( void ) pD->SetValue(aAddr, SnumToDouble(nVal)); } - ScFormulaCell *ImportLotus::Formulacell( sal_uInt16 n ) { OSL_ENSURE( pIn, "-ImportLotus::Formulacell(): Null-Stream -> Rums!" ); @@ -298,13 +285,11 @@ ScFormulaCell *ImportLotus::Formulacell( sal_uInt16 n ) return NULL; } - void ImportLotus::Read( OUString &r ) { ScfTools::AppendCString( *pIn, r, eQuellChar ); } - void ImportLotus::RowPresentation( sal_uInt16 nRecLen ) { OSL_ENSURE( nRecLen > 4, "*ImportLotus::RowPresentation(): Record zu kurz!" ); @@ -339,7 +324,6 @@ void ImportLotus::RowPresentation( sal_uInt16 nRecLen ) } } - void ImportLotus::NamedSheet( void ) { sal_uInt16 nLTab; @@ -354,7 +338,6 @@ void ImportLotus::NamedSheet( void ) pD->InsertTab( static_cast<SCTAB> (nLTab), aName ); } - void ImportLotus::Font_Face( void ) { sal_uInt8 nNum; @@ -370,7 +353,6 @@ void ImportLotus::Font_Face( void ) pLotusRoot->pFontBuff->SetName( nNum, aName ); } - void ImportLotus::Font_Type( void ) { for( sal_uInt16 nCnt = 0 ; nCnt < LotusFontBuffer::nSize ; nCnt++ ) @@ -381,7 +363,6 @@ void ImportLotus::Font_Type( void ) } } - void ImportLotus::Font_Ysize( void ) { for( sal_uInt16 nCnt = 0 ; nCnt < LotusFontBuffer::nSize ; nCnt++ ) @@ -392,7 +373,6 @@ void ImportLotus::Font_Ysize( void ) } } - void ImportLotus::_Row( const sal_uInt16 nRecLen ) { OSL_ENSURE( nExtTab >= 0, "*ImportLotus::_Row(): Kann hier nicht sein!" ); diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx index 525ea505b48c..c690eb57df26 100644 --- a/sc/source/filter/lotus/lotread.cxx +++ b/sc/source/filter/lotus/lotread.cxx @@ -25,10 +25,8 @@ #include "lotattr.hxx" #include "fprogressbar.hxx" - class ScFormulaCell; - FltError ImportLotus::Read() { enum STATE @@ -227,7 +225,6 @@ FltError ImportLotus::Read() return eRet; } - FltError ImportLotus::Read( SvStream& rIn ) { pIn = &rIn; diff --git a/sc/source/filter/lotus/memory.cxx b/sc/source/filter/lotus/memory.cxx index 921ebd176d92..28630b7419d2 100644 --- a/sc/source/filter/lotus/memory.cxx +++ b/sc/source/filter/lotus/memory.cxx @@ -20,7 +20,6 @@ // Bemerkung: Variablen nicht ueber Headerfile, Module muessen sich // selbst per extern ihre Sachen besorgen! - #include "scitems.hxx" #include "scmem.h" #include <svx/algitem.hxx> @@ -53,7 +52,6 @@ bool MemNew( void ) return true; } - void MemDelete( void ) { delete pValueFormCache; diff --git a/sc/source/filter/lotus/optab.cxx b/sc/source/filter/lotus/optab.cxx index d5af5b647b75..b5525d80799e 100644 --- a/sc/source/filter/lotus/optab.cxx +++ b/sc/source/filter/lotus/optab.cxx @@ -20,7 +20,6 @@ #include "op.h" #include "optab.h" - // Bearbeitungsfunktion sal_Char *X( sal_Char * ) OPCODE_FKT pOpFkt[ FKT_LIMIT ] = { // Code @@ -127,7 +126,6 @@ OPCODE_FKT pOpFkt[ FKT_LIMIT ] = OP_HiddenCols, // 100 }; - OPCODE_FKT pOpFkt123[ FKT_LIMIT123 ] = { // Code OP_BOF123, // 0 @@ -233,5 +231,4 @@ OPCODE_FKT pOpFkt123[ FKT_LIMIT123 ] = NI // 100 }; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx index 3b403e76d026..20f4f74e2099 100644 --- a/sc/source/filter/oox/addressconverter.cxx +++ b/sc/source/filter/oox/addressconverter.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; - namespace { //! TODO: this limit may change, is there a way to obtain it via API? @@ -68,7 +67,6 @@ const sal_Int16 BIFF8_MAXTAB = BIFF5_MAXTAB; } // namespace - CellAddress ApiCellRangeList::getBaseAddress() const { if( empty() ) diff --git a/sc/source/filter/oox/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx index 4b8fe421bb51..37fee41ef548 100644 --- a/sc/source/filter/oox/autofilterbuffer.cxx +++ b/sc/source/filter/oox/autofilterbuffer.cxx @@ -41,7 +41,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; - namespace { const sal_uInt8 BIFF12_TOP10FILTER_TOP = 0x01; diff --git a/sc/source/filter/oox/biffhelper.cxx b/sc/source/filter/oox/biffhelper.cxx index 944ee8a5d52e..5a6258799e9b 100644 --- a/sc/source/filter/oox/biffhelper.cxx +++ b/sc/source/filter/oox/biffhelper.cxx @@ -28,9 +28,6 @@ namespace oox { namespace xls { - - - namespace { const sal_Int32 BIFF_RK_100FLAG = 0x00000001; diff --git a/sc/source/filter/oox/biffinputstream.cxx b/sc/source/filter/oox/biffinputstream.cxx index b4b5cb977def..fd3f3853eba8 100644 --- a/sc/source/filter/oox/biffinputstream.cxx +++ b/sc/source/filter/oox/biffinputstream.cxx @@ -25,9 +25,6 @@ namespace oox { namespace xls { - - - namespace prv { BiffInputRecordBuffer::BiffInputRecordBuffer( BinaryInputStream& rInStrm ) : diff --git a/sc/source/filter/oox/chartsheetfragment.cxx b/sc/source/filter/oox/chartsheetfragment.cxx index dada65309dba..57e1685083c5 100644 --- a/sc/source/filter/oox/chartsheetfragment.cxx +++ b/sc/source/filter/oox/chartsheetfragment.cxx @@ -31,7 +31,6 @@ namespace xls { using namespace ::oox::core; - ChartsheetFragment::ChartsheetFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : WorksheetFragmentBase( rHelper, rFragmentPath ) { diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx index dd24c4c46690..4aea74433b0b 100644 --- a/sc/source/filter/oox/commentsbuffer.cxx +++ b/sc/source/filter/oox/commentsbuffer.cxx @@ -50,7 +50,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; - static sal_Int32 lcl_ToHorizAlign( sal_Int32 nAlign ) { switch( nAlign ) diff --git a/sc/source/filter/oox/commentsfragment.cxx b/sc/source/filter/oox/commentsfragment.cxx index 2a8fa5159863..17ce2df5c13d 100644 --- a/sc/source/filter/oox/commentsfragment.cxx +++ b/sc/source/filter/oox/commentsfragment.cxx @@ -26,7 +26,6 @@ namespace xls { using namespace ::oox::core; - CommentsFragment::CommentsFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : WorksheetFragmentBase( rHelper, rFragmentPath ) { diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index 3c3b45eec2f2..7dd7847d1483 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -63,7 +63,6 @@ using namespace ::com::sun::star::style; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; - namespace { const sal_Int32 BIFF12_CFRULE_TYPE_CELLIS = 1; @@ -1192,7 +1191,6 @@ void ExtCfRule::importCfvo( const AttributeList& rAttribs ) maModel.maColorScaleType = rAttribs.getString( XML_type, OUString() ); } - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/connectionsbuffer.cxx b/sc/source/filter/oox/connectionsbuffer.cxx index e07459b9db13..d8e164b5f14c 100644 --- a/sc/source/filter/oox/connectionsbuffer.cxx +++ b/sc/source/filter/oox/connectionsbuffer.cxx @@ -27,7 +27,6 @@ namespace xls { using namespace ::com::sun::star::uno; - namespace { const sal_Int32 BIFF12_RECONNECT_AS_REQUIRED = 1; diff --git a/sc/source/filter/oox/connectionsfragment.cxx b/sc/source/filter/oox/connectionsfragment.cxx index 416cd9b26ab5..7391e4057597 100644 --- a/sc/source/filter/oox/connectionsfragment.cxx +++ b/sc/source/filter/oox/connectionsfragment.cxx @@ -28,7 +28,6 @@ namespace xls { using namespace ::oox::core; - ConnectionContext::ConnectionContext( WorkbookFragmentBase& rParent, Connection& rConnection ) : WorkbookContextBase( rParent ), mrConnection( rConnection ) diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx index d153dfe3df5f..73addbe5d6f7 100644 --- a/sc/source/filter/oox/defnamesbuffer.cxx +++ b/sc/source/filter/oox/defnamesbuffer.cxx @@ -45,7 +45,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; - namespace { const sal_uInt32 BIFF12_DEFNAME_HIDDEN = 0x00000001; diff --git a/sc/source/filter/oox/drawingbase.cxx b/sc/source/filter/oox/drawingbase.cxx index 2caa532763ab..30e75e6cf464 100644 --- a/sc/source/filter/oox/drawingbase.cxx +++ b/sc/source/filter/oox/drawingbase.cxx @@ -32,7 +32,6 @@ namespace xls { using namespace ::com::sun::star::table; using namespace ::oox::drawingml; - namespace { /** Converts the passed 32-bit integer value from 1/100 mm to EMUs. */ diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx index 147c0be65d6f..967b0ff24dd0 100644 --- a/sc/source/filter/oox/drawingfragment.cxx +++ b/sc/source/filter/oox/drawingfragment.cxx @@ -295,10 +295,8 @@ void DrawingFragment::onEndElement() } } - // VML - namespace { class VmlFindNoteFunc diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx index 5ca80ac07d14..90b631052564 100644 --- a/sc/source/filter/oox/drawingmanager.cxx +++ b/sc/source/filter/oox/drawingmanager.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::oox::drawingml; - namespace { // OBJ record ----------------------------------------------------------------- @@ -86,10 +85,8 @@ const sal_uInt8 BIFF_OBJ_PATT_SOLID = 1; } // namespace - // Model structures for BIFF OBJ record data - BiffObjLineModel::BiffObjLineModel() : mnColorIdx( BIFF_OBJ_LINE_AUTOCOLOR ), mnStyle( BIFF_OBJ_LINE_SOLID ), @@ -108,7 +105,6 @@ BiffObjFillModel::BiffObjFillModel() : // BIFF drawing objects - BiffDrawingObjectContainer::BiffDrawingObjectContainer() { } @@ -364,10 +360,8 @@ void BiffDrawingObjectBase::convertFillProperties( ShapePropertyMap& rPropMap, c aFillProps.pushToPropMap( rPropMap, getBaseFilter().getGraphicHelper() ); } - // BIFF drawing page - BiffDrawingBase::BiffDrawingBase( const WorksheetHelper& rHelper, const Reference< XDrawPage >& rxDrawPage ) : WorksheetHelper( rHelper ), mxDrawPage( rxDrawPage ) diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx index 3da6f1ceda1e..60c031815945 100644 --- a/sc/source/filter/oox/excelfilter.cxx +++ b/sc/source/filter/oox/excelfilter.cxx @@ -169,7 +169,6 @@ GraphicHelper* ExcelFilter::implCreateGraphicHelper() const return new ExcelVbaProject( getComponentContext(), Reference< XSpreadsheetDocument >( getModel(), UNO_QUERY ) ); } - sal_Bool SAL_CALL ExcelFilter::filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { if ( XmlFilterBase::filter( rDescriptor ) ) diff --git a/sc/source/filter/oox/excelhandlers.cxx b/sc/source/filter/oox/excelhandlers.cxx index 42af3d1ed7c7..9e2c4261a7c0 100644 --- a/sc/source/filter/oox/excelhandlers.cxx +++ b/sc/source/filter/oox/excelhandlers.cxx @@ -28,7 +28,6 @@ namespace xls { using ::oox::core::FilterBase; using ::oox::core::FragmentHandler2; - WorkbookFragmentBase::WorkbookFragmentBase( const WorkbookHelper& rHelper, const OUString& rFragmentPath ) : FragmentHandler2( rHelper.getOoxFilter(), rFragmentPath ), @@ -43,7 +42,6 @@ WorksheetFragmentBase::WorksheetFragmentBase( { } - BiffContextHandler::~BiffContextHandler() { } diff --git a/sc/source/filter/oox/excelvbaproject.cxx b/sc/source/filter/oox/excelvbaproject.cxx index dbfaa3748d0a..c6ffb14f0e3a 100644 --- a/sc/source/filter/oox/excelvbaproject.cxx +++ b/sc/source/filter/oox/excelvbaproject.cxx @@ -43,7 +43,6 @@ using namespace ::com::sun::star::script; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; - ExcelVbaProject::ExcelVbaProject( const Reference< XComponentContext >& rxContext, const Reference< XSpreadsheetDocument >& rxDocument ) : ::oox::ole::VbaProject( rxContext, Reference< XModel >( rxDocument, UNO_QUERY ), "Calc" ), mxDocument( rxDocument ) diff --git a/sc/source/filter/oox/externallinkfragment.cxx b/sc/source/filter/oox/externallinkfragment.cxx index c31e13e661a2..31854efa4ab9 100644 --- a/sc/source/filter/oox/externallinkfragment.cxx +++ b/sc/source/filter/oox/externallinkfragment.cxx @@ -34,8 +34,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; using namespace ::oox::core; - - ExternalSheetDataContext::ExternalSheetDataContext( WorkbookFragmentBase& rFragment, const Reference< XExternalSheetCache >& rxSheetCache ) : WorkbookContextBase(rFragment) diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index 590384ce6e32..b866a7786fbc 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; - // reference helpers ========================================================== BinSingleRef2d::BinSingleRef2d() : @@ -921,7 +920,6 @@ static const FunctionData saFuncTableOOoLO[] = { "ORG.OPENOFFICE.CONVERT", "ORG.OPENOFFICE.CONVERT", NOID, NOID, 3, 3, V, { VR }, FUNCFLAG_MACROCALL_NEW } }; - const sal_Unicode API_TOKEN_OPEN = '('; const sal_Unicode API_TOKEN_CLOSE = ')'; const sal_Unicode API_TOKEN_SEP = ';'; diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx index 1a9efedbe904..41331fb55d82 100644 --- a/sc/source/filter/oox/formulaparser.cxx +++ b/sc/source/filter/oox/formulaparser.cxx @@ -43,7 +43,6 @@ using namespace ::com::sun::star::sheet::ReferenceFlags; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; - namespace { sal_uInt16 lclReadFmlaSize( BiffInputStream& rStrm, BiffType eBiff, const sal_uInt16* pnFmlaSize ) @@ -1907,7 +1906,6 @@ private: bool pushBiffFunction( sal_uInt16 nFuncId ); bool pushBiffFunction( sal_uInt16 nFuncId, sal_uInt8 nParamCount ); - private: typedef bool (BiffFormulaParserImpl::*ImportTokenFunc)( BiffInputStream& ); typedef bool (BiffFormulaParserImpl::*ImportRefTokenFunc)( BiffInputStream&, bool, bool ); diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx index c0db303be969..0f072dcebd46 100644 --- a/sc/source/filter/oox/numberformatsbuffer.cxx +++ b/sc/source/filter/oox/numberformatsbuffer.cxx @@ -48,7 +48,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; - namespace { /** Stores the number format used in Calc for an Excel built-in number format. */ diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx index 2f4d8bbdfb0d..b6f92d9b8b52 100644 --- a/sc/source/filter/oox/pagesettings.cxx +++ b/sc/source/filter/oox/pagesettings.cxx @@ -323,7 +323,6 @@ void PageSettings::importPictureData( const Relations& rRelations, const OUStrin maModel.maGraphicUrl = getBaseFilter().getGraphicHelper().importEmbeddedGraphicObject( aPicturePath ); } - enum HFPortionId { HF_LEFT, @@ -861,8 +860,6 @@ void HeaderFooterParser::setNewPortion( HFPortionId ePortion ) } } - - PageSettingsConverter::HFHelperData::HFHelperData( sal_Int32 nLeftPropId, sal_Int32 nRightPropId ) : mnLeftPropId( nLeftPropId ), mnRightPropId( nRightPropId ), diff --git a/sc/source/filter/oox/pivotcachefragment.cxx b/sc/source/filter/oox/pivotcachefragment.cxx index 9fc8ca27a34f..452fa14b298c 100644 --- a/sc/source/filter/oox/pivotcachefragment.cxx +++ b/sc/source/filter/oox/pivotcachefragment.cxx @@ -30,7 +30,6 @@ namespace xls { using namespace ::com::sun::star::uno; using namespace ::oox::core; - PivotCacheFieldContext::PivotCacheFieldContext( WorkbookFragmentBase& rFragment, PivotCacheField& rCacheField ) : WorkbookContextBase( rFragment ), mrCacheField( rCacheField ) @@ -315,7 +314,6 @@ void PivotCacheRecordsFragment::importPCRecordItem( sal_Int32 nRecId, SequenceIn } } - namespace { bool lclSeekToPCDField( BiffInputStream& rStrm ) diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx index a1966560946b..0356e5bdaf71 100644 --- a/sc/source/filter/oox/pivottablebuffer.cxx +++ b/sc/source/filter/oox/pivottablebuffer.cxx @@ -58,7 +58,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; using namespace com::sun::star; - namespace { const sal_Int32 OOX_PT_DATALAYOUTFIELD = -2; /// Placeholder index of data layout field. diff --git a/sc/source/filter/oox/pivottablefragment.cxx b/sc/source/filter/oox/pivottablefragment.cxx index cbbeaecce827..9c2fa02dd06b 100644 --- a/sc/source/filter/oox/pivottablefragment.cxx +++ b/sc/source/filter/oox/pivottablefragment.cxx @@ -27,7 +27,6 @@ namespace xls { using namespace ::oox::core; - PivotTableFieldContext::PivotTableFieldContext( WorksheetFragmentBase& rFragment, PivotTableField& rTableField ) : WorksheetContextBase( rFragment ), mrTableField( rTableField ) diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx index 0b4fd9f07891..57c7c1894ba9 100644 --- a/sc/source/filter/oox/querytablebuffer.cxx +++ b/sc/source/filter/oox/querytablebuffer.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; - namespace { const sal_uInt32 BIFF12_QUERYTABLE_HEADERS = 0x00000001; diff --git a/sc/source/filter/oox/querytablefragment.cxx b/sc/source/filter/oox/querytablefragment.cxx index b7d6ac66f92b..32ae66291766 100644 --- a/sc/source/filter/oox/querytablefragment.cxx +++ b/sc/source/filter/oox/querytablefragment.cxx @@ -27,7 +27,6 @@ namespace xls { using namespace ::oox::core; - QueryTableFragment::QueryTableFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : WorksheetFragmentBase( rHelper, rFragmentPath ), mrQueryTable( getQueryTables().createQueryTable() ) @@ -69,7 +68,6 @@ const RecordInfo* QueryTableFragment::getRecordInfos() const return spRecInfos; } - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx index 894974fdb84d..b3c3b29ec961 100644 --- a/sc/source/filter/oox/richstring.cxx +++ b/sc/source/filter/oox/richstring.cxx @@ -33,7 +33,6 @@ namespace xls { using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; - namespace { const sal_uInt8 BIFF12_STRINGFLAG_FONTS = 0x01; diff --git a/sc/source/filter/oox/sharedstringsfragment.cxx b/sc/source/filter/oox/sharedstringsfragment.cxx index 9d9b848ed84e..be2061e5ba9d 100644 --- a/sc/source/filter/oox/sharedstringsfragment.cxx +++ b/sc/source/filter/oox/sharedstringsfragment.cxx @@ -27,7 +27,6 @@ namespace xls { using namespace ::oox::core; - SharedStringsFragment::SharedStringsFragment( const WorkbookHelper& rHelper, const OUString& rFragmentPath ) : WorkbookFragmentBase( rHelper, rFragmentPath ) diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx index 434c07c6639d..446b9f80f66c 100644 --- a/sc/source/filter/oox/sheetdatabuffer.cxx +++ b/sc/source/filter/oox/sheetdatabuffer.cxx @@ -65,7 +65,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; - CellModel::CellModel() : mnCellType( XML_TOKEN_INVALID ), mnXfId( -1 ), @@ -528,7 +527,6 @@ bool SheetDataBuffer::XfIdRowRange::tryExpand( sal_Int32 nRow, sal_Int32 nXfId ) return false; } - SheetDataBuffer::MergedRange::MergedRange( const CellRangeAddress& rRange ) : maRange( rRange ), mnHorAlign( XML_TOKEN_INVALID ) diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 29ae77008971..adead6da18ee 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -859,7 +859,6 @@ void Font::finalizeImport() } } - bool Font::needsRichTextFormat() const { return maApiData.mnEscapement != API_ESCAPE_NONE; @@ -1720,7 +1719,6 @@ bool Border::convertBorderLine( BorderLine2& rBorderLine, const BorderLineModel& return rModel.mbUsed; } - PatternFillModel::PatternFillModel( bool bDxf ) : mnPattern( XML_none ), mbPattColorUsed( !bDxf ), diff --git a/sc/source/filter/oox/stylesfragment.cxx b/sc/source/filter/oox/stylesfragment.cxx index b66b7555e742..10876fc98ab4 100644 --- a/sc/source/filter/oox/stylesfragment.cxx +++ b/sc/source/filter/oox/stylesfragment.cxx @@ -26,7 +26,6 @@ namespace xls { using namespace ::oox::core; - IndexedColorsContext::IndexedColorsContext( WorkbookFragmentBase& rFragment ) : WorkbookContextBase( rFragment ) { diff --git a/sc/source/filter/oox/tablebuffer.cxx b/sc/source/filter/oox/tablebuffer.cxx index 23c2ed7dddd9..4e59dbf53525 100644 --- a/sc/source/filter/oox/tablebuffer.cxx +++ b/sc/source/filter/oox/tablebuffer.cxx @@ -34,7 +34,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; - TableModel::TableModel() : mnId( -1 ), mnType( XML_worksheet ), diff --git a/sc/source/filter/oox/tablefragment.cxx b/sc/source/filter/oox/tablefragment.cxx index 92cf34aeff38..52039c716a74 100644 --- a/sc/source/filter/oox/tablefragment.cxx +++ b/sc/source/filter/oox/tablefragment.cxx @@ -28,7 +28,6 @@ namespace xls { using namespace ::oox::core; - TableFragment::TableFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : WorksheetFragmentBase( rHelper, rFragmentPath ), mrTable( getTables().createTable() ) diff --git a/sc/source/filter/oox/threadpool.cxx b/sc/source/filter/oox/threadpool.cxx index 1055e5997de5..3fcfa755129c 100644 --- a/sc/source/filter/oox/threadpool.cxx +++ b/sc/source/filter/oox/threadpool.cxx @@ -11,7 +11,6 @@ #include <algorithm> - class ThreadPool::ThreadWorker : public salhelper::Thread { ThreadPool *mpPool; @@ -58,7 +57,6 @@ public: return pRet; } - // Why a condition per worker thread - you may ask. // // Unfortunately the Windows synchronisation API that we wrap diff --git a/sc/source/filter/oox/unitconverter.cxx b/sc/source/filter/oox/unitconverter.cxx index dd6f555ee9ed..359a76ac3b2a 100644 --- a/sc/source/filter/oox/unitconverter.cxx +++ b/sc/source/filter/oox/unitconverter.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::uno; - namespace { const double MM100_PER_INCH = 2540.0; diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index 2814ee79d778..088cebc54910 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -378,7 +378,6 @@ void WorkbookFragment::finalizeImport() importOoxFragment( new ConnectionsFragment( *this, aConnFragmentPath ) ); xGlobalSegment->setPosition( 1.0 ); - /* Create fragments for all sheets, before importing them. Needed to do some preprocessing in the fragment constructors, e.g. loading the table fragments for all sheets that are needed before the cell formulas are diff --git a/sc/source/filter/oox/worksheetbuffer.cxx b/sc/source/filter/oox/worksheetbuffer.cxx index 2655e10e070b..cc8147ecd502 100644 --- a/sc/source/filter/oox/worksheetbuffer.cxx +++ b/sc/source/filter/oox/worksheetbuffer.cxx @@ -41,7 +41,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; - SheetInfoModel::SheetInfoModel() : mnBiffHandle( -1 ), mnSheetId( -1 ), diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx index ab4aea79230c..f93d56ee629b 100644 --- a/sc/source/filter/oox/worksheetfragment.cxx +++ b/sc/source/filter/oox/worksheetfragment.cxx @@ -51,7 +51,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; using namespace ::oox::core; - namespace { const sal_uInt16 BIFF_COLINFO_HIDDEN = 0x0001; @@ -129,7 +128,6 @@ void DataValidationsContext::onEndElement() } } - ContextHandlerRef DataValidationsContext::onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) { if( nRecId == BIFF12_ID_DATAVALIDATION ) diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 3c4cf1068c62..4417bbe6cb34 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -91,7 +91,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; - namespace { void lclUpdateProgressBar( const ISegmentProgressBarRef& rxProgressBar, double fPosition ) @@ -102,7 +101,6 @@ void lclUpdateProgressBar( const ISegmentProgressBarRef& rxProgressBar, double f } // namespace - ColumnModel::ColumnModel() : maRange( -1 ), mfWidth( 0.0 ), @@ -203,7 +201,6 @@ void ValidationModel::setBiffErrorStyle( sal_uInt8 nErrorStyle ) mnErrorStyle = STATIC_ARRAY_SELECT( spnErrorStyles, nErrorStyle, XML_stop ); } - class WorksheetGlobals : public WorkbookHelper, public IWorksheetProgress { public: @@ -915,7 +912,6 @@ void WorksheetGlobals::UpdateRowProgress( const CellRangeAddress& rUsedArea, sal } } - void WorksheetGlobals::initializeWorksheetImport() { // set default cell style for unused cells @@ -1359,7 +1355,6 @@ void WorksheetGlobals::finalizeDrawings() } } - WorksheetHelper::WorksheetHelper( WorksheetGlobals& rSheetGlob ) : WorkbookHelper( rSheetGlob ), mrSheetGlob( rSheetGlob ) @@ -1619,7 +1614,6 @@ void WorksheetHelper::createSharedFormulaMapEntry( getFormulaBuffer().createSharedFormulaMapEntry(rAddress, rRange, nSharedId, rTokens); } - } // namespace xls } // namespace oox diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx index d7f6a0f65c18..72811c63a3b3 100644 --- a/sc/source/filter/orcus/interface.cxx +++ b/sc/source/filter/orcus/interface.cxx @@ -472,7 +472,6 @@ size_t ScOrcusStyles::commit_font() return 0; } - // fill void ScOrcusStyles::set_fill_count(size_t /*n*/) @@ -497,7 +496,6 @@ size_t ScOrcusStyles::commit_fill() return 0; } - // border void ScOrcusStyles::set_border_count(size_t /*n*/) @@ -524,7 +522,6 @@ size_t ScOrcusStyles::commit_border() return 0; } - // cell protection void ScOrcusStyles::set_cell_hidden(bool /*b*/) { @@ -568,7 +565,6 @@ size_t ScOrcusStyles::commit_cell_style_xf() return 0; } - // cell xf void ScOrcusStyles::set_cell_xf_count(size_t /*n*/) @@ -581,7 +577,6 @@ size_t ScOrcusStyles::commit_cell_xf() return 0; } - // xf (cell format) - used both by cell xf and cell style xf. void ScOrcusStyles::set_xf_number_format(size_t /*index*/) @@ -621,7 +616,6 @@ void ScOrcusStyles::set_xf_vertical_alignment(orcus::spreadsheet::ver_alignment_ { } - // cell style entry // not needed for now for gnumeric diff --git a/sc/source/filter/orcus/xmlcontext.cxx b/sc/source/filter/orcus/xmlcontext.cxx index fa91fd389ec5..0ee24a8a4586 100644 --- a/sc/source/filter/orcus/xmlcontext.cxx +++ b/sc/source/filter/orcus/xmlcontext.cxx @@ -235,7 +235,6 @@ public: } }; - } bool ScOrcusXMLContextImpl::importXML(const ScOrcusImportXMLParam& rParam) diff --git a/sc/source/filter/qpro/biff.cxx b/sc/source/filter/qpro/biff.cxx index 333c7202ee8a..a23f578f4c9b 100644 --- a/sc/source/filter/qpro/biff.cxx +++ b/sc/source/filter/qpro/biff.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sal/config.h> #include <stdio.h> #include <sfx2/docfile.hxx> diff --git a/sc/source/filter/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxx index 73dbed891bd8..0d8829b5fb53 100644 --- a/sc/source/filter/qpro/qpro.cxx +++ b/sc/source/filter/qpro/qpro.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sal/config.h> #include <stdio.h> #include <sfx2/docfile.hxx> diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx index 7a3ebbd8ec6f..6be47b015577 100644 --- a/sc/source/filter/qpro/qproform.cxx +++ b/sc/source/filter/qpro/qproform.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <rtl/strbuf.hxx> #include <sal/config.h> #include <sal/macros.h> diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx index f26adcdb46c0..48e82e69edf5 100644 --- a/sc/source/filter/rtf/eeimpars.cxx +++ b/sc/source/filter/rtf/eeimpars.cxx @@ -20,7 +20,6 @@ #include "scitems.hxx" #include <editeng/eeitem.hxx> - #include <editeng/adjustitem.hxx> #include <editeng/editobj.hxx> #include <editeng/editview.hxx> @@ -73,7 +72,6 @@ ScEEImport::ScEEImport( ScDocument* pDocP, const ScRange& rRange ) : mpEngine->EnableUndo( false ); } - ScEEImport::~ScEEImport() { // Sequence important, or else we crash in some dtor! @@ -81,7 +79,6 @@ ScEEImport::~ScEEImport() delete mpEngine; // After Parser! } - sal_uLong ScEEImport::Read( SvStream& rStream, const OUString& rBaseURL ) { sal_uLong nErr = mpParser->Read( rStream, rBaseURL ); @@ -110,7 +107,6 @@ sal_uLong ScEEImport::Read( SvStream& rStream, const OUString& rBaseURL ) return nErr; } - void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNumberFormatter* pFormatter, bool bConvertDate ) { ScProgress* pProgress = new ScProgress( mpDoc->GetDocumentShell(), @@ -474,7 +470,6 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu delete pProgress; } - bool ScEEImport::GraphicSize( SCCOL nCol, SCROW nRow, SCTAB /*nTab*/, ScEEParseEntry* pE ) { if ( !pE->maImageList.size() ) @@ -538,7 +533,6 @@ bool ScEEImport::GraphicSize( SCCOL nCol, SCROW nRow, SCTAB /*nTab*/, ScEEParseE return bHasGraphics; } - void ScEEImport::InsertGraphic( SCCOL nCol, SCROW nRow, SCTAB nTab, ScEEParseEntry* pE ) { @@ -606,7 +600,6 @@ void ScEEImport::InsertGraphic( SCCOL nCol, SCROW nRow, SCTAB nTab, } } - ScEEParser::ScEEParser( EditEngine* pEditP ) : pEdit( pEditP ), pPool( EditEngine::CreatePool() ), @@ -623,7 +616,6 @@ ScEEParser::ScEEParser( EditEngine* pEditP ) : NewActEntry( NULL ); } - ScEEParser::~ScEEParser() { delete pActEntry; @@ -635,7 +627,6 @@ ScEEParser::~ScEEParser() SfxItemPool::Free(pPool); } - void ScEEParser::NewActEntry( ScEEParseEntry* pE ) { // New free-flying pActEntry pActEntry = new ScEEParseEntry( pPool ); diff --git a/sc/source/filter/rtf/expbase.cxx b/sc/source/filter/rtf/expbase.cxx index a9ae7b3ab4f6..6d0fb6452da4 100644 --- a/sc/source/filter/rtf/expbase.cxx +++ b/sc/source/filter/rtf/expbase.cxx @@ -21,7 +21,6 @@ #include "document.hxx" #include "editutil.hxx" - ScExportBase::ScExportBase( SvStream& rStrmP, ScDocument* pDocP, const ScRange& rRangeP ) : @@ -33,13 +32,11 @@ ScExportBase::ScExportBase( SvStream& rStrmP, ScDocument* pDocP, { } - ScExportBase::~ScExportBase() { delete pEditEngine; } - bool ScExportBase::GetDataArea( SCTAB nTab, SCCOL& nStartCol, SCROW& nStartRow, SCCOL& nEndCol, SCROW& nEndRow ) const { @@ -48,7 +45,6 @@ bool ScExportBase::GetDataArea( SCTAB nTab, SCCOL& nStartCol, return TrimDataArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow ); } - bool ScExportBase::TrimDataArea( SCTAB nTab, SCCOL& nStartCol, SCROW& nStartRow, SCCOL& nEndCol, SCROW& nEndRow ) const { @@ -62,7 +58,6 @@ bool ScExportBase::TrimDataArea( SCTAB nTab, SCCOL& nStartCol, ::std::numeric_limits<SCROW>::max(); } - bool ScExportBase::IsEmptyTable( SCTAB nTab ) const { if ( !pDoc->HasTable( nTab ) || !pDoc->IsVisible( nTab ) ) @@ -72,7 +67,6 @@ bool ScExportBase::IsEmptyTable( SCTAB nTab ) const return !GetDataArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow ); } - ScFieldEditEngine& ScExportBase::GetEditEngine() const { if ( !pEditEngine ) @@ -80,5 +74,4 @@ ScFieldEditEngine& ScExportBase::GetEditEngine() const return *pEditEngine; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx index 356004a7b199..05032f2d41c9 100644 --- a/sc/source/filter/rtf/rtfexp.cxx +++ b/sc/source/filter/rtf/rtfexp.cxx @@ -20,7 +20,6 @@ #include "scitems.hxx" #include <editeng/eeitem.hxx> - #include <svx/algitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/postitem.hxx> @@ -49,7 +48,6 @@ FltError ScFormatFilterPluginImpl::ScExportRTF( SvStream& rStrm, ScDocument* pDo return aEx.Write(); } - ScRTFExport::ScRTFExport( SvStream& rStrmP, ScDocument* pDocP, const ScRange& rRangeP ) : ScExportBase( rStrmP, pDocP, rRangeP ), @@ -57,13 +55,11 @@ ScRTFExport::ScRTFExport( SvStream& rStrmP, ScDocument* pDocP, const ScRange& rR { } - ScRTFExport::~ScRTFExport() { delete [] pCellX; } - sal_uLong ScRTFExport::Write() { rStrm.WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RTF ); @@ -81,7 +77,6 @@ sal_uLong ScRTFExport::Write() return rStrm.GetError(); } - void ScRTFExport::WriteTab( SCTAB nTab ) { rStrm.WriteChar( '{' ).WriteCharPtr( SAL_NEWLINE_STRING ); @@ -104,7 +99,6 @@ void ScRTFExport::WriteTab( SCTAB nTab ) rStrm.WriteChar( '}' ).WriteCharPtr( SAL_NEWLINE_STRING ); } - void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow ) { rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TROWD ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TRGAPH ).WriteCharPtr( "30" ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TRLEFT ).WriteCharPtr( "-30" ); @@ -158,7 +152,6 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow ) rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ROW ).WriteCharPtr( SAL_NEWLINE_STRING ); } - void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol ) { const ScPatternAttr* pAttr = pDoc->GetPattern( nCol, nRow, nTab ); diff --git a/sc/source/filter/rtf/rtfimp.cxx b/sc/source/filter/rtf/rtfimp.cxx index ec97bf84b404..d70ceada788a 100644 --- a/sc/source/filter/rtf/rtfimp.cxx +++ b/sc/source/filter/rtf/rtfimp.cxx @@ -25,7 +25,6 @@ #include "rtfparse.hxx" #include "ftools.hxx" - FltError ScFormatFilterPluginImpl::ScImportRTF( SvStream &rStream, const OUString& rBaseURL, ScDocument *pDoc, ScRange& rRange ) { ScRTFImport aImp( pDoc, rRange ); @@ -41,14 +40,12 @@ ScEEAbsImport *ScFormatFilterPluginImpl::CreateRTFImport( ScDocument* pDoc, cons return new ScRTFImport( pDoc, rRange ); } - ScRTFImport::ScRTFImport( ScDocument* pDocP, const ScRange& rRange ) : ScEEImport( pDocP, rRange ) { mpParser = new ScRTFParser( mpEngine ); } - ScRTFImport::~ScRTFImport() { // Reihenfolge wichtig, sonst knallt's irgendwann irgendwo in irgendeinem Dtor! diff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx index f8df0288812e..6a44a09c16ae 100644 --- a/sc/source/filter/rtf/rtfparse.cxx +++ b/sc/source/filter/rtf/rtfparse.cxx @@ -32,7 +32,6 @@ #define SC_RTFTWIPTOL 10 // 10 Twips tolerance when determining columns - ScRTFParser::ScRTFParser( EditEngine* pEditP ) : ScEEParser( pEditP ), mnCurPos(0), @@ -50,7 +49,6 @@ ScRTFParser::ScRTFParser( EditEngine* pEditP ) : pInsDefault = new ScRTFCellDefault( pPool ); } - ScRTFParser::~ScRTFParser() { delete pInsDefault; @@ -58,7 +56,6 @@ ScRTFParser::~ScRTFParser() maDefaultList.clear(); } - sal_uLong ScRTFParser::Read( SvStream& rStream, const OUString& rBaseURL ) { Link aOldLink = pEdit->GetImportHdl(); @@ -90,7 +87,6 @@ sal_uLong ScRTFParser::Read( SvStream& rStream, const OUString& rBaseURL ) return nErr; } - void ScRTFParser::EntryEnd( ScEEParseEntry* pE, const ESelection& aSel ) { // Paragraph -2 strips the attached empty paragraph @@ -99,14 +95,12 @@ void ScRTFParser::EntryEnd( ScEEParseEntry* pE, const ESelection& aSel ) pE->aSel.nEndPos = pEdit->GetTextLen( aSel.nEndPara - 1 ); } - inline void ScRTFParser::NextRow() { if ( nRowMax < ++nRowCnt ) nRowMax = nRowCnt; } - bool ScRTFParser::SeekTwips( sal_uInt16 nTwips, SCCOL* pCol ) { ScRTFColTwips::const_iterator it = pColTwips->find( nTwips ); @@ -131,7 +125,6 @@ bool ScRTFParser::SeekTwips( sal_uInt16 nTwips, SCCOL* pCol ) return false; } - void ScRTFParser::ColAdjust() { if ( nStartAdjust != (sal_uLong)~0 ) @@ -161,7 +154,6 @@ void ScRTFParser::ColAdjust() } } - IMPL_LINK( ScRTFParser, RTFImportHdl, ImportInfo*, pInfo ) { switch ( pInfo->eState ) @@ -245,7 +237,6 @@ void ScRTFParser::NewCellRow( ImportInfo* /*pInfo*/ ) OSL_ENSURE( pActDefault, "NewCellRow: pActDefault==0" ); } - /* SW: ~~~ diff --git a/sc/source/filter/starcalc/collect.cxx b/sc/source/filter/starcalc/collect.cxx index 6d8da1aa6de6..54b9f15027aa 100644 --- a/sc/source/filter/starcalc/collect.cxx +++ b/sc/source/filter/starcalc/collect.cxx @@ -28,10 +28,8 @@ ScDataObject::~ScDataObject() { } - // Collection - static void lcl_DeleteScDataObjects( ScDataObject** p, sal_uInt16 nCount ) { if ( p ) @@ -74,8 +72,6 @@ ScCollection::~ScCollection() lcl_DeleteScDataObjects( pItems, nCount ); } - - bool ScCollection::AtInsert(sal_uInt16 nIndex, ScDataObject* pScDataObject) { if ((nCount < MAXCOLLECTIONSIZE) && (nIndex <= nCount) && pItems) @@ -112,7 +108,6 @@ ScDataObject* ScCollection::At(sal_uInt16 nIndex) const return NULL; } - ScCollection& ScCollection::operator=( const ScCollection& r ) { // Check for self-assignment diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx index 4bb7f17c620e..af897be2b700 100644 --- a/sc/source/filter/starcalc/scflt.cxx +++ b/sc/source/filter/starcalc/scflt.cxx @@ -78,7 +78,6 @@ using namespace com::sun::star; const SCCOL SC10MAXCOL = 255; // #i85906# don't try to load more columns than there are in the file - /** Those strings are used with SC10TOSTRING() and strcmp() and such, hence need to be 0-terminated. */ static void lcl_ReadFixedString( SvStream& rStream, void* pData, size_t nLen ) @@ -93,7 +92,6 @@ static void lcl_ReadFixedString( SvStream& rStream, void* pData, size_t nLen ) } } - static void lcl_ReadFileHeader(SvStream& rStream, Sc10FileHeader& rFileHeader) { lcl_ReadFixedString( rStream, &rFileHeader.CopyRight, sizeof(rFileHeader.CopyRight)); @@ -101,7 +99,6 @@ static void lcl_ReadFileHeader(SvStream& rStream, Sc10FileHeader& rFileHeader) rStream.Read(&rFileHeader.Reserved, sizeof(rFileHeader.Reserved)); } - static void lcl_ReadTabProtect(SvStream& rStream, Sc10TableProtect& rProtect) { lcl_ReadFixedString( rStream, &rProtect.PassWord, sizeof(rProtect.PassWord)); @@ -109,7 +106,6 @@ static void lcl_ReadTabProtect(SvStream& rStream, Sc10TableProtect& rProtect) rStream.ReadUChar( rProtect.Protect ); } - static void lcl_ReadSheetProtect(SvStream& rStream, Sc10SheetProtect& rProtect) { lcl_ReadFixedString( rStream, &rProtect.PassWord, sizeof(rProtect.PassWord)); @@ -117,7 +113,6 @@ static void lcl_ReadSheetProtect(SvStream& rStream, Sc10SheetProtect& rProtect) rStream.ReadUChar( rProtect.Protect ); } - static void lcl_ReadRGB(SvStream& rStream, Sc10Color& rColor) { rStream.ReadUChar( rColor.Dummy ); @@ -126,21 +121,18 @@ static void lcl_ReadRGB(SvStream& rStream, Sc10Color& rColor) rStream.ReadUChar( rColor.Red ); } - static void lcl_ReadPalette(SvStream& rStream, Sc10Color* pPalette) { for (sal_uInt16 i = 0; i < 16; i++) lcl_ReadRGB(rStream, pPalette[i]); } - static void lcl_ReadValueFormat(SvStream& rStream, Sc10ValueFormat& rFormat) { rStream.ReadUChar( rFormat.Format ); rStream.ReadUChar( rFormat.Info ); } - static void lcl_ReadLogFont(SvStream& rStream, Sc10LogFont& rFont) { rStream.ReadInt16( rFont.lfHeight ); @@ -159,7 +151,6 @@ static void lcl_ReadLogFont(SvStream& rStream, Sc10LogFont& rFont) lcl_ReadFixedString( rStream, &rFont.lfFaceName, sizeof(rFont.lfFaceName)); } - static void lcl_ReadBlockRect(SvStream& rStream, Sc10BlockRect& rBlock) { rStream.ReadInt16( rBlock.x1 ); @@ -168,7 +159,6 @@ static void lcl_ReadBlockRect(SvStream& rStream, Sc10BlockRect& rBlock) rStream.ReadInt16( rBlock.y2 ); } - static void lcl_ReadHeadFootLine(SvStream& rStream, Sc10HeadFootLine& rLine) { lcl_ReadFixedString( rStream, &rLine.Title, sizeof(rLine.Title)); @@ -184,7 +174,6 @@ static void lcl_ReadHeadFootLine(SvStream& rStream, Sc10HeadFootLine& rLine) rStream.ReadUInt16( rLine.Reserved ); } - static void lcl_ReadPageFormat(SvStream& rStream, Sc10PageFormat& rFormat) { lcl_ReadHeadFootLine(rStream, rFormat.HeadLine); @@ -217,7 +206,6 @@ static void lcl_ReadPageFormat(SvStream& rStream, Sc10PageFormat& rFormat) rStream.Read(&rFormat.Reserved, sizeof(rFormat.Reserved)); } - static void lcl_ReadGraphHeader(SvStream& rStream, Sc10GraphHeader& rHeader) { rStream.ReadUChar( rHeader.Typ ); @@ -237,7 +225,6 @@ static void lcl_ReadGraphHeader(SvStream& rStream, Sc10GraphHeader& rHeader) rStream.Read(&rHeader.Reserved, sizeof(rHeader.Reserved)); } - static void lcl_ReadImageHeaer(SvStream& rStream, Sc10ImageHeader& rHeader) { lcl_ReadFixedString( rStream, &rHeader.FileName, sizeof(rHeader.FileName)); @@ -250,7 +237,6 @@ static void lcl_ReadImageHeaer(SvStream& rStream, Sc10ImageHeader& rHeader) rStream.ReadUInt32( rHeader.Size ); } - static void lcl_ReadChartHeader(SvStream& rStream, Sc10ChartHeader& rHeader) { rStream.ReadInt16( rHeader.MM ); @@ -259,7 +245,6 @@ static void lcl_ReadChartHeader(SvStream& rStream, Sc10ChartHeader& rHeader) rStream.ReadUInt32( rHeader.Size ); } - static void lcl_ReadChartSheetData(SvStream& rStream, Sc10ChartSheetData& rSheetData) { rStream.ReadUChar( rSheetData.HasTitle ); @@ -288,7 +273,6 @@ static void lcl_ReadChartSheetData(SvStream& rStream, Sc10ChartSheetData& rSheet rStream.Read(&rSheetData.Reserved, sizeof(rSheetData.Reserved)); } - static void lcl_ReadChartTypeData(SvStream& rStream, Sc10ChartTypeData& rTypeData) { rStream.ReadInt16( rTypeData.NumSets ); @@ -351,7 +335,6 @@ static double lcl_PascalToDouble(sal_Char* tp6) ldexp ((s ? -1.0 : 1.0), be - (129+39))); } - static void lcl_ChangeColor( sal_uInt16 nIndex, Color& rColor ) { ColorData aCol; @@ -385,7 +368,6 @@ static OUString lcl_MakeOldPageStyleFormatName( sal_uInt16 i ) return aName; } - template < typename T > sal_uLong insert_new( ScCollection* pCollection, SvStream& rStream ) { T* pData = new (::std::nothrow) T( rStream); @@ -402,10 +384,8 @@ template < typename T > sal_uLong insert_new( ScCollection* pCollection, SvStrea return nError; } - // Font - Sc10FontData::Sc10FontData(SvStream& rStream) : Height(0) , CharSet(0) @@ -444,10 +424,8 @@ Sc10FontCollection::Sc10FontCollection(SvStream& rStream) } } - // Benannte-Bereiche - Sc10NameData::Sc10NameData(SvStream& rStream) { sal_uInt8 nLen; @@ -465,7 +443,6 @@ Sc10NameData::Sc10NameData(SvStream& rStream) rStream.Read(Reserved, sizeof(Reserved)); } - Sc10NameCollection::Sc10NameCollection(SvStream& rStream) : ScCollection (4, 4), nError (0) @@ -488,7 +465,6 @@ Sc10NameCollection::Sc10NameCollection(SvStream& rStream) : } } - // Vorlagen Sc10PatternData::Sc10PatternData(SvStream& rStream) : Attr(0) @@ -539,10 +515,8 @@ Sc10PatternCollection::Sc10PatternCollection(SvStream& rStream) : } } - // Datenbank - Sc10DataBaseData::Sc10DataBaseData(SvStream& rStream) { lcl_ReadFixedString( rStream, &DataBaseRec.Name, sizeof(DataBaseRec.Name)); @@ -578,7 +552,6 @@ Sc10DataBaseData::Sc10DataBaseData(SvStream& rStream) DataBaseRec.QueryValue2 = ScfTools::ReadLongDouble(rStream); } - Sc10DataBaseCollection::Sc10DataBaseCollection(SvStream& rStream) : ScCollection (4, 4), nError (0) @@ -602,7 +575,6 @@ Sc10DataBaseCollection::Sc10DataBaseCollection(SvStream& rStream) : } } - bool Sc10LogFont::operator==( const Sc10LogFont& rData ) const { return !strcmp( lfFaceName, rData.lfFaceName ) @@ -621,13 +593,11 @@ bool Sc10LogFont::operator==( const Sc10LogFont& rData ) const && lfPitchAndFamily == rData.lfPitchAndFamily; } - bool Sc10Color::operator==( const Sc10Color& rColor ) const { return ((Red == rColor.Red) && (Green == rColor.Green) && (Blue == rColor.Blue)); } - bool Sc10HeadFootLine::operator==( const Sc10HeadFootLine& rData ) const { return !strcmp(Title, rData.Title) @@ -643,7 +613,6 @@ bool Sc10HeadFootLine::operator==( const Sc10HeadFootLine& rData ) const && Reserved == rData.Reserved; } - bool Sc10PageFormat::operator==( const Sc10PageFormat& rData ) const { return !strcmp(PrintAreaName, rData.PrintAreaName) @@ -675,7 +644,6 @@ bool Sc10PageFormat::operator==( const Sc10PageFormat& rData ) const && !memcmp( &PrintArea, &rData.PrintArea, sizeof(PrintArea) ); } - sal_uInt16 Sc10PageCollection::InsertFormat( const Sc10PageFormat& rData ) { for (sal_uInt16 i=0; i<nCount; i++) @@ -687,7 +655,6 @@ sal_uInt16 Sc10PageCollection::InsertFormat( const Sc10PageFormat& rData ) return nCount-1; } - static inline sal_uInt8 GetMixedCol( const sal_uInt8 nB, const sal_uInt8 nF, const sal_uInt16 nFak ) { sal_Int32 nT = nB - nF; @@ -703,7 +670,6 @@ static inline Color GetMixedColor( const Color& rFore, const Color& rBack, sal_u GetMixedCol( rBack.GetBlue(), rFore.GetBlue(), nFact ) ); } - void Sc10PageCollection::PutToDoc( ScDocument* pDoc ) { ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); @@ -907,7 +873,6 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc ) pSet->Put(SfxBoolItem( ATTR_PAGE_HORCENTER, pPage->HorCenter )); pSet->Put(SfxBoolItem( ATTR_PAGE_VERCENTER, pPage->VerCenter )); - // Area-Parameter: { @@ -919,7 +884,6 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc ) if ( pPage->RowRepeatStart >= 0 ) pRepeatRow = new ScRange( 0, static_cast<SCROW> (pPage->RowRepeatStart), 0 ); - if ( pRepeatRow || pRepeatCol ) { @@ -936,7 +900,6 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc ) delete pRepeatCol; } - // Table-Parameter: pSet->Put( SfxBoolItem( ATTR_PAGE_NOTES, pPage->PrintNote ) ); @@ -956,7 +919,6 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc ) delete pEmptyObject; } - ScDataObject* Sc10PageData::Clone() const { return new Sc10PageData(aPageFormat); @@ -977,7 +939,6 @@ Sc10Import::Sc10Import(SvStream& rStr, ScDocument* pDocument ) : pPrgrsBar = NULL; } - Sc10Import::~Sc10Import() { pDoc->CalcAfterLoad(); @@ -992,7 +953,6 @@ Sc10Import::~Sc10Import() "*Sc10Import::Sc10Import(): Progressbar lebt noch!?" ); } - sal_uLong Sc10Import::Import() { pPrgrsBar = new ScfStreamProgressBar( rStream, pDoc->GetDocumentShell() ); @@ -1034,7 +994,6 @@ sal_uLong Sc10Import::Import() return nError; } - void Sc10Import::LoadFileHeader() { Sc10FileHeader FileHeader; @@ -1055,7 +1014,6 @@ void Sc10Import::LoadFileHeader() } } - void Sc10Import::LoadFileInfo() { Sc10FileInfo FileInfo; @@ -1075,7 +1033,6 @@ void Sc10Import::LoadEditStateInfo() // Achtung Cursorposition und Offset der Tabelle Uebertragen (soll man das machen??) } - void Sc10Import::LoadProtect() { lcl_ReadSheetProtect(rStream, SheetProtect); @@ -1087,7 +1044,6 @@ void Sc10Import::LoadProtect() pDoc->SetDocProtection(&aProtection); } - void Sc10Import::LoadViewColRowBar() { bool bViewColRowBar; @@ -1096,7 +1052,6 @@ void Sc10Import::LoadViewColRowBar() aSc30ViewOpt.SetOption( VOPT_HEADER, bViewColRowBar ); } - void Sc10Import::LoadScrZoom() { // Achtung Zoom ist leider eine 6Byte TP real Zahl (keine Ahnung wie die Umzusetzen ist) @@ -1105,7 +1060,6 @@ void Sc10Import::LoadScrZoom() nError = rStream.GetError(); } - void Sc10Import::LoadPalette() { lcl_ReadPalette(rStream, TextPalette); @@ -1116,7 +1070,6 @@ void Sc10Import::LoadPalette() nError = rStream.GetError(); } - void Sc10Import::LoadFontCollection() { pFontCollection = new Sc10FontCollection(rStream); @@ -1124,7 +1077,6 @@ void Sc10Import::LoadFontCollection() nError = pFontCollection->GetError(); } - void Sc10Import::LoadNameCollection() { pNameCollection = new Sc10NameCollection(rStream); @@ -1132,7 +1084,6 @@ void Sc10Import::LoadNameCollection() nError = pNameCollection->GetError(); } - void Sc10Import::ImportNameCollection() { ScRangeName* pRN = pDoc->GetRangeName(); @@ -1146,7 +1097,6 @@ void Sc10Import::ImportNameCollection() } } - void Sc10Import::LoadPatternCollection() { pPatternCollection = new Sc10PatternCollection( rStream ); @@ -1380,7 +1330,6 @@ void Sc10Import::LoadPatternCollection() } // for (i = 0; i < GetCount() } - void Sc10Import::LoadDataBaseCollection() { pDataBaseCollection = new Sc10DataBaseCollection(rStream); @@ -1405,7 +1354,6 @@ void Sc10Import::LoadDataBaseCollection() } } - void Sc10Import::LoadTables() { Sc10PageCollection aPageCollection; @@ -1454,7 +1402,6 @@ void Sc10Import::LoadTables() nLen = sizeof(TabName) - 1; TabName[nLen] = 0; - rStream.ReadUInt16( Display ); if ( Tab == (sal_Int16)nShowTab ) @@ -1485,7 +1432,6 @@ void Sc10Import::LoadTables() aSc30ViewOpt.SetObjMode( VOBJ_TYPE_DRAW, eObjMode ); } - rStream.ReadUChar( Visible ); nError = rStream.GetError(); @@ -1621,7 +1567,6 @@ void Sc10Import::LoadTables() aPageCollection.PutToDoc( pDoc ); } - void Sc10Import::LoadCol(SCCOL Col, SCTAB Tab) { LoadColAttr(Col, Tab); @@ -1706,7 +1651,6 @@ void Sc10Import::LoadCol(SCCOL Col, SCTAB Tab) } } - void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab) { Sc10ColAttr aFont; @@ -2157,7 +2101,6 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab) } } - void Sc10Import::LoadAttr(Sc10ColAttr& rAttr) { // rAttr is not reused, otherwise we'd have to delete [] rAttr.pData; @@ -2182,7 +2125,6 @@ void Sc10Import::LoadAttr(Sc10ColAttr& rAttr) } } - void Sc10Import::ChangeFormat(sal_uInt16 nFormat, sal_uInt16 nInfo, sal_uLong& nKey) { // Achtung: Die Formate werden nur auf die StarCalc 3.0 internen Formate gemappt @@ -2325,7 +2267,6 @@ void Sc10Import::ChangeFormat(sal_uInt16 nFormat, sal_uInt16 nInfo, sal_uLong& n } } - void Sc10Import::LoadObjects() { sal_uInt16 ID; diff --git a/sc/source/filter/starcalc/scfobj.cxx b/sc/source/filter/starcalc/scfobj.cxx index d086d727e5c3..08e7416f7f6f 100644 --- a/sc/source/filter/starcalc/scfobj.cxx +++ b/sc/source/filter/starcalc/scfobj.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/embed/XVisualObject.hpp> #include <com/sun/star/embed/Aspects.hpp> - using namespace com::sun::star; #include <unotools/moduleoptions.hxx> @@ -39,10 +38,8 @@ using namespace com::sun::star; #include "drwlayer.hxx" #include "chartarr.hxx" - // STATIC DATA ----------------------------------------------------------- - void Sc10InsertObject::InsertChart( ScDocument* pDoc, SCTAB nDestTab, const Rectangle& rRect, SCTAB nSrcTab, sal_uInt16 nX1, sal_uInt16 nY1, sal_uInt16 nX2, sal_uInt16 nY2 ) { diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx index 8eef7b78501f..bb47f2aa6434 100644 --- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #include <stdio.h> #include <sot/storage.hxx> #include "XclExpChangeTrack.hxx" @@ -55,7 +53,6 @@ static OString lcl_DateTimeToOString( const DateTime& rDateTime ) return OString( sBuf ); } - // local functions static void lcl_WriteDateTime( XclExpStream& rStrm, const DateTime& rDateTime ) diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx index b5a6d722bb5e..b6e4180fc76b 100644 --- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "XclImpChangeTrack.hxx" #include <sot/storage.hxx> #include <svl/zforlist.hxx> @@ -30,7 +29,6 @@ #include "externalrefmgr.hxx" #include "document.hxx" - // class XclImpChangeTrack XclImpChangeTrack::XclImpChangeTrack( const XclImpRoot& rRoot, const XclImpStream& rBookStrm ) : @@ -497,7 +495,6 @@ void XclImpChangeTrack::Apply() } } - // class XclImpChTrFmlConverter XclImpChTrFmlConverter::XclImpChTrFmlConverter( diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx index 3e7f6ee29edf..b378c4a1b3e2 100644 --- a/sc/source/filter/xcl97/xcl97esc.cxx +++ b/sc/source/filter/xcl97/xcl97esc.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/awt/XControlModel.hpp> #include <com/sun/star/embed/XClassifiedObject.hpp> #include <com/sun/star/form/XFormsSupplier.hpp> @@ -108,7 +107,6 @@ XclEscherEx::XclEscherEx( const XclExpRoot& rRoot, XclExpObjectManager& rObjMgr, InsertPersistOffset( mnNextKey, 0 ); } - XclEscherEx::~XclEscherEx() { OSL_ENSURE( !aStack.empty(), "~XclEscherEx: stack not empty" ); @@ -116,7 +114,6 @@ XclEscherEx::~XclEscherEx() delete pTheClientData; } - sal_uInt32 XclEscherEx::InitNextDffFragment() { /* Current value of mnNextKey will be used by caller to refer to the @@ -347,7 +344,6 @@ EscherExHostAppData* XclEscherEx::StartShape( const Reference< XShape >& rxShape return pCurrAppData; } - void XclEscherEx::EndShape( sal_uInt16 nShapeType, sal_uInt32 nShapeID ) { // own escher data created? -> never delete such objects @@ -395,7 +391,6 @@ void XclEscherEx::EndShape( sal_uInt16 nShapeType, sal_uInt32 nShapeID ) nAdditionalText = 0; } - EscherExHostAppData* XclEscherEx::EnterAdditionalTextGroup() { nAdditionalText = 1; @@ -530,7 +525,6 @@ void XclEscherClientData::WriteData( EscherEx& rEx ) const rEx.AddAtom( 0, ESCHER_ClientData ); } - // --- class XclEscherClientTextbox ------------------------------------- XclEscherClientTextbox::XclEscherClientTextbox( const XclExpRoot& rRoot, @@ -542,7 +536,6 @@ XclEscherClientTextbox::XclEscherClientTextbox( const XclExpRoot& rRoot, { } - void XclEscherClientTextbox::WriteData( EscherEx& /*rEx*/ ) const { pXclObj->SetText( GetRoot(), rTextObj ); diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 17fda19b1ad1..e28bccf69353 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svx/svdpool.hxx> #include <svx/sdtaitm.hxx> #include <svx/svdotext.hxx> @@ -175,7 +174,6 @@ static bool IsVmlObject( const XclObj *rObj ) } } - static sal_Int32 GetVmlObjectCount( XclExpObjList& rList ) { sal_Int32 nNumVml = 0; @@ -188,7 +186,6 @@ static sal_Int32 GetVmlObjectCount( XclExpObjList& rList ) return nNumVml; } - static void SaveDrawingMLObjects( XclExpObjList& rList, XclExpXmlStream& rStrm, sal_Int32& nDrawingMLCount ) { sal_Int32 nVmlObjects = GetVmlObjectCount( rList ); @@ -229,7 +226,6 @@ static void SaveDrawingMLObjects( XclExpObjList& rList, XclExpXmlStream& rStrm, rStrm.PopStream(); } - static void SaveVmlObjects( XclExpObjList& rList, XclExpXmlStream& rStrm, sal_Int32& nVmlCount ) { if( GetVmlObjectCount( rList ) == 0 ) @@ -270,7 +266,6 @@ static void SaveVmlObjects( XclExpObjList& rList, XclExpXmlStream& rStrm, sal_In rStrm.PopStream(); } - void XclExpObjList::SaveXml( XclExpXmlStream& rStrm ) { if( pSolverContainer ) @@ -283,7 +278,6 @@ void XclExpObjList::SaveXml( XclExpXmlStream& rStrm ) SaveVmlObjects( *this, rStrm, mnVmlCount ); } - void XclExpObjList::ResetCounters() { mnDrawingMLCount = 0; @@ -496,7 +490,6 @@ void XclObjComment::ProcessEscherObj( const XclExpRoot& rRoot, const Rectangle& { EscherPropertyContainer aPropOpt; - lcl_FillProps( aPropOpt, pCaption, bVisible ); nGrbit = 0; // all off: AutoLine, AutoFill, Printable, Locked @@ -545,7 +538,6 @@ protected: virtual void EndShape( sal_Int32 nShapeElement ) SAL_OVERRIDE; }; - VmlCommentExporter::VmlCommentExporter( sax_fastparser::FSHelperPtr p, ScAddress aScPos, SdrCaptionObj* pCaption, bool bVisible, Rectangle &aFrom, Rectangle &aTo ) : VMLExport( p ) @@ -617,7 +609,6 @@ void XclObjComment::SaveXml( XclExpXmlStream& rStrm ) aCommentExporter.AddSdrObject( *mpCaption ); } - // --- class XclObjDropDown ------------------------------------------ XclObjDropDown::XclObjDropDown( XclExpObjectManager& rObjMgr, const ScAddress& rPos, bool bFilt ) : @@ -963,7 +954,6 @@ void XclObjAny::WriteFromTo( XclExpXmlStream& rStrm, const Reference< XShape >& aRange.aEnd.Col()-1, aRange.aEnd.Row()-1, nTab ); - pDrawing->startElement( FSNS( XML_xdr, XML_from ), FSEND ); XclXmlUtils::WriteElement( pDrawing, FSNS( XML_xdr, XML_col ), (sal_Int32) aRange.aStart.Col() ); @@ -1005,7 +995,6 @@ GetEditAs( XclObjAny& rObj ) return "absolute"; } - void XclObjAny::SaveXml( XclExpXmlStream& rStrm ) { // ignore group shapes at the moment, we don't process them correctly @@ -1041,19 +1030,16 @@ void ExcBof8_Base::SaveCont( XclExpStream& rStrm ) << nFileHistory << nLowestBiffVer; } - sal_uInt16 ExcBof8_Base::GetNum() const { return 0x0809; } - sal_Size ExcBof8_Base::GetLen() const { return 16; } - // --- class ExcBof8 ------------------------------------------------- ExcBof8::ExcBof8() @@ -1061,7 +1047,6 @@ ExcBof8::ExcBof8() nDocType = 0x0010; } - // --- class ExcBofW8 ------------------------------------------------ ExcBofW8::ExcBofW8() @@ -1069,7 +1054,6 @@ ExcBofW8::ExcBofW8() nDocType = 0x0005; } - // --- class ExcBundlesheet8 ----------------------------------------- ExcBundlesheet8::ExcBundlesheet8( RootData& rRootData, SCTAB _nTab ) : @@ -1078,16 +1062,12 @@ ExcBundlesheet8::ExcBundlesheet8( RootData& rRootData, SCTAB _nTab ) : { } - ExcBundlesheet8::ExcBundlesheet8( const OUString& rString ) : ExcBundlesheetBase(), sUnicodeName( rString ) { } - - - void ExcBundlesheet8::SaveCont( XclExpStream& rStrm ) { m_nOwnPos = rStrm.GetSvStreamPos(); @@ -1098,13 +1078,11 @@ void ExcBundlesheet8::SaveCont( XclExpStream& rStrm ) rStrm << nGrbit << GetName(); } - sal_Size ExcBundlesheet8::GetLen() const { // Text max 255 chars return 8 + GetName().GetBufferSize(); } - void ExcBundlesheet8::SaveXml( XclExpXmlStream& rStrm ) { OUString sId; @@ -1131,32 +1109,27 @@ sal_uInt16 XclObproj::GetNum() const return 0x00D3; } - sal_Size XclObproj::GetLen() const { return 0; } - // ---- class XclCodename -------------------------------------------- XclCodename::XclCodename( const OUString& r ) : aName( r ) { } - void XclCodename::SaveCont( XclExpStream& rStrm ) { rStrm << aName; } - sal_uInt16 XclCodename::GetNum() const { return 0x01BA; } - sal_Size XclCodename::GetLen() const { return aName.GetSize(); @@ -1192,7 +1165,6 @@ void ExcEScenarioCell::SaveXml( XclExpXmlStream& rStrm ) const FSEND ); } - ExcEScenario::ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab ) { OUString sTmpName; @@ -1321,7 +1293,6 @@ void ExcEScenario::SaveXml( XclExpXmlStream& rStrm ) rWorkbook->endElement( XML_scenario ); } - ExcEScenarioManager::ExcEScenarioManager( const XclExpRoot& rRoot, SCTAB nTab ) : nActive( 0 ) { @@ -1506,25 +1477,21 @@ void XclCalccount::SaveCont( XclExpStream& rStrm ) rStrm << nCount; } - XclCalccount::XclCalccount( const ScDocument& rDoc ) { nCount = rDoc.GetDocOptions().GetIterCount(); } - sal_uInt16 XclCalccount::GetNum() const { return 0x000C; } - sal_Size XclCalccount::GetLen() const { return 2; } - void XclCalccount::SaveXml( XclExpXmlStream& rStrm ) { rStrm.WriteAttributes( @@ -1532,31 +1499,26 @@ void XclCalccount::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } - void XclIteration::SaveCont( XclExpStream& rStrm ) { rStrm << nIter; } - XclIteration::XclIteration( const ScDocument& rDoc ) { nIter = rDoc.GetDocOptions().IsIter()? 1 : 0; } - sal_uInt16 XclIteration::GetNum() const { return 0x0011; } - sal_Size XclIteration::GetLen() const { return 2; } - void XclIteration::SaveXml( XclExpXmlStream& rStrm ) { rStrm.WriteAttributes( @@ -1564,7 +1526,6 @@ void XclIteration::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } - void XclDelta::SaveCont( XclExpStream& rStrm ) { rStrm << fDelta; @@ -1575,19 +1536,16 @@ XclDelta::XclDelta( const ScDocument& rDoc ) fDelta = rDoc.GetDocOptions().GetIterEps(); } - sal_uInt16 XclDelta::GetNum() const { return 0x0010; } - sal_Size XclDelta::GetLen() const { return 8; } - void XclDelta::SaveXml( XclExpXmlStream& rStrm ) { rStrm.WriteAttributes( diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx index 5a2d35f089a7..5fbbf75e2565 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #include "XMLCellRangeSourceContext.hxx" #include <sax/tools/converter.hxx> @@ -28,7 +26,6 @@ using namespace ::com::sun::star; - ScMyImpCellRangeSource::ScMyImpCellRangeSource() : nColumns( 0 ), nRows( 0 ), @@ -36,7 +33,6 @@ ScMyImpCellRangeSource::ScMyImpCellRangeSource() : { } - ScXMLCellRangeSourceContext::ScXMLCellRangeSourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx index 5b6191c726df..95a93c17cf5c 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx @@ -24,7 +24,6 @@ class ScXMLImport; - struct ScMyImpCellRangeSource { OUString sSourceStr; @@ -38,7 +37,6 @@ struct ScMyImpCellRangeSource ScMyImpCellRangeSource(); }; - class ScXMLCellRangeSourceContext : public SvXMLImportContext { private: @@ -63,7 +61,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx index 78a56e400838..76cfdc1cc195 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx @@ -279,7 +279,6 @@ void ScChangeTrackingExportHelper::SetValueAttributes(const double& fValue, cons } } - void ScChangeTrackingExportHelper::WriteValueCell(const ScCellValue& rCell, const OUString& sValue) { OSL_ASSERT(rCell.meType == CELLTYPE_VALUE); diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx index 9fb21cb029d7..ee54d244c099 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx @@ -152,7 +152,6 @@ ScMyMoveAction::~ScMyMoveAction() delete pMoveRanges; } - ScMyContentAction::ScMyContentAction() : ScMyBaseAction(SC_CAT_CONTENT), pCellInfo(NULL) diff --git a/sc/source/filter/xml/XMLCodeNameProvider.cxx b/sc/source/filter/xml/XMLCodeNameProvider.cxx index e86f5349cac5..dfc677ed4778 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.cxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.cxx @@ -22,7 +22,6 @@ using namespace com::sun::star; - bool XMLCodeNameProvider::_getCodeName( const uno::Any& aAny, OUString& rCodeName ) { uno::Sequence<beans::PropertyValue> aProps; @@ -47,7 +46,6 @@ bool XMLCodeNameProvider::_getCodeName( const uno::Any& aAny, OUString& rCodeNam return false; } - XMLCodeNameProvider::XMLCodeNameProvider( ScDocument* pDoc ) : mpDoc( pDoc ), msDocName( "*doc*" ), diff --git a/sc/source/filter/xml/XMLConsolidationContext.cxx b/sc/source/filter/xml/XMLConsolidationContext.cxx index 5c53643a6abc..e211505ca80b 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.cxx +++ b/sc/source/filter/xml/XMLConsolidationContext.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #include "XMLConsolidationContext.hxx" #include "document.hxx" #include "rangeutl.hxx" @@ -30,7 +28,6 @@ using namespace ::com::sun::star; using namespace xmloff::token; - ScXMLConsolidationContext::ScXMLConsolidationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/XMLConsolidationContext.hxx b/sc/source/filter/xml/XMLConsolidationContext.hxx index 3f2f7e2306b0..ba53c2f4af38 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.hxx +++ b/sc/source/filter/xml/XMLConsolidationContext.hxx @@ -26,7 +26,6 @@ class ScXMLImport; - class ScXMLConsolidationContext : public SvXMLImportContext { private: @@ -58,7 +57,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxx index b2ff92a0c1fa..7f08774cdd75 100644 --- a/sc/source/filter/xml/XMLConverter.cxx +++ b/sc/source/filter/xml/XMLConverter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "XMLConverter.hxx" #include <com/sun/star/util/DateTime.hpp> #include <tools/datetime.hxx> @@ -33,7 +32,6 @@ using namespace ::com::sun::star; using namespace xmloff::token; - ScDocument* ScXMLConverter::GetScDocument( uno::Reference< frame::XModel > xModel ) { if (xModel.is()) @@ -100,7 +98,6 @@ ScSubTotalFunc ScXMLConverter::GetSubTotalFuncFromString( const OUString& sFunct return SUBTOTAL_FUNC_NONE; } - void ScXMLConverter::GetStringFromFunction( OUString& rString, const sheet::GeneralFunction eFunction, @@ -157,7 +154,6 @@ void ScXMLConverter::GetStringFromFunction( ScRangeStringConverter::AssignString( rString, sFuncStr, bAppendStr ); } - sheet::DataPilotFieldOrientation ScXMLConverter::GetOrientationFromString( const OUString& rString ) { @@ -172,7 +168,6 @@ sheet::DataPilotFieldOrientation ScXMLConverter::GetOrientationFromString( return sheet::DataPilotFieldOrientation_HIDDEN; } - void ScXMLConverter::GetStringFromOrientation( OUString& rString, const sheet::DataPilotFieldOrientation eOrientation, @@ -204,7 +199,6 @@ void ScXMLConverter::GetStringFromOrientation( ScRangeStringConverter::AssignString( rString, sOrientStr, bAppendStr ); } - ScDetectiveObjType ScXMLConverter::GetDetObjTypeFromString( const OUString& rString ) { if( IsXMLToken(rString, XML_FROM_SAME_TABLE ) ) @@ -233,7 +227,6 @@ bool ScXMLConverter::GetDetOpTypeFromString( ScDetOpType& rDetOpType, const OUSt return true; } - void ScXMLConverter::GetStringFromDetObjType( OUString& rString, const ScDetectiveObjType eObjType, @@ -286,7 +279,6 @@ void ScXMLConverter::GetStringFromDetOpType( ScRangeStringConverter::AssignString( rString, sTypeStr, bAppendStr ); } - void ScXMLConverter::ParseFormula(OUString& sFormula, const bool bIsFormula) { OUStringBuffer sBuffer(sFormula.getLength()); @@ -318,7 +310,6 @@ void ScXMLConverter::ParseFormula(OUString& sFormula, const bool bIsFormula) sFormula = sBuffer.makeStringAndClear(); } - void ScXMLConverter::ConvertDateTimeToString(const DateTime& aDateTime, OUStringBuffer& sDate) { util::DateTime aAPIDateTime; diff --git a/sc/source/filter/xml/XMLConverter.hxx b/sc/source/filter/xml/XMLConverter.hxx index f96a403005bf..f9891cd4ff43 100644 --- a/sc/source/filter/xml/XMLConverter.hxx +++ b/sc/source/filter/xml/XMLConverter.hxx @@ -34,7 +34,6 @@ class ScDocument; class DateTime; - class ScXMLConverter { public: diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx index f9996a6d98ae..8dba4945fccb 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.cxx +++ b/sc/source/filter/xml/XMLDDELinksContext.cxx @@ -30,7 +30,6 @@ using namespace com::sun::star; using namespace xmloff::token; - ScXMLDDELinksContext::ScXMLDDELinksContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/XMLDetectiveContext.cxx b/sc/source/filter/xml/XMLDetectiveContext.cxx index 6db5bc1f10a2..c01c7cb9643c 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.cxx +++ b/sc/source/filter/xml/XMLDetectiveContext.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #include "XMLDetectiveContext.hxx" #include <sax/tools/converter.hxx> @@ -34,7 +32,6 @@ using namespace ::com::sun::star; using namespace xmloff::token; - ScMyImpDetectiveObj::ScMyImpDetectiveObj() : aSourceRange(), eObjType( SC_DETOBJ_NONE ), @@ -62,7 +59,6 @@ bool ScMyImpDetectiveOpArray::GetFirstOp( ScMyImpDetectiveOp& rDetOp ) return true; } - ScXMLDetectiveContext::ScXMLDetectiveContext( ScXMLImport& rImport, sal_uInt16 nPrfx, @@ -104,7 +100,6 @@ void ScXMLDetectiveContext::EndElement() { } - ScXMLDetectiveHighlightedContext::ScXMLDetectiveHighlightedContext( ScXMLImport& rImport, sal_uInt16 nPrfx, @@ -183,7 +178,6 @@ void ScXMLDetectiveHighlightedContext::EndElement() pDetectiveObjVec->push_back( aDetectiveObj ); } - ScXMLDetectiveOperationContext::ScXMLDetectiveOperationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx index 023220424e60..12b0265abc10 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.hxx +++ b/sc/source/filter/xml/XMLDetectiveContext.hxx @@ -29,7 +29,6 @@ class ScXMLImport; - struct ScMyImpDetectiveObj { ScRange aSourceRange; @@ -41,7 +40,6 @@ struct ScMyImpDetectiveObj typedef ::std::vector< ScMyImpDetectiveObj > ScMyImpDetectiveObjVec; - struct ScMyImpDetectiveOp { ScAddress aPosition; @@ -75,7 +73,6 @@ public: bool GetFirstOp( ScMyImpDetectiveOp& rDetOp ); }; - class ScXMLDetectiveContext : public SvXMLImportContext { private: @@ -101,7 +98,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - class ScXMLDetectiveHighlightedContext : public SvXMLImportContext { private: @@ -130,7 +126,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - class ScXMLDetectiveOperationContext : public SvXMLImportContext { private: @@ -157,7 +152,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/XMLExportDDELinks.hxx b/sc/source/filter/xml/XMLExportDDELinks.hxx index 6cb8755d4825..9e6d77464e15 100644 --- a/sc/source/filter/xml/XMLExportDDELinks.hxx +++ b/sc/source/filter/xml/XMLExportDDELinks.hxx @@ -39,5 +39,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/XMLExportIterator.cxx b/sc/source/filter/xml/XMLExportIterator.cxx index a863e58424f0..9f9307e2acc5 100644 --- a/sc/source/filter/xml/XMLExportIterator.cxx +++ b/sc/source/filter/xml/XMLExportIterator.cxx @@ -55,7 +55,6 @@ void ScMyIteratorBase::UpdateAddress( table::CellAddress& rCellAddress ) } } - bool ScMyShape::operator<(const ScMyShape& aShape) const { if( aAddress.Tab() != aShape.aAddress.Tab() ) @@ -183,7 +182,6 @@ bool ScMyMergedRange::operator<(const ScMyMergedRange& aRange) const return (aCellRange.StartColumn < aRange.aCellRange.StartColumn); } - ScMyMergedRangesContainer::ScMyMergedRangesContainer() : aRangeList() { @@ -693,7 +691,6 @@ void ScMyNotEmptyCellsIterator::HasAnnotation(ScMyCell& aCell) } } - void ScMyNotEmptyCellsIterator::SetCurrentTable(const SCTAB nTable, uno::Reference<sheet::XSpreadsheet>& rxTable) { diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index 31566c85b396..fa3f6e81ce86 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -678,13 +678,11 @@ sal_Int32 ScRowFormatRanges::GetMaxRows() const return nMaxRows; } - void ScRowFormatRanges::Sort() { aRowFormatRanges.sort(); } - ScMyFormatRange::ScMyFormatRange() : nStyleNameIndex(-1) , nValidationIndex(-1) diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx index 6d48a61585c8..f88bf6e516b2 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::beans; using namespace xmloff::token; - TYPEINIT1( XMLTableHeaderFooterContext, SvXMLImportContext ); XMLTableHeaderFooterContext::XMLTableHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx index 2ad8d9b8539c..abcc4687cecd 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLTABLEHEADERFOOTERCONTEXT_HXX #define INCLUDED_SC_SOURCE_FILTER_XML_XMLTABLEHEADERFOOTERCONTEXT_HXX - #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimp.hxx> #include <com/sun/star/sheet/XHeaderFooterContent.hpp> @@ -101,7 +100,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.hxx b/sc/source/filter/xml/XMLTableMasterPageExport.hxx index 9700b5d03ff1..a541d3ed819b 100644 --- a/sc/source/filter/xml/XMLTableMasterPageExport.hxx +++ b/sc/source/filter/xml/XMLTableMasterPageExport.hxx @@ -53,7 +53,6 @@ public: virtual ~XMLTableMasterPageExport(); }; - #endif // _XMLOFF_XMLTABLEMASTERPAGEEXPORT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx index 4d3010a5c584..32a9fe0b761e 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star; using namespace xmloff::token; - XMLTableShapeImportHelper::XMLTableShapeImportHelper( ScXMLImport& rImp, SvXMLImportPropertyMapper *pImpMapper ) : XMLShapeImportHelper(rImp, rImp.GetModel(), pImpMapper ), diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx index 497aa1a694d2..de9ac029d0b3 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx @@ -42,7 +42,6 @@ public: const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes) SAL_OVERRIDE; - void SetCell (const ::com::sun::star::table::CellAddress& rAddress) { aStartCell = rAddress; } void SetOnTable (const bool bTempOnTable) { bOnTable = bTempOnTable; } void SetAnnotation(ScXMLAnnotationContext* pAnnotation) { pAnnotationContext = pAnnotation; } @@ -50,7 +49,6 @@ public: ScXMLAnnotationContext* GetAnnotationContext() const { return pAnnotationContext; } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index fb13ac11702e..90e3b9cc9c98 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "XMLTrackedChangesContext.hxx" #include "xmlimprt.hxx" #include "xmlconti.hxx" @@ -39,7 +38,6 @@ using namespace com::sun::star; using namespace xmloff::token; - class ScXMLChangeInfoContext : public SvXMLImportContext { ScMyActionInfo aInfo; diff --git a/sc/source/filter/xml/cachedattraccess.cxx b/sc/source/filter/xml/cachedattraccess.cxx index cf69ec00595a..334e154b2f13 100644 --- a/sc/source/filter/xml/cachedattraccess.cxx +++ b/sc/source/filter/xml/cachedattraccess.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - #include "cachedattraccess.hxx" #include "document.hxx" diff --git a/sc/source/filter/xml/sheetdata.cxx b/sc/source/filter/xml/sheetdata.cxx index 74ac1deefdbc..4d78337b996a 100644 --- a/sc/source/filter/xml/sheetdata.cxx +++ b/sc/source/filter/xml/sheetdata.cxx @@ -255,7 +255,6 @@ bool ScSheetSaveData::AddLoadedNamespaces( SvXMLNamespaceMap& rNamespaces ) cons return true; // success } - void ScSheetSaveData::SetInSupportedSave( bool bSet ) { mbInSupportedSave = bSet; diff --git a/sc/source/filter/xml/xmlannoi.hxx b/sc/source/filter/xml/xmlannoi.hxx index 35d05c9e386e..d107b132d1e4 100644 --- a/sc/source/filter/xml/xmlannoi.hxx +++ b/sc/source/filter/xml/xmlannoi.hxx @@ -106,7 +106,6 @@ private: ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx index 56dba8c2d2af..1b074b99123a 100644 --- a/sc/source/filter/xml/xmlbodyi.cxx +++ b/sc/source/filter/xml/xmlbodyi.cxx @@ -52,7 +52,6 @@ #include <boost/scoped_ptr.hpp> - using namespace com::sun::star; using namespace xmloff::token; diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index def27a91e78f..8ad56505672a 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -1500,7 +1500,6 @@ bool ScXMLTableRowCellContext::IsPossibleErrorString() const return mbPossibleErrorCell || ( mbCheckWithCompilerForError && GetScImport().IsFormulaErrorConstant(*maStringValue) ); } - void ScXMLTableRowCellContext::EndElement() { HasSpecialCaseFormulaText(); diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx index 548b07678a9b..8ddb53751982 100644 --- a/sc/source/filter/xml/xmlcondformat.cxx +++ b/sc/source/filter/xml/xmlcondformat.cxx @@ -20,7 +20,6 @@ #include "XMLConverter.hxx" #include "stylehelper.hxx" - ScXMLConditionalFormatsContext::ScXMLConditionalFormatsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName): SvXMLImportContext( rImport, nPrfx, rLName ) diff --git a/sc/source/filter/xml/xmlcondformat.hxx b/sc/source/filter/xml/xmlcondformat.hxx index 4b54272cefce..26d83fab318d 100644 --- a/sc/source/filter/xml/xmlcondformat.hxx +++ b/sc/source/filter/xml/xmlcondformat.hxx @@ -75,7 +75,6 @@ public: virtual ~ScXMLColorScaleFormatContext() {} - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< @@ -98,7 +97,6 @@ public: virtual ~ScXMLDataBarFormatContext() {} - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< @@ -126,7 +124,6 @@ public: virtual ~ScXMLIconSetFormatContext() {} - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx index 3840a78e281e..d1e181c2776a 100644 --- a/sc/source/filter/xml/xmldpimp.cxx +++ b/sc/source/filter/xml/xmldpimp.cxx @@ -54,7 +54,6 @@ using namespace xmloff::token; using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; - ScXMLDataPilotTablesContext::ScXMLDataPilotTablesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 828cd99d1a19..60630518b6da 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -427,7 +427,6 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Settings_createInsta return (cppu::OWeakObject*)new ScXMLExport(comphelper::getComponentContext(rSMgr), ScXMLOasisExport_Settings_getImplementationName(), EXPORT_SETTINGS|EXPORT_OASIS); } - class ScXMLShapeExport : public XMLShapeExport { public: @@ -460,7 +459,6 @@ sal_Int16 ScXMLExport::GetFieldUnit() return xProperties->getMetric(); } - // #110680# ScXMLExport::ScXMLExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, @@ -552,7 +550,6 @@ ScXMLExport::ScXMLExport( } } - ScXMLExport::~ScXMLExport() { delete pGroupColumns; @@ -4888,7 +4885,6 @@ void ScXMLExport::GetViewSettings(uno::Sequence<beans::PropertyValue>& rProps) GetChangeTrackViewSettings(rProps); } - void ScXMLExport::GetConfigurationSettings(uno::Sequence<beans::PropertyValue>& rProps) { if (GetModel().is()) diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index 40f7c6bcefe3..ef42111b0bc3 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -211,7 +211,6 @@ class ScXMLExport : public SvXMLExport void WriteExternalRefCaches(); void WriteConsolidation(); // core implementation - void CollectUserDefinedNamespaces(const SfxItemPool* pPool, sal_uInt16 nAttrib); void AddStyleFromCells( diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index acc062027607..5c817fa929d1 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -230,16 +230,6 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowCellAttrTokenMap() return *pTableRowCellAttrTokenMap; } - - - - - - - - - - // NB: virtually inherit so we can multiply inherit properly // in ScXMLFlatDocContext_Impl class ScXMLDocContext_Impl : public virtual SvXMLImportContext @@ -302,7 +292,6 @@ SvXMLMetaDocumentContext(i_rImport, i_nPrefix, i_rLName, ScXMLFlatDocContext_Impl::~ScXMLFlatDocContext_Impl() { } - SvXMLImportContext *ScXMLFlatDocContext_Impl::CreateChildContext( sal_uInt16 i_nPrefix, const OUString& i_rLocalName, const uno::Reference<xml::sax::XAttributeList>& i_xAttrList) @@ -427,7 +416,6 @@ const SvXMLTokenMap& ScXMLImport::GetDocElemTokenMap() return *pDocElemTokenMap; } - const SvXMLTokenMap& ScXMLImport::GetBodyElemTokenMap() { if( !pBodyElemTokenMap ) @@ -1944,7 +1932,6 @@ void ScXMLImport::SetPostProcessData( sc::ImportPostProcessData* p ) mpPostProcessData = p; } - sc::PivotTableSources& ScXMLImport::GetPivotTableSources() { if (!mpPivotSources) @@ -3326,7 +3313,6 @@ void ScXMLImport::LockSolarMutex() ++nSolarMutexLocked; } - void ScXMLImport::UnlockSolarMutex() { if (nSolarMutexLocked > 0) diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 8f28ea9c648d..68851fe45bad 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -968,7 +968,6 @@ class ScXMLImport: public SvXMLImport, boost::noncopyable bool mbImportStyles; bool mbHasNewCondFormatData; - protected: // This method is called after the namespace map has been updated, but diff --git a/sc/source/filter/xml/xmllabri.cxx b/sc/source/filter/xml/xmllabri.cxx index 4b53ea791549..82cc26d23c4c 100644 --- a/sc/source/filter/xml/xmllabri.cxx +++ b/sc/source/filter/xml/xmllabri.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "xmllabri.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> @@ -26,7 +25,6 @@ using namespace ::com::sun::star; using namespace xmloff::token; - ScXMLLabelRangesContext::ScXMLLabelRangesContext( ScXMLImport& rImport, sal_uInt16 nPrefix, @@ -66,7 +64,6 @@ void ScXMLLabelRangesContext::EndElement() { } - ScXMLLabelRangeContext::ScXMLLabelRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/xmllabri.hxx b/sc/source/filter/xml/xmllabri.hxx index 5eec7c6f3b32..c384e9960538 100644 --- a/sc/source/filter/xml/xmllabri.hxx +++ b/sc/source/filter/xml/xmllabri.hxx @@ -23,7 +23,6 @@ class ScXMLImport; - class ScXMLLabelRangesContext : public SvXMLImportContext { private: @@ -47,7 +46,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - class ScXMLLabelRangeContext : public SvXMLImportContext { private: diff --git a/sc/source/filter/xml/xmlsceni.cxx b/sc/source/filter/xml/xmlsceni.cxx index 02d30df74d28..9e44757cee16 100644 --- a/sc/source/filter/xml/xmlsceni.cxx +++ b/sc/source/filter/xml/xmlsceni.cxx @@ -34,7 +34,6 @@ using namespace com::sun::star; using namespace xmloff::token; - ScXMLTableScenarioContext::ScXMLTableScenarioContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index b73cddab22de..905719034495 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -808,7 +808,6 @@ ScXMLAutoStylePoolP::~ScXMLAutoStylePoolP() { } - void ScXMLStyleExport::exportStyleAttributes( const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > & rStyle ) @@ -1160,7 +1159,6 @@ bool XmlScPropHdl_PrintContent::exportXML( return bRetval; } - XmlScPropHdl_JustifyMethod::~XmlScPropHdl_JustifyMethod() { } diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index 5ccdf9bcf50b..b9fead1a393a 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -541,7 +541,6 @@ void XMLTableStyleContext::ApplyCondFormat( const uno::Sequence<table::CellRange mbDeleteCondFormat = false; } - } void XMLTableStyleContext::FillPropertySet( @@ -926,7 +925,6 @@ sal_Int32 XMLTableStylesContext::GetIndex(const sal_Int16 nContextID) return -1; } - TYPEINIT1( ScXMLMasterStylesContext, SvXMLStylesContext ); bool ScXMLMasterStylesContext::InsertStyleFamily( sal_uInt16 ) const diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx index 065e47e453b0..1b59c8ea18ab 100644 --- a/sc/source/filter/xml/xmlstyli.hxx +++ b/sc/source/filter/xml/xmlstyli.hxx @@ -272,7 +272,6 @@ public: ::com::sun::star::beans::XPropertySet > & rPropSet ) SAL_OVERRIDE; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx index 40cea682b691..e3f159b08f7e 100644 --- a/sc/source/filter/xml/xmlsubti.cxx +++ b/sc/source/filter/xml/xmlsubti.cxx @@ -53,7 +53,6 @@ using namespace com::sun::star; - ScXMLTabProtectionData::ScXMLTabProtectionData() : meHash1(PASSHASH_SHA1), meHash2(PASSHASH_UNSPECIFIED), diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index e51fc51b658a..ee158d57b5e5 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -75,7 +75,6 @@ using namespace com::sun::star; - ScXMLImportWrapper::ScXMLImportWrapper( ScDocShell& rDocSh, SfxMedium* pM, const uno::Reference < embed::XStorage >& xStor ) : mrDocShell(rDocSh), rDoc(rDocSh.GetDocument()), @@ -986,6 +985,4 @@ bool ScXMLImportWrapper::Export(bool bStylesOnly) return false; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |