diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-22 21:20:15 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-23 03:38:49 +0000 |
commit | 0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch) | |
tree | 5024cba9f9ea5e3b23ea26025323f6aef39488d0 /sc/source/filter/excel | |
parent | fdo#70414: Use correct target names for building Visual Studio projects. (diff) | |
download | core-0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf.tar.gz core-0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf.zip |
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb
Reviewed-on: https://gerrit.libreoffice.org/8182
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/filter/excel')
42 files changed, 321 insertions, 321 deletions
diff --git a/sc/source/filter/excel/colrowst.cxx b/sc/source/filter/excel/colrowst.cxx index dc6eae07b07d..a6b2cf24de9f 100644 --- a/sc/source/filter/excel/colrowst.cxx +++ b/sc/source/filter/excel/colrowst.cxx @@ -286,7 +286,7 @@ void XclImpColRowSettings::Convert( SCTAB nScTab ) nPrevFlags = nFlags; } - // ------------------------------------------------------------------------ + mbDirty = false; } diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index dbdf92c6d745..9aeddf908b80 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -420,7 +420,7 @@ void ImportExcel8::LoadDocumentProperties() } } -//___________________________________________________________________ + // autofilter void ImportExcel8::FilterMode( void ) diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index 977d638cf482..a2a246e4f7b1 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -567,7 +567,7 @@ XclExpFiltermode::XclExpFiltermode() : { } -// ---------------------------------------------------------------------------- + XclExpAutofilterinfo::XclExpAutofilterinfo( const ScAddress& rStartPos, SCCOL nScCol ) : XclExpUInt16Record( EXC_ID_AUTOFILTERINFO, static_cast< sal_uInt16 >( nScCol ) ), @@ -575,7 +575,7 @@ XclExpAutofilterinfo::XclExpAutofilterinfo( const ScAddress& rStartPos, SCCOL nS { } -// ---------------------------------------------------------------------------- + ExcFilterCondition::ExcFilterCondition() : nType( EXC_AFTYPE_NOTUSED ), @@ -673,7 +673,7 @@ void ExcFilterCondition::SaveText( XclExpStream& rStrm ) } } -// ---------------------------------------------------------------------------- + XclExpAutofilter::XclExpAutofilter( const XclExpRoot& rRoot, sal_uInt16 nC ) : XclExpRecord( EXC_ID_AUTOFILTER, 24 ), @@ -896,7 +896,7 @@ void XclExpAutofilter::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_filterColumn ); } -// ---------------------------------------------------------------------------- + ExcAutoFilterRecs::ExcAutoFilterRecs( const XclExpRoot& rRoot, SCTAB nTab ) : XclExpRoot( rRoot ), @@ -1068,7 +1068,7 @@ bool ExcAutoFilterRecs::HasFilterMode() const return pFilterMode != NULL; } -// ---------------------------------------------------------------------------- + XclExpFilterManager::XclExpFilterManager( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ) diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx index a8f0fe63fea7..c030be9a28c7 100644 --- a/sc/source/filter/excel/read.cxx +++ b/sc/source/filter/excel/read.cxx @@ -137,7 +137,7 @@ FltError ImportExcel::Read( void ) switch( eAkt ) { - // ---------------------------------------------------------------- + case Z_BiffNull: // ------------------------------- Z_BiffNull - { switch( nOpcode ) @@ -203,7 +203,7 @@ FltError ImportExcel::Read( void ) } } break; - // ---------------------------------------------------------------- + case Z_Biff2: // ---------------------------------- Z_Biff2 - { switch( nOpcode ) @@ -262,7 +262,7 @@ FltError ImportExcel::Read( void ) } } break; - // ---------------------------------------------------------------- + case Z_Biff3: // ---------------------------------- Z_Biff3 - { switch( nOpcode ) @@ -333,7 +333,7 @@ FltError ImportExcel::Read( void ) } } break; - // ---------------------------------------------------------------- + case Z_Biff4: // ---------------------------------- Z_Biff4 - { switch( nOpcode ) @@ -408,7 +408,7 @@ FltError ImportExcel::Read( void ) } } break; - // ---------------------------------------------------------------- + case Z_Biff4W: // --------------------------------- Z_Biff4W - { switch( nOpcode ) @@ -453,7 +453,7 @@ FltError ImportExcel::Read( void ) } break; - // ---------------------------------------------------------------- + case Z_Biff4T: // --------------------------------- Z_Biff4T - { switch( nOpcode ) @@ -519,7 +519,7 @@ FltError ImportExcel::Read( void ) } break; - // ---------------------------------------------------------------- + case Z_Biff4E: // --------------------------------- Z_Biff4E - { switch( nOpcode ) @@ -593,7 +593,7 @@ FltError ImportExcel::Read( void ) } break; - // ---------------------------------------------------------------- + case Z_Biff5TPre: // ------------------------------- Z_Biff5Pre - { if( nOpcode == 0x0809 ) @@ -634,7 +634,7 @@ FltError ImportExcel::Read( void ) } } break; - // ---------------------------------------------------------------- + case Z_Biff5T: // --------------------------------- Z_Biff5T - { switch( nOpcode ) @@ -689,7 +689,7 @@ FltError ImportExcel::Read( void ) } break; - // ---------------------------------------------------------------- + case Z_Biff5E: // --------------------------------- Z_Biff5E - { switch( nOpcode ) @@ -736,7 +736,7 @@ FltError ImportExcel::Read( void ) } break; - // ---------------------------------------------------------------- + case Z_Ende: // ----------------------------------- Z_Ende - OSL_FAIL( "*ImportExcel::Read(): Not possible state!" ); break; @@ -767,7 +767,7 @@ FltError ImportExcel::Read( void ) } -//___________________________________________________________________ + FltError ImportExcel8::Read( void ) { @@ -956,7 +956,7 @@ FltError ImportExcel8::Read( void ) if( !bInUserView ) switch( eAkt ) { - // ---------------------------------------------------------------- + // before workbook globals: wait for initial workbook globals BOF case EXC_STATE_BEFORE_GLOBALS: { @@ -982,7 +982,7 @@ FltError ImportExcel8::Read( void ) } break; - // ---------------------------------------------------------------- + // prefetch for workbook globals case EXC_STATE_GLOBALS_PRE: { @@ -1023,7 +1023,7 @@ FltError ImportExcel8::Read( void ) } break; - // ---------------------------------------------------------------- + // workbook globals case EXC_STATE_GLOBALS: { @@ -1083,7 +1083,7 @@ FltError ImportExcel8::Read( void ) } break; - // ---------------------------------------------------------------- + // prefetch for worksheet case EXC_STATE_SHEET_PRE: { @@ -1149,7 +1149,7 @@ FltError ImportExcel8::Read( void ) } break; - // ---------------------------------------------------------------- + // worksheet case EXC_STATE_SHEET: { @@ -1240,7 +1240,7 @@ FltError ImportExcel8::Read( void ) } break; - // ---------------------------------------------------------------- + default:; } } @@ -1321,6 +1321,6 @@ 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 1dbd49c9adfe..9443c0e1269b 100644 --- a/sc/source/filter/excel/tokstack.cxx +++ b/sc/source/filter/excel/tokstack.cxx @@ -46,7 +46,7 @@ TokenStack::~TokenStack() -//------------------------------------------------------------------------ + // !ACHTUNG!: nach Aussen hin beginnt die Nummerierung mit 1! // !ACHTUNG!: SC-Token werden mit einem Offset nScTokenOff abgelegt diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index f68bf67ec112..cfec247c9098 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -249,7 +249,7 @@ struct XclExpChRootData : public XclChRootData void FinalizeFutureRecBlock( XclExpStream& rStrm ); }; -// ---------------------------------------------------------------------------- + void XclExpChRootData::RegisterFutureRecBlock( const XclChFrBlock& rFrBlock ) { @@ -297,7 +297,7 @@ void XclExpChRootData::FinalizeFutureRecBlock( XclExpStream& rStrm ) } } -// ---------------------------------------------------------------------------- + XclExpChRoot::XclExpChRoot( const XclExpRoot& rRoot, XclExpChChart& rChartData ) : XclExpRoot( rRoot ), @@ -427,7 +427,7 @@ void XclExpChRoot::FinalizeFutureRecBlock( XclExpStream& rStrm ) mxChData->FinalizeFutureRecBlock( rStrm ); } -// ---------------------------------------------------------------------------- + XclExpChGroupBase::XclExpChGroupBase( const XclExpChRoot& rRoot, sal_uInt16 nFrType, sal_uInt16 nRecId, sal_Size nRecSize ) : @@ -473,7 +473,7 @@ void XclExpChGroupBase::SetFutureRecordContext( sal_uInt16 nFrContext, sal_uInt1 maFrBlock.mnValue2 = nFrValue2; } -// ---------------------------------------------------------------------------- + XclExpChFutureRecordBase::XclExpChFutureRecordBase( const XclExpChRoot& rRoot, XclFutureRecType eRecType, sal_uInt16 nRecId, sal_Size nRecSize ) : @@ -502,7 +502,7 @@ 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 ), @@ -585,7 +585,7 @@ XclExpChLineFormatRef lclCreateLineFormat( const XclExpChRoot& rRoot, } // namespace -// ---------------------------------------------------------------------------- + XclExpChAreaFormat::XclExpChAreaFormat( const XclExpChRoot& rRoot ) : XclExpRecord( EXC_ID_CHAREAFORMAT, (rRoot.GetBiff() == EXC_BIFF8) ? 16 : 12 ), @@ -663,7 +663,7 @@ void XclExpChAreaFormat::WriteBody( XclExpStream& rStrm ) } } -// ---------------------------------------------------------------------------- + XclExpChEscherFormat::XclExpChEscherFormat( const XclExpChRoot& rRoot ) : XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_UNKNOWN, EXC_ID_CHESCHERFORMAT ), @@ -739,7 +739,7 @@ void XclExpChEscherFormat::WriteBody( XclExpStream& rStrm ) rStrm.CopyFromStream( aMemStrm ); } -// ---------------------------------------------------------------------------- + XclExpChFrameBase::XclExpChFrameBase() { @@ -801,7 +801,7 @@ 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 ), @@ -896,7 +896,7 @@ void lclAddDoubleRefData( } // namespace -// ---------------------------------------------------------------------------- + XclExpChSourceLink::XclExpChSourceLink( const XclExpChRoot& rRoot, sal_uInt8 nDestType ) : XclExpRecord( EXC_ID_CHSOURCELINK ), @@ -1113,7 +1113,7 @@ XclExpChFont::XclExpChFont( sal_uInt16 nFontIdx ) : { } -// ---------------------------------------------------------------------------- + XclExpChObjectLink::XclExpChObjectLink( sal_uInt16 nLinkTarget, const XclChDataPointPos& rPointPos ) : XclExpRecord( EXC_ID_CHOBJECTLINK, 6 ) @@ -1127,7 +1127,7 @@ 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,7 +1156,7 @@ void XclExpChFrLabelProps::WriteBody( XclExpStream& rStrm ) rStrm << maData.mnFlags << aXclSep; } -// ---------------------------------------------------------------------------- + XclExpChFontBase::~XclExpChFontBase() { @@ -1183,7 +1183,7 @@ 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 ), @@ -1438,7 +1438,7 @@ void XclExpChText::WriteBody( XclExpStream& rStrm ) } } -// ---------------------------------------------------------------------------- + namespace { @@ -1532,7 +1532,7 @@ void XclExpChMarkerFormat::WriteBody( XclExpStream& rStrm ) } } -// ---------------------------------------------------------------------------- + XclExpChPieFormat::XclExpChPieFormat() : XclExpUInt16Record( EXC_ID_CHPIEFORMAT, 0 ) @@ -1546,7 +1546,7 @@ void XclExpChPieFormat::Convert( const ScfPropertySet& rPropSet ) SetValue( limit_cast< sal_uInt16 >( fApiDist * 100.0, 0, 100 ) ); } -// ---------------------------------------------------------------------------- + XclExpCh3dDataFormat::XclExpCh3dDataFormat() : XclExpRecord( EXC_ID_CH3DDATAFORMAT, 2 ) @@ -1588,14 +1588,14 @@ 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 ) : @@ -1678,7 +1678,7 @@ void XclExpChDataFormat::WriteBody( XclExpStream& rStrm ) << maData.mnFlags; } -// ---------------------------------------------------------------------------- + XclExpChSerTrendLine::XclExpChSerTrendLine( const XclExpChRoot& rRoot ) : XclExpRecord( EXC_ID_CHSERTRENDLINE, 28 ), @@ -1773,7 +1773,7 @@ void XclExpChSerTrendLine::WriteBody( XclExpStream& rStrm ) << maData.mfForecastBack; } -// ---------------------------------------------------------------------------- + XclExpChSerErrorBar::XclExpChSerErrorBar( const XclExpChRoot& rRoot, sal_uInt8 nBarType ) : XclExpRecord( EXC_ID_CHSERERRORBAR, 14 ), @@ -1853,7 +1853,7 @@ void XclExpChSerErrorBar::WriteBody( XclExpStream& rStrm ) << maData.mnValueCount; } -// ---------------------------------------------------------------------------- + namespace { @@ -2268,7 +2268,7 @@ void XclExpChType::WriteBody( XclExpStream& rStrm ) } } -// ---------------------------------------------------------------------------- + XclExpChChart3d::XclExpChChart3d() : XclExpRecord( EXC_ID_CHCHART3D, 14 ) @@ -2323,7 +2323,7 @@ void XclExpChChart3d::WriteBody( XclExpStream& rStrm ) << maData.mnFlags; } -// ---------------------------------------------------------------------------- + XclExpChLegend::XclExpChLegend( const XclExpChRoot& rRoot ) : XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_LEGEND, EXC_ID_CHLEGEND, 20 ) @@ -2422,7 +2422,7 @@ 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 ), @@ -2449,7 +2449,7 @@ 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 ), @@ -2776,7 +2776,7 @@ void XclExpChLabelRange::WriteBody( XclExpStream& rStrm ) rStrm << maLabelData.mnCross << maLabelData.mnLabelFreq << maLabelData.mnTickFreq << maLabelData.mnFlags; } -// ---------------------------------------------------------------------------- + XclExpChValueRange::XclExpChValueRange( const XclExpChRoot& rRoot ) : XclExpRecord( EXC_ID_CHVALUERANGE, 42 ), @@ -2852,7 +2852,7 @@ void XclExpChValueRange::WriteBody( XclExpStream& rStrm ) << maData.mnFlags; } -// ---------------------------------------------------------------------------- + namespace { @@ -2942,7 +2942,7 @@ void XclExpChTick::WriteBody( XclExpStream& rStrm ) rStrm << GetPalette().GetColorIndex( mnTextColorId ) << maData.mnRotation; } -// ---------------------------------------------------------------------------- + namespace { @@ -3122,7 +3122,7 @@ 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,7 +3494,7 @@ void XclExpChChart::WriteBody( XclExpStream& rStrm ) rStrm << maRect; } -// ---------------------------------------------------------------------------- + XclExpChartDrawing::XclExpChartDrawing( const XclExpRoot& rRoot, const Reference< XModel >& rxModel, const Size& rChartSize ) : @@ -3530,7 +3530,7 @@ void XclExpChartDrawing::Save( XclExpStream& rStrm ) mxObjRecs->Save( rStrm ); } -// ---------------------------------------------------------------------------- + XclExpChart::XclExpChart( const XclExpRoot& rRoot, Reference< XModel > xModel, const Rectangle& rChartRect ) : XclExpSubStream( EXC_BOF_CHART ), diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index 327ef0ef8265..718ba0a40e49 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -77,7 +77,7 @@ struct XclExpHashEntrySWO { return *rLeft.mpString < *rRight.mpString; } }; -// ---------------------------------------------------------------------------- + /** Implementation of the SST export. @descr Stores all passed strings in a hash table and prevents repeated @@ -105,7 +105,7 @@ private: sal_uInt32 mnSize; /// Size of the SST (count of unique strings). }; -// ---------------------------------------------------------------------------- + const sal_uInt32 EXC_SST_HASHTABLE_SIZE = 2048; @@ -229,7 +229,7 @@ void XclExpSstImpl::SaveXml( XclExpXmlStream& rStrm ) rStrm.PopStream(); } -// ---------------------------------------------------------------------------- + XclExpSst::XclExpSst() : mxImpl( new XclExpSstImpl ) @@ -602,7 +602,7 @@ private: bool mbPattUsed; /// true = Pattern attribute used. }; -// ---------------------------------------------------------------------------- + XclExpCFImpl::XclExpCFImpl( const XclExpRoot& rRoot, const ScCondFormatEntry& rFormatEntry, sal_Int32 nPriority ) : XclExpRoot( rRoot ), @@ -960,7 +960,7 @@ 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 ), @@ -1131,7 +1131,7 @@ 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 ), @@ -1204,7 +1204,7 @@ void XclExpCondfmt::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_conditionalFormatting ); } -// ---------------------------------------------------------------------------- + XclExpColorScale::XclExpColorScale( const XclExpRoot& rRoot, const ScColorScaleFormat& rFormat, sal_Int32 nPriority ): XclExpRecord(), @@ -1389,7 +1389,7 @@ void XclExpIconSet::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_cfRule ); } -// ---------------------------------------------------------------------------- + XclExpCondFormatBuffer::XclExpCondFormatBuffer( const XclExpRoot& rRoot, XclExtLstRef xExtLst ) : XclExpRoot( rRoot ) @@ -1474,7 +1474,7 @@ const char* lcl_GetOperatorType( sal_uInt32 nFlags ) } // namespace -// ---------------------------------------------------------------------------- + XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) : XclExpRecord( EXC_ID_DV ), @@ -1693,7 +1693,7 @@ void XclExpDV::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_dataValidation ); } -// ---------------------------------------------------------------------------- + XclExpDval::XclExpDval( const XclExpRoot& rRoot ) : XclExpRecord( EXC_ID_DVAL, 18 ), @@ -1904,7 +1904,7 @@ void XclExpWebQuery::Save( XclExpStream& rStrm ) } } -// ---------------------------------------------------------------------------- + XclExpWebQueryBuffer::XclExpWebQueryBuffer( const XclExpRoot& rRoot ) { diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index 67ac32542453..24e54b31cdea 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -245,7 +245,7 @@ void XclExpDffAnchorBase::ImplCalcAnchorRect( const Rectangle&, MapUnit ) OSL_FAIL( "XclExpDffAnchorBase::ImplCalcAnchorRect - not implemented" ); } -// ---------------------------------------------------------------------------- + XclExpDffSheetAnchor::XclExpDffSheetAnchor( const XclExpRoot& rRoot ) : XclExpDffAnchorBase( rRoot ), @@ -267,7 +267,7 @@ 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 ) : @@ -288,7 +288,7 @@ 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 ) @@ -296,7 +296,7 @@ XclExpDffNoteAnchor::XclExpDffNoteAnchor( const XclExpRoot& rRoot, const Rectang maAnchor.SetRect( rRoot, rRoot.GetCurrScTab(), rRect, MAP_100TH_MM ); } -// ---------------------------------------------------------------------------- + XclExpDffDropDownAnchor::XclExpDffDropDownAnchor( const XclExpRoot& rRoot, const ScAddress& rScPos ) : XclExpDffAnchorBase( rRoot, EXC_ESC_ANCHOR_POSLOCKED ) @@ -323,7 +323,7 @@ void XclExpMsoDrawingBase::WriteBody( XclExpStream& rStrm ) rStrm.CopyFromStream( mrEscherEx.GetStream(), mrEscherEx.GetDffFragmentSize( mnFragmentKey ) ); } -// ---------------------------------------------------------------------------- + XclExpMsoDrawingGroup::XclExpMsoDrawingGroup( XclEscherEx& rEscherEx ) : XclExpMsoDrawingBase( rEscherEx, EXC_ID_MSODRAWINGGROUP ) @@ -355,7 +355,7 @@ XclExpMsoDrawingGroup::XclExpMsoDrawingGroup( XclEscherEx& rEscherEx ) : mrEscherEx.UpdateDffFragmentEnd(); } -// ---------------------------------------------------------------------------- + XclExpMsoDrawing::XclExpMsoDrawing( XclEscherEx& rEscherEx ) : XclExpMsoDrawingBase( rEscherEx, EXC_ID_MSODRAWING ) @@ -504,7 +504,7 @@ void XclExpControlHelper::WriteFormulaSubRec( XclExpStream& rStrm, sal_uInt16 nS rStrm.EndRecord(); } -// ---------------------------------------------------------------------------- + //delete for exporting OCX //#if EXC_EXP_OCX_CTRL @@ -1042,7 +1042,7 @@ void XclExpTbxControlObj::WriteSbs( XclExpStream& rStrm ) //#endif -// ---------------------------------------------------------------------------- + XclExpChartObj::XclExpChartObj( XclExpObjectManager& rObjMgr, Reference< XShape > xShape, const Rectangle* pChildAnchor ) : XclObj( rObjMgr, EXC_OBJTYPE_CHART ), @@ -1637,7 +1637,7 @@ void XclExpObjectManager::InitStream( bool bTempFile ) mxDffStrm->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); } -// ---------------------------------------------------------------------------- + XclExpEmbeddedObjectManager::XclExpEmbeddedObjectManager( const XclExpObjectManager& rParent, const Size& rPageSize, sal_Int32 nScaleX, sal_Int32 nScaleY ) : diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx index 706ea3f7f4d0..a01f3dbfa156 100644 --- a/sc/source/filter/excel/xeformula.cxx +++ b/sc/source/filter/excel/xeformula.cxx @@ -63,7 +63,7 @@ struct XclExpScToken inline OpCode GetOpCode() const { return mpScToken ? mpScToken->GetOpCode() : static_cast< OpCode >( ocNone ); } }; -// ---------------------------------------------------------------------------- + /** Effective token class conversion types. */ enum XclExpClassConv @@ -73,7 +73,7 @@ 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,7 +103,7 @@ 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,7 +123,7 @@ void XclExpExtFuncData::Set( const OUString& rFuncName, bool bVBasic, bool bHidd mbHidden = bHidden; } -// ---------------------------------------------------------------------------- + /** Encapsulates all data needed to process an entire function. */ class XclExpFuncData @@ -261,7 +261,7 @@ 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,7 +300,7 @@ XclExpCompData::XclExpCompData( const XclExpCompConfig* pCfg ) : } // namespace -// ---------------------------------------------------------------------------- + /** Implementation class of the export formula compiler. */ class XclExpFmlaCompImpl : protected XclExpRoot, protected XclTokenArrayHelper @@ -325,7 +325,7 @@ public: bool IsRef2D( const ScSingleRefData& rRefData, bool bCheck3DFlag ) const; bool IsRef2D( const ScComplexRefData& rRefData, bool bCheck3DFlag ) const; - // ------------------------------------------------------------------------ + private: const XclExpCompConfig* GetConfigForType( XclFormulaType eType ) const; inline sal_uInt16 GetSize() const { return static_cast< sal_uInt16 >( mxData->maTokVec.size() ); } @@ -461,7 +461,7 @@ private: void AppendExt( double fData ); void AppendExt( const OUString& rString ); - // ------------------------------------------------------------------------ + private: typedef ::std::map< XclFormulaType, XclExpCompConfig > XclExpCompConfigMap; typedef boost::shared_ptr< XclExpCompData > XclExpCompDataRef; @@ -480,7 +480,7 @@ private: const sal_uInt32 mnMaxRowMask; /// Mask to delete invalid bits in row fields. }; -// ---------------------------------------------------------------------------- + XclExpFmlaCompImpl::XclExpFmlaCompImpl( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), @@ -2595,7 +2595,7 @@ void lclPutRangeToTokenArray( ScTokenArray& rScTokArr, const ScRange& rScRange, } // namespace -// ---------------------------------------------------------------------------- + XclExpFormulaCompiler::XclExpFormulaCompiler( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index f94e81689ff8..113d98c5c4ea 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -149,7 +149,7 @@ inline void lclFillAddress( XclAddress& rXclPos, SCCOL nScCol, SCROW nScRow ) } // namespace -// ---------------------------------------------------------------------------- + XclExpAddressConverter::XclExpAddressConverter( const XclExpRoot& rRoot ) : XclAddressConverterBase( rRoot.GetTracer(), rRoot.GetXclMaxPos() ) @@ -286,7 +286,7 @@ OUString lclGetUrlRepresentation( const SvxURLField& rUrlField ) } // namespace -// ---------------------------------------------------------------------------- + XclExpHyperlinkHelper::XclExpHyperlinkHelper( const XclExpRoot& rRoot, const ScAddress& rScPos ) : XclExpRoot( rRoot ), @@ -333,7 +333,7 @@ XclExpHyperlinkHelper::XclExpHyperlinkRef XclExpHyperlinkHelper::GetLinkRecord() return XclExpHyperlinkRef(); } -// ---------------------------------------------------------------------------- + namespace { @@ -526,7 +526,7 @@ XclExpStringRef lclCreateFormattedString( } // namespace -// ---------------------------------------------------------------------------- + XclExpStringRef XclExpStringHelper::CreateString( const XclExpRoot& rRoot, const OUString& rString, XclStrFlags nFlags, sal_uInt16 nMaxLen ) @@ -962,7 +962,7 @@ OUString lclEncodeDosUrl( } // namespace -// ---------------------------------------------------------------------------- + OUString XclExpUrlHelper::EncodeUrl( const XclExpRoot& rRoot, const OUString& rAbsUrl, const OUString* pTableName ) { diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index 7f451c0d7762..23b59771bb6d 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -68,7 +68,7 @@ private: sal_uInt16 mnFlags; /// Flags for record export. }; -// ---------------------------------------------------------------------------- + /** Represents an EXTERNNAME record for an add-in function name. */ class XclExpExtNameAddIn : public XclExpExtNameBase @@ -81,7 +81,7 @@ private: virtual void WriteAddData( XclExpStream& rStrm ); }; -// ---------------------------------------------------------------------------- + /** Represents an EXTERNNAME record for a DDE link. */ class XclExpExtNameDde : public XclExpExtNameBase @@ -99,7 +99,7 @@ private: XclExpCachedMatRef mxMatrix; /// Cached results of the DDE link. }; -// ---------------------------------------------------------------------------- + class XclExpSupbook; @@ -183,7 +183,7 @@ private: SCROW mnScRow; /// Row index of the external cells. }; -// ---------------------------------------------------------------------------- + /** Represents the record XCT which is the header record of a CRN record list. */ @@ -367,7 +367,7 @@ 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,7 +500,7 @@ protected: explicit XclExpLinkManagerImpl( const XclExpRoot& rRoot ); }; -// ---------------------------------------------------------------------------- + /** Implementation of the link manager for BIFF5/BIFF7. */ class XclExpLinkManagerImpl5 : public XclExpLinkManagerImpl @@ -570,7 +570,7 @@ private: XclExpCodeMap maCodeMap; /// Maps special external codes to EXTERNSHEET records. }; -// ---------------------------------------------------------------------------- + /** Implementation of the link manager for BIFF8. */ class XclExpLinkManagerImpl8 : public XclExpLinkManagerImpl @@ -636,7 +636,7 @@ 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 ), @@ -896,7 +896,7 @@ void XclExpExtNameBase::WriteAddData( XclExpStream& /*rStrm*/ ) { } -// ---------------------------------------------------------------------------- + XclExpExtNameAddIn::XclExpExtNameAddIn( const XclExpRoot& rRoot, const OUString& rName ) : XclExpExtNameBase( rRoot, rName ) @@ -910,7 +910,7 @@ 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 ) : @@ -929,7 +929,7 @@ void XclExpExtNameDde::WriteAddData( XclExpStream& rStrm ) mxMatrix->Save( rStrm ); } -// ---------------------------------------------------------------------------- + XclExpExtName::XclExpExtName( const XclExpRoot& rRoot, const XclExpSupbook& rSupbook, const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray ) : @@ -1918,7 +1918,7 @@ XclExpLinkManagerImpl::XclExpLinkManagerImpl( const XclExpRoot& rRoot ) : { } -// ---------------------------------------------------------------------------- + XclExpLinkManagerImpl5::XclExpLinkManagerImpl5( const XclExpRoot& rRoot ) : XclExpLinkManagerImpl( rRoot ) @@ -2103,7 +2103,7 @@ XclExpLinkManagerImpl5::XclExpExtSheetRef XclExpLinkManagerImpl5::FindInternal( return xExtSheet; } -// ---------------------------------------------------------------------------- + XclExpLinkManagerImpl8::XclExpLinkManagerImpl8( const XclExpRoot& rRoot ) : XclExpLinkManagerImpl( rRoot ), diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx index b645d5851722..3e6734eda5b2 100644 --- a/sc/source/filter/excel/xename.cxx +++ b/sc/source/filter/excel/xename.cxx @@ -109,7 +109,7 @@ private: sal_uInt16 mnXclTab; /// The 1-based Excel sheet index for local names. }; -// ---------------------------------------------------------------------------- + class ScRangeData; class ScDBData; @@ -349,7 +349,7 @@ void XclExpName::WriteBody( XclExpStream& rStrm ) mxTokArr->WriteArray( rStrm ); // token array without size } -// ---------------------------------------------------------------------------- + XclExpNameManagerImpl::XclExpNameManagerImpl( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), @@ -675,7 +675,7 @@ void XclExpNameManagerImpl::CreateUserNames() } } -// ---------------------------------------------------------------------------- + XclExpNameManager::XclExpNameManager( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), diff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx index ec4187f4497b..12ff6be5759d 100644 --- a/sc/source/filter/excel/xepage.cxx +++ b/sc/source/filter/excel/xepage.cxx @@ -411,7 +411,7 @@ void XclExpPageSettings::SaveXml( XclExpXmlStream& rStrm ) XclExpImgData( *pGraphic, EXC_ID8_IMGDATA ).SaveXml( rStrm ); } -// ---------------------------------------------------------------------------- + XclExpChartPageSettings::XclExpChartPageSettings( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ) diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index a0a00d600a7b..1993828edff4 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -92,7 +92,7 @@ static const sal_uInt16 spnPCItemFlags[] = } // namespace -// ---------------------------------------------------------------------------- + XclExpPCItem::XclExpPCItem( const OUString& rText ) : XclExpRecord( (!rText.isEmpty()) ? EXC_ID_SXSTRING : EXC_ID_SXEMPTY, 0 ), @@ -133,7 +133,7 @@ XclExpPCItem::XclExpPCItem( bool bValue ) : SetBool( bValue ); } -// ---------------------------------------------------------------------------- + bool XclExpPCItem::EqualsText( const OUString& rText ) const { @@ -155,7 +155,7 @@ bool XclExpPCItem::EqualsBool( bool bValue ) const return GetBool() && (*GetBool() == bValue); } -// ---------------------------------------------------------------------------- + void XclExpPCItem::WriteBody( XclExpStream& rStrm ) { @@ -917,7 +917,7 @@ 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,7 +947,7 @@ OUString lclGetDataFieldCaption( const OUString& rFieldName, GeneralFunction eFu return( aCaption ); } -// ---------------------------------------------------------------------------- + } // namespace @@ -1836,7 +1836,7 @@ void XclExpPivotRecWrapper::SaveXml( XclExpXmlStream& rStrm ) } // namespace -// ---------------------------------------------------------------------------- + XclExpPivotTableManager::XclExpPivotTableManager( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), diff --git a/sc/source/filter/excel/xerecord.cxx b/sc/source/filter/excel/xerecord.cxx index a305afcb7b2a..62b475c5ca81 100644 --- a/sc/source/filter/excel/xerecord.cxx +++ b/sc/source/filter/excel/xerecord.cxx @@ -36,7 +36,7 @@ void XclExpRecordBase::SaveXml( XclExpXmlStream& /*rStrm*/ ) { } -// ---------------------------------------------------------------------------- + XclExpDelegatingRecord::XclExpDelegatingRecord( XclExpRecordBase* pRecord ) : mpRecord( pRecord ) @@ -55,7 +55,7 @@ void XclExpDelegatingRecord::SaveXml( XclExpXmlStream& rStrm ) mpRecord->SaveXml( rStrm ); } -// ---------------------------------------------------------------------------- + XclExpXmlElementRecord::XclExpXmlElementRecord(sal_Int32 const nElement) : mnElement( nElement ) @@ -66,7 +66,7 @@ XclExpXmlElementRecord::~XclExpXmlElementRecord() { } -// ---------------------------------------------------------------------------- + XclExpXmlStartElementRecord::XclExpXmlStartElementRecord(sal_Int32 const nElement) : XclExpXmlElementRecord(nElement) @@ -85,7 +85,7 @@ void XclExpXmlStartElementRecord::SaveXml( XclExpXmlStream& rStrm ) rStream->startElement( mnElement, FSEND ); } -// ---------------------------------------------------------------------------- + XclExpXmlEndElementRecord::XclExpXmlEndElementRecord( sal_Int32 nElement ) : XclExpXmlElementRecord( nElement ) @@ -101,7 +101,7 @@ void XclExpXmlEndElementRecord::SaveXml( XclExpXmlStream& rStrm ) rStrm.GetCurrentStream()->endElement( mnElement ); } -// ---------------------------------------------------------------------------- + XclExpXmlStartSingleElementRecord::XclExpXmlStartSingleElementRecord( sal_Int32 const nElement) @@ -119,7 +119,7 @@ void XclExpXmlStartSingleElementRecord::SaveXml( XclExpXmlStream& rStrm ) rStream->write( "<" )->writeId( mnElement ); } -// ---------------------------------------------------------------------------- + XclExpXmlEndSingleElementRecord::XclExpXmlEndSingleElementRecord() { @@ -134,7 +134,7 @@ void XclExpXmlEndSingleElementRecord::SaveXml( XclExpXmlStream& rStrm ) rStrm.GetCurrentStream()->write( "/>" ); } -// ---------------------------------------------------------------------------- + XclExpRecord::XclExpRecord( sal_uInt16 nRecId, sal_Size nRecSize ) : mnRecSize( nRecSize ), @@ -164,7 +164,7 @@ void XclExpRecord::Save( XclExpStream& rStrm ) rStrm.EndRecord(); } -// ---------------------------------------------------------------------------- + template<> void XclExpValueRecord<double>::SaveXml( XclExpXmlStream& rStrm ) @@ -176,7 +176,7 @@ void XclExpValueRecord<double>::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } -// ---------------------------------------------------------------------------- + void XclExpBoolRecord::WriteBody( XclExpStream& rStrm ) { @@ -194,7 +194,7 @@ void XclExpBoolRecord::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } -// ---------------------------------------------------------------------------- + XclExpDummyRecord::XclExpDummyRecord( sal_uInt16 nRecId, const void* pRecData, sal_Size nRecSize ) : XclExpRecord( nRecId ) diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx index a1b4d05fbc70..5708cc337f48 100644 --- a/sc/source/filter/excel/xeroot.cxx +++ b/sc/source/filter/excel/xeroot.cxx @@ -63,7 +63,7 @@ XclExpRootData::~XclExpRootData() { } -// ---------------------------------------------------------------------------- + XclExpRoot::XclExpRoot( XclExpRootData& rExpRootData ) : XclRoot( rExpRootData ), diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx index 9eec03edc219..80bfeb90d204 100644 --- a/sc/source/filter/excel/xestring.cxx +++ b/sc/source/filter/excel/xestring.cxx @@ -438,7 +438,7 @@ void XclExpString::WriteXml( XclExpXmlStream& rStrm ) const } } -// ---------------------------------------------------------------------------- + bool XclExpString::IsWriteFlags() const { diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index c75322850d47..086577958f66 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -177,7 +177,7 @@ void XclListColor::Merge( const XclListColor& rColor ) AddWeighting( nWeight2 ); } -// ---------------------------------------------------------------------------- + /** Data for each inserted original color, represented by a color ID. */ struct XclColorIdData @@ -224,7 +224,7 @@ typedef ::std::vector< XclNearest > XclNearestVec; } // namespace -// ---------------------------------------------------------------------------- + class XclExpPaletteImpl { @@ -318,7 +318,7 @@ 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,7 +762,7 @@ sal_Int32 XclExpPaletteImpl::GetNearPaletteColors( return nDist1; } -// ---------------------------------------------------------------------------- + XclExpPalette::XclExpPalette( const XclExpRoot& rRoot ) : XclDefaultPalette( rRoot ), @@ -939,7 +939,7 @@ bool XclExpFontHelper::CheckItems( const XclExpRoot& rRoot, const SfxItemSet& rI return bUsed; } -// ---------------------------------------------------------------------------- + namespace { @@ -962,7 +962,7 @@ sal_uInt32 lclCalcHash( const XclFontData& rFontData ) } // namespace -// ---------------------------------------------------------------------------- + XclExpFont::XclExpFont( const XclExpRoot& rRoot, const XclFontData& rFontData, XclExpColorType eColorType ) : @@ -1022,7 +1022,7 @@ void XclExpFont::WriteBody( XclExpStream& rStrm ) << aFontName; } -// ---------------------------------------------------------------------------- + XclExpBlindFont::XclExpBlindFont( const XclExpRoot& rRoot ) : XclExpFont( rRoot, XclFontData(), EXC_COLOR_CELLTEXT ) @@ -1205,7 +1205,7 @@ struct XclExpNumFmtPred { return rFormat.mnScNumFmt == mnScNumFmt; } }; -// ---------------------------------------------------------------------------- + void XclExpNumFmt::SaveXml( XclExpXmlStream& rStrm ) { @@ -1216,7 +1216,7 @@ void XclExpNumFmt::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } -// ---------------------------------------------------------------------------- + XclExpNumFmtBuffer::XclExpNumFmtBuffer( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), @@ -1383,7 +1383,7 @@ void XclExpCellProt::SaveXml( XclExpXmlStream& rStrm ) const FSEND ); } -// ---------------------------------------------------------------------------- + bool XclExpCellAlign::FillFromItemSet( const SfxItemSet& rItemSet, bool bForceLineBreak, XclBiff eBiff, bool bStyle ) @@ -1541,7 +1541,7 @@ void XclExpCellAlign::SaveXml( XclExpXmlStream& rStrm ) const FSEND ); } -// ---------------------------------------------------------------------------- + namespace { @@ -1595,7 +1595,7 @@ void lclGetBorderLine( } // namespace -// ---------------------------------------------------------------------------- + XclExpCellBorder::XclExpCellBorder() : mnLeftColorId( XclExpPalette::GetColorIdFromIndex( mnLeftColor ) ), @@ -1772,7 +1772,7 @@ void XclExpCellBorder::SaveXml( XclExpXmlStream& rStrm ) const rStyleSheet->endElement( XML_border ); } -// ---------------------------------------------------------------------------- + XclExpCellArea::XclExpCellArea() : mnForeColorId( XclExpPalette::GetColorIdFromIndex( mnForeColor ) ), @@ -1902,7 +1902,7 @@ void XclExpColor::SaveXml( XclExpXmlStream& rStrm ) const rStyleSheet->endElement( XML_fill ); } -// ---------------------------------------------------------------------------- + XclExpXFId::XclExpXFId() : mnXFId( XclExpXFBuffer::GetDefCellXFId() ), @@ -1921,7 +1921,7 @@ void XclExpXFId::ConvertXFIndex( const XclExpRoot& rRoot ) mnXFIndex = rRoot.GetXFBuffer().GetXFIndex( mnXFId ); } -// ---------------------------------------------------------------------------- + XclExpXF::XclExpXF( const XclExpRoot& rRoot, const ScPatternAttr& rPattern, sal_Int16 nScript, @@ -2137,7 +2137,7 @@ void XclExpXF::SaveXml( XclExpXmlStream& rStrm ) rStyleSheet->endElement( XML_xf ); } -// ---------------------------------------------------------------------------- + XclExpDefaultXF::XclExpDefaultXF( const XclExpRoot& rRoot, bool bCellXF ) : XclExpXF( rRoot, bCellXF ) @@ -2156,7 +2156,7 @@ void XclExpDefaultXF::SetNumFmt( sal_uInt16 nXclNumFmt ) mbFmtUsed = true; } -// ---------------------------------------------------------------------------- + XclExpStyle::XclExpStyle( sal_uInt32 nXFId, const OUString& rStyleName ) : XclExpRecord( EXC_ID_STYLE, 4 ), @@ -2243,7 +2243,7 @@ void XclExpStyle::SaveXml( XclExpXmlStream& rStrm ) // OOXTODO: XML_extLst } -// ---------------------------------------------------------------------------- + namespace { @@ -2260,7 +2260,7 @@ bool lclIsBuiltInStyle( const OUString& rStyleName ) } // namespace -// ---------------------------------------------------------------------------- + XclExpXFBuffer::XclExpBuiltInInfo::XclExpBuiltInInfo() : mnStyleId( EXC_STYLE_USERDEF ), @@ -2270,7 +2270,7 @@ XclExpXFBuffer::XclExpBuiltInInfo::XclExpBuiltInInfo() : { } -// ---------------------------------------------------------------------------- + /** Predicate for search algorithm. */ struct XclExpBorderPred diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index 89a778b41229..eaf2586f3d6c 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -130,7 +130,7 @@ void XclExpArray::WriteBody( XclExpStream& rStrm ) rStrm << nFlags << sal_uInt32( 0 ) << *mxTokArr; } -// ---------------------------------------------------------------------------- + XclExpArrayBuffer::XclExpArrayBuffer( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ) @@ -199,7 +199,7 @@ void XclExpShrfmla::WriteBody( XclExpStream& rStrm ) rStrm << sal_uInt8( 0 ) << mnUsedCount << *mxTokArr; } -// ---------------------------------------------------------------------------- + XclExpShrfmlaBuffer::XclExpShrfmlaBuffer( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ) @@ -439,7 +439,7 @@ void XclExpTableop::WriteBody( XclExpStream& rStrm ) rStrm << mnColInpXclRow << mnColInpXclCol << sal_uInt32( 0 ); } -// ---------------------------------------------------------------------------- + XclExpTableopBuffer::XclExpTableopBuffer( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ) @@ -613,7 +613,7 @@ void XclExpSingleCellBase::WriteBody( XclExpStream& rStrm ) WriteContents( rStrm ); } -// ---------------------------------------------------------------------------- + IMPL_FIXEDMEMPOOL_NEWDEL( XclExpNumberCell ) @@ -659,7 +659,7 @@ void XclExpNumberCell::WriteContents( XclExpStream& rStrm ) rStrm << mfValue; } -// ---------------------------------------------------------------------------- + IMPL_FIXEDMEMPOOL_NEWDEL( XclExpBooleanCell ) @@ -809,7 +809,7 @@ void XclExpLabelCell::WriteContents( XclExpStream& rStrm ) } } -// ---------------------------------------------------------------------------- + IMPL_FIXEDMEMPOOL_NEWDEL( XclExpFormulaCell ) @@ -1249,7 +1249,7 @@ void XclExpMultiCellBase::RemoveUnusedXFIndexes( const ScfUInt16Vec& rXFIndexes // The Save() function will skip all XF indexes equal to EXC_XF_NOTFOUND. } -// ---------------------------------------------------------------------------- + IMPL_FIXEDMEMPOOL_NEWDEL( XclExpBlankCell ) @@ -1299,7 +1299,7 @@ void XclExpBlankCell::WriteXmlContents( XclExpXmlStream& rStrm, const XclAddress FSEND ); } -// ---------------------------------------------------------------------------- + IMPL_FIXEDMEMPOOL_NEWDEL( XclExpRkCell ) @@ -1408,7 +1408,7 @@ void XclExpOutlineBuffer::UpdateColRow( SCCOLROW nScPos ) } } -// ---------------------------------------------------------------------------- + XclExpGuts::XclExpGuts( const XclExpRoot& rRoot ) : XclExpRecord( EXC_ID_GUTS, 8 ), @@ -1444,7 +1444,7 @@ void XclExpGuts::WriteBody( XclExpStream& rStrm ) rStrm << mnRowWidth << mnColWidth << mnRowLevels << mnColLevels; } -// ---------------------------------------------------------------------------- + XclExpDimensions::XclExpDimensions( const XclExpRoot& rRoot ) : mnFirstUsedXclRow( 0 ), @@ -1514,7 +1514,7 @@ double lclGetCorrectedColWidth( const XclExpRoot& rRoot, sal_uInt16 nXclColWidth } // namespace -// ---------------------------------------------------------------------------- + XclExpDefcolwidth::XclExpDefcolwidth( const XclExpRoot& rRoot ) : XclExpUInt16Record( EXC_ID_DEFCOLWIDTH, EXC_DEFCOLWIDTH_DEF ), @@ -1535,7 +1535,7 @@ 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 ) : @@ -1627,7 +1627,7 @@ void XclExpColinfo::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } -// ---------------------------------------------------------------------------- + XclExpColinfoBuffer::XclExpColinfoBuffer( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), @@ -1745,7 +1745,7 @@ bool operator<( const XclExpDefaultRowData& rLeft, const XclExpDefaultRowData& r ((rLeft.mnHeight == rRight.mnHeight) && (rLeft.mnFlags < rRight.mnFlags)); } -// ---------------------------------------------------------------------------- + XclExpDefrowheight::XclExpDefrowheight() : XclExpRecord( EXC_ID3_DEFROWHEIGHT, 4 ) @@ -1763,7 +1763,7 @@ void XclExpDefrowheight::WriteBody( XclExpStream& rStrm ) rStrm << maDefData.mnFlags << maDefData.mnHeight; } -// ---------------------------------------------------------------------------- + XclExpRow::XclExpRow( const XclExpRoot& rRoot, sal_uInt32 nXclRow, XclExpRowOutlineBuffer& rOutlineBfr, bool bAlwaysEmpty ) : @@ -2060,7 +2060,7 @@ void XclExpRow::SaveXml( XclExpXmlStream& rStrm ) } } -// ---------------------------------------------------------------------------- + XclExpRowBuffer::XclExpRowBuffer( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), diff --git a/sc/source/filter/excel/xeview.cxx b/sc/source/filter/excel/xeview.cxx index 1c35f72f952b..ea466796d6bc 100644 --- a/sc/source/filter/excel/xeview.cxx +++ b/sc/source/filter/excel/xeview.cxx @@ -131,7 +131,7 @@ void XclExpWindow2::WriteBody( XclExpStream& rStrm ) } } -// ---------------------------------------------------------------------------- + XclExpScl::XclExpScl( sal_uInt16 nZoom ) : XclExpRecord( EXC_ID_SCL, 4 ), @@ -157,7 +157,7 @@ void XclExpScl::WriteBody( XclExpStream& rStrm ) rStrm << mnNum << mnDenom; } -// ---------------------------------------------------------------------------- + XclExpPane::XclExpPane( const XclTabViewData& rData ) : XclExpRecord( EXC_ID_PANE, 10 ), @@ -203,7 +203,7 @@ void XclExpPane::WriteBody( XclExpStream& rStrm ) rStrm << sal_uInt8( 0 ); } -// ---------------------------------------------------------------------------- + XclExpSelection::XclExpSelection( const XclTabViewData& rData, sal_uInt8 nPane ) : XclExpRecord( EXC_ID_SELECTION, 15 ), @@ -246,7 +246,7 @@ void XclExpSelection::WriteBody( XclExpStream& rStrm ) maSelData.maXclSelection.Write( rStrm, false ); } -// ---------------------------------------------------------------------------- + XclExpTabBgColor::XclExpTabBgColor( const XclTabViewData& rTabViewData ) : XclExpRecord( EXC_ID_SHEETEXT, 18 ), @@ -288,7 +288,7 @@ sal_uInt16 lclGetXclZoom( long nScZoom, sal_uInt16 nDefXclZoom ) } // namespace -// ---------------------------------------------------------------------------- + XclExpTabViewSettings::XclExpTabViewSettings( const XclExpRoot& rRoot, SCTAB nScTab ) : XclExpRoot( rRoot ), diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index 34c53434a588..314c9259910e 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -207,7 +207,7 @@ struct XclImpChRootData : public XclChRootData inline explicit XclImpChRootData( XclImpChChart& rChartData ) : mrChartData( rChartData ) {} }; -// ---------------------------------------------------------------------------- + XclImpChRoot::XclImpChRoot( const XclImpRoot& rRoot, XclImpChChart& rChartData ) : XclImpRoot( rRoot ), @@ -377,7 +377,7 @@ void XclImpChRoot::ConvertPieRotation( ScfPropertySet& rPropSet, sal_uInt16 nAng rPropSet.SetProperty( EXC_CHPROP_STARTINGANGLE, nApiRot ); } -// ---------------------------------------------------------------------------- + XclImpChGroupBase::~XclImpChGroupBase() { @@ -441,7 +441,7 @@ void XclImpChFramePos::ReadChFramePos( XclImpStream& rStrm ) maData.maRect.mnHeight = rStrm.ReadInt16(); rStrm.Ignore( 2 ); } -// ---------------------------------------------------------------------------- + void XclImpChLineFormat::ReadChLineFormat( XclImpStream& rStrm ) { @@ -473,7 +473,7 @@ void XclImpChLineFormat::Convert( const XclImpChRoot& rRoot, } } -// ---------------------------------------------------------------------------- + void XclImpChAreaFormat::ReadChAreaFormat( XclImpStream& rStrm ) { @@ -508,7 +508,7 @@ void XclImpChAreaFormat::Convert( const XclImpChRoot& rRoot, } } -// ---------------------------------------------------------------------------- + XclImpChEscherFormat::XclImpChEscherFormat( const XclImpRoot& rRoot ) : mnDffFillType( mso_fillSolid ) @@ -548,7 +548,7 @@ void XclImpChEscherFormat::Convert( const XclImpChRoot& rRoot, rRoot.ConvertEscherFormat( rPropSet, maData, bUsePicFmt ? &maPicFmt : 0, mnDffFillType, rFmtInfo.mePropMode ); } -// ---------------------------------------------------------------------------- + XclImpChFrameBase::XclImpChFrameBase( const XclChFormatInfo& rFmtInfo ) { @@ -625,7 +625,7 @@ void XclImpChFrameBase::ConvertFrameBase( const XclImpChRoot& rRoot, ConvertAreaBase( rRoot, rPropSet, eObjType, nFormatIdx, bUsePicFmt ); } -// ---------------------------------------------------------------------------- + XclImpChFrame::XclImpChFrame( const XclImpChRoot& rRoot, XclChObjectType eObjType ) : XclImpChFrameBase( rRoot.GetFormatInfo( eObjType ) ), @@ -723,7 +723,7 @@ Reference< XLabeledDataSequence > lclCreateLabeledDataSequence( } // namespace -// ---------------------------------------------------------------------------- + XclImpChSourceLink::XclImpChSourceLink( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ) @@ -920,7 +920,7 @@ void XclImpChFontBase::ConvertRotationBase( const XclImpChRoot& rRoot, ScfProper rRoot.GetChartPropSetHelper().WriteRotationProperties( rPropSet, GetRotation(), bSupportsStacked ); } -// ---------------------------------------------------------------------------- + XclImpChFont::XclImpChFont() : mnFontIdx( EXC_FONT_NOTFOUND ) @@ -932,7 +932,7 @@ void XclImpChFont::ReadChFont( XclImpStream& rStrm ) rStrm >> mnFontIdx; } -// ---------------------------------------------------------------------------- + XclImpChText::XclImpChText( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ) @@ -1306,7 +1306,7 @@ void XclImpChMarkerFormat::ConvertColor( const XclImpChRoot& rRoot, rPropSet.SetColorProperty( EXC_CHPROP_COLOR, aLineColor ); } -// ---------------------------------------------------------------------------- + XclImpChPieFormat::XclImpChPieFormat() : mnPieDist( 0 ) @@ -1324,7 +1324,7 @@ void XclImpChPieFormat::Convert( ScfPropertySet& rPropSet ) const rPropSet.SetProperty( EXC_CHPROP_OFFSET, fApiDist ); } -// ---------------------------------------------------------------------------- + XclImpChSeriesFormat::XclImpChSeriesFormat() : mnFlags( 0 ) @@ -1336,7 +1336,7 @@ void XclImpChSeriesFormat::ReadChSeriesFormat( XclImpStream& rStrm ) rStrm >> mnFlags; } -// ---------------------------------------------------------------------------- + void XclImpCh3dDataFormat::ReadCh3dDataFormat( XclImpStream& rStrm ) { @@ -1352,7 +1352,7 @@ void XclImpCh3dDataFormat::Convert( ScfPropertySet& rPropSet ) const rPropSet.SetProperty( EXC_CHPROP_GEOMETRY3D, nApiType ); } -// ---------------------------------------------------------------------------- + XclImpChAttachedLabel::XclImpChAttachedLabel( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ), @@ -1379,7 +1379,7 @@ XclImpChTextRef XclImpChAttachedLabel::CreateDataLabel( const XclImpChText* pPar return xLabel; } -// ---------------------------------------------------------------------------- + XclImpChDataFormat::XclImpChDataFormat( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ) @@ -1593,7 +1593,7 @@ void XclImpChDataFormat::UpdateDataLabel( const XclImpChDataFormat* pParentFmt ) mxLabel = mxAttLabel->CreateDataLabel( pDefText ); } -// ---------------------------------------------------------------------------- + XclImpChSerTrendLine::XclImpChSerTrendLine( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ) @@ -1681,7 +1681,7 @@ Reference< XRegressionCurve > XclImpChSerTrendLine::CreateRegressionCurve() cons return xRegCurve; } -// ---------------------------------------------------------------------------- + XclImpChSerErrorBar::XclImpChSerErrorBar( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ) @@ -1782,7 +1782,7 @@ Reference< XPropertySet > XclImpChSerErrorBar::CreateErrorBar( const XclImpChSer return xErrorBar; } -// ---------------------------------------------------------------------------- + XclImpChSeries::XclImpChSeries( const XclImpChRoot& rRoot, sal_uInt16 nSeriesIdx ) : XclImpChRoot( rRoot ), @@ -2399,7 +2399,7 @@ Reference< XChartType > XclImpChType::CreateChartType( Reference< XDiagram > xDi return xChartType; } -// ---------------------------------------------------------------------------- + void XclImpChChart3d::ReadChChart3d( XclImpStream& rStrm ) { @@ -2480,7 +2480,7 @@ 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,7 +2619,7 @@ Reference< XLegend > XclImpChLegend::CreateLegend() const return xLegend; } -// ---------------------------------------------------------------------------- + XclImpChDropBar::XclImpChDropBar( sal_uInt16 nDropBar ) : mnDropBar( nDropBar ), @@ -2643,7 +2643,7 @@ void XclImpChDropBar::Convert( const XclImpChRoot& rRoot, ScfPropertySet& rPropS ConvertFrameBase( rRoot, rPropSet, eObjType ); } -// ---------------------------------------------------------------------------- + XclImpChTypeGroup::XclImpChTypeGroup( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ), @@ -3058,7 +3058,7 @@ void XclImpChLabelRange::ConvertAxisPosition( ScfPropertySet& rPropSet, bool b3d } } -// ---------------------------------------------------------------------------- + XclImpChValueRange::XclImpChValueRange( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ) @@ -3135,7 +3135,7 @@ void XclImpChValueRange::ConvertAxisPosition( ScfPropertySet& rPropSet ) const rPropSet.SetProperty( EXC_CHPROP_CROSSOVERVALUE, fCrossingPos ); } -// ---------------------------------------------------------------------------- + namespace { @@ -3215,7 +3215,7 @@ 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 ), @@ -3490,7 +3490,7 @@ void XclImpChAxis::CreateWallFrame() } } -// ---------------------------------------------------------------------------- + XclImpChAxesSet::XclImpChAxesSet( const XclImpChRoot& rRoot, sal_uInt16 nAxesSetId ) : XclImpChRoot( rRoot ) @@ -4190,7 +4190,7 @@ Reference< XDiagram > XclImpChChart::CreateDiagram() const return xDiagram; } -// ---------------------------------------------------------------------------- + XclImpChartDrawing::XclImpChartDrawing( const XclImpRoot& rRoot, bool bOwnTab ) : XclImpDrawing( rRoot, bOwnTab ), // sheet charts may contain OLE objects @@ -4252,7 +4252,7 @@ void XclImpChartDrawing::OnObjectInserted( const XclImpDrawObjBase& ) { } -// ---------------------------------------------------------------------------- + XclImpChart::XclImpChart( const XclImpRoot& rRoot, bool bOwnTab ) : XclImpRoot( rRoot ), diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index 552dc2626427..ea32ced60b1f 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -213,7 +213,7 @@ void lclInsertUrl( XclImpRoot& rRoot, const OUString& rUrl, SCCOL nScCol, SCROW } // namespace -// ---------------------------------------------------------------------------- + void XclImpHyperlink::ReadHlink( XclImpStream& rStrm ) { @@ -651,7 +651,7 @@ void XclImpCondFormat::Apply() } } -// ---------------------------------------------------------------------------- + XclImpCondFormatManager::XclImpCondFormatManager( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) @@ -963,7 +963,7 @@ void XclImpWebQuery::Apply( ScDocument& rDoc, const OUString& rFilterName ) } } -// ---------------------------------------------------------------------------- + XclImpWebQueryBuffer::XclImpWebQueryBuffer( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) @@ -1109,7 +1109,7 @@ XclImpDecrypterRef lclReadFilepass8( XclImpStream& rStrm ) } // namespace -// ---------------------------------------------------------------------------- + ErrCode XclImpDecryptHelper::ReadFilepass( XclImpStream& rStrm ) { @@ -1201,7 +1201,7 @@ XclImpSheetProtectBuffer::Sheet::Sheet() : { } -// ---------------------------------------------------------------------------- + XclImpSheetProtectBuffer::Sheet::Sheet(const Sheet& r) : mbProtected(r.mbProtected), diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 63ad0de6446d..10d87b3ebe14 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -961,7 +961,7 @@ void XclImpDrawObjBase::ImplReadObj8( XclImpStream& rStrm ) } } -// ---------------------------------------------------------------------------- + void XclImpDrawObjVector::InsertGrouped( XclImpDrawObjRef xDrawObj ) { @@ -980,7 +980,7 @@ sal_Size XclImpDrawObjVector::GetProgressSize() const return nProgressSize; } -// ---------------------------------------------------------------------------- + XclImpPhObj::XclImpPhObj( const XclImpRoot& rRoot ) : XclImpDrawObjBase( rRoot ) @@ -988,7 +988,7 @@ XclImpPhObj::XclImpPhObj( const XclImpRoot& rRoot ) : SetProcessSdrObj( false ); } -// ---------------------------------------------------------------------------- + XclImpGroupObj::XclImpGroupObj( const XclImpRoot& rRoot ) : XclImpDrawObjBase( rRoot ), @@ -1046,7 +1046,7 @@ SdrObject* XclImpGroupObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const R return xSdrObj.release(); } -// ---------------------------------------------------------------------------- + XclImpLineObj::XclImpLineObj( const XclImpRoot& rRoot ) : XclImpDrawObjBase( rRoot ), @@ -1175,7 +1175,7 @@ SdrObject* XclImpLineObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const Re return xSdrObj.release(); } -// ---------------------------------------------------------------------------- + XclImpRectObj::XclImpRectObj( const XclImpRoot& rRoot ) : XclImpDrawObjBase( rRoot ), @@ -1223,7 +1223,7 @@ SdrObject* XclImpRectObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const Re return xSdrObj.release(); } -// ---------------------------------------------------------------------------- + XclImpOvalObj::XclImpOvalObj( const XclImpRoot& rRoot ) : XclImpRectObj( rRoot ) @@ -1238,7 +1238,7 @@ SdrObject* XclImpOvalObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const Re return xSdrObj.release(); } -// ---------------------------------------------------------------------------- + XclImpArcObj::XclImpArcObj( const XclImpRoot& rRoot ) : XclImpDrawObjBase( rRoot ), @@ -1310,7 +1310,7 @@ SdrObject* XclImpArcObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rec return xSdrObj.release(); } -// ---------------------------------------------------------------------------- + XclImpPolygonObj::XclImpPolygonObj( const XclImpRoot& rRoot ) : XclImpRectObj( rRoot ), @@ -1389,7 +1389,7 @@ SdrObject* XclImpPolygonObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const return xSdrObj.release(); } -// ---------------------------------------------------------------------------- + void XclImpObjTextData::ReadByteString( XclImpStream& rStrm ) { @@ -1410,7 +1410,7 @@ void XclImpObjTextData::ReadFormats( XclImpStream& rStrm ) rStrm.Ignore( maData.mnFormatSize ); } -// ---------------------------------------------------------------------------- + XclImpTextObj::XclImpTextObj( const XclImpRoot& rRoot ) : XclImpRectObj( rRoot ) @@ -1613,7 +1613,7 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& XclImpRectObj::DoPreProcessSdrObj( rDffConv, rSdrObj ); } -// ---------------------------------------------------------------------------- + XclImpChartObj::XclImpChartObj( const XclImpRoot& rRoot, bool bOwnTab ) : XclImpRectObj( rRoot ), @@ -1797,7 +1797,7 @@ void XclImpChartObj::FinalizeTabChart() SetAnchor( aAnchor ); } -// ---------------------------------------------------------------------------- + XclImpNoteObj::XclImpNoteObj( const XclImpRoot& rRoot ) : XclImpTextObj( rRoot ), @@ -1833,7 +1833,7 @@ void XclImpNoteObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& } } -// ---------------------------------------------------------------------------- + XclImpControlHelper::XclImpControlHelper( const XclImpRoot& rRoot, XclCtrlBindMode eBindMode ) : mrRoot( rRoot ), @@ -2011,7 +2011,7 @@ void XclImpControlHelper::ReadRangeList( ScRangeList& rScRanges, XclImpStream& r } } -// ---------------------------------------------------------------------------- + XclImpTbxObjBase::XclImpTbxObjBase( const XclImpRoot& rRoot ) : XclImpTextObj( rRoot ), @@ -2107,7 +2107,7 @@ void XclImpTbxObjBase::DoPreProcessSdrObj( XclImpDffConverter& /*rDffConv*/, Sdr ProcessControl( *this ); } -// ---------------------------------------------------------------------------- + XclImpButtonObj::XclImpButtonObj( const XclImpRoot& rRoot ) : XclImpTbxObjBase( rRoot ) @@ -2171,7 +2171,7 @@ XclTbxEventType XclImpButtonObj::DoGetEventType() const return EXC_TBX_EVENT_ACTION; } -// ---------------------------------------------------------------------------- + XclImpCheckBoxObj::XclImpCheckBoxObj( const XclImpRoot& rRoot ) : XclImpTbxObjBase( rRoot ), @@ -2260,7 +2260,7 @@ XclTbxEventType XclImpCheckBoxObj::DoGetEventType() const return EXC_TBX_EVENT_ACTION; } -// ---------------------------------------------------------------------------- + XclImpOptionButtonObj::XclImpOptionButtonObj( const XclImpRoot& rRoot ) : XclImpCheckBoxObj( rRoot ), @@ -2351,7 +2351,7 @@ XclTbxEventType XclImpOptionButtonObj::DoGetEventType() const return EXC_TBX_EVENT_ACTION; } -// ---------------------------------------------------------------------------- + XclImpLabelObj::XclImpLabelObj( const XclImpRoot& rRoot ) : XclImpTbxObjBase( rRoot ) @@ -2382,7 +2382,7 @@ XclTbxEventType XclImpLabelObj::DoGetEventType() const return EXC_TBX_EVENT_MOUSE; } -// ---------------------------------------------------------------------------- + XclImpGroupBoxObj::XclImpGroupBoxObj( const XclImpRoot& rRoot ) : XclImpTbxObjBase( rRoot ), @@ -2431,7 +2431,7 @@ XclTbxEventType XclImpGroupBoxObj::DoGetEventType() const return EXC_TBX_EVENT_MOUSE; } -// ---------------------------------------------------------------------------- + XclImpDialogObj::XclImpDialogObj( const XclImpRoot& rRoot ) : XclImpTbxObjBase( rRoot ) @@ -2455,7 +2455,7 @@ XclTbxEventType XclImpDialogObj::DoGetEventType() const return EXC_TBX_EVENT_MOUSE; } -// ---------------------------------------------------------------------------- + XclImpEditObj::XclImpEditObj( const XclImpRoot& rRoot ) : XclImpTbxObjBase( rRoot ), @@ -2529,7 +2529,7 @@ XclTbxEventType XclImpEditObj::DoGetEventType() const return EXC_TBX_EVENT_TEXT; } -// ---------------------------------------------------------------------------- + XclImpTbxObjScrollableBase::XclImpTbxObjScrollableBase( const XclImpRoot& rRoot ) : XclImpTbxObjBase( rRoot ), @@ -2565,7 +2565,7 @@ void XclImpTbxObjScrollableBase::DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt } } -// ---------------------------------------------------------------------------- + XclImpSpinButtonObj::XclImpSpinButtonObj( const XclImpRoot& rRoot ) : XclImpTbxObjScrollableBase( rRoot ) @@ -2604,7 +2604,7 @@ XclTbxEventType XclImpSpinButtonObj::DoGetEventType() const return EXC_TBX_EVENT_VALUE; } -// ---------------------------------------------------------------------------- + XclImpScrollBarObj::XclImpScrollBarObj( const XclImpRoot& rRoot ) : XclImpTbxObjScrollableBase( rRoot ) @@ -2646,7 +2646,7 @@ XclTbxEventType XclImpScrollBarObj::DoGetEventType() const return EXC_TBX_EVENT_VALUE; } -// ---------------------------------------------------------------------------- + XclImpTbxObjListBase::XclImpTbxObjListBase( const XclImpRoot& rRoot ) : XclImpTbxObjScrollableBase( rRoot ), @@ -2678,7 +2678,7 @@ void XclImpTbxObjListBase::SetBoxFormatting( ScfPropertySet& rPropSet ) const GetFontBuffer().WriteDefaultCtrlFontProperties( rPropSet ); } -// ---------------------------------------------------------------------------- + XclImpListBoxObj::XclImpListBoxObj( const XclImpRoot& rRoot ) : XclImpTbxObjListBase( rRoot ) @@ -2765,7 +2765,7 @@ XclTbxEventType XclImpListBoxObj::DoGetEventType() const return EXC_TBX_EVENT_CHANGE; } -// ---------------------------------------------------------------------------- + XclImpDropDownObj::XclImpDropDownObj( const XclImpRoot& rRoot ) : XclImpTbxObjListBase( rRoot ), @@ -2861,7 +2861,7 @@ 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 ), @@ -3235,7 +3235,7 @@ 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 ), @@ -3268,7 +3268,7 @@ XclImpDffConverter::XclImpDffConvData::XclImpDffConvData( mbHasCtrlForm( false ) { } -// ---------------------------------------------------------------------------- + XclImpDffConverter::XclImpDffConverter( const XclImpRoot& rRoot, SvStream& rDffStrm ) : XclImpSimpleDffConverter( rRoot, rDffStrm ), @@ -4100,7 +4100,7 @@ void XclImpDrawing::ReadTxo( XclImpStream& rStrm ) } } -// ---------------------------------------------------------------------------- + XclImpSheetDrawing::XclImpSheetDrawing( const XclImpRoot& rRoot, SCTAB nScTab ) : XclImpDrawing( rRoot, true ), diff --git a/sc/source/filter/excel/xiformula.cxx b/sc/source/filter/excel/xiformula.cxx index 894aedce8177..867f27de9561 100644 --- a/sc/source/filter/excel/xiformula.cxx +++ b/sc/source/filter/excel/xiformula.cxx @@ -38,13 +38,13 @@ public: const ScTokenArray* CreateFormula( XclFormulaType eType, const XclTokenArray& rXclTokArr ); - // ------------------------------------------------------------------------ + private: XclFunctionProvider maFuncProv; /// Excel function data provider. const XclBiff meBiff; /// Cached BIFF version to save GetBiff() calls. }; -// ---------------------------------------------------------------------------- + XclImpFmlaCompImpl::XclImpFmlaCompImpl( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), @@ -89,7 +89,7 @@ const ScTokenArray* XclImpFmlaCompImpl::CreateFormula( return pArray; } -// ---------------------------------------------------------------------------- + XclImpFormulaCompiler::XclImpFormulaCompiler( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx index d101a9ddf02e..d708f7c4e86b 100644 --- a/sc/source/filter/excel/xihelper.cxx +++ b/sc/source/filter/excel/xihelper.cxx @@ -51,7 +51,7 @@ inline void lclFillAddress( ScAddress& rScPos, sal_uInt16 nXclCol, sal_uInt32 nX } // namespace -// ---------------------------------------------------------------------------- + XclImpAddressConverter::XclImpAddressConverter( const XclImpRoot& rRoot ) : XclAddressConverterBase( rRoot.GetTracer(), rRoot.GetScMaxPos() ) @@ -263,7 +263,7 @@ XclImpHFConverter::XclImpHFPortionInfo::XclImpHFPortionInfo() : maSel.nStartPos = maSel.nEndPos = 0; } -// ---------------------------------------------------------------------------- + XclImpHFConverter::XclImpHFConverter( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index a33da234a82a..4f62ad14c83d 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -157,7 +157,7 @@ inline XclImpStream& operator>>( XclImpStream& rStrm, XclImpXti& rXti ) return rStrm >> rXti.mnSupbook >> rXti.mnSBTabFirst >> rXti.mnSBTabLast; } -// ---------------------------------------------------------------------------- + /** Implementation of the link manager. */ class XclImpLinkManagerImpl : protected XclImpRoot diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx index 58575e581325..6f8094365dd3 100644 --- a/sc/source/filter/excel/xiname.cxx +++ b/sc/source/filter/excel/xiname.cxx @@ -267,7 +267,7 @@ void XclImpName::InsertName(const ScTokenArray* pArray) mpScData = pData; // cache for later use } -// ---------------------------------------------------------------------------- + XclImpNameManager::XclImpNameManager( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) diff --git a/sc/source/filter/excel/xipage.cxx b/sc/source/filter/excel/xipage.cxx index 561121c7e846..086dba9cb61b 100644 --- a/sc/source/filter/excel/xipage.cxx +++ b/sc/source/filter/excel/xipage.cxx @@ -170,7 +170,7 @@ void XclImpPageSettings::SetPaperSize( sal_uInt16 nXclPaperSize, bool bPortrait mbValidPaper = true; } -// ---------------------------------------------------------------------------- + namespace { diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx index 2ea0ed44d0dc..01a7d545f27b 100644 --- a/sc/source/filter/excel/xipivot.cxx +++ b/sc/source/filter/excel/xipivot.cxx @@ -1356,7 +1356,7 @@ void XclImpPivotTable::ReadSxViewEx9( XclImpStream& rStrm ) rStrm >> maPTViewEx9Info; } -// ---------------------------------------------------------------------------- + void XclImpPivotTable::Convert() { @@ -1628,7 +1628,7 @@ void XclImpPivotTableManager::ReadSxViewEx9( XclImpStream& rStrm ) maPTables.back()->ReadSxViewEx9( rStrm ); } -// ---------------------------------------------------------------------------- + void XclImpPivotTableManager::ReadPivotCaches( XclImpStream& rStrm ) { diff --git a/sc/source/filter/excel/xiroot.cxx b/sc/source/filter/excel/xiroot.cxx index 5e7f6ee8e704..187509b07714 100644 --- a/sc/source/filter/excel/xiroot.cxx +++ b/sc/source/filter/excel/xiroot.cxx @@ -52,7 +52,7 @@ XclImpRootData::~XclImpRootData() { } -// ---------------------------------------------------------------------------- + XclImpRoot::XclImpRoot( XclImpRootData& rImpRootData ) : XclRoot( rImpRootData ), diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx index bc57e556d623..6bb02077fb17 100644 --- a/sc/source/filter/excel/xistream.cxx +++ b/sc/source/filter/excel/xistream.cxx @@ -106,7 +106,7 @@ sal_uInt16 XclImpDecrypter::Read( SvStream& rStrm, void* pData, sal_uInt16 nByte return nRet; } -// ---------------------------------------------------------------------------- + XclImpBiff5Decrypter::XclImpBiff5Decrypter( sal_uInt16 nKey, sal_uInt16 nHash ) : mnKey( nKey ), @@ -197,7 +197,7 @@ sal_uInt16 XclImpBiff5Decrypter::OnRead( SvStream& rStrm, sal_uInt8* pnData, sal return nRet; } -// ---------------------------------------------------------------------------- + XclImpBiff8Decrypter::XclImpBiff8Decrypter( sal_uInt8 pnSalt[ 16 ], sal_uInt8 pnVerifier[ 16 ], sal_uInt8 pnVerifierHash[ 16 ] ) : @@ -513,7 +513,7 @@ void XclImpStream::EnableDecryption( bool bEnable ) mbUseDecr = bEnable && HasValidDecrypter(); } -// ---------------------------------------------------------------------------- + void XclImpStream::PushPosition() { @@ -605,7 +605,7 @@ sal_uInt16 XclImpStream::PeekRecId( sal_Size nPos ) return nRecId; } -// ---------------------------------------------------------------------------- + XclImpStream& XclImpStream::operator>>( sal_Int8& rnValue ) { @@ -873,7 +873,7 @@ void XclImpStream::Ignore( sal_Size nBytes ) } } -// ---------------------------------------------------------------------------- + sal_Size XclImpStream::ReadUniStringExtHeader( bool& rb16Bit, bool& rbRich, bool& rbFareast, @@ -896,7 +896,7 @@ sal_Size XclImpStream::ReadUniStringExtHeader( bool& rb16Bit, sal_uInt8 nFlags ) return ReadUniStringExtHeader( rb16Bit, bRich, bFareast, nCrun, nExtInf, nFlags ); } -// ---------------------------------------------------------------------------- + OUString XclImpStream::ReadRawUniString( sal_uInt16 nChars, bool b16Bit ) { @@ -1009,7 +1009,7 @@ void XclImpStream::IgnoreUniString( sal_uInt16 nChars ) IgnoreUniString( nChars, ReaduInt8() ); } -// ---------------------------------------------------------------------------- + OUString XclImpStream::ReadRawByteString( sal_uInt16 nChars ) { diff --git a/sc/source/filter/excel/xistring.cxx b/sc/source/filter/excel/xistring.cxx index d44057514670..e25838cfc86d 100644 --- a/sc/source/filter/excel/xistring.cxx +++ b/sc/source/filter/excel/xistring.cxx @@ -27,7 +27,7 @@ /** All allowed flags for import. */ const XclStrFlags nAllowedFlags = EXC_STR_8BITLENGTH | EXC_STR_SMARTFLAGS | EXC_STR_SEPARATEFORMATS; -// ---------------------------------------------------------------------------- + XclImpString::XclImpString() { diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index c569ce83f05a..324f33e80f93 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -482,7 +482,7 @@ void XclImpFont::GuessScriptType() } } -// ---------------------------------------------------------------------------- + XclImpFontBuffer::XclImpFontBuffer( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), @@ -719,7 +719,7 @@ void XclImpCellProt::FillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs ) c } -// ---------------------------------------------------------------------------- + void XclImpCellAlign::FillFromXF2( sal_uInt8 nFlags ) { @@ -794,7 +794,7 @@ void XclImpCellAlign::FillToItemSet( SfxItemSet& rItemSet, const XclImpFont* pFo ScfTools::PutItem( rItemSet, SvxFrameDirectionItem( GetScFrameDir(), ATTR_WRITINGDIR ), bSkipPoolDefs ); } -// ---------------------------------------------------------------------------- + XclImpCellBorder::XclImpCellBorder() { @@ -960,7 +960,7 @@ void XclImpCellBorder::FillToItemSet( SfxItemSet& rItemSet, const XclImpPalette& } } -// ---------------------------------------------------------------------------- + XclImpCellArea::XclImpCellArea() { @@ -1048,7 +1048,7 @@ void XclImpCellArea::FillToItemSet( SfxItemSet& rItemSet, const XclImpPalette& r } -// ---------------------------------------------------------------------------- + XclImpXF::XclImpXF( const XclImpRoot& rRoot ) : XclXFBase( true ), // default is cell XF @@ -1401,7 +1401,7 @@ void XclImpXF::SetUsedFlags( sal_uInt8 nUsedFlags ) mbAreaUsed = (mbCellXF == ::get_flag( nUsedFlags, EXC_XF_DIFF_AREA )); } -// ---------------------------------------------------------------------------- + XclImpStyle::XclImpStyle( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), @@ -1495,7 +1495,7 @@ void XclImpStyle::CreateUserStyle( const OUString& rFinalName ) CreateStyleSheet(); } -// ---------------------------------------------------------------------------- + XclImpXFBuffer::XclImpXFBuffer( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) @@ -1660,7 +1660,7 @@ bool XclImpXFRange::Expand( const XclImpXFRange& rNextRange ) return false; } -// ---------------------------------------------------------------------------- + void XclImpXFRangeColumn::SetDefaultXF( const XclImpXFIndex& rXFIndex ) { @@ -1672,7 +1672,7 @@ void XclImpXFRangeColumn::SetDefaultXF( const XclImpXFIndex& rXFIndex ) maIndexList.push_back( new XclImpXFRange( 0, MAXROW, rXFIndex ) ); } -// ---------------------------------------------------------------------------- + void XclImpXFRangeColumn::SetXF( SCROW nScRow, const XclImpXFIndex& rXFIndex ) { @@ -1824,7 +1824,7 @@ void XclImpXFRangeColumn::TryConcatPrev( sal_uLong nIndex ) maIndexList.erase( maIndexList.begin() + nIndex ); } -// ---------------------------------------------------------------------------- + XclImpXFRangeBuffer::XclImpXFRangeBuffer( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) diff --git a/sc/source/filter/excel/xiview.cxx b/sc/source/filter/excel/xiview.cxx index 57f028e4bc5e..282c0d9d10e7 100644 --- a/sc/source/filter/excel/xiview.cxx +++ b/sc/source/filter/excel/xiview.cxx @@ -83,7 +83,7 @@ long lclGetScZoom( sal_uInt16 nXclZoom, sal_uInt16 nDefZoom ) } // namespace -// ---------------------------------------------------------------------------- + XclImpTabViewSettings::XclImpTabViewSettings( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) diff --git a/sc/source/filter/excel/xladdress.cxx b/sc/source/filter/excel/xladdress.cxx index ffc06a095c42..19e32972a97b 100644 --- a/sc/source/filter/excel/xladdress.cxx +++ b/sc/source/filter/excel/xladdress.cxx @@ -42,7 +42,7 @@ void XclAddress::Write( XclExpStream& rStrm, bool bCol16Bit ) const rStrm << static_cast< sal_uInt8 >( mnCol ); } -// ---------------------------------------------------------------------------- + bool XclRange::Contains( const XclAddress& rPos ) const { @@ -73,7 +73,7 @@ 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 { diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx index 0f238a7cf873..dbfedce07f6f 100644 --- a/sc/source/filter/excel/xlchart.cxx +++ b/sc/source/filter/excel/xlchart.cxx @@ -71,7 +71,7 @@ XclChRectangle::XclChRectangle() : { } -// ---------------------------------------------------------------------------- + XclChDataPointPos::XclChDataPointPos( sal_uInt16 nSeriesIdx, sal_uInt16 nPointIdx ) : mnSeriesIdx( nSeriesIdx ), @@ -85,7 +85,7 @@ bool operator<( const XclChDataPointPos& rL, const XclChDataPointPos& rR ) ((rL.mnSeriesIdx == rR.mnSeriesIdx) && (rL.mnPointIdx < rR.mnPointIdx)); } -// ---------------------------------------------------------------------------- + XclChFrBlock::XclChFrBlock( sal_uInt16 nType ) : mnType( nType ), @@ -103,7 +103,7 @@ XclChFramePos::XclChFramePos() : { } -// ---------------------------------------------------------------------------- + XclChLineFormat::XclChLineFormat() : maColor( COL_BLACK ), @@ -113,7 +113,7 @@ XclChLineFormat::XclChLineFormat() : { } -// ---------------------------------------------------------------------------- + XclChAreaFormat::XclChAreaFormat() : maPattColor( COL_WHITE ), @@ -123,7 +123,7 @@ XclChAreaFormat::XclChAreaFormat() : { } -// ---------------------------------------------------------------------------- + XclChEscherFormat::XclChEscherFormat() { @@ -133,7 +133,7 @@ XclChEscherFormat::~XclChEscherFormat() { } -// ---------------------------------------------------------------------------- + XclChPicFormat::XclChPicFormat() : mnBmpMode( EXC_CHPICFORMAT_NONE ), @@ -142,7 +142,7 @@ XclChPicFormat::XclChPicFormat() : { } -// ---------------------------------------------------------------------------- + XclChFrame::XclChFrame() : mnFormat( EXC_CHFRAME_STANDARD ), @@ -167,14 +167,14 @@ XclChObjectLink::XclChObjectLink() : { } -// ---------------------------------------------------------------------------- + XclChFrLabelProps::XclChFrLabelProps() : mnFlags( 0 ) { } -// ---------------------------------------------------------------------------- + XclChText::XclChText() : maTextColor( COL_BLACK ), @@ -198,7 +198,7 @@ XclChMarkerFormat::XclChMarkerFormat() : { }; -// ---------------------------------------------------------------------------- + XclCh3dDataFormat::XclCh3dDataFormat() : mnBase( EXC_CH3DDATAFORMAT_RECT ), @@ -206,7 +206,7 @@ XclCh3dDataFormat::XclCh3dDataFormat() : { } -// ---------------------------------------------------------------------------- + XclChDataFormat::XclChDataFormat() : mnFormatIdx( EXC_CHDATAFORMAT_DEFAULT ), @@ -214,7 +214,7 @@ XclChDataFormat::XclChDataFormat() : { } -// ---------------------------------------------------------------------------- + XclChSerTrendLine::XclChSerTrendLine() : mfForecastFor( 0.0 ), @@ -231,7 +231,7 @@ XclChSerTrendLine::XclChSerTrendLine() : pDouble->w32_parts.msw = pDouble->w32_parts.lsw = 0xFFFFFFFF; } -// ---------------------------------------------------------------------------- + XclChSerErrorBar::XclChSerErrorBar() : mfValue( 0.0 ), @@ -242,7 +242,7 @@ XclChSerErrorBar::XclChSerErrorBar() : { } -// ---------------------------------------------------------------------------- + XclChSeries::XclChSeries() : mnCategType( EXC_CHSERIES_NUMERIC ), @@ -267,7 +267,7 @@ XclChType::XclChType() : { } -// ---------------------------------------------------------------------------- + XclChChart3d::XclChChart3d() : mnRotation( 20 ), @@ -280,7 +280,7 @@ XclChChart3d::XclChChart3d() : { } -// ---------------------------------------------------------------------------- + XclChLegend::XclChLegend() : mnDockMode( EXC_CHLEGEND_RIGHT ), @@ -290,7 +290,7 @@ XclChLegend::XclChLegend() : { } -// ---------------------------------------------------------------------------- + XclChTypeGroup::XclChTypeGroup() : mnFlags( 0 ), @@ -298,7 +298,7 @@ XclChTypeGroup::XclChTypeGroup() : { } -// ---------------------------------------------------------------------------- + XclChProperties::XclChProperties() : mnFlags( 0 ), @@ -316,7 +316,7 @@ XclChLabelRange::XclChLabelRange() : { } -// ---------------------------------------------------------------------------- + XclChDateRange::XclChDateRange() : mnMinDate( 0 ), @@ -334,7 +334,7 @@ XclChDateRange::XclChDateRange() : { } -// ---------------------------------------------------------------------------- + XclChValueRange::XclChValueRange() : mfMin( 0.0 ), @@ -348,7 +348,7 @@ XclChValueRange::XclChValueRange() : { } -// ---------------------------------------------------------------------------- + XclChTick::XclChTick() : maTextColor( COL_BLACK ), @@ -361,7 +361,7 @@ XclChTick::XclChTick() : { } -// ---------------------------------------------------------------------------- + XclChAxis::XclChAxis() : mnType( EXC_CHAXIS_NONE ) @@ -380,7 +380,7 @@ sal_Int32 XclChAxis::GetApiAxisDimension() const return nApiAxisDim; } -// ---------------------------------------------------------------------------- + XclChAxesSet::XclChAxesSet() : mnAxesSetId( EXC_CHAXESSET_PRIMARY ) @@ -492,7 +492,7 @@ static const XclChFormatInfo spFmtInfos[] = } -// ---------------------------------------------------------------------------- + XclChFormatInfoProvider::XclChFormatInfoProvider() { @@ -561,7 +561,7 @@ void XclChExtTypeInfo::Set( const XclChTypeInfo& rTypeInfo, bool b3dChart, bool mbSpline = bSpline; } -// ---------------------------------------------------------------------------- + XclChTypeInfoProvider::XclChTypeInfoProvider() { @@ -694,7 +694,7 @@ const sal_Char* const sppcBitmapNames[] = { "FillStyle", "FillBitmapName", "Fill } // namespace -// ---------------------------------------------------------------------------- + XclChPropSetHelper::XclChPropSetHelper() : maLineHlpCommon( sppcLineNamesCommon ), @@ -1273,7 +1273,7 @@ EXC_DEFINEFUNC_GETAXISTITLESHAPE( lclGetSecYAxisTitleShape, XSecondAxisTitleSupp } // namespace -// ---------------------------------------------------------------------------- + XclChRootData::XclChRootData() : mxTypeInfoProv( new XclChTypeInfoProvider ), diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx index 56fbb5587169..ce0ec44064ae 100644 --- a/sc/source/filter/excel/xlescher.cxx +++ b/sc/source/filter/excel/xlescher.cxx @@ -134,7 +134,7 @@ sal_uInt16 lclGetEmbeddedScale( long nPageSize, sal_Int32 nPageScale, long nPos, } // namespace -// ---------------------------------------------------------------------------- + XclObjAnchor::XclObjAnchor() : mnLX( 0 ), @@ -206,7 +206,7 @@ void XclObjAnchor::SetRect( const Size& rPageSize, sal_Int32 nScaleX, sal_Int32 Set( 0, 0, 0, 0 ); } -// ---------------------------------------------------------------------------- + XclObjLineData::XclObjLineData() : mnColorIdx( EXC_OBJ_LINE_AUTOCOLOR ), @@ -225,7 +225,7 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclObjLineData& rLineData ) >> rLineData.mnAuto; } -// ---------------------------------------------------------------------------- + XclObjFillData::XclObjFillData() : mnBackColorIdx( EXC_OBJ_LINE_AUTOCOLOR ), @@ -244,7 +244,7 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclObjFillData& rFillData ) >> rFillData.mnAuto; } -// ---------------------------------------------------------------------------- + XclObjTextData::XclObjTextData() : mnTextLen( 0 ), diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index 4895721f96f7..967c96b83dbf 100644 --- a/sc/source/filter/excel/xlformula.cxx +++ b/sc/source/filter/excel/xlformula.cxx @@ -582,7 +582,7 @@ static const XclFunctionInfo saFuncTable_OOoLO[] = #undef EXC_FUNCENTRY_OOO -// ---------------------------------------------------------------------------- + XclFunctionProvider::XclFunctionProvider( const XclRoot& rRoot ) { @@ -747,7 +747,7 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclTokenArrayRef& rxTokArr return rStrm; } -// ---------------------------------------------------------------------------- + XclTokenArrayIterator::XclTokenArrayIterator() : mppScTokenBeg( 0 ), diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx index 29d78d8ff5cb..82935f4c2804 100644 --- a/sc/source/filter/excel/xlpivot.cxx +++ b/sc/source/filter/excel/xlpivot.cxx @@ -109,7 +109,7 @@ void XclPCItem::SetBool( bool bValue ) mbValue = bValue; } -// ---------------------------------------------------------------------------- + bool XclPCItem::IsEqual( const XclPCItem& rItem ) const { @@ -413,7 +413,7 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTCachedName& rCachedNam return rStrm; } -// ---------------------------------------------------------------------------- + const OUString* XclPTVisNameInfo::GetVisName() const { diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx index 18668912eba1..0b363995463e 100644 --- a/sc/source/filter/excel/xlroot.cxx +++ b/sc/source/filter/excel/xlroot.cxx @@ -75,7 +75,7 @@ XclDebugObjCounter::~XclDebugObjCounter() } #endif -// ---------------------------------------------------------------------------- + XclRootData::XclRootData( XclBiff eBiff, SfxMedium& rMedium, SotStorageRef xRootStrg, ScDocument& rDoc, rtl_TextEncoding eTextEnc, bool bExport ) : @@ -160,7 +160,7 @@ XclRootData::~XclRootData() { } -// ---------------------------------------------------------------------------- + XclRoot::XclRoot( XclRootData& rRootData ) : mrData( rRootData ) diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx index 8439347af6d7..e3657b7c060b 100644 --- a/sc/source/filter/excel/xlstyle.cxx +++ b/sc/source/filter/excel/xlstyle.cxx @@ -85,7 +85,7 @@ static const ColorData spnDefColorTable8[] = #undef EXC_PALETTE_EGA_COLORS_LIGHT #undef EXC_PALETTE_EGA_COLORS_DARK -// ---------------------------------------------------------------------------- + XclDefaultPalette::XclDefaultPalette( const XclRoot& rRoot ) : mpnColorTable( 0 ), @@ -169,7 +169,7 @@ namespace AwtFontFamily = Awt::FontFamily; namespace AwtFontUnderline = Awt::FontUnderline; namespace AwtFontStrikeout = Awt::FontStrikeout; -// ---------------------------------------------------------------------------- + XclFontData::XclFontData() { @@ -517,7 +517,7 @@ void XclFontData::SetApiStrikeout( sal_Int16 nApiStrikeout ) (nApiStrikeout != AwtFontStrikeout::DONTKNOW); } -// ---------------------------------------------------------------------------- + bool operator==( const XclFontData& rLeft, const XclFontData& rRight ) { @@ -536,7 +536,7 @@ bool operator==( const XclFontData& rLeft, const XclFontData& rRight ) (rLeft.maName == rRight.maName); } -// ---------------------------------------------------------------------------- + namespace { @@ -614,7 +614,7 @@ void lclWriteChartFont( ScfPropertySet& rPropSet, } // namespace -// ---------------------------------------------------------------------------- + XclFontPropSetHelper::XclFontPropSetHelper() : maHlpChCommon( sppcPropNamesChCommon ), @@ -766,7 +766,7 @@ 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,7 +778,7 @@ 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,7 +789,7 @@ 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 ) \ @@ -807,7 +807,7 @@ struct XclBuiltInFormat #define EXC_NUMFMT_ENDTABLE() \ { EXC_FORMAT_NOTFOUND, 0, NF_NUMBER_STANDARD, 0 } -// ---------------------------------------------------------------------------- + // Currency unit characters #define UTF8_BAHT "\340\270\277" @@ -837,7 +837,7 @@ 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,14 +1410,14 @@ 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,7 +1471,7 @@ static const XclBuiltInFormatTable spBuiltInFormatTables[] = { LANGUAGE_THAI, LANGUAGE_DONTKNOW, spBuiltInFormats_THAI } }; -// ---------------------------------------------------------------------------- + } // namespace @@ -1570,7 +1570,7 @@ bool operator==( const XclCellProt& rLeft, const XclCellProt& rRight ) return (rLeft.mbLocked == rRight.mbLocked) && (rLeft.mbHidden == rRight.mbHidden); } -// ---------------------------------------------------------------------------- + XclCellAlign::XclCellAlign() : mnHorAlign( EXC_XF_HOR_GENERAL ), @@ -1689,7 +1689,7 @@ bool operator==( const XclCellAlign& rLeft, const XclCellAlign& rRight ) (rLeft.mbLineBreak == rRight.mbLineBreak) && (rLeft.mbShrink == rRight.mbShrink); } -// ---------------------------------------------------------------------------- + XclCellBorder::XclCellBorder() : mnLeftColor( 0 ), @@ -1718,7 +1718,7 @@ bool operator==( const XclCellBorder& rLeft, const XclCellBorder& rRight ) (rLeft.mbDiagTLtoBR == rRight.mbDiagTLtoBR) && (rLeft.mbDiagBLtoTR == rRight.mbDiagBLtoTR); } -// ---------------------------------------------------------------------------- + XclCellArea::XclCellArea() : mnForeColor( EXC_COLOR_WINDOWTEXT ), @@ -1739,7 +1739,7 @@ bool operator==( const XclCellArea& rLeft, const XclCellArea& rRight ) (rLeft.mnPattern == rRight.mnPattern); } -// ---------------------------------------------------------------------------- + XclXFBase::XclXFBase( bool bCellXF ) : mnParent( bCellXF ? EXC_XF_DEFAULTSTYLE : EXC_XF_STYLEPARENT ), diff --git a/sc/source/filter/excel/xlview.cxx b/sc/source/filter/excel/xlview.cxx index a69c766928e5..6cb3c3e697f5 100644 --- a/sc/source/filter/excel/xlview.cxx +++ b/sc/source/filter/excel/xlview.cxx @@ -35,7 +35,7 @@ XclDocViewData::XclDocViewData() : { } -// ---------------------------------------------------------------------------- + XclTabViewData::XclTabViewData() : maFirstXclPos( ScAddress::UNINITIALIZED ), |