From c4c51709eaa02a5c9a2af3e5d436790307109813 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Sun, 6 Apr 2014 17:13:43 +0200 Subject: whitespace cleanup in sc Change-Id: Id1dcadcac179c52977e48a6912ce4d5fd542f60c --- sc/source/filter/excel/colrowst.cxx | 6 ---- sc/source/filter/excel/excel.cxx | 2 -- sc/source/filter/excel/excform.cxx | 2 -- sc/source/filter/excel/excform8.cxx | 2 -- sc/source/filter/excel/excimp8.cxx | 2 -- sc/source/filter/excel/excrecds.cxx | 38 --------------------- sc/source/filter/excel/expop2.cxx | 2 -- sc/source/filter/excel/fontbuff.cxx | 2 -- sc/source/filter/excel/frmbase.cxx | 4 --- sc/source/filter/excel/impop.cxx | 2 -- sc/source/filter/excel/namebuff.cxx | 4 --- sc/source/filter/excel/read.cxx | 4 --- sc/source/filter/excel/tokstack.cxx | 2 -- sc/source/filter/excel/xechart.cxx | 66 ------------------------------------ sc/source/filter/excel/xecontent.cxx | 24 ------------- sc/source/filter/excel/xeescher.cxx | 30 ---------------- sc/source/filter/excel/xeformula.cxx | 18 ---------- sc/source/filter/excel/xehelper.cxx | 12 ------- sc/source/filter/excel/xelink.cxx | 30 ---------------- sc/source/filter/excel/xename.cxx | 10 ------ sc/source/filter/excel/xepage.cxx | 4 --- sc/source/filter/excel/xepivot.cxx | 28 --------------- sc/source/filter/excel/xerecord.cxx | 24 ------------- sc/source/filter/excel/xeroot.cxx | 4 --- sc/source/filter/excel/xestream.cxx | 6 ---- sc/source/filter/excel/xestring.cxx | 6 ---- sc/source/filter/excel/xestyle.cxx | 48 -------------------------- sc/source/filter/excel/xetable.cxx | 38 --------------------- sc/source/filter/excel/xeview.cxx | 10 ------ sc/source/filter/excel/xichart.cxx | 58 ------------------------------- sc/source/filter/excel/xicontent.cxx | 12 ------- sc/source/filter/excel/xiescher.cxx | 64 ---------------------------------- sc/source/filter/excel/xiformula.cxx | 6 ---- sc/source/filter/excel/xihelper.cxx | 6 ---- sc/source/filter/excel/xilink.cxx | 8 ----- sc/source/filter/excel/xiname.cxx | 4 --- sc/source/filter/excel/xipage.cxx | 4 --- sc/source/filter/excel/xipivot.cxx | 16 --------- sc/source/filter/excel/xiroot.cxx | 4 --- sc/source/filter/excel/xistream.cxx | 2 -- sc/source/filter/excel/xistring.cxx | 4 --- sc/source/filter/excel/xistyle.cxx | 22 ------------ sc/source/filter/excel/xiview.cxx | 4 --- sc/source/filter/excel/xladdress.cxx | 10 ------ sc/source/filter/excel/xlchart.cxx | 58 ------------------------------- sc/source/filter/excel/xlescher.cxx | 12 ------- sc/source/filter/excel/xlformula.cxx | 6 ---- sc/source/filter/excel/xlpage.cxx | 2 -- sc/source/filter/excel/xlpivot.cxx | 6 ---- sc/source/filter/excel/xlroot.cxx | 6 ---- sc/source/filter/excel/xlstyle.cxx | 38 --------------------- sc/source/filter/excel/xltoolbar.cxx | 2 -- sc/source/filter/excel/xltools.cxx | 2 -- sc/source/filter/excel/xltracer.cxx | 2 -- sc/source/filter/excel/xlview.cxx | 4 --- 55 files changed, 792 deletions(-) (limited to 'sc/source/filter/excel') diff --git a/sc/source/filter/excel/colrowst.cxx b/sc/source/filter/excel/colrowst.cxx index 534f44e4ca9a..c048ab86802c 100644 --- a/sc/source/filter/excel/colrowst.cxx +++ b/sc/source/filter/excel/colrowst.cxx @@ -32,15 +32,11 @@ // for filter manager #include "excimp8.hxx" - - const sal_uInt8 EXC_COLROW_USED = 0x01; const sal_uInt8 EXC_COLROW_DEFAULT = 0x02; const sal_uInt8 EXC_COLROW_HIDDEN = 0x04; const sal_uInt8 EXC_COLROW_MAN = 0x08; - - XclImpColRowSettings::XclImpColRowSettings( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), maColWidths(0, MAXCOLCOUNT, 0), @@ -286,8 +282,6 @@ void XclImpColRowSettings::Convert( SCTAB nScTab ) nPrevFlags = nFlags; } - - mbDirty = false; } diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx index dea00ad809cc..80faea664427 100644 --- a/sc/source/filter/excel/excel.cxx +++ b/sc/source/filter/excel/excel.cxx @@ -219,6 +219,4 @@ FltError ScFormatFilterPluginImpl::ScExportExcel5( SfxMedium& rMedium, ScDocumen return eRet; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx index f85d2ee9b68a..a25dc74ff481 100644 --- a/sc/source/filter/excel/excform.cxx +++ b/sc/source/filter/excel/excform.cxx @@ -181,8 +181,6 @@ void ImportExcel::Formula( } - - ExcelToSc::ExcelToSc( const XclImpRoot& rRoot ) : ExcelConverterBase( 512 ), XclImpRoot( rRoot ), diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx index 740c770e7844..e0b1b77d49e0 100644 --- a/sc/source/filter/excel/excform8.cxx +++ b/sc/source/filter/excel/excform8.cxx @@ -79,8 +79,6 @@ ExcelToSc8::ExternalTabInfo::ExternalTabInfo() : { } - - ExcelToSc8::ExcelToSc8( const XclImpRoot& rRoot ) : ExcelToSc( rRoot ), rLinkMan( rRoot.GetLinkManager() ) diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 72d949be52f8..8209a86bb8d4 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -534,8 +534,6 @@ void ImportExcel8::AutoFilter( void ) pData->ReadAutoFilter(aIn, GetDoc().GetSharedStringPool()); } - - XclImpAutoFilterData::XclImpAutoFilterData( RootData* pRoot, const ScRange& rRange ) : ExcRoot( pRoot ), pCurrDBData(NULL), diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index 5097c800ff83..4dc124386b21 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -186,8 +186,6 @@ sal_Size ExcBoolRecord::GetLen( void ) const } - - //--------------------------------------------------------- class ExcBof_Base - ExcBof_Base::ExcBof_Base() : @@ -196,8 +194,6 @@ ExcBof_Base::ExcBof_Base() : { } - - //-------------------------------------------------------------- class ExcBof - ExcBof::ExcBof( void ) @@ -224,8 +220,6 @@ sal_Size ExcBof::GetLen( void ) const return 8; } - - //------------------------------------------------------------- class ExcBofW - ExcBofW::ExcBofW( void ) @@ -240,22 +234,16 @@ void ExcBofW::SaveCont( XclExpStream& rStrm ) rStrm << nVers << nDocType << nRupBuild << nRupYear; } - - sal_uInt16 ExcBofW::GetNum( void ) const { return 0x0809; } - - sal_Size ExcBofW::GetLen( void ) const { return 8; } - - //-------------------------------------------------------------- class ExcEof - sal_uInt16 ExcEof::GetNum( void ) const @@ -269,8 +257,6 @@ sal_Size ExcEof::GetLen( void ) const return 0; } - - //--------------------------------------------------------- class ExcDummy_00 - sal_Size ExcDummy_00::GetLen( void ) const @@ -284,8 +270,6 @@ const sal_uInt8* ExcDummy_00::GetData( void ) const return pMyData; } - - //-------------------------------------------------------- class ExcDummy_04x - sal_Size ExcDummy_040::GetLen( void ) const @@ -300,8 +284,6 @@ const sal_uInt8* ExcDummy_040::GetData( void ) const } - - sal_Size ExcDummy_041::GetLen( void ) const { return nMyLen; @@ -313,8 +295,6 @@ const sal_uInt8* ExcDummy_041::GetData( void ) const return pMyData; } - - //------------------------------------------------------------- class Exc1904 - Exc1904::Exc1904( ScDocument& rDoc ) @@ -350,8 +330,6 @@ void Exc1904::SaveXml( XclExpXmlStream& rStrm ) } } - - //------------------------------------------------------ class ExcBundlesheet - ExcBundlesheetBase::ExcBundlesheetBase( RootData& rRootData, SCTAB nTabNum ) : @@ -387,8 +365,6 @@ sal_uInt16 ExcBundlesheetBase::GetNum( void ) const } - - ExcBundlesheet::ExcBundlesheet( RootData& rRootData, SCTAB _nTab ) : ExcBundlesheetBase( rRootData, _nTab ) { @@ -568,23 +544,17 @@ void XclExpPassHash::WriteBody(XclExpStream& rStrm) rStrm << mnHash; } - - XclExpFiltermode::XclExpFiltermode() : XclExpEmptyRecord( EXC_ID_FILTERMODE ) { } - - XclExpAutofilterinfo::XclExpAutofilterinfo( const ScAddress& rStartPos, SCCOL nScCol ) : XclExpUInt16Record( EXC_ID_AUTOFILTERINFO, static_cast< sal_uInt16 >( nScCol ) ), maStartPos( rStartPos ) { } - - ExcFilterCondition::ExcFilterCondition() : nType( EXC_AFTYPE_NOTUSED ), nOper( EXC_AFOPER_EQUAL ), @@ -681,8 +651,6 @@ void ExcFilterCondition::SaveText( XclExpStream& rStrm ) } } - - XclExpAutofilter::XclExpAutofilter( const XclExpRoot& rRoot, sal_uInt16 nC ) : XclExpRecord( EXC_ID_AUTOFILTER, 24 ), XclExpRoot( rRoot ), @@ -904,8 +872,6 @@ void XclExpAutofilter::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_filterColumn ); } - - ExcAutoFilterRecs::ExcAutoFilterRecs( const XclExpRoot& rRoot, SCTAB nTab ) : XclExpRoot( rRoot ), pFilterMode( NULL ), @@ -1076,8 +1042,6 @@ bool ExcAutoFilterRecs::HasFilterMode() const return pFilterMode != NULL; } - - XclExpFilterManager::XclExpFilterManager( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ) { @@ -1111,6 +1075,4 @@ bool XclExpFilterManager::HasFilterMode( SCTAB nScTab ) return false; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx index 9f22bbef3d63..8f9ebf9c0eba 100644 --- a/sc/source/filter/excel/expop2.cxx +++ b/sc/source/filter/excel/expop2.cxx @@ -119,8 +119,6 @@ FltError ExportBiff5::Write() return eERR_OK; } - - ExportBiff8::ExportBiff8( XclExpRootData& rExpData, SvStream& rStrm ) : ExportBiff5( rExpData, rStrm ) { diff --git a/sc/source/filter/excel/fontbuff.cxx b/sc/source/filter/excel/fontbuff.cxx index 2d0dbba9f2cb..75859817b74e 100644 --- a/sc/source/filter/excel/fontbuff.cxx +++ b/sc/source/filter/excel/fontbuff.cxx @@ -147,6 +147,4 @@ void LotusFontBuffer::MakeFont( ENTRY* pEntry ) pEntry->pTmpName = NULL; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/frmbase.cxx b/sc/source/filter/excel/frmbase.cxx index 6d167fff5b5b..5210f71ebdfc 100644 --- a/sc/source/filter/excel/frmbase.cxx +++ b/sc/source/filter/excel/frmbase.cxx @@ -189,8 +189,6 @@ void ConverterBase::Reset() } - - ExcelConverterBase::ExcelConverterBase( sal_uInt16 nNewBuffer ) : ConverterBase( nNewBuffer ) { @@ -213,8 +211,6 @@ void ExcelConverterBase::Reset() } - - LotusConverterBase::LotusConverterBase( SvStream &rStr, sal_uInt16 nNewBuffer ) : ConverterBase( nNewBuffer ), aIn( rStr ), diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index 4bc69bb122d5..8ee0d7d7f53e 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -416,8 +416,6 @@ void ImportExcel::Window1() } - - void ImportExcel::Row25( void ) { sal_uInt16 nRow, nRowHeight; diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx index 50496be6e76b..85dfb194cc4a 100644 --- a/sc/source/filter/excel/namebuff.cxx +++ b/sc/source/filter/excel/namebuff.cxx @@ -49,8 +49,6 @@ sal_uInt32 StringHashEntry::MakeHashCode( const OUString& r ) } - - NameBuffer::~NameBuffer() { std::vector::iterator pIter; @@ -197,8 +195,6 @@ void ExtSheetBuffer::Reset( void ) } - - bool ExtName::IsDDE( void ) const { return ( nFlags & 0x0001 ) != 0; diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx index 16cb97b7ba5f..05d2fca9b0f5 100644 --- a/sc/source/filter/excel/read.cxx +++ b/sc/source/filter/excel/read.cxx @@ -767,8 +767,6 @@ FltError ImportExcel::Read( void ) } - - FltError ImportExcel8::Read( void ) { #ifdef EXC_INCL_DUMPER @@ -1320,6 +1318,4 @@ FltError ImportExcel8::Read( void ) return eLastErr; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx index 9443c0e1269b..843158385e8a 100644 --- a/sc/source/filter/excel/tokstack.cxx +++ b/sc/source/filter/excel/tokstack.cxx @@ -46,8 +46,6 @@ TokenStack::~TokenStack() - - // !ACHTUNG!: nach Aussen hin beginnt die Nummerierung mit 1! // !ACHTUNG!: SC-Token werden mit einem Offset nScTokenOff abgelegt // -> Unterscheidung von anderen Token diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index 2a8f39670ca8..f4c3dd98af94 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -249,8 +249,6 @@ struct XclExpChRootData : public XclChRootData void FinalizeFutureRecBlock( XclExpStream& rStrm ); }; - - void XclExpChRootData::RegisterFutureRecBlock( const XclChFrBlock& rFrBlock ) { maUnwrittenFrBlocks.push_back( rFrBlock ); @@ -297,8 +295,6 @@ void XclExpChRootData::FinalizeFutureRecBlock( XclExpStream& rStrm ) } } - - XclExpChRoot::XclExpChRoot( const XclExpRoot& rRoot, XclExpChChart& rChartData ) : XclExpRoot( rRoot ), mxChData( new XclExpChRootData( rChartData ) ) @@ -427,8 +423,6 @@ void XclExpChRoot::FinalizeFutureRecBlock( XclExpStream& rStrm ) mxChData->FinalizeFutureRecBlock( rStrm ); } - - XclExpChGroupBase::XclExpChGroupBase( const XclExpChRoot& rRoot, sal_uInt16 nFrType, sal_uInt16 nRecId, sal_Size nRecSize ) : XclExpRecord( nRecId, nRecSize ), @@ -473,8 +467,6 @@ void XclExpChGroupBase::SetFutureRecordContext( sal_uInt16 nFrContext, sal_uInt1 maFrBlock.mnValue2 = nFrValue2; } - - XclExpChFutureRecordBase::XclExpChFutureRecordBase( const XclExpChRoot& rRoot, XclFutureRecType eRecType, sal_uInt16 nRecId, sal_Size nRecSize ) : XclExpFutureRecord( eRecType, nRecId, nRecSize ), @@ -502,8 +494,6 @@ void XclExpChFramePos::WriteBody( XclExpStream& rStrm ) rStrm << maData.mnTLMode << maData.mnBRMode << maData.maRect; } - - XclExpChLineFormat::XclExpChLineFormat( const XclExpChRoot& rRoot ) : XclExpRecord( EXC_ID_CHLINEFORMAT, (rRoot.GetBiff() == EXC_BIFF8) ? 12 : 10 ), mnColorId( XclExpPalette::GetColorIdFromIndex( EXC_COLOR_CHWINDOWTEXT ) ) @@ -585,8 +575,6 @@ XclExpChLineFormatRef lclCreateLineFormat( const XclExpChRoot& rRoot, } // namespace - - XclExpChAreaFormat::XclExpChAreaFormat( const XclExpChRoot& rRoot ) : XclExpRecord( EXC_ID_CHAREAFORMAT, (rRoot.GetBiff() == EXC_BIFF8) ? 16 : 12 ), mnPattColorId( XclExpPalette::GetColorIdFromIndex( EXC_COLOR_CHWINDOWBACK ) ), @@ -663,8 +651,6 @@ void XclExpChAreaFormat::WriteBody( XclExpStream& rStrm ) } } - - XclExpChEscherFormat::XclExpChEscherFormat( const XclExpChRoot& rRoot ) : XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_UNKNOWN, EXC_ID_CHESCHERFORMAT ), mnColor1Id( XclExpPalette::GetColorIdFromIndex( EXC_COLOR_CHWINDOWBACK ) ), @@ -739,8 +725,6 @@ void XclExpChEscherFormat::WriteBody( XclExpStream& rStrm ) rStrm.CopyFromStream( aMemStrm ); } - - XclExpChFrameBase::XclExpChFrameBase() { } @@ -801,8 +785,6 @@ void XclExpChFrameBase::WriteFrameRecords( XclExpStream& rStrm ) lclSaveRecord( rStrm, mxEscherFmt ); } - - XclExpChFrame::XclExpChFrame( const XclExpChRoot& rRoot, XclChObjectType eObjType ) : XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_FRAME, EXC_ID_CHFRAME, 4 ), meObjType( eObjType ) @@ -896,8 +878,6 @@ void lclAddDoubleRefData( } // namespace - - XclExpChSourceLink::XclExpChSourceLink( const XclExpChRoot& rRoot, sal_uInt8 nDestType ) : XclExpRecord( EXC_ID_CHSOURCELINK ), XclExpChRoot( rRoot ) @@ -1113,8 +1093,6 @@ XclExpChFont::XclExpChFont( sal_uInt16 nFontIdx ) : { } - - XclExpChObjectLink::XclExpChObjectLink( sal_uInt16 nLinkTarget, const XclChDataPointPos& rPointPos ) : XclExpRecord( EXC_ID_CHOBJECTLINK, 6 ) { @@ -1127,8 +1105,6 @@ void XclExpChObjectLink::WriteBody( XclExpStream& rStrm ) rStrm << maData.mnTarget << maData.maPointPos.mnSeriesIdx << maData.maPointPos.mnPointIdx; } - - XclExpChFrLabelProps::XclExpChFrLabelProps( const XclExpChRoot& rRoot ) : XclExpChFutureRecordBase( rRoot, EXC_FUTUREREC_UNUSEDREF, EXC_ID_CHFRLABELPROPS, 4 ) { @@ -1156,8 +1132,6 @@ void XclExpChFrLabelProps::WriteBody( XclExpStream& rStrm ) rStrm << maData.mnFlags << aXclSep; } - - XclExpChFontBase::~XclExpChFontBase() { } @@ -1183,8 +1157,6 @@ void XclExpChFontBase::ConvertRotationBase( SetRotation( nRotation ); } - - XclExpChText::XclExpChText( const XclExpChRoot& rRoot ) : XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_TEXT, EXC_ID_CHTEXT, (rRoot.GetBiff() == EXC_BIFF8) ? 32 : 26 ), mnTextColorId( XclExpPalette::GetColorIdFromIndex( EXC_COLOR_CHWINDOWTEXT ) ) @@ -1438,8 +1410,6 @@ void XclExpChText::WriteBody( XclExpStream& rStrm ) } } - - namespace { /** Creates and returns an Excel text object from the passed title. */ @@ -1532,8 +1502,6 @@ void XclExpChMarkerFormat::WriteBody( XclExpStream& rStrm ) } } - - XclExpChPieFormat::XclExpChPieFormat() : XclExpUInt16Record( EXC_ID_CHPIEFORMAT, 0 ) { @@ -1546,8 +1514,6 @@ void XclExpChPieFormat::Convert( const ScfPropertySet& rPropSet ) SetValue( limit_cast< sal_uInt16 >( fApiDist * 100.0, 0, 100 ) ); } - - XclExpCh3dDataFormat::XclExpCh3dDataFormat() : XclExpRecord( EXC_ID_CH3DDATAFORMAT, 2 ) { @@ -1588,15 +1554,11 @@ void XclExpCh3dDataFormat::WriteBody( XclExpStream& rStrm ) rStrm << maData.mnBase << maData.mnTop; } - - XclExpChAttachedLabel::XclExpChAttachedLabel( sal_uInt16 nFlags ) : XclExpUInt16Record( EXC_ID_CHATTACHEDLABEL, nFlags ) { } - - XclExpChDataFormat::XclExpChDataFormat( const XclExpChRoot& rRoot, const XclChDataPointPos& rPointPos, sal_uInt16 nFormatIdx ) : XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_DATAFORMAT, EXC_ID_CHDATAFORMAT, 8 ) @@ -1678,8 +1640,6 @@ void XclExpChDataFormat::WriteBody( XclExpStream& rStrm ) << maData.mnFlags; } - - XclExpChSerTrendLine::XclExpChSerTrendLine( const XclExpChRoot& rRoot ) : XclExpRecord( EXC_ID_CHSERTRENDLINE, 28 ), XclExpChRoot( rRoot ) @@ -1773,8 +1733,6 @@ void XclExpChSerTrendLine::WriteBody( XclExpStream& rStrm ) << maData.mfForecastBack; } - - XclExpChSerErrorBar::XclExpChSerErrorBar( const XclExpChRoot& rRoot, sal_uInt8 nBarType ) : XclExpRecord( EXC_ID_CHSERERRORBAR, 14 ), XclExpChRoot( rRoot ) @@ -1853,8 +1811,6 @@ void XclExpChSerErrorBar::WriteBody( XclExpStream& rStrm ) << maData.mnValueCount; } - - namespace { /** Returns the property set of the specified data point. */ @@ -2268,8 +2224,6 @@ void XclExpChType::WriteBody( XclExpStream& rStrm ) } } - - XclExpChChart3d::XclExpChChart3d() : XclExpRecord( EXC_ID_CHCHART3D, 14 ) { @@ -2323,8 +2277,6 @@ void XclExpChChart3d::WriteBody( XclExpStream& rStrm ) << maData.mnFlags; } - - XclExpChLegend::XclExpChLegend( const XclExpChRoot& rRoot ) : XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_LEGEND, EXC_ID_CHLEGEND, 20 ) { @@ -2422,8 +2374,6 @@ void XclExpChLegend::WriteBody( XclExpStream& rStrm ) rStrm << maData.maRect << maData.mnDockMode << maData.mnSpacing << maData.mnFlags; } - - XclExpChDropBar::XclExpChDropBar( const XclExpChRoot& rRoot, XclChObjectType eObjType ) : XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_DROPBAR, EXC_ID_CHDROPBAR, 2 ), meObjType( eObjType ), @@ -2449,8 +2399,6 @@ void XclExpChDropBar::WriteBody( XclExpStream& rStrm ) rStrm << mnBarDist; } - - XclExpChTypeGroup::XclExpChTypeGroup( const XclExpChRoot& rRoot, sal_uInt16 nGroupIdx ) : XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_TYPEGROUP, EXC_ID_CHTYPEGROUP, 20 ), maType( rRoot ), @@ -2776,8 +2724,6 @@ void XclExpChLabelRange::WriteBody( XclExpStream& rStrm ) rStrm << maLabelData.mnCross << maLabelData.mnLabelFreq << maLabelData.mnTickFreq << maLabelData.mnFlags; } - - XclExpChValueRange::XclExpChValueRange( const XclExpChRoot& rRoot ) : XclExpRecord( EXC_ID_CHVALUERANGE, 42 ), XclExpChRoot( rRoot ) @@ -2852,8 +2798,6 @@ void XclExpChValueRange::WriteBody( XclExpStream& rStrm ) << maData.mnFlags; } - - namespace { sal_uInt8 lclGetXclTickPos( sal_Int32 nApiTickmarks ) @@ -2942,8 +2886,6 @@ void XclExpChTick::WriteBody( XclExpStream& rStrm ) rStrm << GetPalette().GetColorIndex( mnTextColorId ) << maData.mnRotation; } - - namespace { /** Returns an API axis object from the passed coordinate system. */ @@ -3122,8 +3064,6 @@ void XclExpChAxis::WriteBody( XclExpStream& rStrm ) rStrm.WriteZeroBytes( 16 ); } - - XclExpChAxesSet::XclExpChAxesSet( const XclExpChRoot& rRoot, sal_uInt16 nAxesSetId ) : XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_AXESSET, EXC_ID_CHAXESSET, 18 ) { @@ -3494,8 +3434,6 @@ void XclExpChChart::WriteBody( XclExpStream& rStrm ) rStrm << maRect; } - - XclExpChartDrawing::XclExpChartDrawing( const XclExpRoot& rRoot, const Reference< XModel >& rxModel, const Size& rChartSize ) : XclExpRoot( rRoot ) @@ -3530,8 +3468,6 @@ void XclExpChartDrawing::Save( XclExpStream& rStrm ) mxObjRecs->Save( rStrm ); } - - XclExpChart::XclExpChart( const XclExpRoot& rRoot, Reference< XModel > xModel, const Rectangle& rChartRect ) : XclExpSubStream( EXC_BOF_CHART ), XclExpRoot( rRoot ) @@ -3545,6 +3481,4 @@ XclExpChart::XclExpChart( const XclExpRoot& rRoot, Reference< XModel > xModel, c AppendNewRecord( new XclExpChChart( rRoot, xChartDoc, rChartRect ) ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index 0df97bbe030a..290f79fb4f51 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -77,8 +77,6 @@ struct XclExpHashEntrySWO { return *rLeft.mpString < *rRight.mpString; } }; - - /** Implementation of the SST export. @descr Stores all passed strings in a hash table and prevents repeated insertion of equal strings. */ @@ -105,8 +103,6 @@ private: sal_uInt32 mnSize; /// Size of the SST (count of unique strings). }; - - const sal_uInt32 EXC_SST_HASHTABLE_SIZE = 2048; XclExpSstImpl::XclExpSstImpl() : @@ -229,8 +225,6 @@ void XclExpSstImpl::SaveXml( XclExpXmlStream& rStrm ) rStrm.PopStream(); } - - XclExpSst::XclExpSst() : mxImpl( new XclExpSstImpl ) { @@ -602,8 +596,6 @@ private: bool mbPattUsed; /// true = Pattern attribute used. }; - - XclExpCFImpl::XclExpCFImpl( const XclExpRoot& rRoot, const ScCondFormatEntry& rFormatEntry, sal_Int32 nPriority ) : XclExpRoot( rRoot ), mrFormatEntry( rFormatEntry ), @@ -960,8 +952,6 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_cfRule ); } - - XclExpCF::XclExpCF( const XclExpRoot& rRoot, const ScCondFormatEntry& rFormatEntry, sal_Int32 nPriority = 0 ) : XclExpRecord( EXC_ID_CF ), XclExpRoot( rRoot ), @@ -1131,8 +1121,6 @@ void XclExpColScaleCol::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_color ); } - - XclExpCondfmt::XclExpCondfmt( const XclExpRoot& rRoot, const ScConditionalFormat& rCondFormat, XclExtLstRef xExtLst, sal_Int32& rIndex ) : XclExpRecord( EXC_ID_CONDFMT ), XclExpRoot( rRoot ) @@ -1204,8 +1192,6 @@ void XclExpCondfmt::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_conditionalFormatting ); } - - XclExpColorScale::XclExpColorScale( const XclExpRoot& rRoot, const ScColorScaleFormat& rFormat, sal_Int32 nPriority ): XclExpRecord(), XclExpRoot( rRoot ), @@ -1389,8 +1375,6 @@ void XclExpIconSet::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_cfRule ); } - - XclExpCondFormatBuffer::XclExpCondFormatBuffer( const XclExpRoot& rRoot, XclExtLstRef xExtLst ) : XclExpRoot( rRoot ) { @@ -1474,8 +1458,6 @@ const char* lcl_GetOperatorType( sal_uInt32 nFlags ) } // namespace - - XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) : XclExpRecord( EXC_ID_DV ), XclExpRoot( rRoot ), @@ -1693,8 +1675,6 @@ void XclExpDV::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_dataValidation ); } - - XclExpDval::XclExpDval( const XclExpRoot& rRoot ) : XclExpRecord( EXC_ID_DVAL, 18 ), XclExpRoot( rRoot ) @@ -1904,8 +1884,6 @@ void XclExpWebQuery::Save( XclExpStream& rStrm ) } } - - XclExpWebQueryBuffer::XclExpWebQueryBuffer( const XclExpRoot& rRoot ) { SCTAB nScTab = rRoot.GetCurrScTab(); @@ -1974,6 +1952,4 @@ XclExpWebQueryBuffer::XclExpWebQueryBuffer( const XclExpRoot& rRoot ) } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index f3530b3c4e10..10ed6364db6e 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -245,8 +245,6 @@ void XclExpDffAnchorBase::ImplCalcAnchorRect( const Rectangle&, MapUnit ) OSL_FAIL( "XclExpDffAnchorBase::ImplCalcAnchorRect - not implemented" ); } - - XclExpDffSheetAnchor::XclExpDffSheetAnchor( const XclExpRoot& rRoot ) : XclExpDffAnchorBase( rRoot ), mnScTab( rRoot.GetCurrScTab() ) @@ -267,8 +265,6 @@ void XclExpDffSheetAnchor::ImplCalcAnchorRect( const Rectangle& rRect, MapUnit e maAnchor.SetRect( GetRoot(), mnScTab, rRect, eMapUnit ); } - - XclExpDffEmbeddedAnchor::XclExpDffEmbeddedAnchor( const XclExpRoot& rRoot, const Size& rPageSize, sal_Int32 nScaleX, sal_Int32 nScaleY ) : XclExpDffAnchorBase( rRoot ), @@ -288,16 +284,12 @@ void XclExpDffEmbeddedAnchor::ImplCalcAnchorRect( const Rectangle& rRect, MapUni maAnchor.SetRect( maPageSize, mnScaleX, mnScaleY, rRect, eMapUnit, true ); } - - XclExpDffNoteAnchor::XclExpDffNoteAnchor( const XclExpRoot& rRoot, const Rectangle& rRect ) : XclExpDffAnchorBase( rRoot, EXC_ESC_ANCHOR_SIZELOCKED ) { maAnchor.SetRect( rRoot, rRoot.GetCurrScTab(), rRect, MAP_100TH_MM ); } - - XclExpDffDropDownAnchor::XclExpDffDropDownAnchor( const XclExpRoot& rRoot, const ScAddress& rScPos ) : XclExpDffAnchorBase( rRoot, EXC_ESC_ANCHOR_POSLOCKED ) { @@ -323,8 +315,6 @@ void XclExpMsoDrawingBase::WriteBody( XclExpStream& rStrm ) rStrm.CopyFromStream( mrEscherEx.GetStream(), mrEscherEx.GetDffFragmentSize( mnFragmentKey ) ); } - - XclExpMsoDrawingGroup::XclExpMsoDrawingGroup( XclEscherEx& rEscherEx ) : XclExpMsoDrawingBase( rEscherEx, EXC_ID_MSODRAWINGGROUP ) { @@ -355,15 +345,11 @@ XclExpMsoDrawingGroup::XclExpMsoDrawingGroup( XclEscherEx& rEscherEx ) : mrEscherEx.UpdateDffFragmentEnd(); } - - XclExpMsoDrawing::XclExpMsoDrawing( XclEscherEx& rEscherEx ) : XclExpMsoDrawingBase( rEscherEx, EXC_ID_MSODRAWING ) { } - - XclExpImgData::XclExpImgData( const Graphic& rGraphic, sal_uInt16 nRecId ) : maGraphic( rGraphic ), mnRecId( nRecId ) @@ -423,8 +409,6 @@ void XclExpImgData::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } - - XclExpControlHelper::XclExpControlHelper( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), mnEntryCount( 0 ) @@ -504,8 +488,6 @@ void XclExpControlHelper::WriteFormulaSubRec( XclExpStream& rStrm, sal_uInt16 nS rStrm.EndRecord(); } - - //delete for exporting OCX //#if EXC_EXP_OCX_CTRL @@ -1042,8 +1024,6 @@ void XclExpTbxControlObj::WriteSbs( XclExpStream& rStrm ) //#endif - - XclExpChartObj::XclExpChartObj( XclExpObjectManager& rObjMgr, Reference< XShape > xShape, const Rectangle* pChildAnchor ) : XclObj( rObjMgr, EXC_OBJTYPE_CHART ), XclExpRoot( rObjMgr.GetRoot() ), mxShape( xShape ) @@ -1208,8 +1188,6 @@ void XclExpChartObj::WriteShapeTransformation( sax_fastparser::FSHelperPtr pFS, pFS->endElementNS( XML_xdr, XML_xfrm ); } - - XclExpNote::XclExpNote( const XclExpRoot& rRoot, const ScAddress& rScPos, const ScPostIt* pScNote, const OUString& rAddText ) : XclExpRecord( EXC_ID_NOTE ), @@ -1388,8 +1366,6 @@ void XclExpNote::WriteXml( sal_Int32 nAuthorId, XclExpXmlStream& rStrm ) rComments->endElement( XML_comment ); } - - XclMacroHelper::XclMacroHelper( const XclExpRoot& rRoot ) : XclExpControlHelper( rRoot ) { @@ -1454,8 +1430,6 @@ void XclExpShapeObj::WriteSubRecs( XclExpStream& rStrm ) WriteMacroSubRec( rStrm ); } - - XclExpComments::XclExpComments( SCTAB nTab, XclExpRecordList< XclExpNote >& rNotes ) : mnTab( nTab ), mrNotes( rNotes ) { @@ -1637,8 +1611,6 @@ void XclExpObjectManager::InitStream( bool bTempFile ) mxDffStrm->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); } - - XclExpEmbeddedObjectManager::XclExpEmbeddedObjectManager( const XclExpObjectManager& rParent, const Size& rPageSize, sal_Int32 nScaleX, sal_Int32 nScaleY ) : XclExpObjectManager( rParent ), @@ -1653,6 +1625,4 @@ XclExpDffAnchorBase* XclExpEmbeddedObjectManager::CreateDffAnchor() const return new XclExpDffEmbeddedAnchor( GetRoot(), maPageSize, mnScaleX, mnScaleY ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx index 4e1dc5191e89..0231faf207fb 100644 --- a/sc/source/filter/excel/xeformula.cxx +++ b/sc/source/filter/excel/xeformula.cxx @@ -63,8 +63,6 @@ struct XclExpScToken inline OpCode GetOpCode() const { return mpScToken ? mpScToken->GetOpCode() : static_cast< OpCode >( ocNone ); } }; - - /** Effective token class conversion types. */ enum XclExpClassConv { @@ -73,8 +71,6 @@ enum XclExpClassConv EXC_CLASSCONV_ARR /// Convert VAL tokens to ARR class (REF remains uncahnged). }; - - /** Token class conversion and position of a token in the token array. */ struct XclExpTokenConvInfo { @@ -103,8 +99,6 @@ void XclExpOperandList::AppendOperand( sal_uInt16 nTokPos, XclFuncParamConv eCon typedef boost::shared_ptr< XclExpOperandList > XclExpOperandListRef; typedef ::std::vector< XclExpOperandListRef > XclExpOperandListVector; - - /** Encapsulates all data needed for a call to an external function (macro, add-in). */ struct XclExpExtFuncData { @@ -123,8 +117,6 @@ void XclExpExtFuncData::Set( const OUString& rFuncName, bool bVBasic, bool bHidd mbHidden = bHidden; } - - /** Encapsulates all data needed to process an entire function. */ class XclExpFuncData { @@ -261,8 +253,6 @@ static const XclExpCompConfig spConfigTable[] = { EXC_FMLATYPE_LISTVAL, EXC_CLASSTYPE_NAME, true, false, false, false } }; - - /** Working data of the formula compiler. Used to push onto a stack for recursive calls. */ struct XclExpCompData { @@ -300,8 +290,6 @@ XclExpCompData::XclExpCompData( const XclExpCompConfig* pCfg ) : } // namespace - - /** Implementation class of the export formula compiler. */ class XclExpFmlaCompImpl : protected XclExpRoot, protected XclTokenArrayHelper { @@ -480,8 +468,6 @@ private: const sal_uInt32 mnMaxRowMask; /// Mask to delete invalid bits in row fields. }; - - XclExpFmlaCompImpl::XclExpFmlaCompImpl( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), maFuncProv( rRoot ), @@ -2552,8 +2538,6 @@ void XclExpFmlaCompImpl::AppendExt( const OUString& rString ) lclAppend( mxData->maExtDataVec, GetRoot(), rString, (meBiff == EXC_BIFF8) ? EXC_STR_DEFAULT : EXC_STR_8BITLENGTH ); } - - namespace { void lclInitOwnTab( ScSingleRefData& rRef, const ScAddress& rScPos, SCTAB nCurrScTab, bool b3DRefOnly ) @@ -2595,8 +2579,6 @@ void lclPutRangeToTokenArray( ScTokenArray& rScTokArr, const ScRange& rScRange, } // namespace - - XclExpFormulaCompiler::XclExpFormulaCompiler( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), mxImpl( new XclExpFmlaCompImpl( rRoot ) ) diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index 5d2526d06bca..c5301d6bd546 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -149,8 +149,6 @@ inline void lclFillAddress( XclAddress& rXclPos, SCCOL nScCol, SCROW nScRow ) } // namespace - - XclExpAddressConverter::XclExpAddressConverter( const XclExpRoot& rRoot ) : XclAddressConverterBase( rRoot.GetTracer(), rRoot.GetXclMaxPos() ) { @@ -286,8 +284,6 @@ OUString lclGetUrlRepresentation( const SvxURLField& rUrlField ) } // namespace - - XclExpHyperlinkHelper::XclExpHyperlinkHelper( const XclExpRoot& rRoot, const ScAddress& rScPos ) : XclExpRoot( rRoot ), maScPos( rScPos ), @@ -333,8 +329,6 @@ XclExpHyperlinkHelper::XclExpHyperlinkRef XclExpHyperlinkHelper::GetLinkRecord() return XclExpHyperlinkRef(); } - - namespace { /** Creates a new formatted string from the passed unformatted string. @@ -526,8 +520,6 @@ XclExpStringRef lclCreateFormattedString( } // namespace - - XclExpStringRef XclExpStringHelper::CreateString( const XclExpRoot& rRoot, const OUString& rString, XclStrFlags nFlags, sal_uInt16 nMaxLen ) { @@ -962,8 +954,6 @@ OUString lclEncodeDosUrl( } // namespace - - OUString XclExpUrlHelper::EncodeUrl( const XclExpRoot& rRoot, const OUString& rAbsUrl, const OUString* pTableName ) { OUString aDosUrl = INetURLObject(rAbsUrl).getFSysPath(INetURLObject::FSYS_DOS); @@ -1064,6 +1054,4 @@ void XclExpCachedMatrix::Save( XclExpStream& rStrm ) const } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index 9f6f0f0cb302..1e431a480288 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -68,8 +68,6 @@ private: sal_uInt16 mnFlags; /// Flags for record export. }; - - /** Represents an EXTERNNAME record for an add-in function name. */ class XclExpExtNameAddIn : public XclExpExtNameBase { @@ -81,8 +79,6 @@ private: virtual void WriteAddData( XclExpStream& rStrm ) SAL_OVERRIDE; }; - - /** Represents an EXTERNNAME record for a DDE link. */ class XclExpExtNameDde : public XclExpExtNameBase { @@ -99,8 +95,6 @@ private: XclExpCachedMatRef mxMatrix; /// Cached results of the DDE link. }; - - class XclExpSupbook; class XclExpExtName : public XclExpExtNameBase @@ -183,8 +177,6 @@ private: SCROW mnScRow; /// Row index of the external cells. }; - - /** Represents the record XCT which is the header record of a CRN record list. */ class XclExpXct : public XclExpRecordBase, protected XclExpRoot @@ -367,8 +359,6 @@ inline bool operator==( const XclExpXti& rLeft, const XclExpXti& rRight ) (rLeft.mnLastSBTab == rRight.mnLastSBTab); } - - /** Contains a list of all SUPBOOK records and index arrays of external sheets. */ class XclExpSupbookBuffer : public XclExpRecordBase, protected XclExpRoot { @@ -500,8 +490,6 @@ protected: explicit XclExpLinkManagerImpl( const XclExpRoot& rRoot ); }; - - /** Implementation of the link manager for BIFF5/BIFF7. */ class XclExpLinkManagerImpl5 : public XclExpLinkManagerImpl { @@ -570,8 +558,6 @@ private: XclExpCodeMap maCodeMap; /// Maps special external codes to EXTERNSHEET records. }; - - /** Implementation of the link manager for BIFF8. */ class XclExpLinkManagerImpl8 : public XclExpLinkManagerImpl { @@ -636,8 +622,6 @@ const sal_uInt8 EXC_TABBUF_VISIBLE = 0x10; /// Sheet is visible. const sal_uInt8 EXC_TABBUF_SELECTED = 0x20; /// Sheet is selected. const sal_uInt8 EXC_TABBUF_MIRRORED = 0x40; /// Sheet is mirrored (right-to-left). - - XclExpTabInfo::XclExpTabInfo( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), mnScCnt( 0 ), @@ -896,8 +880,6 @@ void XclExpExtNameBase::WriteAddData( XclExpStream& /*rStrm*/ ) { } - - XclExpExtNameAddIn::XclExpExtNameAddIn( const XclExpRoot& rRoot, const OUString& rName ) : XclExpExtNameBase( rRoot, rName ) { @@ -910,8 +892,6 @@ void XclExpExtNameAddIn::WriteAddData( XclExpStream& rStrm ) rStrm << sal_uInt16( 2 ) << EXC_TOKID_ERR << EXC_ERR_REF; } - - XclExpExtNameDde::XclExpExtNameDde( const XclExpRoot& rRoot, const OUString& rName, sal_uInt16 nFlags, const ScMatrix* pResults ) : XclExpExtNameBase( rRoot, rName, nFlags ) @@ -929,8 +909,6 @@ void XclExpExtNameDde::WriteAddData( XclExpStream& rStrm ) mxMatrix->Save( rStrm ); } - - XclExpExtName::XclExpExtName( const XclExpRoot& rRoot, const XclExpSupbook& rSupbook, const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray ) : XclExpExtNameBase( rRoot, rName ), @@ -1918,8 +1896,6 @@ XclExpLinkManagerImpl::XclExpLinkManagerImpl( const XclExpRoot& rRoot ) : { } - - XclExpLinkManagerImpl5::XclExpLinkManagerImpl5( const XclExpRoot& rRoot ) : XclExpLinkManagerImpl( rRoot ) { @@ -2103,8 +2079,6 @@ XclExpLinkManagerImpl5::XclExpExtSheetRef XclExpLinkManagerImpl5::FindInternal( return xExtSheet; } - - XclExpLinkManagerImpl8::XclExpLinkManagerImpl8( const XclExpRoot& rRoot ) : XclExpLinkManagerImpl( rRoot ), maSBBuffer( rRoot ) @@ -2249,8 +2223,6 @@ sal_uInt16 XclExpLinkManagerImpl8::InsertXti( const XclExpXti& rXti ) return ulimit_cast< sal_uInt16 >( maXtiVec.size() - 1 ); } - - XclExpLinkManager::XclExpLinkManager( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ) { @@ -2348,6 +2320,4 @@ void XclExpLinkManager::Save( XclExpStream& rStrm ) mxImpl->Save( rStrm ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx index 42268fab2c1f..f62ee680c587 100644 --- a/sc/source/filter/excel/xename.cxx +++ b/sc/source/filter/excel/xename.cxx @@ -36,8 +36,6 @@ using namespace ::oox; - - // *** Helper classes *** @@ -109,8 +107,6 @@ private: sal_uInt16 mnXclTab; /// The 1-based Excel sheet index for local names. }; - - class ScRangeData; class ScDBData; @@ -349,8 +345,6 @@ void XclExpName::WriteBody( XclExpStream& rStrm ) mxTokArr->WriteArray( rStrm ); // token array without size } - - XclExpNameManagerImpl::XclExpNameManagerImpl( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), mnFirstUserIdx( 0 ) @@ -678,8 +672,6 @@ void XclExpNameManagerImpl::CreateUserNames() } } - - XclExpNameManager::XclExpNameManager( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), mxImpl( new XclExpNameManagerImpl( rRoot ) ) @@ -761,6 +753,4 @@ void XclExpNameManager::SaveXml( XclExpXmlStream& rStrm ) mxImpl->SaveXml( rStrm ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx index 23091a4e174b..8db13be1d52c 100644 --- a/sc/source/filter/excel/xepage.cxx +++ b/sc/source/filter/excel/xepage.cxx @@ -411,8 +411,6 @@ void XclExpPageSettings::SaveXml( XclExpXmlStream& rStrm ) XclExpImgData( *pGraphic, EXC_ID8_IMGDATA ).SaveXml( rStrm ); } - - XclExpChartPageSettings::XclExpChartPageSettings( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ) { @@ -428,6 +426,4 @@ void XclExpChartPageSettings::Save( XclExpStream& rStrm ) XclExpUInt16Record( EXC_ID_PRINTSIZE, EXC_PRINTSIZE_FULL ).Save( rStrm ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index 09dadf7f840f..e7a3d2047626 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -56,8 +56,6 @@ using ::com::sun::star::sheet::DataPilotFieldAutoShowInfo; using ::com::sun::star::sheet::DataPilotFieldLayoutInfo; using ::com::sun::star::sheet::DataPilotFieldReference; - - // Pivot cache @@ -92,8 +90,6 @@ static const sal_uInt16 spnPCItemFlags[] = } // namespace - - XclExpPCItem::XclExpPCItem( const OUString& rText ) : XclExpRecord( (!rText.isEmpty()) ? EXC_ID_SXSTRING : EXC_ID_SXEMPTY, 0 ), mnTypeFlag( EXC_PCITEM_DATA_STRING ) @@ -133,8 +129,6 @@ XclExpPCItem::XclExpPCItem( bool bValue ) : SetBool( bValue ); } - - bool XclExpPCItem::EqualsText( const OUString& rText ) const { return rText.isEmpty() ? IsEmpty() : (GetText() && (*GetText() == rText)); @@ -155,8 +149,6 @@ bool XclExpPCItem::EqualsBool( bool bValue ) const return GetBool() && (*GetBool() == bValue); } - - void XclExpPCItem::WriteBody( XclExpStream& rStrm ) { if( const OUString* pText = GetText() ) @@ -193,8 +185,6 @@ void XclExpPCItem::WriteBody( XclExpStream& rStrm ) } } - - XclExpPCField::XclExpPCField( const XclExpRoot& rRoot, const XclExpPivotCache& rPCache, sal_uInt16 nFieldIdx, const ScDPObject& rDPObj, const ScRange& rRange ) : @@ -624,8 +614,6 @@ void XclExpPCField::WriteBody( XclExpStream& rStrm ) rStrm << maFieldInfo; } - - XclExpPivotCache::XclExpPivotCache( const XclExpRoot& rRoot, const ScDPObject& rDPObj, sal_uInt16 nListIdx ) : XclExpRoot( rRoot ), mnListIdx( nListIdx ), @@ -917,8 +905,6 @@ void XclExpPivotCache::WriteSxindexlistList( XclExpStream& rStrm ) const namespace { - - /** Returns a display string for a data field containing the field name and aggregation function. */ OUString lclGetDataFieldCaption( const OUString& rFieldName, GeneralFunction eFunc ) { @@ -947,12 +933,8 @@ OUString lclGetDataFieldCaption( const OUString& rFieldName, GeneralFunction eFu return( aCaption ); } - - } // namespace - - XclExpPTItem::XclExpPTItem( const XclExpPCField& rCacheField, sal_uInt16 nCacheIdx ) : XclExpRecord( EXC_ID_SXVI, 8 ), mpCacheItem( rCacheField.GetItem( nCacheIdx ) ) @@ -994,8 +976,6 @@ void XclExpPTItem::WriteBody( XclExpStream& rStrm ) rStrm << maItemInfo; } - - XclExpPTField::XclExpPTField( const XclExpPivotTable& rPTable, sal_uInt16 nCacheIdx ) : mrPTable( rPTable ), mpCacheField( rPTable.GetCacheField( nCacheIdx ) ) @@ -1241,8 +1221,6 @@ void XclExpPTField::WriteSxvdex( XclExpStream& rStrm ) const rStrm.EndRecord(); } - - XclExpPivotTable::XclExpPivotTable( const XclExpRoot& rRoot, const ScDPObject& rDPObj, const XclExpPivotCache& rPCache, size_t nId ) : XclExpRoot( rRoot ), mrPCache( rPCache ), @@ -1798,8 +1776,6 @@ void XclExpPivotTable::WriteSxViewEx9( XclExpStream& rStrm ) const } } - - namespace { const SCTAB EXC_PTMGR_PIVOTCACHES = SCTAB_MAX; @@ -1840,8 +1816,6 @@ void XclExpPivotRecWrapper::SaveXml( XclExpXmlStream& rStrm ) } // namespace - - XclExpPivotTableManager::XclExpPivotTableManager( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), mbShareCaches( true ) @@ -1950,6 +1924,4 @@ const XclExpPivotCache* XclExpPivotTableManager::CreatePivotCache( const ScDPObj return 0; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xerecord.cxx b/sc/source/filter/excel/xerecord.cxx index 74c37287b29e..45a62f135a42 100644 --- a/sc/source/filter/excel/xerecord.cxx +++ b/sc/source/filter/excel/xerecord.cxx @@ -36,8 +36,6 @@ void XclExpRecordBase::SaveXml( XclExpXmlStream& /*rStrm*/ ) { } - - XclExpDelegatingRecord::XclExpDelegatingRecord( XclExpRecordBase* pRecord ) : mpRecord( pRecord ) { @@ -55,8 +53,6 @@ void XclExpDelegatingRecord::SaveXml( XclExpXmlStream& rStrm ) mpRecord->SaveXml( rStrm ); } - - XclExpXmlElementRecord::XclExpXmlElementRecord(sal_Int32 const nElement) : mnElement( nElement ) { @@ -66,8 +62,6 @@ XclExpXmlElementRecord::~XclExpXmlElementRecord() { } - - XclExpXmlStartElementRecord::XclExpXmlStartElementRecord(sal_Int32 const nElement) : XclExpXmlElementRecord(nElement) { @@ -85,8 +79,6 @@ void XclExpXmlStartElementRecord::SaveXml( XclExpXmlStream& rStrm ) rStream->startElement( mnElement, FSEND ); } - - XclExpXmlEndElementRecord::XclExpXmlEndElementRecord( sal_Int32 nElement ) : XclExpXmlElementRecord( nElement ) { @@ -101,8 +93,6 @@ void XclExpXmlEndElementRecord::SaveXml( XclExpXmlStream& rStrm ) rStrm.GetCurrentStream()->endElement( mnElement ); } - - XclExpXmlStartSingleElementRecord::XclExpXmlStartSingleElementRecord( sal_Int32 const nElement) : XclExpXmlElementRecord( nElement ) @@ -119,8 +109,6 @@ void XclExpXmlStartSingleElementRecord::SaveXml( XclExpXmlStream& rStrm ) rStream->write( "<" )->writeId( mnElement ); } - - XclExpXmlEndSingleElementRecord::XclExpXmlEndSingleElementRecord() { } @@ -134,8 +122,6 @@ void XclExpXmlEndSingleElementRecord::SaveXml( XclExpXmlStream& rStrm ) rStrm.GetCurrentStream()->write( "/>" ); } - - XclExpRecord::XclExpRecord( sal_uInt16 nRecId, sal_Size nRecSize ) : mnRecSize( nRecSize ), mnRecId( nRecId ) @@ -164,8 +150,6 @@ void XclExpRecord::Save( XclExpStream& rStrm ) rStrm.EndRecord(); } - - template<> void XclExpValueRecord::SaveXml( XclExpXmlStream& rStrm ) { @@ -176,8 +160,6 @@ void XclExpValueRecord::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } - - void XclExpBoolRecord::WriteBody( XclExpStream& rStrm ) { rStrm << (static_cast< sal_uInt16 >( mbValue ? 1 : 0 )); @@ -194,8 +176,6 @@ void XclExpBoolRecord::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } - - XclExpDummyRecord::XclExpDummyRecord( sal_uInt16 nRecId, const void* pRecData, sal_Size nRecSize ) : XclExpRecord( nRecId ) { @@ -231,8 +211,6 @@ void XclExpFutureRecord::Save( XclExpStream& rStrm ) rStrm.EndRecord(); } - - XclExpSubStream::XclExpSubStream( sal_uInt16 nSubStrmType ) : mnSubStrmType( nSubStrmType ) { @@ -281,6 +259,4 @@ void XclExpSubStream::Save( XclExpStream& rStrm ) rStrm.EndRecord(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx index 3da442773401..683f9097804b 100644 --- a/sc/source/filter/excel/xeroot.cxx +++ b/sc/source/filter/excel/xeroot.cxx @@ -63,8 +63,6 @@ XclExpRootData::~XclExpRootData() { } - - XclExpRoot::XclExpRoot( XclExpRootData& rExpRootData ) : XclRoot( rExpRootData ), mrExpData( rExpRootData ) @@ -356,6 +354,4 @@ XclExpRootData::XclExpLinkMgrRef XclExpRoot::GetLocalLinkMgrRef() const return IsInGlobals() ? mrExpData.mxGlobLinkMgr : mrExpData.mxLocLinkMgr; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 04a8298585a9..9ca1a4749171 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -77,8 +77,6 @@ using namespace ::com::sun::star::uno; using namespace ::formula; using namespace ::oox; - - XclExpStream::XclExpStream( SvStream& rOutStrm, const XclExpRoot& rRoot, sal_uInt16 nMaxRecSize ) : mrStrm( rOutStrm ), mrRoot( rRoot ), @@ -459,8 +457,6 @@ void XclExpStream::WriteRawZeroBytes( sal_Size nBytes ) mrStrm.Write( &nData, nBytesLeft ); } - - XclExpBiff8Encrypter::XclExpBiff8Encrypter( const XclExpRoot& rRoot ) : mnOldPos(STREAM_SEEK_TO_END), mbValid(false) @@ -933,8 +929,6 @@ sax_fastparser::FSHelperPtr XclXmlUtils::WriteFontData( sax_fastparser::FSHelper } - - 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 f3b8069c011e..685d4479ca25 100644 --- a/sc/source/filter/excel/xestring.cxx +++ b/sc/source/filter/excel/xestring.cxx @@ -28,8 +28,6 @@ using namespace ::oox; - - namespace { // compare vectors @@ -438,8 +436,6 @@ void XclExpString::WriteXml( XclExpXmlStream& rStrm ) const } } - - bool XclExpString::IsWriteFlags() const { return mbIsBiff8 && (!IsEmpty() || !mbSmartFlags); @@ -560,6 +556,4 @@ void XclExpString::PrepareWrite( XclExpStream& rStrm, sal_uInt16 nBytes ) const rStrm.SetSliceSize( nBytes + (mbIsUnicode ? 2 : 1) ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 573ca8aac387..7f7c90a4a321 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -177,8 +177,6 @@ void XclListColor::Merge( const XclListColor& rColor ) AddWeighting( nWeight2 ); } - - /** Data for each inserted original color, represented by a color ID. */ struct XclColorIdData { @@ -224,8 +222,6 @@ typedef ::std::vector< XclNearest > XclNearestVec; } // namespace - - class XclExpPaletteImpl { public: @@ -318,8 +314,6 @@ private: sal_uInt32 mnLastIdx; /// Last insertion index for search opt. }; - - const sal_uInt32 EXC_PAL_INDEXBASE = 0xFFFF0000; const sal_uInt32 EXC_PAL_MAXRAWSIZE = 1024; @@ -762,8 +756,6 @@ sal_Int32 XclExpPaletteImpl::GetNearPaletteColors( return nDist1; } - - XclExpPalette::XclExpPalette( const XclExpRoot& rRoot ) : XclDefaultPalette( rRoot ), XclExpRecord( EXC_ID_PALETTE ) @@ -939,8 +931,6 @@ bool XclExpFontHelper::CheckItems( const XclExpRoot& rRoot, const SfxItemSet& rI return bUsed; } - - namespace { sal_uInt32 lclCalcHash( const XclFontData& rFontData ) @@ -962,8 +952,6 @@ sal_uInt32 lclCalcHash( const XclFontData& rFontData ) } // namespace - - XclExpFont::XclExpFont( const XclExpRoot& rRoot, const XclFontData& rFontData, XclExpColorType eColorType ) : XclExpRecord( EXC_ID2_FONT, 14 ), @@ -1022,8 +1010,6 @@ void XclExpFont::WriteBody( XclExpStream& rStrm ) << aFontName; } - - XclExpBlindFont::XclExpBlindFont( const XclExpRoot& rRoot ) : XclExpFont( rRoot, XclFontData(), EXC_COLOR_CELLTEXT ) { @@ -1039,8 +1025,6 @@ void XclExpBlindFont::Save( XclExpStream& /*rStrm*/ ) // do nothing } - - XclExpFontBuffer::XclExpFontBuffer( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), mnXclMaxSize( 0 ) @@ -1205,8 +1189,6 @@ struct XclExpNumFmtPred { return rFormat.mnScNumFmt == mnScNumFmt; } }; - - void XclExpNumFmt::SaveXml( XclExpXmlStream& rStrm ) { sax_fastparser::FSHelperPtr& rStyleSheet = rStrm.GetCurrentStream(); @@ -1216,8 +1198,6 @@ void XclExpNumFmt::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } - - XclExpNumFmtBuffer::XclExpNumFmtBuffer( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), /* Compiler needs a hint, this doesn't work: new NfKeywordTable; @@ -1383,8 +1363,6 @@ void XclExpCellProt::SaveXml( XclExpXmlStream& rStrm ) const FSEND ); } - - bool XclExpCellAlign::FillFromItemSet( const SfxItemSet& rItemSet, bool bForceLineBreak, XclBiff eBiff, bool bStyle ) { @@ -1541,8 +1519,6 @@ void XclExpCellAlign::SaveXml( XclExpXmlStream& rStrm ) const FSEND ); } - - namespace { void lclGetBorderLine( @@ -1613,8 +1589,6 @@ void lclGetBorderLine( } // namespace - - XclExpCellBorder::XclExpCellBorder() : mnLeftColorId( XclExpPalette::GetColorIdFromIndex( mnLeftColor ) ), mnRightColorId( XclExpPalette::GetColorIdFromIndex( mnRightColor ) ), @@ -1794,8 +1768,6 @@ void XclExpCellBorder::SaveXml( XclExpXmlStream& rStrm ) const rStyleSheet->endElement( XML_border ); } - - XclExpCellArea::XclExpCellArea() : mnForeColorId( XclExpPalette::GetColorIdFromIndex( mnForeColor ) ), mnBackColorId( XclExpPalette::GetColorIdFromIndex( mnBackColor ) ) @@ -1924,8 +1896,6 @@ void XclExpColor::SaveXml( XclExpXmlStream& rStrm ) const rStyleSheet->endElement( XML_fill ); } - - XclExpXFId::XclExpXFId() : mnXFId( XclExpXFBuffer::GetDefCellXFId() ), mnXFIndex( EXC_XF_DEFAULTCELL ) @@ -1943,8 +1913,6 @@ void XclExpXFId::ConvertXFIndex( const XclExpRoot& rRoot ) mnXFIndex = rRoot.GetXFBuffer().GetXFIndex( mnXFId ); } - - XclExpXF::XclExpXF( const XclExpRoot& rRoot, const ScPatternAttr& rPattern, sal_Int16 nScript, sal_uLong nForceScNumFmt, sal_uInt16 nForceXclFont, bool bForceLineBreak ) : @@ -2159,8 +2127,6 @@ void XclExpXF::SaveXml( XclExpXmlStream& rStrm ) rStyleSheet->endElement( XML_xf ); } - - XclExpDefaultXF::XclExpDefaultXF( const XclExpRoot& rRoot, bool bCellXF ) : XclExpXF( rRoot, bCellXF ) { @@ -2178,8 +2144,6 @@ void XclExpDefaultXF::SetNumFmt( sal_uInt16 nXclNumFmt ) mbFmtUsed = true; } - - XclExpStyle::XclExpStyle( sal_uInt32 nXFId, const OUString& rStyleName ) : XclExpRecord( EXC_ID_STYLE, 4 ), maName( rStyleName ), @@ -2265,8 +2229,6 @@ void XclExpStyle::SaveXml( XclExpXmlStream& rStrm ) // OOXTODO: XML_extLst } - - namespace { const sal_uInt32 EXC_XFLIST_INDEXBASE = 0xFFFE0000; @@ -2282,8 +2244,6 @@ bool lclIsBuiltInStyle( const OUString& rStyleName ) } // namespace - - XclExpXFBuffer::XclExpBuiltInInfo::XclExpBuiltInInfo() : mnStyleId( EXC_STYLE_USERDEF ), mnLevel( EXC_STYLE_NOLEVEL ), @@ -2292,8 +2252,6 @@ XclExpXFBuffer::XclExpBuiltInInfo::XclExpBuiltInInfo() : { } - - /** Predicate for search algorithm. */ struct XclExpBorderPred { @@ -3020,8 +2978,6 @@ void XclExpDxfs::SaveXml( XclExpXmlStream& rStrm ) rStyleSheet->endElement( XML_dxfs ); } - - XclExpDxf::XclExpDxf( const XclExpRoot& rRoot, XclExpCellAlign* pAlign, XclExpCellBorder* pBorder, XclExpFont* pFont, XclExpNumFmt* pNumberFmt, XclExpCellProt* pProt, XclExpColor* pColor) : XclExpRoot( rRoot ), @@ -3058,8 +3014,6 @@ void XclExpDxf::SaveXml( XclExpXmlStream& rStrm ) rStyleSheet->endElement( XML_dxf ); } - - XclExpXmlStyleSheet::XclExpXmlStyleSheet( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ) { @@ -3090,6 +3044,4 @@ void XclExpXmlStyleSheet::SaveXml( XclExpXmlStream& rStrm ) rStrm.PopStream(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index 18b9e0ec9359..a1c9585372a8 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -130,8 +130,6 @@ void XclExpArray::WriteBody( XclExpStream& rStrm ) rStrm << nFlags << sal_uInt32( 0 ) << *mxTokArr; } - - XclExpArrayBuffer::XclExpArrayBuffer( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ) { @@ -199,8 +197,6 @@ void XclExpShrfmla::WriteBody( XclExpStream& rStrm ) rStrm << sal_uInt8( 0 ) << mnUsedCount << *mxTokArr; } - - XclExpShrfmlaBuffer::XclExpShrfmlaBuffer( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ) { @@ -439,8 +435,6 @@ void XclExpTableop::WriteBody( XclExpStream& rStrm ) rStrm << mnColInpXclRow << mnColInpXclCol << sal_uInt32( 0 ); } - - XclExpTableopBuffer::XclExpTableopBuffer( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ) { @@ -613,8 +607,6 @@ void XclExpSingleCellBase::WriteBody( XclExpStream& rStrm ) WriteContents( rStrm ); } - - IMPL_FIXEDMEMPOOL_NEWDEL( XclExpNumberCell ) XclExpNumberCell::XclExpNumberCell( @@ -659,8 +651,6 @@ void XclExpNumberCell::WriteContents( XclExpStream& rStrm ) rStrm << mfValue; } - - IMPL_FIXEDMEMPOOL_NEWDEL( XclExpBooleanCell ) XclExpBooleanCell::XclExpBooleanCell( @@ -809,8 +799,6 @@ void XclExpLabelCell::WriteContents( XclExpStream& rStrm ) } } - - IMPL_FIXEDMEMPOOL_NEWDEL( XclExpFormulaCell ) XclExpFormulaCell::XclExpFormulaCell( @@ -1249,8 +1237,6 @@ void XclExpMultiCellBase::RemoveUnusedXFIndexes( const ScfUInt16Vec& rXFIndexes // The Save() function will skip all XF indexes equal to EXC_XF_NOTFOUND. } - - IMPL_FIXEDMEMPOOL_NEWDEL( XclExpBlankCell ) XclExpBlankCell::XclExpBlankCell( const XclAddress& rXclPos, const XclExpMultiXFId& rXFId ) : @@ -1299,8 +1285,6 @@ void XclExpBlankCell::WriteXmlContents( XclExpXmlStream& rStrm, const XclAddress FSEND ); } - - IMPL_FIXEDMEMPOOL_NEWDEL( XclExpRkCell ) XclExpRkCell::XclExpRkCell( @@ -1408,8 +1392,6 @@ void XclExpOutlineBuffer::UpdateColRow( SCCOLROW nScPos ) } } - - XclExpGuts::XclExpGuts( const XclExpRoot& rRoot ) : XclExpRecord( EXC_ID_GUTS, 8 ), mnColLevels( 0 ), @@ -1444,8 +1426,6 @@ void XclExpGuts::WriteBody( XclExpStream& rStrm ) rStrm << mnRowWidth << mnColWidth << mnRowLevels << mnColLevels; } - - XclExpDimensions::XclExpDimensions( const XclExpRoot& rRoot ) : mnFirstUsedXclRow( 0 ), mnFirstFreeXclRow( 0 ), @@ -1502,8 +1482,6 @@ void XclExpDimensions::WriteBody( XclExpStream& rStrm ) rStrm << sal_uInt16( 0 ); } - - namespace { double lclGetCorrectedColWidth( const XclExpRoot& rRoot, sal_uInt16 nXclColWidth ) @@ -1514,8 +1492,6 @@ double lclGetCorrectedColWidth( const XclExpRoot& rRoot, sal_uInt16 nXclColWidth } // namespace - - XclExpDefcolwidth::XclExpDefcolwidth( const XclExpRoot& rRoot ) : XclExpUInt16Record( EXC_ID_DEFCOLWIDTH, EXC_DEFCOLWIDTH_DEF ), XclExpRoot( rRoot ) @@ -1535,8 +1511,6 @@ void XclExpDefcolwidth::SetDefWidth( sal_uInt16 nXclColWidth ) SetValue( limit_cast< sal_uInt16 >( fNewColWidth / 256.0 + 0.5 ) ); } - - XclExpColinfo::XclExpColinfo( const XclExpRoot& rRoot, SCCOL nScCol, SCROW nLastScRow, XclExpColOutlineBuffer& rOutlineBfr ) : XclExpRecord( EXC_ID_COLINFO, 12 ), @@ -1627,8 +1601,6 @@ void XclExpColinfo::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } - - XclExpColinfoBuffer::XclExpColinfoBuffer( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), maDefcolwidth( rRoot ), @@ -1723,8 +1695,6 @@ void XclExpColinfoBuffer::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_cols ); } - - XclExpDefaultRowData::XclExpDefaultRowData() : mnFlags( EXC_DEFROW_DEFAULTFLAGS ), mnHeight( EXC_DEFROW_DEFAULTHEIGHT ) @@ -1745,8 +1715,6 @@ bool operator<( const XclExpDefaultRowData& rLeft, const XclExpDefaultRowData& r ((rLeft.mnHeight == rRight.mnHeight) && (rLeft.mnFlags < rRight.mnFlags)); } - - XclExpDefrowheight::XclExpDefrowheight() : XclExpRecord( EXC_ID3_DEFROWHEIGHT, 4 ) { @@ -1763,8 +1731,6 @@ void XclExpDefrowheight::WriteBody( XclExpStream& rStrm ) rStrm << maDefData.mnFlags << maDefData.mnHeight; } - - XclExpRow::XclExpRow( const XclExpRoot& rRoot, sal_uInt32 nXclRow, XclExpRowOutlineBuffer& rOutlineBfr, bool bAlwaysEmpty ) : XclExpRecord( EXC_ID3_ROW, 16 ), @@ -2060,8 +2026,6 @@ void XclExpRow::SaveXml( XclExpXmlStream& rStrm ) } } - - XclExpRowBuffer::XclExpRowBuffer( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), maOutlineBfr( rRoot ), @@ -2557,6 +2521,4 @@ void XclExpCellTable::SaveXml( XclExpXmlStream& rStrm ) mxExtLst->SaveXml( rStrm ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xeview.cxx b/sc/source/filter/excel/xeview.cxx index 53cf362d562a..c2da6eed2e2e 100644 --- a/sc/source/filter/excel/xeview.cxx +++ b/sc/source/filter/excel/xeview.cxx @@ -131,8 +131,6 @@ void XclExpWindow2::WriteBody( XclExpStream& rStrm ) } } - - XclExpScl::XclExpScl( sal_uInt16 nZoom ) : XclExpRecord( EXC_ID_SCL, 4 ), mnNum( nZoom ), @@ -157,8 +155,6 @@ void XclExpScl::WriteBody( XclExpStream& rStrm ) rStrm << mnNum << mnDenom; } - - XclExpPane::XclExpPane( const XclTabViewData& rData ) : XclExpRecord( EXC_ID_PANE, 10 ), mnSplitX( rData.mnSplitX ), @@ -203,8 +199,6 @@ void XclExpPane::WriteBody( XclExpStream& rStrm ) rStrm << sal_uInt8( 0 ); } - - XclExpSelection::XclExpSelection( const XclTabViewData& rData, sal_uInt8 nPane ) : XclExpRecord( EXC_ID_SELECTION, 15 ), mnPane( nPane ) @@ -246,8 +240,6 @@ void XclExpSelection::WriteBody( XclExpStream& rStrm ) maSelData.maXclSelection.Write( rStrm, false ); } - - XclExpTabBgColor::XclExpTabBgColor( const XclTabViewData& rTabViewData ) : XclExpRecord( EXC_ID_SHEETEXT, 18 ), mrTabViewData( rTabViewData ) @@ -288,8 +280,6 @@ sal_uInt16 lclGetXclZoom( long nScZoom, sal_uInt16 nDefXclZoom ) } // namespace - - XclExpTabViewSettings::XclExpTabViewSettings( const XclExpRoot& rRoot, SCTAB nScTab ) : XclExpRoot( rRoot ), mnGridColorId( XclExpPalette::GetColorIdFromIndex( EXC_COLOR_WINDOWTEXT ) ) diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index b00c49cd574e..b70aee53b8fb 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -207,8 +207,6 @@ struct XclImpChRootData : public XclChRootData inline explicit XclImpChRootData( XclImpChChart& rChartData ) : mrChartData( rChartData ) {} }; - - XclImpChRoot::XclImpChRoot( const XclImpRoot& rRoot, XclImpChChart& rChartData ) : XclImpRoot( rRoot ), mxChData( new XclImpChRootData( rChartData ) ) @@ -377,8 +375,6 @@ void XclImpChRoot::ConvertPieRotation( ScfPropertySet& rPropSet, sal_uInt16 nAng rPropSet.SetProperty( EXC_CHPROP_STARTINGANGLE, nApiRot ); } - - XclImpChGroupBase::~XclImpChGroupBase() { } @@ -441,8 +437,6 @@ void XclImpChFramePos::ReadChFramePos( XclImpStream& rStrm ) maData.maRect.mnHeight = rStrm.ReadInt16(); rStrm.Ignore( 2 ); } - - void XclImpChLineFormat::ReadChLineFormat( XclImpStream& rStrm ) { rStrm >> maData.maColor >> maData.mnPattern >> maData.mnWeight >> maData.mnFlags; @@ -473,8 +467,6 @@ void XclImpChLineFormat::Convert( const XclImpChRoot& rRoot, } } - - void XclImpChAreaFormat::ReadChAreaFormat( XclImpStream& rStrm ) { rStrm >> maData.maPattColor >> maData.maBackColor >> maData.mnPattern >> maData.mnFlags; @@ -508,8 +500,6 @@ void XclImpChAreaFormat::Convert( const XclImpChRoot& rRoot, } } - - XclImpChEscherFormat::XclImpChEscherFormat( const XclImpRoot& rRoot ) : mnDffFillType( mso_fillSolid ) { @@ -548,8 +538,6 @@ void XclImpChEscherFormat::Convert( const XclImpChRoot& rRoot, rRoot.ConvertEscherFormat( rPropSet, maData, bUsePicFmt ? &maPicFmt : 0, mnDffFillType, rFmtInfo.mePropMode ); } - - XclImpChFrameBase::XclImpChFrameBase( const XclChFormatInfo& rFmtInfo ) { if( rFmtInfo.mbCreateDefFrame ) switch( rFmtInfo.meDefFrameType ) @@ -625,8 +613,6 @@ void XclImpChFrameBase::ConvertFrameBase( const XclImpChRoot& rRoot, ConvertAreaBase( rRoot, rPropSet, eObjType, nFormatIdx, bUsePicFmt ); } - - XclImpChFrame::XclImpChFrame( const XclImpChRoot& rRoot, XclChObjectType eObjType ) : XclImpChFrameBase( rRoot.GetFormatInfo( eObjType ) ), XclImpChRoot( rRoot ), @@ -723,8 +709,6 @@ Reference< XLabeledDataSequence > lclCreateLabeledDataSequence( } // namespace - - XclImpChSourceLink::XclImpChSourceLink( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ) { @@ -920,8 +904,6 @@ void XclImpChFontBase::ConvertRotationBase( const XclImpChRoot& rRoot, ScfProper rRoot.GetChartPropSetHelper().WriteRotationProperties( rPropSet, GetRotation(), bSupportsStacked ); } - - XclImpChFont::XclImpChFont() : mnFontIdx( EXC_FONT_NOTFOUND ) { @@ -932,8 +914,6 @@ void XclImpChFont::ReadChFont( XclImpStream& rStrm ) rStrm >> mnFontIdx; } - - XclImpChText::XclImpChText( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ) { @@ -1306,8 +1286,6 @@ void XclImpChMarkerFormat::ConvertColor( const XclImpChRoot& rRoot, rPropSet.SetColorProperty( EXC_CHPROP_COLOR, aLineColor ); } - - XclImpChPieFormat::XclImpChPieFormat() : mnPieDist( 0 ) { @@ -1324,8 +1302,6 @@ void XclImpChPieFormat::Convert( ScfPropertySet& rPropSet ) const rPropSet.SetProperty( EXC_CHPROP_OFFSET, fApiDist ); } - - XclImpChSeriesFormat::XclImpChSeriesFormat() : mnFlags( 0 ) { @@ -1336,8 +1312,6 @@ void XclImpChSeriesFormat::ReadChSeriesFormat( XclImpStream& rStrm ) rStrm >> mnFlags; } - - void XclImpCh3dDataFormat::ReadCh3dDataFormat( XclImpStream& rStrm ) { rStrm >> maData.mnBase >> maData.mnTop; @@ -1352,8 +1326,6 @@ void XclImpCh3dDataFormat::Convert( ScfPropertySet& rPropSet ) const rPropSet.SetProperty( EXC_CHPROP_GEOMETRY3D, nApiType ); } - - XclImpChAttachedLabel::XclImpChAttachedLabel( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ), mnFlags( 0 ) @@ -1379,8 +1351,6 @@ XclImpChTextRef XclImpChAttachedLabel::CreateDataLabel( const XclImpChText* pPar return xLabel; } - - XclImpChDataFormat::XclImpChDataFormat( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ) { @@ -1593,8 +1563,6 @@ void XclImpChDataFormat::UpdateDataLabel( const XclImpChDataFormat* pParentFmt ) mxLabel = mxAttLabel->CreateDataLabel( pDefText ); } - - XclImpChSerTrendLine::XclImpChSerTrendLine( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ) { @@ -1681,8 +1649,6 @@ Reference< XRegressionCurve > XclImpChSerTrendLine::CreateRegressionCurve() cons return xRegCurve; } - - XclImpChSerErrorBar::XclImpChSerErrorBar( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ) { @@ -1782,8 +1748,6 @@ Reference< XPropertySet > XclImpChSerErrorBar::CreateErrorBar( const XclImpChSer return xErrorBar; } - - XclImpChSeries::XclImpChSeries( const XclImpChRoot& rRoot, sal_uInt16 nSeriesIdx ) : XclImpChRoot( rRoot ), mnGroupIdx( EXC_CHSERGROUP_NONE ), @@ -2399,8 +2363,6 @@ Reference< XChartType > XclImpChType::CreateChartType( Reference< XDiagram > xDi return xChartType; } - - void XclImpChChart3d::ReadChChart3d( XclImpStream& rStrm ) { rStrm >> maData.mnRotation @@ -2480,8 +2442,6 @@ void XclImpChChart3d::Convert( ScfPropertySet& rPropSet, bool b3dWallChart ) con rPropSet.SetProperty( EXC_CHPROP_D3DSCENELIGHTDIR2, cssd::Direction3D( 0.2, 0.4, 1.0 ) ); } - - XclImpChLegend::XclImpChLegend( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ) { @@ -2619,8 +2579,6 @@ Reference< XLegend > XclImpChLegend::CreateLegend() const return xLegend; } - - XclImpChDropBar::XclImpChDropBar( sal_uInt16 nDropBar ) : mnDropBar( nDropBar ), mnBarDist( 0 ) @@ -2643,8 +2601,6 @@ void XclImpChDropBar::Convert( const XclImpChRoot& rRoot, ScfPropertySet& rPropS ConvertFrameBase( rRoot, rPropSet, eObjType ); } - - XclImpChTypeGroup::XclImpChTypeGroup( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ), maType( rRoot ), @@ -3058,8 +3014,6 @@ void XclImpChLabelRange::ConvertAxisPosition( ScfPropertySet& rPropSet, bool b3d } } - - XclImpChValueRange::XclImpChValueRange( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ) { @@ -3135,8 +3089,6 @@ void XclImpChValueRange::ConvertAxisPosition( ScfPropertySet& rPropSet ) const rPropSet.SetProperty( EXC_CHPROP_CROSSOVERVALUE, fCrossingPos ); } - - namespace { sal_Int32 lclGetApiTickmarks( sal_uInt8 nXclTickPos ) @@ -3215,8 +3167,6 @@ void XclImpChTick::Convert( ScfPropertySet& rPropSet ) const rPropSet.SetProperty( EXC_CHPROP_MARKPOSITION, cssc::ChartAxisMarkPosition_AT_AXIS ); } - - XclImpChAxis::XclImpChAxis( const XclImpChRoot& rRoot, sal_uInt16 nAxisType ) : XclImpChRoot( rRoot ), mnNumFmtIdx( EXC_FORMAT_NOTFOUND ) @@ -3490,8 +3440,6 @@ void XclImpChAxis::CreateWallFrame() } } - - XclImpChAxesSet::XclImpChAxesSet( const XclImpChRoot& rRoot, sal_uInt16 nAxesSetId ) : XclImpChRoot( rRoot ) { @@ -4190,8 +4138,6 @@ Reference< XDiagram > XclImpChChart::CreateDiagram() const return xDiagram; } - - XclImpChartDrawing::XclImpChartDrawing( const XclImpRoot& rRoot, bool bOwnTab ) : XclImpDrawing( rRoot, bOwnTab ), // sheet charts may contain OLE objects mnScTab( rRoot.GetCurrScTab() ), @@ -4252,8 +4198,6 @@ void XclImpChartDrawing::OnObjectInserted( const XclImpDrawObjBase& ) { } - - XclImpChart::XclImpChart( const XclImpRoot& rRoot, bool bOwnTab ) : XclImpRoot( rRoot ), mbOwnTab( bOwnTab ), @@ -4383,6 +4327,4 @@ void XclImpChart::ReadChChart( XclImpStream& rStrm ) mxChartData->ReadRecordGroup( rStrm ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index 8e45697bfbf9..76a8a2e88ae5 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -214,8 +214,6 @@ void lclInsertUrl( XclImpRoot& rRoot, const OUString& rUrl, SCCOL nScCol, SCROW } // namespace - - void XclImpHyperlink::ReadHlink( XclImpStream& rStrm ) { XclRange aXclRange( ScAddress::UNINITIALIZED ); @@ -683,8 +681,6 @@ void XclImpCondFormat::Apply() } } - - XclImpCondFormatManager::XclImpCondFormatManager( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) { @@ -995,8 +991,6 @@ void XclImpWebQuery::Apply( ScDocument& rDoc, const OUString& rFilterName ) } } - - XclImpWebQueryBuffer::XclImpWebQueryBuffer( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) { @@ -1141,8 +1135,6 @@ XclImpDecrypterRef lclReadFilepass8( XclImpStream& rStrm ) } // namespace - - ErrCode XclImpDecryptHelper::ReadFilepass( XclImpStream& rStrm ) { XclImpDecrypterRef xDecr; @@ -1233,8 +1225,6 @@ XclImpSheetProtectBuffer::Sheet::Sheet() : { } - - XclImpSheetProtectBuffer::Sheet::Sheet(const Sheet& r) : mbProtected(r.mbProtected), mnPasswordHash(r.mnPasswordHash), @@ -1359,6 +1349,4 @@ XclImpSheetProtectBuffer::Sheet* XclImpSheetProtectBuffer::GetSheetItem( SCTAB n return &itr->second; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index e558273c86b0..1b7ecc60ce8b 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -142,8 +142,6 @@ using ::com::sun::star::script::XEventAttacherManager; using ::com::sun::star::table::CellAddress; using ::com::sun::star::table::CellRangeAddress; - - namespace { /** Helper class which mimics the auto_ptr< SdrObject > semantics, but calls @@ -963,8 +961,6 @@ void XclImpDrawObjBase::ImplReadObj8( XclImpStream& rStrm ) } } - - void XclImpDrawObjVector::InsertGrouped( XclImpDrawObjRef xDrawObj ) { if( !empty() ) @@ -982,16 +978,12 @@ sal_Size XclImpDrawObjVector::GetProgressSize() const return nProgressSize; } - - XclImpPhObj::XclImpPhObj( const XclImpRoot& rRoot ) : XclImpDrawObjBase( rRoot ) { SetProcessSdrObj( false ); } - - XclImpGroupObj::XclImpGroupObj( const XclImpRoot& rRoot ) : XclImpDrawObjBase( rRoot ), mnFirstUngrouped( 0 ) @@ -1048,8 +1040,6 @@ SdrObject* XclImpGroupObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const R return xSdrObj.release(); } - - XclImpLineObj::XclImpLineObj( const XclImpRoot& rRoot ) : XclImpDrawObjBase( rRoot ), mnArrows( 0 ), @@ -1177,8 +1167,6 @@ SdrObject* XclImpLineObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const Re return xSdrObj.release(); } - - XclImpRectObj::XclImpRectObj( const XclImpRoot& rRoot ) : XclImpDrawObjBase( rRoot ), mnFrameFlags( 0 ) @@ -1225,8 +1213,6 @@ SdrObject* XclImpRectObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const Re return xSdrObj.release(); } - - XclImpOvalObj::XclImpOvalObj( const XclImpRoot& rRoot ) : XclImpRectObj( rRoot ) { @@ -1240,8 +1226,6 @@ SdrObject* XclImpOvalObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const Re return xSdrObj.release(); } - - XclImpArcObj::XclImpArcObj( const XclImpRoot& rRoot ) : XclImpDrawObjBase( rRoot ), mnQuadrant( EXC_OBJ_ARC_TR ) @@ -1312,8 +1296,6 @@ SdrObject* XclImpArcObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rec return xSdrObj.release(); } - - XclImpPolygonObj::XclImpPolygonObj( const XclImpRoot& rRoot ) : XclImpRectObj( rRoot ), mnPolyFlags( 0 ), @@ -1391,8 +1373,6 @@ SdrObject* XclImpPolygonObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const return xSdrObj.release(); } - - void XclImpObjTextData::ReadByteString( XclImpStream& rStrm ) { mxString.reset(); @@ -1412,8 +1392,6 @@ void XclImpObjTextData::ReadFormats( XclImpStream& rStrm ) rStrm.Ignore( maData.mnFormatSize ); } - - XclImpTextObj::XclImpTextObj( const XclImpRoot& rRoot ) : XclImpRectObj( rRoot ) { @@ -1615,8 +1593,6 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& XclImpRectObj::DoPreProcessSdrObj( rDffConv, rSdrObj ); } - - XclImpChartObj::XclImpChartObj( const XclImpRoot& rRoot, bool bOwnTab ) : XclImpRectObj( rRoot ), mbOwnTab( bOwnTab ) @@ -1799,8 +1775,6 @@ void XclImpChartObj::FinalizeTabChart() SetAnchor( aAnchor ); } - - XclImpNoteObj::XclImpNoteObj( const XclImpRoot& rRoot ) : XclImpTextObj( rRoot ), maScPos( ScAddress::INITIALIZE_INVALID ), @@ -1835,8 +1809,6 @@ void XclImpNoteObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& } } - - XclImpControlHelper::XclImpControlHelper( const XclImpRoot& rRoot, XclCtrlBindMode eBindMode ) : mrRoot( rRoot ), meBindMode( eBindMode ) @@ -2013,8 +1985,6 @@ void XclImpControlHelper::ReadRangeList( ScRangeList& rScRanges, XclImpStream& r } } - - XclImpTbxObjBase::XclImpTbxObjBase( const XclImpRoot& rRoot ) : XclImpTextObj( rRoot ), XclImpControlHelper( rRoot, EXC_CTRL_BINDPOSITION ) @@ -2109,8 +2079,6 @@ void XclImpTbxObjBase::DoPreProcessSdrObj( XclImpDffConverter& /*rDffConv*/, Sdr ProcessControl( *this ); } - - XclImpButtonObj::XclImpButtonObj( const XclImpRoot& rRoot ) : XclImpTbxObjBase( rRoot ) { @@ -2173,8 +2141,6 @@ XclTbxEventType XclImpButtonObj::DoGetEventType() const return EXC_TBX_EVENT_ACTION; } - - XclImpCheckBoxObj::XclImpCheckBoxObj( const XclImpRoot& rRoot ) : XclImpTbxObjBase( rRoot ), mnState( EXC_OBJ_CHECKBOX_UNCHECKED ), @@ -2262,8 +2228,6 @@ XclTbxEventType XclImpCheckBoxObj::DoGetEventType() const return EXC_TBX_EVENT_ACTION; } - - XclImpOptionButtonObj::XclImpOptionButtonObj( const XclImpRoot& rRoot ) : XclImpCheckBoxObj( rRoot ), mnNextInGroup( 0 ), @@ -2353,8 +2317,6 @@ XclTbxEventType XclImpOptionButtonObj::DoGetEventType() const return EXC_TBX_EVENT_ACTION; } - - XclImpLabelObj::XclImpLabelObj( const XclImpRoot& rRoot ) : XclImpTbxObjBase( rRoot ) { @@ -2384,8 +2346,6 @@ XclTbxEventType XclImpLabelObj::DoGetEventType() const return EXC_TBX_EVENT_MOUSE; } - - XclImpGroupBoxObj::XclImpGroupBoxObj( const XclImpRoot& rRoot ) : XclImpTbxObjBase( rRoot ), mnGroupBoxFlags( 0 ) @@ -2433,8 +2393,6 @@ XclTbxEventType XclImpGroupBoxObj::DoGetEventType() const return EXC_TBX_EVENT_MOUSE; } - - XclImpDialogObj::XclImpDialogObj( const XclImpRoot& rRoot ) : XclImpTbxObjBase( rRoot ) { @@ -2457,8 +2415,6 @@ XclTbxEventType XclImpDialogObj::DoGetEventType() const return EXC_TBX_EVENT_MOUSE; } - - XclImpEditObj::XclImpEditObj( const XclImpRoot& rRoot ) : XclImpTbxObjBase( rRoot ), mnContentType( EXC_OBJ_EDIT_TEXT ), @@ -2531,8 +2487,6 @@ XclTbxEventType XclImpEditObj::DoGetEventType() const return EXC_TBX_EVENT_TEXT; } - - XclImpTbxObjScrollableBase::XclImpTbxObjScrollableBase( const XclImpRoot& rRoot ) : XclImpTbxObjBase( rRoot ), mnValue( 0 ), @@ -2567,8 +2521,6 @@ void XclImpTbxObjScrollableBase::DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt } } - - XclImpSpinButtonObj::XclImpSpinButtonObj( const XclImpRoot& rRoot ) : XclImpTbxObjScrollableBase( rRoot ) { @@ -2606,8 +2558,6 @@ XclTbxEventType XclImpSpinButtonObj::DoGetEventType() const return EXC_TBX_EVENT_VALUE; } - - XclImpScrollBarObj::XclImpScrollBarObj( const XclImpRoot& rRoot ) : XclImpTbxObjScrollableBase( rRoot ) { @@ -2648,8 +2598,6 @@ XclTbxEventType XclImpScrollBarObj::DoGetEventType() const return EXC_TBX_EVENT_VALUE; } - - XclImpTbxObjListBase::XclImpTbxObjListBase( const XclImpRoot& rRoot ) : XclImpTbxObjScrollableBase( rRoot ), mnEntryCount( 0 ), @@ -2680,8 +2628,6 @@ void XclImpTbxObjListBase::SetBoxFormatting( ScfPropertySet& rPropSet ) const GetFontBuffer().WriteDefaultCtrlFontProperties( rPropSet ); } - - XclImpListBoxObj::XclImpListBoxObj( const XclImpRoot& rRoot ) : XclImpTbxObjListBase( rRoot ) { @@ -2767,8 +2713,6 @@ XclTbxEventType XclImpListBoxObj::DoGetEventType() const return EXC_TBX_EVENT_CHANGE; } - - XclImpDropDownObj::XclImpDropDownObj( const XclImpRoot& rRoot ) : XclImpTbxObjListBase( rRoot ), mnLeft( 0 ), @@ -2863,8 +2807,6 @@ XclTbxEventType XclImpDropDownObj::DoGetEventType() const return (GetDropDownType() == EXC_OBJ_DROPDOWN_COMBOBOX) ? EXC_TBX_EVENT_TEXT : EXC_TBX_EVENT_CHANGE; } - - XclImpPictureObj::XclImpPictureObj( const XclImpRoot& rRoot ) : XclImpRectObj( rRoot ), XclImpControlHelper( rRoot, EXC_CTRL_BINDCONTENT ), @@ -3237,8 +3179,6 @@ void XclImpSolverContainer::UpdateConnection( sal_uInt32 nDffShapeId, SdrObject* } } - - XclImpSimpleDffConverter::XclImpSimpleDffConverter( const XclImpRoot& rRoot, SvStream& rDffStrm ) : SvxMSDffManager( rDffStrm, rRoot.GetBasePath(), 0, 0, rRoot.GetDoc().GetDrawLayer(), 1440, COL_DEFAULT, 24, 0 ), XclImpRoot( rRoot ) @@ -4102,8 +4042,6 @@ void XclImpDrawing::ReadTxo( XclImpStream& rStrm ) } } - - XclImpSheetDrawing::XclImpSheetDrawing( const XclImpRoot& rRoot, SCTAB nScTab ) : XclImpDrawing( rRoot, true ), maScUsedArea( ScAddress::INITIALIZE_INVALID ) @@ -4337,6 +4275,4 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclImpDffPropSet& rPropSet ) return rStrm; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xiformula.cxx b/sc/source/filter/excel/xiformula.cxx index f29636beb36a..ccc47475a9f9 100644 --- a/sc/source/filter/excel/xiformula.cxx +++ b/sc/source/filter/excel/xiformula.cxx @@ -44,8 +44,6 @@ private: const XclBiff meBiff; /// Cached BIFF version to save GetBiff() calls. }; - - XclImpFmlaCompImpl::XclImpFmlaCompImpl( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), maFuncProv( rRoot ), @@ -89,8 +87,6 @@ const ScTokenArray* XclImpFmlaCompImpl::CreateFormula( return pArray; } - - XclImpFormulaCompiler::XclImpFormulaCompiler( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), mxImpl( new XclImpFmlaCompImpl( rRoot ) ) @@ -114,6 +110,4 @@ const ScTokenArray* XclImpFormulaCompiler::CreateFormula( return mxImpl->CreateFormula(eType, rXclTokArr); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx index deab5bf5c8d0..6d17288efe52 100644 --- a/sc/source/filter/excel/xihelper.cxx +++ b/sc/source/filter/excel/xihelper.cxx @@ -51,8 +51,6 @@ inline void lclFillAddress( ScAddress& rScPos, sal_uInt16 nXclCol, sal_uInt32 nX } // namespace - - XclImpAddressConverter::XclImpAddressConverter( const XclImpRoot& rRoot ) : XclAddressConverterBase( rRoot.GetTracer(), rRoot.GetScMaxPos() ) { @@ -263,8 +261,6 @@ XclImpHFConverter::XclImpHFPortionInfo::XclImpHFPortionInfo() : maSel.nStartPos = maSel.nEndPos = 0; } - - XclImpHFConverter::XclImpHFConverter( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), mrEE( rRoot.GetHFEditEngine() ), @@ -897,6 +893,4 @@ ScMatrixRef XclImpCachedMatrix::CreateScMatrix( svl::SharedStringPool& rPool ) c return xScMatrix; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index 8be264201a7e..6bcbdc30a404 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -36,8 +36,6 @@ using ::std::vector; - - // *** Helper classes *** @@ -157,8 +155,6 @@ inline XclImpStream& operator>>( XclImpStream& rStrm, XclImpXti& rXti ) return rStrm >> rXti.mnSupbook >> rXti.mnSBTabFirst >> rXti.mnSBTabLast; } - - /** Implementation of the link manager. */ class XclImpLinkManagerImpl : protected XclImpRoot { @@ -866,8 +862,6 @@ void XclImpLinkManagerImpl::LoadCachedValues() itSupbook->LoadCachedValues(); } - - XclImpLinkManager::XclImpLinkManager( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), mxImpl( new XclImpLinkManagerImpl( rRoot ) ) @@ -939,6 +933,4 @@ const OUString& XclImpLinkManager::GetMacroName( sal_uInt16 nExtSheet, sal_uInt1 return mxImpl->GetMacroName( nExtSheet, nExtName ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx index 14391ba2f3c4..5defaecdc8f5 100644 --- a/sc/source/filter/excel/xiname.cxx +++ b/sc/source/filter/excel/xiname.cxx @@ -267,8 +267,6 @@ void XclImpName::InsertName(const ScTokenArray* pArray) mpScData = pData; // cache for later use } - - XclImpNameManager::XclImpNameManager( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) { @@ -311,6 +309,4 @@ void XclImpNameManager::ConvertAllTokens() it->ConvertTokens(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xipage.cxx b/sc/source/filter/excel/xipage.cxx index 9c34d59ccdd0..d521f898d01b 100644 --- a/sc/source/filter/excel/xipage.cxx +++ b/sc/source/filter/excel/xipage.cxx @@ -170,8 +170,6 @@ void XclImpPageSettings::SetPaperSize( sal_uInt16 nXclPaperSize, bool bPortrait mbValidPaper = true; } - - namespace { void lclPutMarginItem( SfxItemSet& rItemSet, sal_uInt16 nRecId, double fMarginInch ) @@ -380,6 +378,4 @@ void XclImpPageSettings::Finalize() } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx index 9ed241fe75e6..ad2ae652fdea 100644 --- a/sc/source/filter/excel/xipivot.cxx +++ b/sc/source/filter/excel/xipivot.cxx @@ -173,8 +173,6 @@ void XclImpPCItem::ReadSxempty( XclImpStream& rStrm ) SetEmpty(); } - - XclImpPCField::XclImpPCField( const XclImpRoot& rRoot, XclImpPivotCache& rPCache, sal_uInt16 nFieldIdx ) : XclPCField( EXC_PCFIELD_UNKNOWN, nFieldIdx ), XclImpRoot( rRoot ), @@ -582,8 +580,6 @@ const sal_Int16* XclImpPCField::GetDateGroupStep() const return 0; } - - XclImpPivotCache::XclImpPivotCache( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), maSrcRange( ScAddress::INITIALIZE_INVALID ), @@ -915,8 +911,6 @@ void XclImpPTItem::ConvertItem( ScDPSaveDimension& rSaveDim ) const } } - - XclImpPTField::XclImpPTField( const XclImpPivotTable& rPTable, sal_uInt16 nCacheIdx ) : mrPTable( rPTable ) { @@ -1191,8 +1185,6 @@ void XclImpPTField::ConvertItems( ScDPSaveDimension& rSaveDim ) const (*aIt)->ConvertItem( rSaveDim ); } - - XclImpPivotTable::XclImpPivotTable( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), maDataOrientField( *this, EXC_SXIVD_DATA ), @@ -1356,8 +1348,6 @@ void XclImpPivotTable::ReadSxViewEx9( XclImpStream& rStrm ) rStrm >> maPTViewEx9Info; } - - void XclImpPivotTable::Convert() { if( !mxPCache || !mxPCache->IsValid() ) @@ -1525,8 +1515,6 @@ void XclImpPivotTable::ApplyMergeFlags(const ScRange& rOutRange, const ScDPSaveD } } - - XclImpPivotTableManager::XclImpPivotTableManager( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) { @@ -1628,8 +1616,6 @@ void XclImpPivotTableManager::ReadSxViewEx9( XclImpStream& rStrm ) maPTables.back()->ReadSxViewEx9( rStrm ); } - - void XclImpPivotTableManager::ReadPivotCaches( XclImpStream& rStrm ) { for( XclImpPivotCacheVec::iterator aIt = maPCaches.begin(), aEnd = maPCaches.end(); aIt != aEnd; ++aIt ) @@ -1648,6 +1634,4 @@ void XclImpPivotTableManager::MaybeRefreshPivotTables() (*aIt)->MaybeRefresh(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xiroot.cxx b/sc/source/filter/excel/xiroot.cxx index 1d0d4be3011d..77db4fbc121c 100644 --- a/sc/source/filter/excel/xiroot.cxx +++ b/sc/source/filter/excel/xiroot.cxx @@ -52,8 +52,6 @@ XclImpRootData::~XclImpRootData() { } - - XclImpRoot::XclImpRoot( XclImpRootData& rImpRootData ) : XclRoot( rImpRootData ), mrImpData( rImpRootData ) @@ -302,6 +300,4 @@ ScDocumentImport& XclImpRoot::GetDocImport() return *mrImpData.mxDocImport; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx index 448f7cffd023..5419b8305a9e 100644 --- a/sc/source/filter/excel/xistream.cxx +++ b/sc/source/filter/excel/xistream.cxx @@ -1122,6 +1122,4 @@ sal_uInt16 XclImpStream::ReadRawData( void* pData, sal_uInt16 nBytes ) return nRet; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xistring.cxx b/sc/source/filter/excel/xistring.cxx index 51b4a04d98dc..c4165dd8b9c8 100644 --- a/sc/source/filter/excel/xistring.cxx +++ b/sc/source/filter/excel/xistring.cxx @@ -27,8 +27,6 @@ /** All allowed flags for import. */ const XclStrFlags nAllowedFlags = EXC_STR_8BITLENGTH | EXC_STR_SMARTFLAGS | EXC_STR_SEPARATEFORMATS; - - XclImpString::XclImpString() { } @@ -202,6 +200,4 @@ XclImpStringIterator& XclImpStringIterator::operator++() return *this; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index 55549cbc9fd8..e591b156b7af 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -482,8 +482,6 @@ void XclImpFont::GuessScriptType() } } - - XclImpFontBuffer::XclImpFontBuffer( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), maFont4( rRoot ), @@ -738,8 +736,6 @@ void XclImpCellProt::FillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs ) c } - - void XclImpCellAlign::FillFromXF2( sal_uInt8 nFlags ) { mnHorAlign = ::extract_value< sal_uInt8 >( nFlags, 0, 3 ); @@ -824,8 +820,6 @@ void XclImpCellAlign::FillToItemSet( SfxItemSet& rItemSet, const XclImpFont* pFo ScfTools::PutItem( rItemSet, SvxFrameDirectionItem( GetScFrameDir(), ATTR_WRITINGDIR ), bSkipPoolDefs ); } - - XclImpCellBorder::XclImpCellBorder() { SetUsedFlags( false, false ); @@ -990,8 +984,6 @@ void XclImpCellBorder::FillToItemSet( SfxItemSet& rItemSet, const XclImpPalette& } } - - XclImpCellArea::XclImpCellArea() { SetUsedFlags( false ); @@ -1078,8 +1070,6 @@ void XclImpCellArea::FillToItemSet( SfxItemSet& rItemSet, const XclImpPalette& r } - - XclImpXF::XclImpXF( const XclImpRoot& rRoot ) : XclXFBase( true ), // default is cell XF XclImpRoot( rRoot ), @@ -1431,8 +1421,6 @@ void XclImpXF::SetUsedFlags( sal_uInt8 nUsedFlags ) mbAreaUsed = (mbCellXF == ::get_flag( nUsedFlags, EXC_XF_DIFF_AREA )); } - - XclImpStyle::XclImpStyle( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), mnXfId( EXC_XF_NOTFOUND ), @@ -1525,8 +1513,6 @@ void XclImpStyle::CreateUserStyle( const OUString& rFinalName ) CreateStyleSheet(); } - - XclImpXFBuffer::XclImpXFBuffer( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) { @@ -1690,8 +1676,6 @@ bool XclImpXFRange::Expand( const XclImpXFRange& rNextRange ) return false; } - - void XclImpXFRangeColumn::SetDefaultXF( const XclImpXFIndex& rXFIndex ) { // List should be empty when inserting the default column format. @@ -1702,8 +1686,6 @@ void XclImpXFRangeColumn::SetDefaultXF( const XclImpXFIndex& rXFIndex ) maIndexList.push_back( new XclImpXFRange( 0, MAXROW, rXFIndex ) ); } - - void XclImpXFRangeColumn::SetXF( SCROW nScRow, const XclImpXFIndex& rXFIndex ) { XclImpXFRange* pPrevRange; @@ -1854,8 +1836,6 @@ void XclImpXFRangeColumn::TryConcatPrev( sal_uLong nIndex ) maIndexList.erase( maIndexList.begin() + nIndex ); } - - XclImpXFRangeBuffer::XclImpXFRangeBuffer( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) { @@ -2051,6 +2031,4 @@ void XclImpXFRangeBuffer::Finalize() } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xiview.cxx b/sc/source/filter/excel/xiview.cxx index b4e196d151a5..e7b91d4d804f 100644 --- a/sc/source/filter/excel/xiview.cxx +++ b/sc/source/filter/excel/xiview.cxx @@ -83,8 +83,6 @@ long lclGetScZoom( sal_uInt16 nXclZoom, sal_uInt16 nDefZoom ) } // namespace - - XclImpTabViewSettings::XclImpTabViewSettings( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) { @@ -293,6 +291,4 @@ void XclImpTabViewSettings::Finalize() rDoc.SetTabBgColor(nScTab, maData.maTabBgColor); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xladdress.cxx b/sc/source/filter/excel/xladdress.cxx index 829523de9268..0fec06888933 100644 --- a/sc/source/filter/excel/xladdress.cxx +++ b/sc/source/filter/excel/xladdress.cxx @@ -22,8 +22,6 @@ #include "xltracer.hxx" #include "xistream.hxx" - - void XclAddress::Read( XclImpStream& rStrm, bool bCol16Bit ) { mnRow = rStrm.ReaduInt16(); @@ -42,8 +40,6 @@ void XclAddress::Write( XclExpStream& rStrm, bool bCol16Bit ) const rStrm << static_cast< sal_uInt8 >( mnCol ); } - - bool XclRange::Contains( const XclAddress& rPos ) const { return (maFirst.mnCol <= rPos.mnCol) && (rPos.mnCol <= maLast.mnCol) && @@ -73,8 +69,6 @@ void XclRange::Write( XclExpStream& rStrm, bool bCol16Bit ) const rStrm << static_cast< sal_uInt8 >( maFirst.mnCol ) << static_cast< sal_uInt8 >( maLast.mnCol ); } - - XclRange XclRangeList::GetEnclosingRange() const { XclRange aXclRange; @@ -126,8 +120,6 @@ void XclRangeList::WriteSubList( XclExpStream& rStrm, size_t nBegin, size_t nCou aIt->Write( rStrm, bCol16Bit ); } - - XclAddressConverterBase::XclAddressConverterBase( XclTracer& rTracer, const ScAddress& rMaxPos ) : mrTracer( rTracer ), maMaxPos( rMaxPos ), @@ -156,6 +148,4 @@ bool XclAddressConverterBase::CheckScTab( SCTAB nScTab, bool bWarn ) return bValid; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx index e49b2445280d..4c359250a01d 100644 --- a/sc/source/filter/excel/xlchart.cxx +++ b/sc/source/filter/excel/xlchart.cxx @@ -71,8 +71,6 @@ XclChRectangle::XclChRectangle() : { } - - XclChDataPointPos::XclChDataPointPos( sal_uInt16 nSeriesIdx, sal_uInt16 nPointIdx ) : mnSeriesIdx( nSeriesIdx ), mnPointIdx( nPointIdx ) @@ -85,8 +83,6 @@ bool operator<( const XclChDataPointPos& rL, const XclChDataPointPos& rR ) ((rL.mnSeriesIdx == rR.mnSeriesIdx) && (rL.mnPointIdx < rR.mnPointIdx)); } - - XclChFrBlock::XclChFrBlock( sal_uInt16 nType ) : mnType( nType ), mnContext( 0 ), @@ -103,8 +99,6 @@ XclChFramePos::XclChFramePos() : { } - - XclChLineFormat::XclChLineFormat() : maColor( COL_BLACK ), mnPattern( EXC_CHLINEFORMAT_SOLID ), @@ -113,8 +107,6 @@ XclChLineFormat::XclChLineFormat() : { } - - XclChAreaFormat::XclChAreaFormat() : maPattColor( COL_WHITE ), maBackColor( COL_BLACK ), @@ -123,8 +115,6 @@ XclChAreaFormat::XclChAreaFormat() : { } - - XclChEscherFormat::XclChEscherFormat() { } @@ -133,8 +123,6 @@ XclChEscherFormat::~XclChEscherFormat() { } - - XclChPicFormat::XclChPicFormat() : mnBmpMode( EXC_CHPICFORMAT_NONE ), mnFlags( EXC_CHPICFORMAT_TOPBOTTOM | EXC_CHPICFORMAT_FRONTBACK | EXC_CHPICFORMAT_LEFTRIGHT ), @@ -142,8 +130,6 @@ XclChPicFormat::XclChPicFormat() : { } - - XclChFrame::XclChFrame() : mnFormat( EXC_CHFRAME_STANDARD ), mnFlags( EXC_CHFRAME_AUTOSIZE | EXC_CHFRAME_AUTOPOS ) @@ -167,15 +153,11 @@ XclChObjectLink::XclChObjectLink() : { } - - XclChFrLabelProps::XclChFrLabelProps() : mnFlags( 0 ) { } - - XclChText::XclChText() : maTextColor( COL_BLACK ), mnHAlign( EXC_CHTEXT_ALIGN_CENTER ), @@ -198,24 +180,18 @@ XclChMarkerFormat::XclChMarkerFormat() : { }; - - XclCh3dDataFormat::XclCh3dDataFormat() : mnBase( EXC_CH3DDATAFORMAT_RECT ), mnTop( EXC_CH3DDATAFORMAT_STRAIGHT ) { } - - XclChDataFormat::XclChDataFormat() : mnFormatIdx( EXC_CHDATAFORMAT_DEFAULT ), mnFlags( 0 ) { } - - XclChSerTrendLine::XclChSerTrendLine() : mfForecastFor( 0.0 ), mfForecastBack( 0.0 ), @@ -231,8 +207,6 @@ XclChSerTrendLine::XclChSerTrendLine() : pDouble->w32_parts.msw = pDouble->w32_parts.lsw = 0xFFFFFFFF; } - - XclChSerErrorBar::XclChSerErrorBar() : mfValue( 0.0 ), mnValueCount( 1 ), @@ -242,8 +216,6 @@ XclChSerErrorBar::XclChSerErrorBar() : { } - - XclChSeries::XclChSeries() : mnCategType( EXC_CHSERIES_NUMERIC ), mnValueType( EXC_CHSERIES_NUMERIC ), @@ -267,8 +239,6 @@ XclChType::XclChType() : { } - - XclChChart3d::XclChChart3d() : mnRotation( 20 ), mnElevation( 15 ), @@ -280,8 +250,6 @@ XclChChart3d::XclChChart3d() : { } - - XclChLegend::XclChLegend() : mnDockMode( EXC_CHLEGEND_RIGHT ), mnSpacing( EXC_CHLEGEND_MEDIUM ), @@ -290,16 +258,12 @@ XclChLegend::XclChLegend() : { } - - XclChTypeGroup::XclChTypeGroup() : mnFlags( 0 ), mnGroupIdx( EXC_CHSERGROUP_NONE ) { } - - XclChProperties::XclChProperties() : mnFlags( 0 ), mnEmptyMode( EXC_CHPROPS_EMPTY_SKIP ) @@ -316,8 +280,6 @@ XclChLabelRange::XclChLabelRange() : { } - - XclChDateRange::XclChDateRange() : mnMinDate( 0 ), mnMaxDate( 0 ), @@ -334,8 +296,6 @@ XclChDateRange::XclChDateRange() : { } - - XclChValueRange::XclChValueRange() : mfMin( 0.0 ), mfMax( 0.0 ), @@ -348,8 +308,6 @@ XclChValueRange::XclChValueRange() : { } - - XclChTick::XclChTick() : maTextColor( COL_BLACK ), mnMajor( EXC_CHTICK_INSIDE | EXC_CHTICK_OUTSIDE ), @@ -361,8 +319,6 @@ XclChTick::XclChTick() : { } - - XclChAxis::XclChAxis() : mnType( EXC_CHAXIS_NONE ) { @@ -380,8 +336,6 @@ sal_Int32 XclChAxis::GetApiAxisDimension() const return nApiAxisDim; } - - XclChAxesSet::XclChAxesSet() : mnAxesSetId( EXC_CHAXESSET_PRIMARY ) { @@ -492,8 +446,6 @@ static const XclChFormatInfo spFmtInfos[] = } - - XclChFormatInfoProvider::XclChFormatInfoProvider() { const XclChFormatInfo* pEnd = STATIC_ARRAY_END( spFmtInfos ); @@ -561,8 +513,6 @@ void XclChExtTypeInfo::Set( const XclChTypeInfo& rTypeInfo, bool b3dChart, bool mbSpline = bSpline; } - - XclChTypeInfoProvider::XclChTypeInfoProvider() { const XclChTypeInfo* pEnd = STATIC_ARRAY_END( spTypeInfos ); @@ -694,8 +644,6 @@ const sal_Char* const sppcBitmapNames[] = { "FillStyle", "FillBitmapName", "Fill } // namespace - - XclChPropSetHelper::XclChPropSetHelper() : maLineHlpCommon( sppcLineNamesCommon ), maLineHlpLinear( sppcLineNamesLinear ), @@ -1231,8 +1179,6 @@ ScfPropSetHelper& XclChPropSetHelper::GetHatchHelper( XclChPropertyMode ePropMod return maHatchHlpCommon; } - - namespace { /* The following local functions implement getting the XShape interface of all @@ -1273,8 +1219,6 @@ EXC_DEFINEFUNC_GETAXISTITLESHAPE( lclGetSecYAxisTitleShape, XSecondAxisTitleSupp } // namespace - - XclChRootData::XclChRootData() : mxTypeInfoProv( new XclChTypeInfoProvider ), mxFmtInfoProv( new XclChFormatInfoProvider ), @@ -1343,6 +1287,4 @@ Reference< XShape > XclChRootData::GetTitleShape( const XclChTextKey& rTitleKey return xTitleShape; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx index e1787d21bc19..2d6d29e29c8b 100644 --- a/sc/source/filter/excel/xlescher.cxx +++ b/sc/source/filter/excel/xlescher.cxx @@ -134,8 +134,6 @@ sal_uInt16 lclGetEmbeddedScale( long nPageSize, sal_Int32 nPageScale, long nPos, } // namespace - - XclObjAnchor::XclObjAnchor() : mnLX( 0 ), mnTY( 0 ), @@ -206,8 +204,6 @@ void XclObjAnchor::SetRect( const Size& rPageSize, sal_Int32 nScaleX, sal_Int32 Set( 0, 0, 0, 0 ); } - - XclObjLineData::XclObjLineData() : mnColorIdx( EXC_OBJ_LINE_AUTOCOLOR ), mnStyle( EXC_OBJ_LINE_SOLID ), @@ -225,8 +221,6 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclObjLineData& rLineData ) >> rLineData.mnAuto; } - - XclObjFillData::XclObjFillData() : mnBackColorIdx( EXC_OBJ_LINE_AUTOCOLOR ), mnPattColorIdx( EXC_OBJ_FILL_AUTOCOLOR ), @@ -244,8 +238,6 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclObjFillData& rFillData ) >> rFillData.mnAuto; } - - XclObjTextData::XclObjTextData() : mnTextLen( 0 ), mnFormatSize( 0 ), @@ -287,8 +279,6 @@ void XclObjTextData::ReadTxo8( XclImpStream& rStrm ) rStrm >> mnFlags >> mnOrient >> mnButtonFlags >> mnShortcut >> mnShortcutEA >> mnTextLen >> mnFormatSize; } - - Reference< XControlModel > XclControlHelper::GetControlModel( Reference< XShape > xShape ) { Reference< XControlModel > xCtrlModel; @@ -342,6 +332,4 @@ OUString XclControlHelper::ExtractFromMacroDescriptor( return OUString(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index e7222a75639d..b15cb426a586 100644 --- a/sc/source/filter/excel/xlformula.cxx +++ b/sc/source/filter/excel/xlformula.cxx @@ -594,8 +594,6 @@ static const XclFunctionInfo saFuncTable_OOoLO[] = #undef EXC_FUNCENTRY_OOO - - XclFunctionProvider::XclFunctionProvider( const XclRoot& rRoot ) { void (XclFunctionProvider::*pFillFunc)( const XclFunctionInfo*, const XclFunctionInfo* ) = @@ -759,8 +757,6 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclTokenArrayRef& rxTokArr return rStrm; } - - XclTokenArrayIterator::XclTokenArrayIterator() : mppScTokenBeg( 0 ), mppScTokenEnd( 0 ), @@ -955,6 +951,4 @@ bool XclTokenArrayHelper::GetMultipleOpRefs( return eState == stClose; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xlpage.cxx b/sc/source/filter/excel/xlpage.cxx index e9a96fa41e98..0cccec7f7349 100644 --- a/sc/source/filter/excel/xlpage.cxx +++ b/sc/source/filter/excel/xlpage.cxx @@ -261,6 +261,4 @@ void XclPageData::SetScPaperSize( const Size& rSize, bool bPortrait, bool bStric SetScPaperSize( rSize, bPortrait, true ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx index 8010d89cbb9a..ef4be100aaf6 100644 --- a/sc/source/filter/excel/xlpivot.cxx +++ b/sc/source/filter/excel/xlpivot.cxx @@ -109,8 +109,6 @@ void XclPCItem::SetBool( bool bValue ) mbValue = bValue; } - - bool XclPCItem::IsEqual( const XclPCItem& rItem ) const { if( meType == rItem.meType ) switch( meType ) @@ -413,8 +411,6 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTCachedName& rCachedNam return rStrm; } - - const OUString* XclPTVisNameInfo::GetVisName() const { return HasVisName() ? &maVisName.maName : 0; @@ -935,8 +931,6 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTExtInfo& rInfo ) << EXC_PT_NOSTRING; // length of vacate style name } - - // Pivot table autoformat settings ============================================ /** diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx index bf12dab002dc..2bb35751b2ea 100644 --- a/sc/source/filter/excel/xlroot.cxx +++ b/sc/source/filter/excel/xlroot.cxx @@ -75,8 +75,6 @@ XclDebugObjCounter::~XclDebugObjCounter() } #endif - - XclRootData::XclRootData( XclBiff eBiff, SfxMedium& rMedium, SotStorageRef xRootStrg, ScDocument& rDoc, rtl_TextEncoding eTextEnc, bool bExport ) : meBiff( eBiff ), @@ -160,8 +158,6 @@ XclRootData::~XclRootData() { } - - XclRoot::XclRoot( XclRootData& rRootData ) : mrData( rRootData ) { @@ -408,6 +404,4 @@ XclTracer& XclRoot::GetTracer() const return *mrData.mxTracer; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx index d237a9b4ce4f..d2bf5e4d48b0 100644 --- a/sc/source/filter/excel/xlstyle.cxx +++ b/sc/source/filter/excel/xlstyle.cxx @@ -85,8 +85,6 @@ static const ColorData spnDefColorTable8[] = #undef EXC_PALETTE_EGA_COLORS_LIGHT #undef EXC_PALETTE_EGA_COLORS_DARK - - XclDefaultPalette::XclDefaultPalette( const XclRoot& rRoot ) : mpnColorTable( 0 ), mnTableSize( 0 ) @@ -169,8 +167,6 @@ namespace AwtFontFamily = Awt::FontFamily; namespace AwtFontUnderline = Awt::FontUnderline; namespace AwtFontStrikeout = Awt::FontStrikeout; - - XclFontData::XclFontData() { Clear(); @@ -517,8 +513,6 @@ void XclFontData::SetApiStrikeout( sal_Int16 nApiStrikeout ) (nApiStrikeout != AwtFontStrikeout::DONTKNOW); } - - bool operator==( const XclFontData& rLeft, const XclFontData& rRight ) { return @@ -536,8 +530,6 @@ bool operator==( const XclFontData& rLeft, const XclFontData& rRight ) (rLeft.maName == rRight.maName); } - - namespace { /** Property names for common font settings. */ @@ -614,8 +606,6 @@ void lclWriteChartFont( ScfPropertySet& rPropSet, } // namespace - - XclFontPropSetHelper::XclFontPropSetHelper() : maHlpChCommon( sppcPropNamesChCommon ), maHlpChWstrn( sppcPropNamesChWstrn ), @@ -766,8 +756,6 @@ ScfPropSetHelper& XclFontPropSetHelper::GetChartHelper( sal_Int16 nScript ) namespace { - - /** Special number format index describing a reused format. */ const NfIndexTableOffset PRV_NF_INDEX_REUSE = NF_INDEX_TABLE_ENTRIES; @@ -778,8 +766,6 @@ const LanguageType PRV_LANGUAGE_FRENCH_PRIM = LANGUAGE_FRENCH & LANGUAGE_MASK_PR /** Parent language identifier for Asian languages. */ const LanguageType PRV_LANGUAGE_ASIAN_PRIM = LANGUAGE_CHINESE & LANGUAGE_MASK_PRIMARY; - - /** Stores the number format used in Calc for an Excel built-in number format. */ struct XclBuiltInFormat { @@ -789,8 +775,6 @@ struct XclBuiltInFormat sal_uInt16 mnXclReuseFmt; /// Use this Excel format, if meOffset==PRV_NF_INDEX_REUSE. }; - - /** Defines a literal Excel built-in number format. */ #define EXC_NUMFMT_STRING( nXclNumFmt, pcUtf8 ) \ { nXclNumFmt, pcUtf8, NF_NUMBER_STANDARD, 0 } @@ -807,8 +791,6 @@ struct XclBuiltInFormat #define EXC_NUMFMT_ENDTABLE() \ { EXC_FORMAT_NOTFOUND, 0, NF_NUMBER_STANDARD, 0 } - - // Currency unit characters #define UTF8_BAHT "\340\270\277" #define UTF8_EURO "\342\202\254" @@ -837,8 +819,6 @@ struct XclBuiltInFormat #define UTF8_KO_MIN "\353\266\204" #define UTF8_KO_SEC "\354\264\210" - - /** Default number format table. Last parent of all other tables, used for unknown languages. */ static const XclBuiltInFormat spBuiltInFormats_DONTKNOW[] = { @@ -1410,15 +1390,11 @@ static const XclBuiltInFormat spBuiltInFormats_THAI[] = EXC_NUMFMT_ENDTABLE() }; - - #undef EXC_NUMFMT_ENDTABLE #undef EXC_NUMFMT_REUSE #undef EXC_NUMFMT_OFFSET #undef EXC_NUMFMT_STRING - - /** Specifies a number format table for a specific language. */ struct XclBuiltInFormatTable { @@ -1471,12 +1447,8 @@ static const XclBuiltInFormatTable spBuiltInFormatTables[] = { LANGUAGE_THAI, LANGUAGE_DONTKNOW, spBuiltInFormats_THAI } }; - - } // namespace - - XclNumFmtBuffer::XclNumFmtBuffer( const XclRoot& rRoot ) : meSysLang( rRoot.GetSysLanguage() ), mnStdScNumFmt( rRoot.GetFormatter().GetStandardFormat( ScGlobal::eLnge ) ) @@ -1570,8 +1542,6 @@ bool operator==( const XclCellProt& rLeft, const XclCellProt& rRight ) return (rLeft.mbLocked == rRight.mbLocked) && (rLeft.mbHidden == rRight.mbHidden); } - - XclCellAlign::XclCellAlign() : mnHorAlign( EXC_XF_HOR_GENERAL ), mnVerAlign( EXC_XF_VER_BOTTOM ), @@ -1689,8 +1659,6 @@ bool operator==( const XclCellAlign& rLeft, const XclCellAlign& rRight ) (rLeft.mbLineBreak == rRight.mbLineBreak) && (rLeft.mbShrink == rRight.mbShrink); } - - XclCellBorder::XclCellBorder() : mnLeftColor( 0 ), mnRightColor( 0 ), @@ -1718,8 +1686,6 @@ bool operator==( const XclCellBorder& rLeft, const XclCellBorder& rRight ) (rLeft.mbDiagTLtoBR == rRight.mbDiagTLtoBR) && (rLeft.mbDiagBLtoTR == rRight.mbDiagBLtoTR); } - - XclCellArea::XclCellArea() : mnForeColor( EXC_COLOR_WINDOWTEXT ), mnBackColor( EXC_COLOR_WINDOWBACK ), @@ -1739,8 +1705,6 @@ bool operator==( const XclCellArea& rLeft, const XclCellArea& rRight ) (rLeft.mnPattern == rRight.mnPattern); } - - XclXFBase::XclXFBase( bool bCellXF ) : mnParent( bCellXF ? EXC_XF_DEFAULTSTYLE : EXC_XF_STYLEPARENT ), mbCellXF( bCellXF ) @@ -1771,6 +1735,4 @@ bool XclXFBase::Equals( const XclXFBase& rCmp ) const (mbBorderUsed == rCmp.mbBorderUsed) && (mbAreaUsed == rCmp.mbAreaUsed); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx index e285bebd4edc..33aa2a43ea1b 100644 --- a/sc/source/filter/excel/xltoolbar.cxx +++ b/sc/source/filter/excel/xltoolbar.cxx @@ -67,8 +67,6 @@ OUString MSOExcelCommandConvertor::MSOTCIDToOOCommand( sal_Int16 key ) return sResult; } - - CTBS::CTBS() : bSignature(0), bVersion(0), reserved1(0), reserved2(0), reserved3(0), ctb(0), ctbViews(0), ictbView(0) { } diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx index ce6e64611d86..f436152a60b6 100644 --- a/sc/source/filter/excel/xltools.cxx +++ b/sc/source/filter/excel/xltools.cxx @@ -728,6 +728,4 @@ XclExpStream& operator<<( XclExpStream& rStrm, const Color& rColor ) return rStrm << rColor.GetRed() << rColor.GetGreen() << rColor.GetBlue() << sal_uInt8( 0 ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xltracer.cxx b/sc/source/filter/excel/xltracer.cxx index a18b76decdab..6c7e632aebca 100644 --- a/sc/source/filter/excel/xltracer.cxx +++ b/sc/source/filter/excel/xltracer.cxx @@ -146,6 +146,4 @@ void XclTracer::TraceDVType( bool bType) ProcessTraceOnce(eDVType); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xlview.cxx b/sc/source/filter/excel/xlview.cxx index 0942f25d49bc..eb540a66def5 100644 --- a/sc/source/filter/excel/xlview.cxx +++ b/sc/source/filter/excel/xlview.cxx @@ -35,8 +35,6 @@ XclDocViewData::XclDocViewData() : { } - - XclTabViewData::XclTabViewData() : maFirstXclPos( ScAddress::UNINITIALIZED ), maSecondXclPos( ScAddress::UNINITIALIZED ) @@ -101,6 +99,4 @@ XclSelectionData& XclTabViewData::CreateSelectionData( sal_uInt8 nPane ) return *rxSelData; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit