diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-04-06 17:13:43 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-04-06 17:19:54 +0200 |
| commit | c4c51709eaa02a5c9a2af3e5d436790307109813 (patch) | |
| tree | c67362b4f2c3d3f34655ca65ec10d54e1509cf73 /sc/source/filter/oox | |
| parent | c78f918a7cb267a713804b8feacc3425196d4428 (diff) | |
whitespace cleanup in sc
Change-Id: Id1dcadcac179c52977e48a6912ce4d5fd542f60c
Diffstat (limited to 'sc/source/filter/oox')
56 files changed, 0 insertions, 796 deletions
diff --git a/sc/source/filter/oox/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx index 7362c9050b8d..6f9208c37349 100644 --- a/sc/source/filter/oox/addressconverter.cxx +++ b/sc/source/filter/oox/addressconverter.cxx @@ -31,16 +31,12 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; - - namespace { //! TODO: this limit may change, is there a way to obtain it via API? @@ -73,8 +69,6 @@ const sal_Int16 BIFF8_MAXTAB = BIFF5_MAXTAB; } // namespace - - CellAddress ApiCellRangeList::getBaseAddress() const { if( empty() ) @@ -82,8 +76,6 @@ CellAddress ApiCellRangeList::getBaseAddress() const return CellAddress( front().Sheet, front().StartColumn, front().StartRow ); } - - void BinAddress::read( SequenceInputStream& rStrm ) { rStrm >> mnRow >> mnCol; @@ -95,8 +87,6 @@ void BinAddress::read( BiffInputStream& rStrm, bool bCol16Bit, bool bRow32Bit ) mnCol = bCol16Bit ? rStrm.readuInt16() : rStrm.readuInt8(); } - - void BinRange::read( SequenceInputStream& rStrm ) { rStrm >> maFirst.mnRow >> maLast.mnRow >> maFirst.mnCol >> maLast.mnCol; @@ -110,8 +100,6 @@ void BinRange::read( BiffInputStream& rStrm, bool bCol16Bit, bool bRow32Bit ) maLast.mnCol = bCol16Bit ? rStrm.readuInt16() : rStrm.readuInt8(); } - - void BinRangeList::read( SequenceInputStream& rStrm ) { sal_Int32 nCount = rStrm.readInt32(); @@ -120,8 +108,6 @@ void BinRangeList::read( SequenceInputStream& rStrm ) aIt->read( rStrm ); } - - AddressConverter::AddressConverter( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), mbColOverflow( false ), @@ -163,8 +149,6 @@ AddressConverter::AddressConverter( const WorkbookHelper& rHelper ) : } } - - bool AddressConverter::parseOoxAddress2d( sal_Int32& ornColumn, sal_Int32& ornRow, const OUString& rString, sal_Int32 nStart, sal_Int32 nLength ) @@ -309,8 +293,6 @@ bool AddressConverter::parseOoxRange2d( return false; } - - bool AddressConverter::checkCol( sal_Int32 nCol, bool bTrackOverflow ) { bool bValid = (0 <= nCol) && (nCol <= maMaxPos.Column); @@ -335,8 +317,6 @@ bool AddressConverter::checkTab( sal_Int16 nSheet, bool bTrackOverflow ) return bValid; } - - bool AddressConverter::checkCellAddress( const CellAddress& rAddress, bool bTrackOverflow ) { return @@ -418,8 +398,6 @@ CellAddress AddressConverter::createValidCellAddress( return aAddress; } - - bool AddressConverter::checkCellRange( const CellRangeAddress& rRange, bool bAllowOverflow, bool bTrackOverflow ) { return @@ -477,8 +455,6 @@ bool AddressConverter::convertToCellRange( CellRangeAddress& orRange, return validateCellRange( orRange, bAllowOverflow, bTrackOverflow ); } - - void AddressConverter::validateCellRangeList( ApiCellRangeList& orRanges, bool bTrackOverflow ) { for( size_t nIndex = orRanges.size(); nIndex > 0; --nIndex ) @@ -544,8 +520,6 @@ void AddressConverter::initializeMaxPos( } } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx index 148038d09a5c..40683a24d6b7 100644 --- a/sc/source/filter/oox/autofilterbuffer.cxx +++ b/sc/source/filter/oox/autofilterbuffer.cxx @@ -42,8 +42,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; - - namespace { const sal_uInt8 BIFF12_TOP10FILTER_TOP = 0x01; @@ -59,8 +57,6 @@ const sal_uInt8 BIFF_FILTER_DATATYPE_BOOLEAN = 8; const sal_uInt8 BIFF_FILTER_DATATYPE_EMPTY = 12; const sal_uInt8 BIFF_FILTER_DATATYPE_NOTEMPTY = 14; - - bool lclGetApiOperatorFromToken( sal_Int32& rnApiOperator, sal_Int32 nToken ) { switch( nToken ) @@ -145,8 +141,6 @@ bool lclConvertWildcardsToRegExp( OUString& rValue ) } // namespace - - ApiFilterSettings::ApiFilterSettings() { } @@ -188,8 +182,6 @@ void ApiFilterSettings::appendField( bool bAnd, const std::vector<OUString>& rVa } } - - FilterSettingsBase::FilterSettingsBase( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -208,8 +200,6 @@ ApiFilterSettings FilterSettingsBase::finalizeImport( sal_Int32 /*nMaxCount*/ ) return ApiFilterSettings(); } - - DiscreteFilter::DiscreteFilter( const WorkbookHelper& rHelper ) : FilterSettingsBase( rHelper ), mnCalendarType( XML_none ), @@ -285,8 +275,6 @@ ApiFilterSettings DiscreteFilter::finalizeImport( sal_Int32 nMaxCount ) return aSettings; } - - Top10Filter::Top10Filter( const WorkbookHelper& rHelper ) : FilterSettingsBase( rHelper ), mfValue( 0.0 ), @@ -326,8 +314,6 @@ ApiFilterSettings Top10Filter::finalizeImport( sal_Int32 /*nMaxCount*/ ) return aSettings; } - - FilterCriterionModel::FilterCriterionModel() : mnOperator( XML_equal ), mnDataType( BIFF_FILTER_DATATYPE_NONE ), @@ -381,8 +367,6 @@ void FilterCriterionModel::readBiffData( SequenceInputStream& rStrm ) } } - - CustomFilter::CustomFilter( const WorkbookHelper& rHelper ) : FilterSettingsBase( rHelper ), mbAnd( false ) @@ -501,8 +485,6 @@ void CustomFilter::appendCriterion( const FilterCriterionModel& rCriterion ) maCriteria.push_back( rCriterion ); } - - FilterColumn::FilterColumn( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), mnColId( -1 ), @@ -540,8 +522,6 @@ ApiFilterSettings FilterColumn::finalizeImport( sal_Int32 nMaxCount ) return aSettings; } - - AutoFilter::AutoFilter( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -648,8 +628,6 @@ void AutoFilter::finalizeImport( const Reference<XSheetFilterDescriptor3>& rxFil } } - - AutoFilterBuffer::AutoFilterBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -745,8 +723,6 @@ AutoFilter* AutoFilterBuffer::getActiveAutoFilter() return maAutoFilters.empty() ? 0 : maAutoFilters.back().get(); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/autofiltercontext.cxx b/sc/source/filter/oox/autofiltercontext.cxx index 4f98319bfc6b..d7ea3d95f762 100644 --- a/sc/source/filter/oox/autofiltercontext.cxx +++ b/sc/source/filter/oox/autofiltercontext.cxx @@ -27,8 +27,6 @@ namespace xls { using ::oox::core::ContextHandlerRef; - - FilterSettingsContext::FilterSettingsContext( WorksheetContextBase& rParent, FilterSettingsBase& rFilterSettings ) : WorksheetContextBase( rParent ), mrFilterSettings( rFilterSettings ) @@ -73,8 +71,6 @@ void FilterSettingsContext::onStartRecord( SequenceInputStream& rStrm ) mrFilterSettings.importRecord( getCurrentElement(), rStrm ); } - - FilterColumnContext::FilterColumnContext( WorksheetContextBase& rParent, FilterColumn& rFilterColumn ) : WorksheetContextBase( rParent ), mrFilterColumn( rFilterColumn ) @@ -119,8 +115,6 @@ void FilterColumnContext::onStartRecord( SequenceInputStream& rStrm ) mrFilterColumn.importFilterColumn( rStrm ); } - - AutoFilterContext::AutoFilterContext( WorksheetFragmentBase& rFragment, AutoFilter& rAutoFilter ) : WorksheetContextBase( rFragment ), mrAutoFilter( rAutoFilter ) @@ -151,8 +145,6 @@ void AutoFilterContext::onStartRecord( SequenceInputStream& rStrm ) mrAutoFilter.importAutoFilter( rStrm, getSheetIndex() ); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/biffcodec.cxx b/sc/source/filter/oox/biffcodec.cxx index 74c0072bff8c..fa7b55f00229 100644 --- a/sc/source/filter/oox/biffcodec.cxx +++ b/sc/source/filter/oox/biffcodec.cxx @@ -27,15 +27,11 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; using ::oox::core::FilterBase; - - BiffDecoderBase::BiffDecoderBase() : mbValid( false ) { @@ -69,8 +65,6 @@ void BiffDecoderBase::decode( sal_uInt8* pnDestData, const sal_uInt8* pnSrcData, } } - - BiffDecoder_XOR::BiffDecoder_XOR( const BiffDecoder_XOR& rDecoder ) : BiffDecoderBase(), // must be called to prevent compiler warning maCodec( ::oox::core::BinaryCodec_XOR::CODEC_EXCEL ), @@ -130,8 +124,6 @@ void BiffDecoder_XOR::implDecode( sal_uInt8* pnDestData, const sal_uInt8* pnSrcD maCodec.decode( pnDestData, pnSrcData, nBytes ); } - - namespace { /** Returns the block index of the passed stream position for RCF decryption. */ @@ -148,8 +140,6 @@ sal_Int32 lclGetRcfOffset( sal_Int64 nStreamPos ) } // namespace - - BiffDecoder_RCF::BiffDecoder_RCF( const BiffDecoder_RCF& rDecoder ) : BiffDecoderBase(), // must be called to prevent compiler warning maEncryptionData( rDecoder.maEncryptionData ), @@ -231,8 +221,6 @@ void BiffDecoder_RCF::implDecode( sal_uInt8* pnDestData, const sal_uInt8* pnSrcD } } - - BiffCodecHelper::BiffCodecHelper( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -244,8 +232,6 @@ void BiffCodecHelper::cloneDecoder( BiffInputStream& rStrm ) rStrm.setDecoder( BiffDecoderRef( mxDecoder->clone() ) ); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/biffhelper.cxx b/sc/source/filter/oox/biffhelper.cxx index 3344304d084b..ae5fcd5ab442 100644 --- a/sc/source/filter/oox/biffhelper.cxx +++ b/sc/source/filter/oox/biffhelper.cxx @@ -31,8 +31,6 @@ namespace xls { - - namespace { const sal_Int32 BIFF_RK_100FLAG = 0x00000001; @@ -50,8 +48,6 @@ union DecodedDouble } // namespace - - // conversion ----------------------------------------------------------------- /*static*/ double BiffHelper::calcDoubleFromRk( sal_Int32 nRkValue ) diff --git a/sc/source/filter/oox/biffinputstream.cxx b/sc/source/filter/oox/biffinputstream.cxx index b64f50a97504..b4b5cb977def 100644 --- a/sc/source/filter/oox/biffinputstream.cxx +++ b/sc/source/filter/oox/biffinputstream.cxx @@ -28,8 +28,6 @@ namespace xls { - - namespace prv { BiffInputRecordBuffer::BiffInputRecordBuffer( BinaryInputStream& rInStrm ) : @@ -154,8 +152,6 @@ void BiffInputRecordBuffer::updateDecoded() } // namespace prv - - BiffInputStream::BiffInputStream( BinaryInputStream& rInStream, bool bContLookup ) : BinaryStreamBase( true ), maRecBuffer( rInStream ), @@ -489,8 +485,6 @@ void BiffInputStream::readUniStringHeader( bool& orb16BitChars, sal_Int32& ornAd ornAddSize = 4 * nFontCount + ::std::max< sal_Int32 >( 0, nPhoneticSize ); } - - BiffInputStreamPos::BiffInputStreamPos( BiffInputStream& rStrm ) : mrStrm( rStrm ), mnRecHandle( rStrm.getRecHandle() ), @@ -506,8 +500,6 @@ bool BiffInputStreamPos::restorePosition() return bValidRec && !mrStrm.isEof(); } - - BiffInputStreamPosGuard::BiffInputStreamPosGuard( BiffInputStream& rStrm ) : BiffInputStreamPos( rStrm ) { @@ -518,8 +510,6 @@ BiffInputStreamPosGuard::~BiffInputStreamPosGuard() restorePosition(); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/chartsheetfragment.cxx b/sc/source/filter/oox/chartsheetfragment.cxx index 7c64569266a2..aae9266ccf4d 100644 --- a/sc/source/filter/oox/chartsheetfragment.cxx +++ b/sc/source/filter/oox/chartsheetfragment.cxx @@ -29,13 +29,9 @@ namespace oox { namespace xls { - - using namespace ::oox::core; - - ChartsheetFragment::ChartsheetFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : WorksheetFragmentBase( rHelper, rFragmentPath ) { diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx index d3f0c661dcfe..b52a3769f02c 100644 --- a/sc/source/filter/oox/commentsbuffer.cxx +++ b/sc/source/filter/oox/commentsbuffer.cxx @@ -44,8 +44,6 @@ using ::com::sun::star::text::XTextRange; namespace oox { namespace xls { - - using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; @@ -83,8 +81,6 @@ static sal_Int32 lcl_ToVertAlign( sal_Int32 nAlign ) } } - - CommentModel::CommentModel() : mnAuthorId( -1 ), mnObjId( BIFF_OBJ_INVALID_ID ), @@ -92,8 +88,6 @@ CommentModel::CommentModel() : { } - - Comment::Comment( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ) { @@ -221,8 +215,6 @@ void CommentsBuffer::finalizeImport() maComments.forEachMem( &Comment::finalizeImport ); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/commentsfragment.cxx b/sc/source/filter/oox/commentsfragment.cxx index febdb14aea0a..2a8fa5159863 100644 --- a/sc/source/filter/oox/commentsfragment.cxx +++ b/sc/source/filter/oox/commentsfragment.cxx @@ -24,13 +24,9 @@ namespace oox { namespace xls { - - using namespace ::oox::core; - - CommentsFragment::CommentsFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : WorksheetFragmentBase( rHelper, rFragmentPath ) { @@ -143,8 +139,6 @@ void CommentsFragment::importComment( SequenceInputStream& rStrm ) mxComment->importComment( rStrm ); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index c83b84b87df0..50c5b33b802e 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -55,8 +55,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; @@ -65,8 +63,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; - - namespace { const sal_Int32 BIFF12_CFRULE_TYPE_CELLIS = 1; @@ -120,8 +116,6 @@ const sal_uInt16 BIFF12_CFRULE_ABOVEAVERAGE = 0x0004; const sal_uInt16 BIFF12_CFRULE_BOTTOM = 0x0008; const sal_uInt16 BIFF12_CFRULE_PERCENT = 0x0010; - - template< typename Type > void lclAppendProperty( ::std::vector< PropertyValue >& orProps, const OUString& rPropName, const Type& rValue ) { @@ -130,8 +124,6 @@ void lclAppendProperty( ::std::vector< PropertyValue >& orProps, const OUString& orProps.back().Value <<= rValue; } - - void SetCfvoData( ColorScaleRuleModelEntry* pEntry, const AttributeList& rAttribs ) { OUString aType = rAttribs.getString( XML_type, OUString() ); @@ -256,8 +248,6 @@ void ColorScaleRule::AddEntries( ScColorScaleFormat* pFormat, ScDocument* pDoc, } } - - DataBarRule::DataBarRule( const CondFormat& rFormat ): WorksheetHelper( rFormat ), mpFormat(new ScDataBarFormatData) @@ -313,8 +303,6 @@ void DataBarRule::SetData( ScDataBarFormat* pFormat, ScDocument* pDoc, const ScA pFormat->SetDataBarData(mpFormat); } - - IconSetRule::IconSetRule( const CondFormat& rFormat ): WorksheetHelper( rFormat ), mpFormatData( new ScIconSetFormatData ) @@ -358,8 +346,6 @@ void IconSetRule::SetData( ScIconSetFormat* pFormat, ScDocument* pDoc, const ScA pFormat->SetIconSetData(mpFormatData); } - - CondFormatRuleModel::CondFormatRuleModel() : mnPriority( -1 ), mnType( XML_TOKEN_INVALID ), @@ -393,8 +379,6 @@ void CondFormatRuleModel::setBiff12TextType( sal_Int32 nOperator ) mnOperator = STATIC_ARRAY_SELECT( spnOperators, nOperator, XML_TOKEN_INVALID ); } - - CondFormatRule::CondFormatRule( const CondFormat& rCondFormat, ScConditionalFormat* pFormat ) : WorksheetHelper( rCondFormat ), mrCondFormat( rCondFormat ), @@ -956,15 +940,11 @@ IconSetRule* CondFormatRule::getIconSet() return mpIconSet.get(); } - - CondFormatModel::CondFormatModel() : mbPivot( false ) { } - - CondFormat::CondFormat( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ), mpFormat(NULL), @@ -1038,8 +1018,6 @@ void CondFormat::insertRule( CondFormatRuleRef xRule ) } } - - CondFormatBuffer::CondFormatBuffer( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ) { diff --git a/sc/source/filter/oox/condformatcontext.cxx b/sc/source/filter/oox/condformatcontext.cxx index 4cfd409ba698..7153e1a6780b 100644 --- a/sc/source/filter/oox/condformatcontext.cxx +++ b/sc/source/filter/oox/condformatcontext.cxx @@ -23,12 +23,8 @@ namespace oox { namespace xls { - - using ::oox::core::ContextHandlerRef; - - ColorScaleContext::ColorScaleContext( CondFormatContext& rFragment, CondFormatRuleRef xRule ) : WorksheetContextBase( rFragment ), mxRule( xRule ) @@ -65,8 +61,6 @@ void ColorScaleContext::onStartElement( const AttributeList& rAttribs ) } } - - DataBarContext::DataBarContext( CondFormatContext& rFragment, CondFormatRuleRef xRule ) : WorksheetContextBase( rFragment ), mxRule( xRule ) @@ -106,8 +100,6 @@ void DataBarContext::onStartElement( const AttributeList& rAttribs ) } } - - IconSetContext::IconSetContext( CondFormatContext& rFragment, CondFormatRuleRef xRule ) : WorksheetContextBase( rFragment ), mxRule( xRule ) @@ -142,8 +134,6 @@ void IconSetContext::onStartElement( const AttributeList& rAttribs ) } } - - CondFormatContext::CondFormatContext( WorksheetFragmentBase& rFragment ) : WorksheetContextBase( rFragment ) { @@ -236,8 +226,6 @@ void CondFormatContext::onEndRecord() } } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/connectionsbuffer.cxx b/sc/source/filter/oox/connectionsbuffer.cxx index 6ee777e6f09c..49cbca9bbd7d 100644 --- a/sc/source/filter/oox/connectionsbuffer.cxx +++ b/sc/source/filter/oox/connectionsbuffer.cxx @@ -25,13 +25,9 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::uno; - - namespace { const sal_Int32 BIFF12_RECONNECT_AS_REQUIRED = 1; @@ -68,8 +64,6 @@ const sal_uInt8 BIFF12_WEBPR_HAS_URL = 0x04; } // namespace - - WebPrModel::WebPrModel() : mnHtmlFormat( XML_none ), mbXml( false ), @@ -84,8 +78,6 @@ WebPrModel::WebPrModel() : { } - - ConnectionModel::ConnectionModel() : mnId( -1 ), mnType( BIFF12_CONNECTION_UNKNOWN ), @@ -110,8 +102,6 @@ WebPrModel& ConnectionModel::createWebPr() return *mxWebPr; } - - Connection::Connection( const WorkbookHelper& rHelper, sal_Int32 nConnId ) : WorkbookHelper( rHelper ) { @@ -277,8 +267,6 @@ void Connection::importWebPrTable( SequenceInputStream& rStrm, sal_Int32 nRecId } } - - ConnectionsBuffer::ConnectionsBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), mnUnusedId( 1 ) @@ -314,8 +302,6 @@ void ConnectionsBuffer::insertConnectionToMap( const ConnectionRef& rxConnection } } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/connectionsfragment.cxx b/sc/source/filter/oox/connectionsfragment.cxx index 4ad7d92220d1..4011197e4075 100644 --- a/sc/source/filter/oox/connectionsfragment.cxx +++ b/sc/source/filter/oox/connectionsfragment.cxx @@ -26,13 +26,9 @@ namespace oox { namespace xls { - - using namespace ::oox::core; - - ConnectionContext::ConnectionContext( WorkbookFragmentBase& rParent, Connection& rConnection ) : WorkbookContextBase( rParent ), mrConnection( rConnection ) @@ -105,8 +101,6 @@ void ConnectionContext::onStartRecord( SequenceInputStream& rStrm ) mrConnection.importConnection( rStrm ); } - - ConnectionsFragment::ConnectionsFragment( const WorkbookHelper& rHelper, const OUString& rFragmentPath ) : WorkbookFragmentBase( rHelper, rFragmentPath ) { @@ -164,8 +158,6 @@ void ConnectionsFragment::finalizeImport() getConnections().finalizeImport(); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx index fa462bfcf4ca..8aef91a13423 100644 --- a/sc/source/filter/oox/defnamesbuffer.cxx +++ b/sc/source/filter/oox/defnamesbuffer.cxx @@ -41,15 +41,11 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; - - namespace { const sal_uInt32 BIFF12_DEFNAME_HIDDEN = 0x00000001; @@ -63,8 +59,6 @@ const sal_uInt16 BIFF_REFFLAG_ROW1REL = 0x0002; const sal_uInt16 BIFF_REFFLAG_COL2REL = 0x0004; const sal_uInt16 BIFF_REFFLAG_ROW2REL = 0x0008; - - const sal_Char* const spcOoxPrefix = "_xlnm."; const sal_Char* const sppcBaseNames[] = @@ -183,8 +177,6 @@ Any lclConvertReference( const Any& rRefAny, const CellAddress& rBaseAddr, sal_u } // namespace - - DefinedNameModel::DefinedNameModel() : mnSheet( -1 ), mnFuncGroupId( -1 ), @@ -195,8 +187,6 @@ DefinedNameModel::DefinedNameModel() : { } - - DefinedNameBase::DefinedNameBase( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -256,8 +246,6 @@ ApiTokenSequence DefinedNameBase::importBiffFormula( sal_Int16 nBaseSheet, BiffI getFormulaParser().convertErrorToFormula( BIFF_ERR_NAME ); } - - DefinedName::DefinedName( const WorkbookHelper& rHelper ) : DefinedNameBase( rHelper ), mpScRangeData(NULL), @@ -463,8 +451,6 @@ bool DefinedName::getAbsoluteRange( CellRangeAddress& orRange ) const return getFormulaParser().extractCellRange( orRange, aFTokenSeq, false ); } - - DefinedNamesBuffer::DefinedNamesBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -538,8 +524,6 @@ DefinedNameRef DefinedNamesBuffer::createDefinedName() return xDefName; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/drawingbase.cxx b/sc/source/filter/oox/drawingbase.cxx index d830c9f30956..0b40518abacc 100644 --- a/sc/source/filter/oox/drawingbase.cxx +++ b/sc/source/filter/oox/drawingbase.cxx @@ -29,14 +29,10 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::table; using namespace ::oox::drawingml; - - namespace { /** Converts the passed 32-bit integer value from 1/100 mm to EMUs. */ @@ -53,8 +49,6 @@ inline sal_Int32 lclEmuToHmm( sal_Int64 nValue ) } // namespace - - CellAnchorModel::CellAnchorModel() : mnCol( -1 ), mnRow( -1 ), @@ -63,16 +57,12 @@ CellAnchorModel::CellAnchorModel() : { } - - AnchorClientDataModel::AnchorClientDataModel() : mbLocksWithSheet( true ), mbPrintsWithSheet( true ) { } - - ShapeAnchor::ShapeAnchor( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ), meAnchorType( ANCHOR_INVALID ), @@ -301,8 +291,6 @@ EmuPoint ShapeAnchor::calcCellAnchorEmu( const CellAnchorModel& rModel ) const return aEmuPoint; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx index 0da5045e122d..0df6ab1bf3c5 100644 --- a/sc/source/filter/oox/drawingfragment.cxx +++ b/sc/source/filter/oox/drawingfragment.cxx @@ -61,8 +61,6 @@ using ::com::sun::star::awt::Rectangle; using ::com::sun::star::awt::XControlModel; // no using's for ::oox::vml, that may clash with ::oox::drawingml types - - ShapeMacroAttacher::ShapeMacroAttacher( const OUString& rMacroName, const Reference< XShape >& rxShape ) : VbaMacroAttacherBase( rMacroName ), mxShape( rxShape ) @@ -87,8 +85,6 @@ void ShapeMacroAttacher::attachMacro( const OUString& rMacroUrl ) } } - - Shape::Shape( const WorksheetHelper& rHelper, const AttributeList& rAttribs, const sal_Char* pcServiceName ) : ::oox::drawingml::Shape( pcServiceName ), WorksheetHelper( rHelper ) @@ -120,8 +116,6 @@ void Shape::finalizeXShape( XmlFilterBase& rFilter, const Reference< XShapes >& } } - - GroupShapeContext::GroupShapeContext( ContextHandler2Helper& rParent, const WorksheetHelper& rHelper, const ShapePtr& rxParentShape, const ShapePtr& rxShape ) : ShapeGroupContext( rParent, rxParentShape, rxShape ), @@ -176,8 +170,6 @@ ContextHandlerRef GroupShapeContext::onCreateContext( return xContext.get() ? xContext.get() : ShapeGroupContext::onCreateContext( nElement, rAttribs ); } - - DrawingFragment::DrawingFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : WorksheetFragmentBase( rHelper, rFragmentPath ), mxDrawPage( rHelper.getDrawPage(), UNO_QUERY ) @@ -320,8 +312,6 @@ private: sal_Int32 mnRow; }; - - VmlFindNoteFunc::VmlFindNoteFunc( const CellAddress& rPos ) : mnCol( rPos.Column ), mnRow( rPos.Row ) @@ -336,8 +326,6 @@ bool VmlFindNoteFunc::operator()( const ::oox::vml::ShapeBase& rShape ) const } // namespace - - VmlControlMacroAttacher::VmlControlMacroAttacher( const OUString& rMacroName, const Reference< XIndexContainer >& rxCtrlFormIC, sal_Int32 nCtrlIndex, sal_Int32 nCtrlType, sal_Int32 nDropStyle ) : VbaMacroAttacherBase( rMacroName ), @@ -401,8 +389,6 @@ void VmlControlMacroAttacher::attachMacro( const OUString& rMacroUrl ) } } - - VmlDrawing::VmlDrawing( const WorksheetHelper& rHelper ) : ::oox::vml::Drawing( rHelper.getOoxFilter(), rHelper.getDrawPage(), ::oox::vml::VMLDRAWING_EXCEL ), WorksheetHelper( rHelper ), @@ -764,8 +750,6 @@ void VmlDrawing::convertControlBackground( AxMorphDataModelBase& rAxModel, const } } - - VmlDrawingFragment::VmlDrawingFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : ::oox::vml::DrawingFragment( rHelper.getOoxFilter(), rFragmentPath, rHelper.getVmlDrawing() ), WorksheetHelper( rHelper ) @@ -778,8 +762,6 @@ void VmlDrawingFragment::finalizeImport() getVmlDrawing().convertAndInsert(); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx index 4644d934c786..6b7cef62ff35 100644 --- a/sc/source/filter/oox/drawingmanager.cxx +++ b/sc/source/filter/oox/drawingmanager.cxx @@ -36,8 +36,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::awt; using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::lang; @@ -45,8 +43,6 @@ using namespace ::com::sun::star::uno; using namespace ::oox::drawingml; - - namespace { // OBJ record ----------------------------------------------------------------- @@ -114,8 +110,6 @@ BiffInputStream& operator>>( BiffInputStream& rStrm, BiffObjLineModel& rModel ) return rStrm; } - - BiffObjFillModel::BiffObjFillModel() : mnBackColorIdx( BIFF_OBJ_LINE_AUTOCOLOR ), mnPattColorIdx( BIFF_OBJ_FILL_AUTOCOLOR ), @@ -145,8 +139,6 @@ void BiffDrawingObjectContainer::convertAndInsert( BiffDrawingBase& rDrawing, co maObjects.forEachMem( &BiffDrawingObjectBase::convertAndInsert, ::boost::ref( rDrawing ), ::boost::cref( rxShapes ), pParentRect ); } - - BiffDrawingObjectBase::BiffDrawingObjectBase( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ), maAnchor( rHelper ), @@ -419,8 +411,6 @@ void BiffDrawingBase::finalizeImport() maRawObjs.convertAndInsert( *this, xShapes ); } - - BiffSheetDrawing::BiffSheetDrawing( const WorksheetHelper& rHelper ) : BiffDrawingBase( rHelper, rHelper.getDrawPage() ) { @@ -432,8 +422,6 @@ void BiffSheetDrawing::notifyShapeInserted( const Reference< XShape >& /*rxShape extendShapeBoundingBox( rShapeRect ); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/excelchartconverter.cxx b/sc/source/filter/oox/excelchartconverter.cxx index 467db26feeef..38ffb791e49e 100644 --- a/sc/source/filter/oox/excelchartconverter.cxx +++ b/sc/source/filter/oox/excelchartconverter.cxx @@ -32,8 +32,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::chart2; using namespace ::com::sun::star::chart2::data; using namespace ::com::sun::star::lang; @@ -42,8 +40,6 @@ using namespace ::com::sun::star::uno; using ::oox::drawingml::chart::DataSequenceModel; - - ExcelChartConverter::ExcelChartConverter( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -121,8 +117,6 @@ Reference< XDataSequence > ExcelChartConverter::createDataSequence( return xDataSeq; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx index 1cdd1036280e..c6bdbc67fb88 100644 --- a/sc/source/filter/oox/excelfilter.cxx +++ b/sc/source/filter/oox/excelfilter.cxx @@ -33,8 +33,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; @@ -43,8 +41,6 @@ using namespace ::oox::core; using ::oox::drawingml::table::TableStyleListPtr; - - OUString ExcelFilter_getImplementationName() { return OUString( "com.sun.star.comp.oox.xls.ExcelFilter" ); @@ -64,8 +60,6 @@ Reference< XInterface > ExcelFilter_create( return static_cast< ::cppu::OWeakObject* >( new ExcelFilter( rxContext ) ); } - - ExcelFilter::ExcelFilter( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) : XmlFilterBase( rxContext ), mpBookGlob( 0 ) diff --git a/sc/source/filter/oox/excelhandlers.cxx b/sc/source/filter/oox/excelhandlers.cxx index 303b6cff59f4..afbb1412e7d2 100644 --- a/sc/source/filter/oox/excelhandlers.cxx +++ b/sc/source/filter/oox/excelhandlers.cxx @@ -25,14 +25,10 @@ namespace oox { namespace xls { - - using ::oox::core::FilterBase; using ::oox::core::FragmentHandler2; - - WorkbookFragmentBase::WorkbookFragmentBase( const WorkbookHelper& rHelper, const OUString& rFragmentPath ) : FragmentHandler2( rHelper.getOoxFilter(), rFragmentPath ), @@ -40,8 +36,6 @@ WorkbookFragmentBase::WorkbookFragmentBase( { } - - WorksheetFragmentBase::WorksheetFragmentBase( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : FragmentHandler2( rHelper.getOoxFilter(), rFragmentPath ), @@ -50,21 +44,15 @@ WorksheetFragmentBase::WorksheetFragmentBase( } - - BiffContextHandler::~BiffContextHandler() { } - - BiffWorksheetContextBase::BiffWorksheetContextBase( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ) { } - - BiffFragmentHandler::BiffFragmentHandler( const FilterBase& rFilter, const OUString& rStrmName ) { // do not automatically close the root stream (indicated by empty stream name) @@ -85,8 +73,6 @@ bool BiffFragmentHandler::skipFragment() return !mxBiffStrm->isEof() && (mxBiffStrm->getRecId() == BIFF_ID_EOF); } - - BiffWorkbookFragmentBase::BiffWorkbookFragmentBase( const WorkbookHelper& rHelper, const OUString& rStrmName, bool bCloneDecoder ) : BiffFragmentHandler( rHelper.getBaseFilter(), rStrmName ), WorkbookHelper( rHelper ) @@ -95,8 +81,6 @@ BiffWorkbookFragmentBase::BiffWorkbookFragmentBase( const WorkbookHelper& rHelpe getCodecHelper().cloneDecoder( getInputStream() ); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/excelvbaproject.cxx b/sc/source/filter/oox/excelvbaproject.cxx index 6d5c27f7b018..67bed9f58d84 100644 --- a/sc/source/filter/oox/excelvbaproject.cxx +++ b/sc/source/filter/oox/excelvbaproject.cxx @@ -35,8 +35,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::container; using namespace ::com::sun::star::document; using namespace ::com::sun::star::frame; @@ -46,8 +44,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; - - ExcelVbaProject::ExcelVbaProject( const Reference< XComponentContext >& rxContext, const Reference< XSpreadsheetDocument >& rxDocument ) : ::oox::ole::VbaProject( rxContext, Reference< XModel >( rxDocument, UNO_QUERY ), "Calc" ), mxDocument( rxDocument ) @@ -132,8 +128,6 @@ void ExcelVbaProject::prepareImport() } } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx index dfe55b7af8f8..4b86f1c68826 100644 --- a/sc/source/filter/oox/externallinkbuffer.cxx +++ b/sc/source/filter/oox/externallinkbuffer.cxx @@ -43,8 +43,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; @@ -52,8 +50,6 @@ using namespace ::com::sun::star::uno; using ::oox::core::Relation; using ::oox::core::Relations; - - namespace { const sal_uInt16 BIFF12_EXTERNALBOOK_BOOK = 0; @@ -68,8 +64,6 @@ const sal_uInt16 BIFF12_EXTNAME_ICONIFIED = 0x0020; } // namespace - - ExternalNameModel::ExternalNameModel() : mbBuiltIn( false ), mbNotify( false ), @@ -80,8 +74,6 @@ ExternalNameModel::ExternalNameModel() : { } - - ExternalName::ExternalName( const ExternalLink& rParentLink ) : DefinedNameBase( rParentLink ), mrParentLink( rParentLink ), @@ -271,8 +263,6 @@ void ExternalName::setResultSize( sal_Int32 nColumns, sal_Int32 nRows ) maCurrIt = maResults.begin(); } - - void LinkSheetRange::setDeleted() { meType = LINKSHEETRANGE_INTERNAL; @@ -309,8 +299,6 @@ void LinkSheetRange::setExternalRange( sal_Int32 nDocLink, sal_Int32 nFirst, sal } } - - ExternalLink::ExternalLink( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), meLinkType( LINKTYPE_UNKNOWN ), @@ -624,8 +612,6 @@ ExternalNameRef ExternalLink::createExternalName() return xExtName; } - - RefSheetsModel::RefSheetsModel() : mnExtRefId( -1 ), mnTabId1( -1 ), @@ -638,8 +624,6 @@ void RefSheetsModel::readBiff12Data( SequenceInputStream& rStrm ) rStrm >> mnExtRefId >> mnTabId1 >> mnTabId2; } - - ExternalLinkBuffer::ExternalLinkBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), mxSelfRef( new ExternalLink( rHelper ) ), @@ -796,8 +780,6 @@ const RefSheetsModel* ExternalLinkBuffer::getRefSheets( sal_Int32 nRefId ) const &maRefSheets[ static_cast< size_t >( nRefId ) ] : 0; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/externallinkfragment.cxx b/sc/source/filter/oox/externallinkfragment.cxx index b9059973794a..6f487f8df1a5 100644 --- a/sc/source/filter/oox/externallinkfragment.cxx +++ b/sc/source/filter/oox/externallinkfragment.cxx @@ -29,8 +29,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; @@ -38,8 +36,6 @@ using namespace ::oox::core; - - ExternalSheetDataContext::ExternalSheetDataContext( WorkbookFragmentBase& rFragment, const Reference< XExternalSheetCache >& rxSheetCache ) : WorkbookContextBase(rFragment) @@ -160,8 +156,6 @@ void ExternalSheetDataContext::setCellValue( const Any& rValue ) } } - - ExternalLinkFragment::ExternalLinkFragment( const WorkbookHelper& rHelper, const OUString& rFragmentPath, ExternalLink& rExtLink ) : WorkbookFragmentBase( rHelper, rFragmentPath ), @@ -337,8 +331,6 @@ const RecordInfo* ExternalLinkFragment::getRecordInfos() const return spRecInfos; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index 25021e880771..64270d226e99 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -42,8 +42,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; @@ -119,8 +117,6 @@ void BinSingleRef2d::readBiff8Data( BiffInputStream& rStrm, bool bRelativeAsOffs setBiff8Data( nCol, nRow, bRelativeAsOffset ); } - - void BinComplexRef2d::readBiff12Data( SequenceInputStream& rStrm, bool bRelativeAsOffset ) { sal_Int32 nRow1, nRow2; @@ -997,8 +993,6 @@ private: sal_uInt8 nMaxParam, bool bImportFilter, FilterType eFilter ); }; - - FunctionProviderImpl::FunctionProviderImpl( FilterType eFilter, BiffType eBiff, bool bImportFilter, bool bCallerKnowsAboutMacroExport ) { @@ -1110,8 +1104,6 @@ void FunctionProviderImpl::initFuncs( const FunctionData* pBeg, const FunctionDa initFunc( *pIt, nMaxParam ); } - - FunctionProvider::FunctionProvider( FilterType eFilter, BiffType eBiff, bool bImportFilter, bool bCallerKnowsAboutMacroExport ) : mxFuncImpl( new FunctionProviderImpl( eFilter, eBiff, bImportFilter, bCallerKnowsAboutMacroExport ) ) @@ -1194,8 +1186,6 @@ private: bool initFuncOpCodes( const ApiTokenMap& rIntFuncTokenMap, const ApiTokenMap& rExtFuncTokenMap, const FunctionInfoVector& rFuncInfos ); }; - - OpCodeProviderImpl::OpCodeProviderImpl( const FunctionInfoVector& rFuncInfos, const Reference< XMultiServiceFactory >& rxModelFactory ) { @@ -1449,8 +1439,6 @@ bool OpCodeProviderImpl::initFuncOpCodes( const ApiTokenMap& rIntFuncTokenMap, c return bIsValid; } - - OpCodeProvider::OpCodeProvider( const Reference< XMultiServiceFactory >& rxModelFactory, FilterType eFilter, BiffType eBiff, bool bImportFilter, bool bCallerKnowsAboutMacroExport ) : FunctionProvider( eFilter, eBiff, bImportFilter, bCallerKnowsAboutMacroExport ), @@ -1589,8 +1577,6 @@ TokenToRangeListState lclProcessClose( sal_Int32& ornParenLevel ) } // namespace - - FormulaProcessorBase::FormulaProcessorBase( const WorkbookHelper& rHelper ) : OpCodeProvider( rHelper.getBaseFilter().getModelFactory(), rHelper.getFilterType(), rHelper.getBiff(), rHelper.getBaseFilter().isImportFilter() ), ApiOpCodes( getOpCodes() ), @@ -1598,8 +1584,6 @@ FormulaProcessorBase::FormulaProcessorBase( const WorkbookHelper& rHelper ) : { } - - OUString FormulaProcessorBase::generateAddress2dString( const CellAddress& rAddress, bool bAbsolute ) { return generateAddress2dString( BinAddress( rAddress ), bAbsolute ); @@ -1620,8 +1604,6 @@ OUString FormulaProcessorBase::generateAddress2dString( const BinAddress& rAddre return aBuffer.makeStringAndClear(); } - - OUString FormulaProcessorBase::generateApiString( const OUString& rString ) { OUString aRetString = rString; @@ -1658,8 +1640,6 @@ OUString FormulaProcessorBase::generateApiArray( const Matrix< Any >& rMatrix ) return aBuffer.makeStringAndClear(); } - - Any FormulaProcessorBase::extractReference( const ApiTokenSequence& rTokens ) const { ApiTokenIterator aTokenIt( rTokens, OPCODE_SPACES, true ); @@ -1773,8 +1753,6 @@ void FormulaProcessorBase::convertStringToStringList( } } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx index 731be0fcd5b2..9416b5c7cb37 100644 --- a/sc/source/filter/oox/formulaparser.cxx +++ b/sc/source/filter/oox/formulaparser.cxx @@ -38,16 +38,12 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::sheet::ReferenceFlags; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; - - namespace { sal_uInt16 lclReadFmlaSize( BiffInputStream& rStrm, BiffType eBiff, const sal_uInt16* pnFmlaSize ) @@ -573,8 +569,6 @@ private: WhiteSpaceVec maClosingSpaces; /// List of whitespaces before closing parenthesis. }; - - FormulaParserImpl::FormulaParserImpl( const FormulaParser& rParent ) : FormulaFinalizer( rParent ), WorkbookHelper( rParent ), @@ -1290,8 +1284,6 @@ private: bool mbNeedExtRefs; /// True = parser needs initialization of external reference info. }; - - OoxFormulaParserImpl::OoxFormulaParserImpl( const FormulaParser& rParent ) : FormulaParserImpl( rParent ), maApiParser( rParent.getBaseFilter().getModelFactory(), rParent ), @@ -1842,8 +1834,6 @@ bool lclIsValidNlrRange( const BiffNlr& rNlr, const BinRange& rRange, bool bRow } // namespace - - class BiffFormulaParserImpl : public FormulaParserImpl { public: @@ -1947,8 +1937,6 @@ private: sal_uInt16 mnRefIdSize; /// Size of unused data following a reference identifier. }; - - BiffFormulaParserImpl::BiffFormulaParserImpl( const FormulaParser& rParent ) : FormulaParserImpl( rParent ), mnAddDataPos( 0 ), @@ -2741,8 +2729,6 @@ bool BiffFormulaParserImpl::pushBiffFunction( sal_uInt16 nFuncId, sal_uInt8 nPar return pushFunctionOperator( OPCODE_NONAME, nParamCount ); } - - namespace { /** Extracts the reference identifier and the remaining data from a formula in @@ -2764,8 +2750,6 @@ bool lclExtractRefId( sal_Int32& rnRefId, OUString& rRemainder, const OUString& } - - FormulaParser::FormulaParser( const WorkbookHelper& rHelper ) : FormulaProcessorBase( rHelper ) { @@ -2902,8 +2886,6 @@ OUString FormulaParser::importMacroName( const OUString& rFormulaString ) return OUString(); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx index a7709b3d28f5..340d15c8b1b1 100644 --- a/sc/source/filter/oox/numberformatsbuffer.cxx +++ b/sc/source/filter/oox/numberformatsbuffer.cxx @@ -43,16 +43,12 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; - - namespace { /** Stores the number format used in Calc for an Excel built-in number format. */ @@ -435,8 +431,6 @@ struct BuiltinFormat #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 locales. */ static const BuiltinFormat spBuiltinFormats_BASE[] = { @@ -533,8 +527,6 @@ static const BuiltinFormat spBuiltinFormats_BASE[] = NUMFMT_ENDTABLE() }; - - /** Arabic, U.A.E. */ static const BuiltinFormat spBuiltinFormats_ar_AE[] = { @@ -1634,8 +1626,6 @@ static const BuiltinFormat spBuiltinFormats_zh_TW[] = NUMFMT_ENDTABLE() }; - - /** Specifies a built-in number format table for a specific locale. */ struct BuiltinFormatTable { @@ -1795,22 +1785,16 @@ static const BuiltinFormatTable spBuiltinFormatTables[] = } // namespace - - NumFmtModel::NumFmtModel() : mnPredefId( -1 ) { } - - ApiNumFmtData::ApiNumFmtData() : mnIndex( 0 ) { } - - namespace { sal_Int32 lclCreatePredefinedFormat( const Reference< XNumberFormats >& rxNumFmts, @@ -1861,8 +1845,6 @@ sal_Int32 lclCreateFormat( const Reference< XNumberFormats >& rxNumFmts, return nIndex; } - - /** Functor for converting an XML number format to an API number format index. */ class NumberFormatFinalizer { @@ -1893,8 +1875,6 @@ NumberFormatFinalizer::NumberFormatFinalizer( const WorkbookHelper& rHelper ) : } // namespace - - NumberFormat::NumberFormat( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -1949,8 +1929,6 @@ void NumberFormat::writeToPropertyMap( PropertyMap& rPropMap ) const rPropMap.setProperty( PROP_NumberFormat, maApiData.mnIndex); } - - NumberFormatsBuffer::NumberFormatsBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper(rHelper) , mnHighestId(0) @@ -2077,8 +2055,6 @@ void NumberFormatsBuffer::insertBuiltinFormats() } } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx index eeb0e06d027d..a95c05c2e7ac 100644 --- a/sc/source/filter/oox/ooxformulaparser.cxx +++ b/sc/source/filter/oox/ooxformulaparser.cxx @@ -26,8 +26,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; @@ -35,8 +33,6 @@ using namespace ::com::sun::star::uno; using ::rtl::OUString; - - class OOXMLFormulaParserImpl : private FormulaFinalizer { public: @@ -51,8 +47,6 @@ private: ApiParserWrapper maApiParser; }; - - OOXMLFormulaParserImpl::OOXMLFormulaParserImpl( const Reference< XMultiServiceFactory >& rxModelFactory ) : FormulaFinalizer( OpCodeProvider( rxModelFactory, FILTER_OOXML, BIFF_UNKNOWN, true ) ), maApiParser( rxModelFactory, *this ) @@ -103,8 +97,6 @@ const FunctionInfo* OOXMLFormulaParserImpl::resolveBadFuncName( const OUString& return 0; } - - Sequence< OUString > OOXMLFormulaParser_getSupportedServiceNames() { Sequence< OUString > aServiceNames( 1 ); @@ -122,8 +114,6 @@ Reference< XInterface > OOXMLFormulaParser_create( const Reference< XComponentCo return static_cast< ::cppu::OWeakObject* >( new OOXMLFormulaParser ); } - - OOXMLFormulaParser::OOXMLFormulaParser() { } @@ -185,8 +175,6 @@ OUString SAL_CALL OOXMLFormulaParser::printFormula( throw RuntimeException(); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx index 81fc024c238d..fdaed2281738 100644 --- a/sc/source/filter/oox/pagesettings.cxx +++ b/sc/source/filter/oox/pagesettings.cxx @@ -47,16 +47,12 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using ::oox::core::Relations; - - namespace { const double OOX_MARGIN_DEFAULT_LR = 0.748; /// Left/right default margin in inches. @@ -90,8 +86,6 @@ const sal_uInt16 BIFF12_CHARTPAGESETUP_DRAFTQUALITY = 0x0020; } // namespace - - PageSettingsModel::PageSettingsModel() : mfLeftMargin( OOX_MARGIN_DEFAULT_LR ), mfRightMargin( OOX_MARGIN_DEFAULT_LR ), @@ -133,8 +127,6 @@ void PageSettingsModel::setBiffPrintErrors( sal_uInt8 nPrintErrors ) mnPrintErrors = STATIC_ARRAY_SELECT( spnErrorIds, nPrintErrors, XML_none ); } - - PageSettings::PageSettings( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ) { @@ -332,8 +324,6 @@ void PageSettings::importPictureData( const Relations& rRelations, const OUStrin } - - enum HFPortionId { HF_LEFT, @@ -342,8 +332,6 @@ enum HFPortionId HF_COUNT }; - - struct HFPortionInfo { Reference<text::XText> mxText; /// XText interface of this portion. @@ -369,8 +357,6 @@ bool HFPortionInfo::initialize( const Reference<text::XText>& rxText ) return bRet; } - - class HeaderFooterParser : public WorkbookHelper { public: @@ -441,8 +427,6 @@ private: FontModel maFontModel; /// Font attributes of current text range. }; - - namespace { // different names for bold font style (lowercase) @@ -468,8 +452,6 @@ static const sal_Char* const sppcItalicNames[] = } // namespace - - HeaderFooterParser::HeaderFooterParser( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), maPageNumberService( "com.sun.star.text.TextField.PageNumber" ), @@ -881,8 +863,6 @@ void HeaderFooterParser::setNewPortion( HFPortionId ePortion ) - - PageSettingsConverter::HFHelperData::HFHelperData( sal_Int32 nLeftPropId, sal_Int32 nRightPropId ) : mnLeftPropId( nLeftPropId ), mnRightPropId( nRightPropId ), @@ -894,8 +874,6 @@ PageSettingsConverter::HFHelperData::HFHelperData( sal_Int32 nLeftPropId, sal_In { } - - PageSettingsConverter::PageSettingsConverter( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), mxHFParser( new HeaderFooterParser( rHelper ) ), @@ -1063,8 +1041,6 @@ sal_Int32 PageSettingsConverter::writeHeaderFooter( return nHeight; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx index 3cd2d9036082..454a1acf1299 100644 --- a/sc/source/filter/oox/pivotcachebuffer.cxx +++ b/sc/source/filter/oox/pivotcachebuffer.cxx @@ -44,8 +44,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; @@ -54,8 +52,6 @@ using namespace ::com::sun::star::util; using ::oox::core::Relations; - - namespace { const sal_uInt16 BIFF12_PCDFIELD_SERVERFIELD = 0x0001; @@ -102,8 +98,6 @@ const sal_uInt8 BIFF12_PCDEFINITION_SUPPORTDRILL = 0x08; const sal_uInt8 BIFF12_PCDWBSOURCE_HASRELID = 0x01; const sal_uInt8 BIFF12_PCDWBSOURCE_HASSHEET = 0x02; - - const sal_uInt16 BIFF_PC_NOSTRING = 0xFFFF; const sal_uInt16 BIFF_PCDFIELD_HASITEMS = 0x0001; @@ -127,8 +121,6 @@ const sal_uInt16 BIFF_PCDEFINITION_OPTIMIZEMEMORY = 0x0008; const sal_uInt16 BIFF_PCDEFINITION_BACKGROUNDQUERY = 0x0010; const sal_uInt16 BIFF_PCDEFINITION_ENABLEREFRESH = 0x0020; - - /** Adjusts the weird date format read from binary streams. Dates before 1900-Mar-01 are stored including the non-existing leap day @@ -151,8 +143,6 @@ void lclAdjustBinDateTime( css::util::DateTime& orDateTime ) } // namespace - - PivotCacheItem::PivotCacheItem() : mnType( XML_m ), mbUnused( false ) { @@ -305,8 +295,6 @@ OUString PivotCacheItem::getName() const return OUString(); } - - PivotCacheItemList::PivotCacheItemList( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -424,8 +412,6 @@ void PivotCacheItemList::importArray( SequenceInputStream& rStrm ) } } - - PCFieldModel::PCFieldModel() : mnNumFmtId( 0 ), mnSqlType( 0 ), @@ -439,8 +425,6 @@ PCFieldModel::PCFieldModel() : { } - - PCSharedItemsModel::PCSharedItemsModel() : mbHasSemiMixed( true ), mbHasNonDate( true ), @@ -455,8 +439,6 @@ PCSharedItemsModel::PCSharedItemsModel() : { } - - PCFieldGroupModel::PCFieldGroupModel() : mfStartValue( 0.0 ), mfEndValue( 0.0 ), @@ -478,8 +460,6 @@ void PCFieldGroupModel::setBiffGroupBy( sal_uInt8 nGroupBy ) mnGroupBy = STATIC_ARRAY_SELECT( spnGroupBy, nGroupBy, XML_range ); } - - PivotCacheField::PivotCacheField( const WorkbookHelper& rHelper, bool bIsDatabaseField ) : WorkbookHelper( rHelper ), maSharedItems( rHelper ), @@ -1033,8 +1013,6 @@ void PivotCacheField::writeSharedItemToSourceDataCell( writeItemToSourceDataCell( rSheetHelper, nCol, nRow, *pCacheItem ); } - - PCDefinitionModel::PCDefinitionModel() : mfRefreshedDate( 0.0 ), mnRecords( 0 ), @@ -1053,23 +1031,17 @@ PCDefinitionModel::PCDefinitionModel() : { } - - PCSourceModel::PCSourceModel() : mnSourceType( XML_TOKEN_INVALID ), mnConnectionId( 0 ) { } - - PCWorksheetSourceModel::PCWorksheetSourceModel() { maRange.StartColumn = maRange.StartRow = maRange.EndColumn = maRange.EndRow = -1; } - - PivotCache::PivotCache( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), mnCurrRow( -1 ), @@ -1396,8 +1368,6 @@ void PivotCache::updateSourceDataRow( WorksheetHelper& rSheetHelper, sal_Int32 n } } - - PivotCacheBuffer::PivotCacheBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -1484,8 +1454,6 @@ PivotCache& PivotCacheBuffer::createPivotCache( sal_Int32 nCacheId ) return *rxCache; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/pivotcachefragment.cxx b/sc/source/filter/oox/pivotcachefragment.cxx index f9d860d64d13..008a190efd98 100644 --- a/sc/source/filter/oox/pivotcachefragment.cxx +++ b/sc/source/filter/oox/pivotcachefragment.cxx @@ -27,14 +27,10 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::uno; using namespace ::oox::core; - - PivotCacheFieldContext::PivotCacheFieldContext( WorkbookFragmentBase& rFragment, PivotCacheField& rCacheField ) : WorkbookContextBase( rFragment ), mrCacheField( rCacheField ) @@ -106,8 +102,6 @@ void PivotCacheFieldContext::onStartRecord( SequenceInputStream& rStrm ) mrCacheField.importPCDField( rStrm ); } - - PivotCacheDefinitionFragment::PivotCacheDefinitionFragment( const WorkbookHelper& rHelper, const OUString& rFragmentPath, PivotCache& rPivotCache ) : WorkbookFragmentBase( rHelper, rFragmentPath ), @@ -208,8 +202,6 @@ void PivotCacheDefinitionFragment::finalizeImport() } } - - PivotCacheRecordsFragment::PivotCacheRecordsFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath, const PivotCache& rPivotCache ) : WorksheetFragmentBase( rHelper, rFragmentPath ), @@ -324,8 +316,6 @@ void PivotCacheRecordsFragment::importPCRecordItem( sal_Int32 nRecId, SequenceIn } - - namespace { bool lclSeekToPCDField( BiffInputStream& rStrm ) @@ -340,8 +330,6 @@ bool lclSeekToPCDField( BiffInputStream& rStrm ) } // namespace - - BiffPivotCacheFragment::BiffPivotCacheFragment( const WorkbookHelper& rHelper, const OUString& rStrmName, PivotCache& rPivotCache ) : BiffWorkbookFragmentBase( rHelper, rStrmName, true ), @@ -383,8 +371,6 @@ bool BiffPivotCacheFragment::importFragment() return rStrm.getRecId() == BIFF_ID_EOF; } - - BiffPivotCacheRecordsContext::BiffPivotCacheRecordsContext( const WorksheetHelper& rHelper, const PivotCache& rPivotCache ) : BiffWorksheetContextBase( rHelper ), mrPivotCache( rPivotCache ), @@ -460,8 +446,6 @@ void BiffPivotCacheRecordsContext::startNextRow() mbInRow = true; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx index 72a7c06b6661..7b18a69ec564 100644 --- a/sc/source/filter/oox/pivottablebuffer.cxx +++ b/sc/source/filter/oox/pivottablebuffer.cxx @@ -52,8 +52,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; @@ -61,8 +59,6 @@ using namespace ::com::sun::star::uno; using namespace com::sun::star; - - namespace { const sal_Int32 OOX_PT_DATALAYOUTFIELD = -2; /// Placeholder index of data layout field. @@ -70,8 +66,6 @@ const sal_Int32 OOX_PT_DATALAYOUTFIELD = -2; /// Placehol const sal_Int32 OOX_PT_PREVIOUS_ITEM = 0x001000FC; /// Calculation of data item result is based on previous item. const sal_Int32 OOX_PT_NEXT_ITEM = 0x001000FD; /// Calculation of data item result is based on next item. - - const sal_uInt32 BIFF12_PTFIELD_DATAFIELD = 0x00000008; const sal_uInt32 BIFF12_PTFIELD_DEFAULT = 0x00000100; const sal_uInt32 BIFF12_PTFIELD_SUM = 0x00000200; @@ -158,8 +152,6 @@ const sal_uInt8 BIFF12_PTDEF_COLAXIS = 2; } // namespace - - PTFieldItemModel::PTFieldItemModel() : mnCacheItem( -1 ), mnType( XML_data ), @@ -176,8 +168,6 @@ void PTFieldItemModel::setBiffType( sal_uInt16 nType ) mnType = STATIC_ARRAY_SELECT( spnTypes, nType, XML_data ); } - - PTFieldModel::PTFieldModel() : mnAxis( XML_TOKEN_INVALID ), mnNumFmtId( 0 ), @@ -224,16 +214,12 @@ void PTFieldModel::setBiffAxis( sal_uInt8 nAxis ) mnAxis = STATIC_ARRAY_SELECT( spnAxisIds, nAxis, XML_TOKEN_INVALID ); } - - PTPageFieldModel::PTPageFieldModel() : mnField( -1 ), mnItem( BIFF12_PTPAGEFIELD_MULTIITEMS ) { } - - PTDataFieldModel::PTDataFieldModel() : mnField( -1 ), mnSubtotal( XML_sum ), @@ -256,8 +242,6 @@ void PTDataFieldModel::setBiffShowDataAs( sal_Int32 nShowDataAs ) mnShowDataAs = STATIC_ARRAY_SELECT( spnShowDataAs, nShowDataAs, XML_TOKEN_INVALID ); } - - PivotTableField::PivotTableField( PivotTable& rPivotTable, sal_Int32 nFieldIndex ) : WorkbookHelper( rPivotTable ), mrPivotTable( rPivotTable ), @@ -747,8 +731,6 @@ Reference< XDataPilotField > PivotTableField::convertRowColPageField( sal_Int32 return xDPField; } - - PTFilterModel::PTFilterModel() : mfValue( 0.0 ), mnField( -1 ), @@ -762,8 +744,6 @@ PTFilterModel::PTFilterModel() : { } - - PivotTableFilter::PivotTableFilter( const PivotTable& rPivotTable ) : WorkbookHelper( rPivotTable ), mrPivotTable( rPivotTable ) @@ -865,8 +845,6 @@ void PivotTableFilter::finalizeImport() } } - - PTDefinitionModel::PTDefinitionModel() : mnCacheId( -1 ), mnDataPosition( 0 ), @@ -902,8 +880,6 @@ PTDefinitionModel::PTDefinitionModel() : { } - - PTLocationModel::PTLocationModel() : mnFirstHeaderRow( 0 ), mnFirstDataRow( 0 ), @@ -913,8 +889,6 @@ PTLocationModel::PTLocationModel() : { } - - PivotTable::PivotTable( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), mpDPObject(NULL), @@ -1345,8 +1319,6 @@ void PivotTable::importFields( IndexVector& orFields, SequenceInputStream& rStrm orFields.push_back( rStrm.readInt32() ); } - - PivotTableBuffer::PivotTableBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -1364,8 +1336,6 @@ void PivotTableBuffer::finalizeImport() maTables.forEachMem( &PivotTable::finalizeImport ); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/pivottablefragment.cxx b/sc/source/filter/oox/pivottablefragment.cxx index c211b870bea1..cbbeaecce827 100644 --- a/sc/source/filter/oox/pivottablefragment.cxx +++ b/sc/source/filter/oox/pivottablefragment.cxx @@ -25,13 +25,9 @@ namespace oox { namespace xls { - - using namespace ::oox::core; - - PivotTableFieldContext::PivotTableFieldContext( WorksheetFragmentBase& rFragment, PivotTableField& rTableField ) : WorksheetContextBase( rFragment ), mrTableField( rTableField ) @@ -110,8 +106,6 @@ void PivotTableFieldContext::onStartRecord( SequenceInputStream& rStrm ) mrTableField.importPTField( rStrm ); } - - PivotTableFilterContext::PivotTableFilterContext( WorksheetFragmentBase& rFragment, PivotTableFilter& rTableFilter ) : WorksheetContextBase( rFragment ), mrTableFilter( rTableFilter ) @@ -164,8 +158,6 @@ void PivotTableFilterContext::onStartRecord( SequenceInputStream& rStrm ) mrTableFilter.importPTFilter( rStrm ); } - - PivotTableFragment::PivotTableFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : WorksheetFragmentBase( rHelper, rFragmentPath ), mrPivotTable( getPivotTables().createPivotTable() ) @@ -282,8 +274,6 @@ const RecordInfo* PivotTableFragment::getRecordInfos() const return spRecInfos; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx index 362308cf095d..9952d4de879d 100644 --- a/sc/source/filter/oox/querytablebuffer.cxx +++ b/sc/source/filter/oox/querytablebuffer.cxx @@ -33,16 +33,12 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; - - namespace { const sal_uInt32 BIFF12_QUERYTABLE_HEADERS = 0x00000001; @@ -64,8 +60,6 @@ const sal_uInt32 BIFF12_QUERYTABLE_APPLYBORDER = 0x00020000; const sal_uInt32 BIFF12_QUERYTABLE_APPLYFILL = 0x00040000; const sal_uInt32 BIFF12_QUERYTABLE_APPLYPROTECTION = 0x00080000; - - void lclAppendWebQueryTableName( OUStringBuffer& rTables, const OUString& rTableName ) { if( !rTableName.isEmpty() ) @@ -132,8 +126,6 @@ Reference< XAreaLink > lclFindAreaLink( } // namespace - - QueryTableModel::QueryTableModel() : mnConnId( -1 ), mnGrowShrinkType( XML_insertDelete ), @@ -152,8 +144,6 @@ QueryTableModel::QueryTableModel() : { } - - QueryTable::QueryTable( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ) { @@ -268,8 +258,6 @@ void QueryTable::finalizeImport() } } - - QueryTableBuffer::QueryTableBuffer( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ) { @@ -287,8 +275,6 @@ void QueryTableBuffer::finalizeImport() maQueryTables.forEachMem( &QueryTable::finalizeImport ); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/querytablefragment.cxx b/sc/source/filter/oox/querytablefragment.cxx index dbd51f41a748..b7d6ac66f92b 100644 --- a/sc/source/filter/oox/querytablefragment.cxx +++ b/sc/source/filter/oox/querytablefragment.cxx @@ -25,13 +25,9 @@ namespace oox { namespace xls { - - using namespace ::oox::core; - - QueryTableFragment::QueryTableFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : WorksheetFragmentBase( rHelper, rFragmentPath ), mrQueryTable( getQueryTables().createQueryTable() ) @@ -74,8 +70,6 @@ const RecordInfo* QueryTableFragment::getRecordInfos() const } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx index d95da34b2ccf..2fb062ab2eb8 100644 --- a/sc/source/filter/oox/richstring.cxx +++ b/sc/source/filter/oox/richstring.cxx @@ -30,14 +30,10 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; - - namespace { const sal_uInt8 BIFF12_STRINGFLAG_FONTS = 0x01; @@ -50,8 +46,6 @@ inline bool lclNeedsRichTextFormat( const Font* pFont ) } // namespace - - RichStringPortion::RichStringPortion( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), mnFontId( -1 ) @@ -157,16 +151,12 @@ void RichStringPortion::writeFontProperties( const Reference<XText>& rxText, con pFont->writeToPropertySet(aPropSet, FONT_PROPTYPE_TEXT); } - - void FontPortionModel::read( SequenceInputStream& rStrm ) { mnPos = rStrm.readuInt16(); mnFontId = rStrm.readuInt16(); } - - void FontPortionModelList::appendPortion( const FontPortionModel& rPortion ) { // #i33341# real life -- same character index may occur several times @@ -195,8 +185,6 @@ void FontPortionModelList::importPortions( SequenceInputStream& rStrm ) } } - - PhoneticDataModel::PhoneticDataModel() : mnFontId( -1 ), mnType( XML_fullwidthKatakana ), @@ -213,8 +201,6 @@ void PhoneticDataModel::setBiffData( sal_Int32 nType, sal_Int32 nAlignment ) mnAlignment = STATIC_ARRAY_SELECT( spnAlignments, nAlignment, XML_left ); } - - PhoneticSettings::PhoneticSettings( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -244,8 +230,6 @@ void PhoneticSettings::importStringData( SequenceInputStream& rStrm ) maModel.setBiffData( extractValue< sal_Int32 >( nFlags, 0, 2 ), extractValue< sal_Int32 >( nFlags, 2, 2 ) ); } - - RichStringPhonetic::RichStringPhonetic( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), mnBasePos( -1 ), @@ -270,8 +254,6 @@ void RichStringPhonetic::setBaseRange( sal_Int32 nBasePos, sal_Int32 nBaseEnd ) mnBaseEnd = nBaseEnd; } - - void PhoneticPortionModel::read( SequenceInputStream& rStrm ) { mnPos = rStrm.readuInt16(); @@ -279,8 +261,6 @@ void PhoneticPortionModel::read( SequenceInputStream& rStrm ) mnBaseLen = rStrm.readuInt16(); } - - void PhoneticPortionModelList::appendPortion( const PhoneticPortionModel& rPortion ) { // same character index may occur several times @@ -314,8 +294,6 @@ void PhoneticPortionModelList::importPortions( SequenceInputStream& rStrm ) } } - - RichString::RichString( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), maPhonSettings( rHelper ) @@ -500,8 +478,6 @@ void RichString::createPhoneticPortions( const OUString& rText, PhoneticPortionM } } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/richstringcontext.cxx b/sc/source/filter/oox/richstringcontext.cxx index ad8ebf32dbaf..1bb6c96491d9 100644 --- a/sc/source/filter/oox/richstringcontext.cxx +++ b/sc/source/filter/oox/richstringcontext.cxx @@ -24,12 +24,8 @@ namespace oox { namespace xls { - - using ::oox::core::ContextHandlerRef; - - ContextHandlerRef RichStringContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) { if( isRootElement() ) @@ -90,8 +86,6 @@ void RichStringContext::onCharacters( const OUString& rChars ) } } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/scenariobuffer.cxx b/sc/source/filter/oox/scenariobuffer.cxx index 62004a87ae77..a2f4a7f29a97 100644 --- a/sc/source/filter/oox/scenariobuffer.cxx +++ b/sc/source/filter/oox/scenariobuffer.cxx @@ -35,31 +35,23 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; - - ScenarioCellModel::ScenarioCellModel() : mnNumFmtId( 0 ), mbDeleted( false ) { } - - ScenarioModel::ScenarioModel() : mbLocked( false ), mbHidden( false ) { } - - Scenario::Scenario( const WorkbookHelper& rHelper, sal_Int16 nSheet ) : WorkbookHelper( rHelper ), mnSheet( nSheet ) @@ -158,16 +150,12 @@ void Scenario::finalizeImport() } } - - SheetScenariosModel::SheetScenariosModel() : mnCurrent( 0 ), mnShown( 0 ) { } - - SheetScenarios::SheetScenarios( const WorkbookHelper& rHelper, sal_Int16 nSheet ) : WorkbookHelper( rHelper ), mnSheet( nSheet ) @@ -210,8 +198,6 @@ void SheetScenarios::finalizeImport() } } - - ScenarioBuffer::ScenarioBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -230,8 +216,6 @@ void ScenarioBuffer::finalizeImport() maSheetScenarios.forEachMem( &SheetScenarios::finalizeImport ); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/scenariocontext.cxx b/sc/source/filter/oox/scenariocontext.cxx index db921cc9ec0d..8535b89a67b0 100644 --- a/sc/source/filter/oox/scenariocontext.cxx +++ b/sc/source/filter/oox/scenariocontext.cxx @@ -24,12 +24,8 @@ namespace oox { namespace xls { - - using ::oox::core::ContextHandlerRef; - - ScenarioContext::ScenarioContext( WorksheetContextBase& rParent, SheetScenarios& rSheetScenarios ) : WorksheetContextBase( rParent ), mrScenario( rSheetScenarios.createScenario() ) @@ -70,8 +66,6 @@ void ScenarioContext::onStartRecord( SequenceInputStream& rStrm ) mrScenario.importScenario( rStrm ); } - - ScenariosContext::ScenariosContext( WorksheetFragmentBase& rFragment ) : WorksheetContextBase( rFragment ), mrSheetScenarios( getScenarios().createSheetScenarios( getSheetIndex() ) ) @@ -112,8 +106,6 @@ void ScenariosContext::onStartRecord( SequenceInputStream& rStrm ) mrSheetScenarios.importScenarios( rStrm ); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/sharedstringsbuffer.cxx b/sc/source/filter/oox/sharedstringsbuffer.cxx index 59951c3bc522..3d90c5a6208a 100644 --- a/sc/source/filter/oox/sharedstringsbuffer.cxx +++ b/sc/source/filter/oox/sharedstringsbuffer.cxx @@ -24,13 +24,9 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; - - SharedStringsBuffer::SharedStringsBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -53,8 +49,6 @@ RichStringRef SharedStringsBuffer::getString( sal_Int32 nStringId ) const return maStrings.get( nStringId ); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/sharedstringsfragment.cxx b/sc/source/filter/oox/sharedstringsfragment.cxx index 19fdf3c551c8..9d9b848ed84e 100644 --- a/sc/source/filter/oox/sharedstringsfragment.cxx +++ b/sc/source/filter/oox/sharedstringsfragment.cxx @@ -25,13 +25,9 @@ namespace oox { namespace xls { - - using namespace ::oox::core; - - SharedStringsFragment::SharedStringsFragment( const WorkbookHelper& rHelper, const OUString& rFragmentPath ) : WorkbookFragmentBase( rHelper, rFragmentPath ) @@ -87,8 +83,6 @@ void SharedStringsFragment::finalizeImport() getSharedStrings().finalizeImport(); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx index 7422e1ad70e9..67018af69489 100644 --- a/sc/source/filter/oox/sheetdatabuffer.cxx +++ b/sc/source/filter/oox/sheetdatabuffer.cxx @@ -58,8 +58,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; @@ -68,8 +66,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; - - CellModel::CellModel() : mnCellType( XML_TOKEN_INVALID ), mnXfId( -1 ), @@ -77,8 +73,6 @@ CellModel::CellModel() : { } - - CellFormulaModel::CellFormulaModel() : mnFormulaType( XML_TOKEN_INVALID ), mnSharedId( -1 ) @@ -101,8 +95,6 @@ bool CellFormulaModel::isValidSharedRef( const CellAddress& rCellAddr ) (maFormulaRef.StartRow <= rCellAddr.Row) && (rCellAddr.Row <= maFormulaRef.EndRow); } - - DataTableModel::DataTableModel() : mb2dTable( false ), mbRowTable( false ), @@ -111,8 +103,6 @@ DataTableModel::DataTableModel() : { } - - CellBlockBuffer::CellBlockBuffer( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ), mnCurrRow( -1 ) @@ -131,8 +121,6 @@ void CellBlockBuffer::finalizeImport() { } - - SheetDataBuffer::SheetDataBuffer( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ), maCellBlocks( rHelper ), @@ -564,8 +552,6 @@ bool SheetDataBuffer::MergedRange::tryExpand( const CellAddress& rAddress, sal_I return false; } - - void SheetDataBuffer::setCellFormula( const CellAddress& rCellAddr, const ApiTokenSequence& rTokens ) { if( rTokens.hasElements() ) diff --git a/sc/source/filter/oox/sheetdatacontext.cxx b/sc/source/filter/oox/sheetdatacontext.cxx index 4d2c57a568c1..9fe0331e3b0e 100644 --- a/sc/source/filter/oox/sheetdatacontext.cxx +++ b/sc/source/filter/oox/sheetdatacontext.cxx @@ -34,8 +34,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::text; @@ -43,8 +41,6 @@ using namespace ::com::sun::star::uno; using ::oox::core::ContextHandlerRef; - - namespace { // record constants ----------------------------------------------------------- @@ -66,8 +62,6 @@ const sal_uInt8 BIFF12_ROW_SHOWPHONETIC = 0x01; } // namespace - - SheetDataContextBase::SheetDataContextBase( const WorksheetHelper& rHelper ) : mrAddressConv( rHelper.getAddressConverter() ), mrFormulaParser( rHelper.getFormulaParser() ), @@ -80,8 +74,6 @@ SheetDataContextBase::~SheetDataContextBase() { } - - SheetDataContext::SheetDataContext( WorksheetFragmentBase& rFragment ) : WorksheetContextBase( rFragment ), SheetDataContextBase( rFragment ), diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 28d32c00954e..dc2f589cc6f9 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -82,8 +82,6 @@ using ::com::sun::star::table::BorderLine2; namespace oox { namespace xls { - - using namespace com::sun::star; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::container; @@ -94,8 +92,6 @@ using namespace ::com::sun::star::uno; using ::oox::core::FilterBase; - - namespace { // OOXML constants ------------------------------------------------------------ @@ -206,8 +202,6 @@ const sal_uInt8 BIFF_FONTUNDERL_DOUBLE = 2; const sal_uInt8 BIFF_FONTUNDERL_SINGLE_ACC = 33; const sal_uInt8 BIFF_FONTUNDERL_DOUBLE_ACC = 34; - - sal_Int32 lclReadRgbColor( BinaryInputStream& rStrm ) { sal_uInt8 nR, nG, nB, nA; @@ -224,8 +218,6 @@ sal_Int32 lclReadRgbColor( BinaryInputStream& rStrm ) } // namespace - - ExcelGraphicHelper::ExcelGraphicHelper( const WorkbookHelper& rHelper ) : GraphicHelper( rHelper.getBaseFilter().getComponentContext(), rHelper.getBaseFilter().getTargetFrame(), rHelper.getBaseFilter().getStorage() ), WorkbookHelper( rHelper ) @@ -244,8 +236,6 @@ sal_Int32 ExcelGraphicHelper::getPaletteColor( sal_Int32 nPaletteIdx ) const return getStyles().getPaletteColor( nPaletteIdx ); } - - void Color::setAuto() { clearTransformations(); @@ -341,8 +331,6 @@ SequenceInputStream& operator>>( SequenceInputStream& rStrm, Color& orColor ) return rStrm; } - - namespace { /** Standard EGA colors, bright. */ @@ -397,8 +385,6 @@ static const sal_Int32 spnDefColors8[] = } // namespace - - ColorPalette::ColorPalette( const WorkbookHelper& rHelper ) : WorkbookHelper(rHelper) , mnAppendIndex(0) @@ -471,8 +457,6 @@ void ColorPalette::appendColor( sal_Int32 nRGBValue ) ++mnAppendIndex; } - - namespace { void lclSetFontName( ApiScriptFontName& rFontName, const FontDescriptor& rFontDesc, bool bHasGlyphs ) @@ -492,8 +476,6 @@ void lclSetFontName( ApiScriptFontName& rFontName, const FontDescriptor& rFontDe } // namespace - - FontModel::FontModel() : mnScheme( XML_none ), mnFamily( OOX_FONTFAMILY_NONE ), @@ -544,8 +526,6 @@ void FontModel::setBiffEscapement( sal_uInt16 nEscapement ) mnEscapement = STATIC_ARRAY_SELECT( spnEscapes, nEscapement, XML_baseline ); } - - ApiFontUsedFlags::ApiFontUsedFlags( bool bAllUsed ) : mbNameUsed( bAllUsed ), mbColorUsed( bAllUsed ), @@ -561,16 +541,12 @@ ApiFontUsedFlags::ApiFontUsedFlags( bool bAllUsed ) : { } - - ApiScriptFontName::ApiScriptFontName() : mnFamily( ::com::sun::star::awt::FontFamily::DONTKNOW ), mnTextEnc( RTL_TEXTENCODING_DONTKNOW ) { } - - ApiFontData::ApiFontData() : maDesc( "Calibri", @@ -598,8 +574,6 @@ ApiFontData::ApiFontData() : maLatinFont.maName = maDesc.Name; } - - Font::Font( const WorkbookHelper& rHelper, bool bDxf ) : WorkbookHelper( rHelper ), maModel( rHelper.getTheme().getDefaultFontModel() ), @@ -1118,8 +1092,6 @@ void Font::writeToPropertySet( PropertySet& rPropSet, FontPropertyType ePropType rPropSet.setProperties( aPropMap ); } - - AlignmentModel::AlignmentModel() : mnHorAlign( XML_general ), mnVerAlign( XML_bottom ), @@ -1147,8 +1119,6 @@ void AlignmentModel::setBiffVerAlign( sal_uInt8 nVerAlign ) mnVerAlign = STATIC_ARRAY_SELECT( spnVerAligns, nVerAlign, XML_bottom ); } - - ApiAlignmentData::ApiAlignmentData() : meHorJustify( ::com::sun::star::table::CellHoriJustify_STANDARD ), mnHorJustifyMethod( ::com::sun::star::table::CellJustifyMethod::AUTO ), @@ -1178,8 +1148,6 @@ bool operator==( const ApiAlignmentData& rLeft, const ApiAlignmentData& rRight ) (rLeft.mbShrink == rRight.mbShrink); } - - Alignment::Alignment( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -1392,16 +1360,12 @@ void Alignment::writeToPropertyMap( PropertyMap& rPropMap ) const rPropMap.setProperty( PROP_ShrinkToFit, maApiData.mbShrink); } - - ProtectionModel::ProtectionModel() : mbLocked( true ), // default in Excel and Calc mbHidden( false ) { } - - ApiProtectionData::ApiProtectionData() : maCellProt( sal_True, sal_False, sal_False, sal_False ) { @@ -1416,8 +1380,6 @@ bool operator==( const ApiProtectionData& rLeft, const ApiProtectionData& rRight (rLeft.maCellProt.IsPrintHidden == rRight.maCellProt.IsPrintHidden); } - - Protection::Protection( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -1451,8 +1413,6 @@ void Protection::fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs ) const ScfTools::PutItem( rItemSet, ScProtectionAttr( maApiData.maCellProt.IsLocked, maApiData.maCellProt.IsFormulaHidden ), bSkipPoolDefs ); } - - namespace { bool lcl_isBorder(const ::com::sun::star::table::BorderLine& rBorder) @@ -1479,8 +1439,6 @@ void BorderLineModel::setBiffStyle( sal_Int32 nLineStyle ) mnStyle = STATIC_ARRAY_SELECT( spnStyleIds, nLineStyle, XML_none ); } - - BorderModel::BorderModel( bool bDxf ) : maLeft( bDxf ), maRight( bDxf ), @@ -1492,8 +1450,6 @@ BorderModel::BorderModel( bool bDxf ) : { } - - ApiBorderData::ApiBorderData() : mbBorderUsed( false ), mbDiagUsed( false ) @@ -1535,8 +1491,6 @@ bool operator==( const ApiBorderData& rLeft, const ApiBorderData& rRight ) (rLeft.mbDiagUsed == rRight.mbDiagUsed); } - - namespace { inline void lclSetBorderLineWidth( BorderLine& rBorderLine, @@ -1549,8 +1503,6 @@ inline void lclSetBorderLineWidth( BorderLine& rBorderLine, } // namespace - - Border::Border( const WorkbookHelper& rHelper, bool bDxf ) : WorkbookHelper( rHelper ), maModel( bDxf ), @@ -1773,8 +1725,6 @@ bool Border::convertBorderLine( BorderLine2& rBorderLine, const BorderLineModel& } - - PatternFillModel::PatternFillModel( bool bDxf ) : mnPattern( XML_none ), mbPattColorUsed( !bDxf ), @@ -1796,8 +1746,6 @@ void PatternFillModel::setBiffPattern( sal_Int32 nPattern ) mnPattern = STATIC_ARRAY_SELECT( spnPatternIds, nPattern, XML_none ); } - - GradientFillModel::GradientFillModel() : mnType( XML_linear ), mfAngle( 0.0 ), @@ -1833,8 +1781,6 @@ void GradientFillModel::readGradientStop( SequenceInputStream& rStrm, bool bDxf maColors[ fPosition ] = aColor; } - - ApiSolidFillData::ApiSolidFillData() : mnColor( API_RGB_TRANSPARENT ), mbTransparent( true ), @@ -1850,8 +1796,6 @@ bool operator==( const ApiSolidFillData& rLeft, const ApiSolidFillData& rRight ) (rLeft.mbUsed == rRight.mbUsed); } - - namespace { inline sal_Int32 lclGetMixedColorComp( sal_Int32 nPatt, sal_Int32 nFill, sal_Int32 nAlpha ) @@ -1869,8 +1813,6 @@ sal_Int32 lclGetMixedColor( sal_Int32 nPattColor, sal_Int32 nFillColor, sal_Int3 } // namespace - - Fill::Fill( const WorkbookHelper& rHelper, bool bDxf ) : WorkbookHelper( rHelper ), mbDxf( bDxf ) @@ -2100,8 +2042,6 @@ void Fill::writeToPropertyMap( PropertyMap& rPropMap ) const } } - - XfModel::XfModel() : mnStyleXfId( -1 ), mnFontId( -1 ), @@ -2118,8 +2058,6 @@ XfModel::XfModel() : { } - - Xf::Xf( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), maAlignment( rHelper ), @@ -2383,8 +2321,6 @@ Xf::createPattern( bool bSkipPoolDefs ) return *mpPattern; } - - Dxf::Dxf( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -2507,8 +2443,6 @@ void Dxf::fillToItemSet( SfxItemSet& rSet ) const mxFill->fillToItemSet(rSet); } - - namespace { const sal_Char* const spcStyleNamePrefix = "Excel Built-in "; @@ -2594,8 +2528,6 @@ OUString lclCreateStyleName( const CellStyleModel& rModel ) } // namespace - - CellStyleModel::CellStyleModel() : mnXfId( -1 ), mnBuiltinId( -1 ), @@ -2616,8 +2548,6 @@ bool CellStyleModel::isDefaultStyle() const return mbBuiltin && (mnBuiltinId == OOX_STYLE_NORMAL); } - - CellStyle::CellStyle( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), mbCreated( false ), @@ -2697,8 +2627,6 @@ void CellStyle::finalizeImport( const OUString& rFinalName ) createCellStyle(); } - - CellStyleBuffer::CellStyleBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -2868,8 +2796,6 @@ OUString CellStyleBuffer::createCellStyle( const CellStyleRef& rxCellStyle ) con return lclGetBuiltinStyleName( OOX_STYLE_NORMAL, OUString() ); } - - AutoFormatModel::AutoFormatModel() : mnAutoFormatId( 0 ), mbApplyNumFmt( false ), @@ -2881,8 +2807,6 @@ AutoFormatModel::AutoFormatModel() : { } - - StylesBuffer::StylesBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), maPalette( rHelper ), diff --git a/sc/source/filter/oox/stylesfragment.cxx b/sc/source/filter/oox/stylesfragment.cxx index bc06d4fb9db7..979d5f868dca 100644 --- a/sc/source/filter/oox/stylesfragment.cxx +++ b/sc/source/filter/oox/stylesfragment.cxx @@ -24,13 +24,9 @@ namespace oox { namespace xls { - - using namespace ::oox::core; - - IndexedColorsContext::IndexedColorsContext( WorkbookFragmentBase& rFragment ) : WorkbookContextBase( rFragment ) { @@ -58,8 +54,6 @@ ContextHandlerRef IndexedColorsContext::onCreateRecordContext( sal_Int32 nRecId, return 0; } - - ContextHandlerRef FontContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) { if( mxFont.get() ) @@ -67,8 +61,6 @@ ContextHandlerRef FontContext::onCreateContext( sal_Int32 nElement, const Attrib return 0; } - - void BorderContext::onStartElement( const AttributeList& rAttribs ) { if( mxBorder.get() && (getCurrentElement() == XLS_TOKEN( border )) ) @@ -90,8 +82,6 @@ ContextHandlerRef BorderContext::onCreateContext( sal_Int32 nElement, const Attr return 0; } - - ContextHandlerRef FillContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) { if( mxFill.get() ) switch( getCurrentElement() ) @@ -125,8 +115,6 @@ ContextHandlerRef FillContext::onCreateContext( sal_Int32 nElement, const Attrib return 0; } - - void XfContext::onStartElement( const AttributeList& rAttribs ) { if( mxXf.get() && (getCurrentElement() == XLS_TOKEN( xf )) ) @@ -148,8 +136,6 @@ ContextHandlerRef XfContext::onCreateContext( sal_Int32 nElement, const Attribut return 0; } - - ContextHandlerRef DxfContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) { if( mxDxf.get() ) switch( getCurrentElement() ) @@ -172,8 +158,6 @@ ContextHandlerRef DxfContext::onCreateContext( sal_Int32 nElement, const Attribu return 0; } - - StylesFragment::StylesFragment( const WorkbookHelper& rHelper, const OUString& rFragmentPath ) : WorkbookFragmentBase( rHelper, rFragmentPath ) { @@ -314,8 +298,6 @@ void StylesFragment::finalizeImport() getStyles().finalizeImport(); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/tablebuffer.cxx b/sc/source/filter/oox/tablebuffer.cxx index ee1a0fe46c60..ebd10dd5a4cf 100644 --- a/sc/source/filter/oox/tablebuffer.cxx +++ b/sc/source/filter/oox/tablebuffer.cxx @@ -30,15 +30,11 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; - - TableModel::TableModel() : mnId( -1 ), mnType( XML_worksheet ), @@ -47,8 +43,6 @@ TableModel::TableModel() : { } - - Table::Table( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), maAutoFilters( rHelper ), @@ -123,8 +117,6 @@ void Table::applyAutoFilters() } } - - TableBuffer::TableBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -176,8 +168,6 @@ void TableBuffer::insertTableToMaps( const TableRef& rxTable ) } } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/tablefragment.cxx b/sc/source/filter/oox/tablefragment.cxx index 0e4148294a2d..92cf34aeff38 100644 --- a/sc/source/filter/oox/tablefragment.cxx +++ b/sc/source/filter/oox/tablefragment.cxx @@ -26,13 +26,9 @@ namespace oox { namespace xls { - - using namespace ::oox::core; - - TableFragment::TableFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : WorksheetFragmentBase( rHelper, rFragmentPath ), mrTable( getTables().createTable() ) @@ -91,8 +87,6 @@ const RecordInfo* TableFragment::getRecordInfos() const return spRecInfos; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/themebuffer.cxx b/sc/source/filter/oox/themebuffer.cxx index cc80aa0e41eb..58ed24219cfc 100644 --- a/sc/source/filter/oox/themebuffer.cxx +++ b/sc/source/filter/oox/themebuffer.cxx @@ -24,12 +24,8 @@ namespace oox { namespace xls { - - using ::oox::drawingml::ClrScheme; - - ThemeBuffer::ThemeBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), mxDefFontModel( new FontModel ) @@ -60,8 +56,6 @@ sal_Int32 ThemeBuffer::getColorByToken( sal_Int32 nToken ) const return getClrScheme().getColor( nToken, nColor ) ? nColor : API_RGB_TRANSPARENT; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/unitconverter.cxx b/sc/source/filter/oox/unitconverter.cxx index 30b4c9e8ea4c..12e164b1a1d2 100644 --- a/sc/source/filter/oox/unitconverter.cxx +++ b/sc/source/filter/oox/unitconverter.cxx @@ -34,15 +34,11 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::uno; - - namespace { const double MM100_PER_INCH = 2540.0; @@ -50,8 +46,6 @@ const double MM100_PER_POINT = MM100_PER_INCH / 72.0; const double MM100_PER_TWIP = MM100_PER_POINT / 20.0; const double MM100_PER_EMU = 1.0 / 360.0; - - /** Returns true, if the passed year is a leap year. */ inline bool lclIsLeapYear( sal_Int32 nYear ) { @@ -93,8 +87,6 @@ sal_Int32 lclGetDays( const util::Date& rDate ) } // namespace - - UnitConverter::UnitConverter( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), maCoeffs( UNIT_ENUM_SIZE, 1.0 ), @@ -237,8 +229,6 @@ double UnitConverter::getCoefficient( Unit eUnit ) const return maCoeffs[ static_cast< size_t >( eUnit ) ]; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/viewsettings.cxx b/sc/source/filter/oox/viewsettings.cxx index de36ecf6dd02..3cd23b33ea4a 100644 --- a/sc/source/filter/oox/viewsettings.cxx +++ b/sc/source/filter/oox/viewsettings.cxx @@ -42,8 +42,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::awt; using namespace ::com::sun::star::container; using namespace ::com::sun::star::document; @@ -52,8 +50,6 @@ using namespace ::com::sun::star::uno; using ::oox::core::FilterBase; - - namespace { const sal_Int32 OOX_BOOKVIEW_TABBARRATIO_DEF = 600; /// Default tabbar ratio. @@ -98,8 +94,6 @@ const sal_Int16 API_SPLITPANE_TOPRIGHT = 1; /// Top-right pa const sal_Int16 API_SPLITPANE_BOTTOMLEFT = 2; /// Bottom-left, bottom, left, or single pane. const sal_Int16 API_SPLITPANE_BOTTOMRIGHT = 3; /// Bottom-right, or right pane. - - /** Returns the OOXML pane identifier from the passed BIFF pane id. */ sal_Int32 lclGetOoxPaneId( sal_Int32 nBiffPaneId, sal_Int32 nDefaultPaneId ) { @@ -109,15 +103,11 @@ sal_Int32 lclGetOoxPaneId( sal_Int32 nBiffPaneId, sal_Int32 nDefaultPaneId ) } // namespace - - PaneSelectionModel::PaneSelectionModel() : mnActiveCellId( 0 ) { } - - SheetViewModel::SheetViewModel() : mnWorkbookViewId( 0 ), mnViewType( XML_normal ), @@ -184,8 +174,6 @@ PaneSelectionModel& SheetViewModel::createPaneSelection( sal_Int32 nPaneId ) return *rxPaneSel; } - - SheetViewSettings::SheetViewSettings( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ) { @@ -460,8 +448,6 @@ SheetViewModelRef SheetViewSettings::createSheetView() return xModel; } - - WorkbookViewModel::WorkbookViewModel() : mnWinX( 0 ), mnWinY( 0 ), @@ -478,8 +464,6 @@ WorkbookViewModel::WorkbookViewModel() : { } - - ViewSettings::ViewSettings( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), mbValidOleSize( false ) @@ -633,8 +617,6 @@ WorkbookViewModel& ViewSettings::createWorkbookView() return *xModel; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index 69a9c90c513b..776c3d957d5e 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -67,8 +67,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::io; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; @@ -77,16 +75,12 @@ using namespace ::oox::core; using ::oox::drawingml::ThemeFragmentHandler; - - namespace { const double PROGRESS_LENGTH_GLOBALS = 0.1; /// 10% of progress bar for globals import. } // namespace - - WorkbookFragment::WorkbookFragment( const WorkbookHelper& rHelper, const OUString& rFragmentPath ) : WorkbookFragmentBase( rHelper, rFragmentPath ) { diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index 8039f7bcbac7..9bb9f3ce3b8c 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -90,8 +90,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::awt; using namespace ::com::sun::star::container; using namespace ::com::sun::star::document; @@ -106,8 +104,6 @@ using ::oox::core::FragmentHandler; using ::oox::core::XmlFilterBase; using ::oox::drawingml::Theme; - - bool IgnoreCaseCompare::operator()( const OUString& rName1, const OUString& rName2 ) const { // there is no wrapper in OUString, TODO: compare with collator @@ -115,8 +111,6 @@ bool IgnoreCaseCompare::operator()( const OUString& rName1, const OUString& rNam rName1.getStr(), rName1.getLength(), rName2.getStr(), rName2.getLength() ) < 0; } - - class WorkbookGlobals : boost::noncopyable { public: @@ -318,8 +312,6 @@ private: boost::scoped_ptr<ScDocumentImport> mxDocImport; }; - - WorkbookGlobals::WorkbookGlobals( ExcelFilter& rFilter ) : mrBaseFilter( rFilter ), mrExcelFilter( rFilter ), @@ -707,8 +699,6 @@ void WorkbookGlobals::recalcFormulaCells() rDoc.CalcFormulaTree(false, true, false); } - - WorkbookHelper::~WorkbookHelper() { } @@ -1034,8 +1024,6 @@ BiffCodecHelper& WorkbookHelper::getCodecHelper() const return mrBookGlob.getCodecHelper(); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/workbooksettings.cxx b/sc/source/filter/oox/workbooksettings.cxx index 53cedc8d354a..8be9165a73c2 100644 --- a/sc/source/filter/oox/workbooksettings.cxx +++ b/sc/source/filter/oox/workbooksettings.cxx @@ -34,8 +34,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; @@ -43,8 +41,6 @@ using namespace ::com::sun::star::util; using ::oox::core::CodecHelper; - - namespace { const sal_uInt32 BIFF12_WORKBOOKPR_DATE1904 = 0x00000001; @@ -65,16 +61,12 @@ const sal_Int16 API_SHOWMODE_PLACEHOLDER = 2; /// Show placeholder } // namespace - - FileSharingModel::FileSharingModel() : mnPasswordHash( 0 ), mbRecommendReadOnly( false ) { } - - WorkbookSettingsModel::WorkbookSettingsModel() : mnShowObjectMode( XML_all ), mnUpdateLinksMode( XML_userSet ), @@ -91,8 +83,6 @@ void WorkbookSettingsModel::setBiffObjectMode( sal_uInt16 nObjMode ) mnShowObjectMode = STATIC_ARRAY_SELECT( spnObjModes, nObjMode, XML_all ); } - - CalcSettingsModel::CalcSettingsModel() : mfIterateDelta( 0.001 ), mnCalcId( -1 ), @@ -109,8 +99,6 @@ CalcSettingsModel::CalcSettingsModel() : { } - - WorkbookSettings::WorkbookSettings( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -276,8 +264,6 @@ void WorkbookSettings::setDateMode( bool bDateMode1904, bool bDateCompatibility getUnitConverter().finalizeNullDate( getNullDate() ); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/worksheetbuffer.cxx b/sc/source/filter/oox/worksheetbuffer.cxx index a0f0cafafba3..c2dce216435d 100644 --- a/sc/source/filter/oox/worksheetbuffer.cxx +++ b/sc/source/filter/oox/worksheetbuffer.cxx @@ -37,15 +37,11 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; - - SheetInfoModel::SheetInfoModel() : mnBiffHandle( -1 ), mnSheetId( -1 ), @@ -53,8 +49,6 @@ SheetInfoModel::SheetInfoModel() : { } - - WorksheetBuffer::WorksheetBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -221,8 +215,6 @@ void WorksheetBuffer::insertSheet( const SheetInfoModel& rModel ) maSheetInfosByName[ lclQuoteName( rModel.maName ) ] = xSheetInfo; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx index cd46a2aabae8..05f8b8cfcb27 100644 --- a/sc/source/filter/oox/worksheetfragment.cxx +++ b/sc/source/filter/oox/worksheetfragment.cxx @@ -47,15 +47,11 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; using namespace ::oox::core; - - namespace { const sal_uInt16 BIFF_COLINFO_HIDDEN = 0x0001; @@ -80,8 +76,6 @@ const sal_uInt16 BIFF12_OLEOBJECT_AUTOLOAD = 0x0002; } // namespace - - DataValidationsContext::DataValidationsContext( WorksheetFragmentBase& rFragment ) : WorksheetContextBase( rFragment ) { @@ -197,8 +191,6 @@ void DataValidationsContext::importDataValidation( SequenceInputStream& rStrm ) setValidation( aModel ); } - - WorksheetFragment::WorksheetFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : WorksheetFragmentBase( rHelper, rFragmentPath ) { diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 9a1533b92cec..02df50057a22 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -81,8 +81,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::drawing; @@ -94,8 +92,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; - - namespace { void lclUpdateProgressBar( const ISegmentProgressBarRef& rxProgressBar, double fPosition ) @@ -107,8 +103,6 @@ void lclUpdateProgressBar( const ISegmentProgressBarRef& rxProgressBar, double f } // namespace - - ColumnModel::ColumnModel() : maRange( -1 ), mfWidth( 0.0 ), @@ -132,8 +126,6 @@ bool ColumnModel::isMergeable( const ColumnModel& rModel ) const (mbCollapsed == rModel.mbCollapsed); } - - RowModel::RowModel() : mnRow( -1 ), mfHeight( 0.0 ), @@ -179,8 +171,6 @@ HyperlinkModel::HyperlinkModel() { } - - ValidationModel::ValidationModel() : mnType( XML_none ), mnOperator( XML_between ), @@ -214,8 +204,6 @@ void ValidationModel::setBiffErrorStyle( sal_uInt8 nErrorStyle ) } - - class WorksheetGlobals : public WorkbookHelper, public IWorksheetProgress { public: @@ -423,8 +411,6 @@ private: bool mbHasDefWidth; /// True = default column width is set from defaultColWidth attribute. }; - - WorksheetGlobals::WorksheetGlobals( const WorkbookHelper& rHelper, const ISegmentProgressBarRef& rxProgressBar, WorksheetType eSheetType, sal_Int16 nSheet ) : WorkbookHelper( rHelper ), maSheetCellRanges( "com.sun.star.sheet.SheetCellRanges" ), @@ -1376,8 +1362,6 @@ void WorksheetGlobals::finalizeDrawings() } - - WorksheetHelper::WorksheetHelper( WorksheetGlobals& rSheetGlob ) : WorkbookHelper( rSheetGlob ), mrSheetGlob( rSheetGlob ) @@ -1638,8 +1622,6 @@ void WorksheetHelper::createSharedFormulaMapEntry( } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/worksheetsettings.cxx b/sc/source/filter/oox/worksheetsettings.cxx index 906df7b47a69..e58b41d6d346 100644 --- a/sc/source/filter/oox/worksheetsettings.cxx +++ b/sc/source/filter/oox/worksheetsettings.cxx @@ -32,16 +32,12 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; using ::oox::core::CodecHelper; - - namespace { const sal_uInt8 BIFF12_SHEETPR_FILTERMODE = 0x01; @@ -53,8 +49,6 @@ const sal_uInt16 BIFF_SHEETPR_FITTOPAGES = 0x0100; } // namespace - - SheetSettingsModel::SheetSettingsModel() : mbFilterMode( false ), mbApplyStyles( false ), @@ -63,8 +57,6 @@ SheetSettingsModel::SheetSettingsModel() : { } - - SheetProtectionModel::SheetProtectionModel() : mnPasswordHash( 0 ), mbSheet( false ), @@ -86,8 +78,6 @@ SheetProtectionModel::SheetProtectionModel() : { } - - WorksheetSettings::WorksheetSettings( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ), maPhoneticSett( rHelper ) @@ -254,8 +244,6 @@ void WorksheetSettings::finalizeImport() } } - - } // namespace xls } // namespace oox |