From 98d7782c1ff4e83f6ebf386605e09a7b39d8349d Mon Sep 17 00:00:00 2001 From: Elton Chung Date: Sat, 11 Feb 2012 19:31:56 +0800 Subject: [PATCH] Remove unused code --- oox/inc/oox/drawingml/chart/objectformatter.hxx | 8 ----- oox/inc/oox/dump/dumperbase.hxx | 1 - oox/inc/oox/ole/vbahelper.hxx | 7 ---- oox/inc/oox/ole/vbaproject.hxx | 4 -- oox/inc/oox/xls/addressconverter.hxx | 20 ------------ oox/inc/oox/xls/formulabase.hxx | 23 ------------- oox/inc/oox/xls/stylesbuffer.hxx | 4 -- oox/source/drawingml/chart/objectformatter.cxx | 11 ------ oox/source/dump/dumperbase.cxx | 6 --- oox/source/ole/vbahelper.cxx | 14 -------- oox/source/ole/vbaproject.cxx | 10 ------ oox/source/xls/addressconverter.cxx | 8 ----- oox/source/xls/formulabase.cxx | 39 ----------------------- oox/source/xls/stylesbuffer.cxx | 11 ------ unusedcode.easy | 12 ------- 15 files changed, 0 insertions(+), 178 deletions(-) diff --git a/oox/inc/oox/drawingml/chart/objectformatter.hxx b/oox/inc/oox/drawingml/chart/objectformatter.hxx index 8c24abc..e13cef8 100644 --- a/oox/inc/oox/drawingml/chart/objectformatter.hxx +++ b/oox/inc/oox/drawingml/chart/objectformatter.hxx @@ -142,20 +142,12 @@ public: const NumberFormat& rNumberFormat, bool bPercentFormat = false ); - /** Sets automatic line properties to the passed property set. */ - void convertAutomaticLine( - PropertySet& rPropSet, - ObjectType eObjType, - sal_Int32 nSeriesIdx = -1 ); - /** Sets automatic fill properties to the passed property set. */ void convertAutomaticFill( PropertySet& rPropSet, ObjectType eObjType, sal_Int32 nSeriesIdx = -1 ); - /** Returns true, if the passed shape properties have automatic line mode. */ - static bool isAutomaticLine( const ModelRef< Shape >& rxShapeProp ); /** Returns true, if the passed shape properties have automatic fill mode. */ static bool isAutomaticFill( const ModelRef< Shape >& rxShapeProp ); diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx index 8debfa5..7cba7ae 100644 --- a/oox/inc/oox/dump/dumperbase.hxx +++ b/oox/inc/oox/dump/dumperbase.hxx @@ -1405,7 +1405,6 @@ protected: void writeCharItem( const String& rName, sal_Unicode cData ); void writeStringItem( const String& rName, const ::rtl::OUString& rData ); void writeArrayItem( const String& rName, const sal_uInt8* pnData, sal_Size nSize, sal_Unicode cSep = OOX_DUMP_LISTSEP ); - void writeBoolItem( const String& rName, bool bData ); double writeRkItem( const String& rName, sal_Int32 nRk ); void writeColorABGRItem( const String& rName, sal_Int32 nColor ); void writeDateTimeItem( const String& rName, const ::com::sun::star::util::DateTime& rDateTime ); diff --git a/oox/inc/oox/ole/vbahelper.hxx b/oox/inc/oox/ole/vbahelper.hxx index 1f67a77..ad227aa 100644 --- a/oox/inc/oox/ole/vbahelper.hxx +++ b/oox/inc/oox/ole/vbahelper.hxx @@ -64,13 +64,6 @@ const sal_uInt16 VBA_ID_PROJECTVERSION = 0x0009; class VbaHelper { public: - /** Returns the full Basic script URL from a VBA module and macro name. - The script is assumed to be in a document library. */ - static ::rtl::OUString getBasicScriptUrl( - const ::rtl::OUString& rLibraryName, - const ::rtl::OUString& rModuleName, - const ::rtl::OUString& rMacroName ); - /** Reads the next record from the VBA directory stream 'dir'. @param rnRecId (out parameter) The record identifier of the new record. diff --git a/oox/inc/oox/ole/vbaproject.hxx b/oox/inc/oox/ole/vbaproject.hxx index ca6c8ad..f4af24a 100644 --- a/oox/inc/oox/ole/vbaproject.hxx +++ b/oox/inc/oox/ole/vbaproject.hxx @@ -140,13 +140,9 @@ public: /** Returns true, if the document contains at least one code module. */ bool hasModules() const; - /** Returns true, if the document contains the specified code module. */ - bool hasModule( const ::rtl::OUString& rModuleName ) const; /** Returns true, if the document contains at least one dialog. */ bool hasDialogs() const; - /** Returns true, if the document contains the specified dialog. */ - bool hasDialog( const ::rtl::OUString& rDialogName ) const; void setOleOverridesSink( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rxOleOverridesSink ){ mxOleOverridesSink = rxOleOverridesSink; } diff --git a/oox/inc/oox/xls/addressconverter.hxx b/oox/inc/oox/xls/addressconverter.hxx index ce2c876..1bc3330 100644 --- a/oox/inc/oox/xls/addressconverter.hxx +++ b/oox/inc/oox/xls/addressconverter.hxx @@ -581,26 +581,6 @@ public: // ------------------------------------------------------------------------ - /** Checks the passed cell range list if it fits into the spreadsheet limits. - - @param rRanges The cell range list to be checked. - @param bAllowOverflow true = Allow ranges that start inside the - supported sheet limits but may end outside of these limits. - false = Do not allow ranges that overflow the supported limits. - @param bTrackOverflow true = Update the internal overflow flags, if - the passed range list contains cells outside of the supported sheet - limits. - @return true = All cell ranges are valid. This function returns also - true, if overflowing ranges are allowed via parameter bAllowOverflow - and only parts of the ranges are outside the current sheet limits. - Returns false, if one of the ranges is completely outside the sheet - limits or if overflowing ranges are not allowed via parameter - bAllowOverflow. - */ - bool checkCellRangeList( - const ApiCellRangeList& rRanges, - bool bAllowOverflow, bool bTrackOverflow ); - /** Tries to restrict the passed cell range list to current sheet limits. @param orRanges (in-out-parameter) Restricts the cell range addresses diff --git a/oox/inc/oox/xls/formulabase.hxx b/oox/inc/oox/xls/formulabase.hxx index b3e403a..e49dacd 100644 --- a/oox/inc/oox/xls/formulabase.hxx +++ b/oox/inc/oox/xls/formulabase.hxx @@ -705,14 +705,6 @@ public: // ------------------------------------------------------------------------ - /** Generates a cell address string in Calc's absolute $Sheet.$A$1 notation - from the passed cell address. - - @param rAddress The cell address to be converted to a string. - */ - ::rtl::OUString generateApiAddressString( - const ::com::sun::star::table::CellAddress& rAddress ) const; - /** Generates a cell range string in Calc's absolute $Sheet.$A$1:$A$ notation from the passed cell range address. @@ -721,13 +713,6 @@ public: ::rtl::OUString generateApiRangeString( const ::com::sun::star::table::CellRangeAddress& rRange ) const; - /** Generates a cell range list string in Calc's absolute $Sheet.$A$1:$A$1 - notation from the passed cell range addresses. - - @param rRanges The list of cell ranges to be converted to a string. - */ - ::rtl::OUString generateApiRangeListString( const ApiCellRangeList& rRanges ) const; - /** Generates a string in Calc formula notation from the passed string. @param rString The string value. @@ -775,14 +760,6 @@ public: relative references (based on cell A1 of the current sheet). False = only real absolute references will be accepted. - @return True, if the token sequence contains a valid cell address - which has been extracted to orAddress, false otherwise. - */ - bool extractCellAddress( - ::com::sun::star::table::CellAddress& orAddress, - const ApiTokenSequence& rTokens, - bool bAllowRelative ) const; - /** Tries to extract a cell range address from a formula token sequence. @param orAddress (output parameter) If the token sequence is valid, diff --git a/oox/inc/oox/xls/stylesbuffer.hxx b/oox/inc/oox/xls/stylesbuffer.hxx index 0ab97dd..365474a 100644 --- a/oox/inc/oox/xls/stylesbuffer.hxx +++ b/oox/inc/oox/xls/stylesbuffer.hxx @@ -1040,8 +1040,6 @@ public: XfRef getCellXf( sal_Int32 nXfId ) const; /** Returns the specified style format object. */ XfRef getStyleXf( sal_Int32 nXfId ) const; - /** Returns the specified diferential cell format object. */ - DxfRef getDxf( sal_Int32 nDxfId ) const; /** Returns the font object of the specified cell XF. */ FontRef getFontFromCellXf( sal_Int32 nXfId ) const; @@ -1072,8 +1070,6 @@ public: void writeFillToPropertyMap( PropertyMap& rPropMap, sal_Int32 nFillId ) const; /** Writes the cell formatting attributes of the specified XF to the passed property map. */ void writeCellXfToPropertyMap( PropertyMap& rPropMap, sal_Int32 nXfId ) const; - /** Writes the cell formatting attributes of the specified style XF to the passed property map. */ - void writeStyleXfToPropertyMap( PropertyMap& rPropMap, sal_Int32 nXfId ) const; /** Writes the cell formatting attributes of the specified XF to the passed property set. */ void writeCellXfToPropertySet( PropertySet& rPropSet, sal_Int32 nXfId ) const; diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index 7aca5b8..076aa41 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -1161,23 +1161,12 @@ void ObjectFormatter::convertNumberFormat( PropertySet& rPropSet, const NumberFo } } -void ObjectFormatter::convertAutomaticLine( PropertySet& rPropSet, ObjectType eObjType, sal_Int32 nSeriesIdx ) -{ - if( ObjectTypeFormatter* pFormat = mxData->getTypeFormatter( eObjType ) ) - pFormat->convertAutomaticLine( rPropSet, nSeriesIdx ); -} - void ObjectFormatter::convertAutomaticFill( PropertySet& rPropSet, ObjectType eObjType, sal_Int32 nSeriesIdx ) { if( ObjectTypeFormatter* pFormat = mxData->getTypeFormatter( eObjType ) ) pFormat->convertAutomaticFill( rPropSet, nSeriesIdx ); } -/*static*/ bool ObjectFormatter::isAutomaticLine( const ModelRef< Shape >& rxShapeProp ) -{ - return !rxShapeProp || !rxShapeProp->getLineProperties().maLineFill.moFillType.has(); -} - /*static*/ bool ObjectFormatter::isAutomaticFill( const ModelRef< Shape >& rxShapeProp ) { return !rxShapeProp || !rxShapeProp->getFillProperties().moFillType.has(); diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index eacbba3..f109168 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -2384,12 +2384,6 @@ void OutputObjectBase::writeArrayItem( const String& rName, const sal_uInt8* pnD mxOut->writeArray( pnData, nSize, cSep ); } -void OutputObjectBase::writeBoolItem( const String& rName, bool bData ) -{ - ItemGuard aItem( mxOut, rName ); - mxOut->writeBool( bData ); -} - double OutputObjectBase::writeRkItem( const String& rName, sal_Int32 nRk ) { MultiItemsGuard aMultiGuard( mxOut ); diff --git a/oox/source/ole/vbahelper.cxx b/oox/source/ole/vbahelper.cxx index e78ec21..a545c57 100644 --- a/oox/source/ole/vbahelper.cxx +++ b/oox/source/ole/vbahelper.cxx @@ -42,20 +42,6 @@ using ::rtl::OUStringBuffer; // ============================================================================ -/*static*/ OUString VbaHelper::getBasicScriptUrl( - const OUString& rLibraryName, const OUString& rModuleName, const OUString& rMacroName ) -{ - OSL_ENSURE( !rLibraryName.isEmpty(), "VbaHelper::getBasicScriptUrl - library name is empty" ); - OSL_ENSURE( !rModuleName.isEmpty(), "VbaHelper::getBasicScriptUrl - module name is empty" ); - OSL_ENSURE( !rMacroName.isEmpty(), "VbaHelper::getBasicScriptUrl - macro name is empty" ); - const sal_Unicode cDot = '.'; - return OUStringBuffer(). - appendAscii( RTL_CONSTASCII_STRINGPARAM( "vnd.sun.star.script:" ) ). - append( rLibraryName ).append( cDot ).append( rModuleName ).append( cDot ).append( rMacroName ). - appendAscii( RTL_CONSTASCII_STRINGPARAM( "?language=Basic&location=document" ) ). - makeStringAndClear(); -} - /*static*/ bool VbaHelper::readDirRecord( sal_uInt16& rnRecId, StreamDataSequence& rRecData, BinaryInputStream& rInStrm ) { // read the record header diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx index 4237d2a..19defae 100644 --- a/oox/source/ole/vbaproject.cxx +++ b/oox/source/ole/vbaproject.cxx @@ -212,21 +212,11 @@ bool VbaProject::hasModules() const return mxBasicLib.is() && mxBasicLib->hasElements(); } -bool VbaProject::hasModule( const OUString& rModuleName ) const -{ - return mxBasicLib.is() && mxBasicLib->hasByName( rModuleName ); -} - bool VbaProject::hasDialogs() const { return mxDialogLib.is() && mxDialogLib->hasElements(); } -bool VbaProject::hasDialog( const OUString& rDialogName ) const -{ - return mxDialogLib.is() && mxDialogLib->hasByName( rDialogName ); -} - // protected ------------------------------------------------------------------ void VbaProject::addDummyModule( const OUString& rName, sal_Int32 nType ) diff --git a/oox/source/xls/addressconverter.cxx b/oox/source/xls/addressconverter.cxx index 8a5a670..146651f 100644 --- a/oox/source/xls/addressconverter.cxx +++ b/oox/source/xls/addressconverter.cxx @@ -705,14 +705,6 @@ bool AddressConverter::convertToCellRange( CellRangeAddress& orRange, // ---------------------------------------------------------------------------- -bool AddressConverter::checkCellRangeList( const ApiCellRangeList& rRanges, bool bAllowOverflow, bool bTrackOverflow ) -{ - for( ApiCellRangeList::const_iterator aIt = rRanges.begin(), aEnd = rRanges.end(); aIt != aEnd; ++aIt ) - if( !checkCellRange( *aIt, bAllowOverflow, bTrackOverflow ) ) - return false; - return true; -} - void AddressConverter::validateCellRangeList( ApiCellRangeList& orRanges, bool bTrackOverflow ) { for( size_t nIndex = orRanges.size(); nIndex > 0; --nIndex ) diff --git a/oox/source/xls/formulabase.cxx b/oox/source/xls/formulabase.cxx index 477a8f9..e9ffa95 100644 --- a/oox/source/xls/formulabase.cxx +++ b/oox/source/xls/formulabase.cxx @@ -1494,15 +1494,6 @@ OUString FormulaProcessorBase::generateRangeList2dString( const ApiCellRangeList // ---------------------------------------------------------------------------- -OUString FormulaProcessorBase::generateApiAddressString( const CellAddress& rAddress ) const -{ - OUString aCellName; - PropertySet aCellProp( getCellFromDoc( rAddress ) ); - aCellProp.getProperty( aCellName, PROP_AbsoluteName ); - OSL_ENSURE( !aCellName.isEmpty(), "FormulaProcessorBase::generateApiAddressString - cannot create cell address string" ); - return aCellName; -} - OUString FormulaProcessorBase::generateApiRangeString( const CellRangeAddress& rRange ) const { OUString aRangeName; @@ -1512,22 +1503,6 @@ OUString FormulaProcessorBase::generateApiRangeString( const CellRangeAddress& r return aRangeName; } -OUString FormulaProcessorBase::generateApiRangeListString( const ApiCellRangeList& rRanges ) const -{ - OUStringBuffer aBuffer; - for( ApiCellRangeList::const_iterator aIt = rRanges.begin(), aEnd = rRanges.end(); aIt != aEnd; ++aIt ) - { - OUString aRangeName = generateApiRangeString( *aIt ); - if( !aRangeName.isEmpty() ) - { - if( aBuffer.getLength() > 0 ) - aBuffer.append( API_TOKEN_SEP ); - aBuffer.append( aRangeName ); - } - } - return aBuffer.makeStringAndClear(); -} - OUString FormulaProcessorBase::generateApiString( const OUString& rString ) { OUString aRetString = rString; @@ -1578,20 +1553,6 @@ Any FormulaProcessorBase::extractReference( const ApiTokenSequence& rTokens ) co return Any(); } -bool FormulaProcessorBase::extractCellAddress( CellAddress& orAddress, - const ApiTokenSequence& rTokens, bool bAllowRelative ) const -{ - CellRangeAddress aRange; - if( extractCellRange( aRange, rTokens, bAllowRelative ) && (aRange.StartColumn == aRange.EndColumn) && (aRange.StartRow == aRange.EndRow) ) - { - orAddress.Sheet = aRange.Sheet; - orAddress.Column = aRange.StartColumn; - orAddress.Row = aRange.StartRow; - return true; - } - return false; -} - bool FormulaProcessorBase::extractCellRange( CellRangeAddress& orRange, const ApiTokenSequence& rTokens, bool bAllowRelative ) const { diff --git a/oox/source/xls/stylesbuffer.cxx b/oox/source/xls/stylesbuffer.cxx index a09c4eb..5312549 100644 --- a/oox/source/xls/stylesbuffer.cxx +++ b/oox/source/xls/stylesbuffer.cxx @@ -3329,11 +3329,6 @@ XfRef StylesBuffer::getStyleXf( sal_Int32 nXfId ) const return maStyleXfs.get( nXfId ); } -DxfRef StylesBuffer::getDxf( sal_Int32 nDxfId ) const -{ - return maDxfs.get( nDxfId ); -} - FontRef StylesBuffer::getFontFromCellXf( sal_Int32 nXfId ) const { FontRef xFont; @@ -3470,12 +3465,6 @@ void StylesBuffer::writeCellXfToPropertyMap( PropertyMap& rPropMap, sal_Int32 nX pXf->writeToPropertyMap( rPropMap ); } -void StylesBuffer::writeStyleXfToPropertyMap( PropertyMap& rPropMap, sal_Int32 nXfId ) const -{ - if( Xf* pXf = maStyleXfs.get( nXfId ).get() ) - pXf->writeToPropertyMap( rPropMap ); -} - void StylesBuffer::writeCellXfToPropertySet( PropertySet& rPropSet, sal_Int32 nXfId ) const { if( Xf* pXf = maCellXfs.get( nXfId ).get() ) diff --git a/unusedcode.easy b/unusedcode.easy index 71fcc97..aff73cc 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1270,8 +1270,6 @@ oox::drawingml::TextBodyProperties::pushToPropMap(oox::PropertyMap&) const oox::drawingml::TextListStyle::dump() const oox::drawingml::Theme::getEffectStyle(int) const oox::drawingml::addMissingProperties(oox::PropertyMap const&, oox::PropertyMap&) -oox::drawingml::chart::ObjectFormatter::convertAutomaticLine(oox::PropertySet&, oox::drawingml::chart::ObjectType, int) -oox::drawingml::chart::ObjectFormatter::isAutomaticLine(oox::drawingml::chart::ModelRef const&) oox::drawingml::lcl_SequenceHasUnhiddenData(com::sun::star::uno::Reference const&) oox::drawingml::lcl_dump_pset(com::sun::star::uno::Reference) oox::drawingml::lcl_getSequenceLengthByRole(com::sun::star::uno::Sequence > const&, rtl::OUString const&) @@ -1289,7 +1287,6 @@ oox::dump::Output::resetIndent() oox::dump::Output::writeAddress(oox::dump::Address const&) oox::dump::Output::writeRange(oox::dump::Range const&) oox::dump::Output::writeRangeList(std::__debug::vector > const&) -oox::dump::OutputObjectBase::writeBoolItem(oox::dump::String const&, bool) oox::dump::StorageIterator::getElementCount() const oox::dump::StringHelper::prependToken(rtl::OUStringBuffer&, long, unsigned short) oox::dump::TextStreamObjectBase::construct(oox::dump::InputObjectBase const&, unsigned short) @@ -1298,12 +1295,8 @@ oox::dump::biff::BiffObjectBase::dumpRowRange(oox::dump::String const&, bool) oox::dump::biff::FormulaObject::dumpCellFormula(oox::dump::String const&, unsigned short) oox::formulaimport::XmlStream::AttributeList::hasAttribute(int) const oox::formulaimport::XmlStream::skipElement(int) -oox::ole::VbaHelper::getBasicScriptUrl(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&) -oox::ole::VbaProject::hasDialog(rtl::OUString const&) const -oox::ole::VbaProject::hasModule(rtl::OUString const&) const oox::ole::VbaSiteModel::isVisible() const oox::ppt::PPTShape::findPlaceholder(int, int, std::__debug::vector, std::allocator > >&) -oox::xls::AddressConverter::checkCellRangeList(oox::xls::ApiCellRangeList const&, bool, bool) oox::xls::ApiTokenIterator::ApiTokenIterator(oox::xls::ApiTokenIterator const&, bool) oox::xls::BiffDrawingBase::appendRawObject(boost::shared_ptr const&) oox::xls::BiffDrawingBase::setSkipObj(unsigned short) @@ -1337,9 +1330,6 @@ oox::xls::FormulaParser::convertNumberToHyperlink(rtl::OUString const&, double) oox::xls::FormulaParser::importOleTargetLink(oox::xls::BiffInputStream&, unsigned short const*) const oox::xls::FormulaParserImpl::pushParenthesesOperand() oox::xls::FormulaParserImpl::removeLastOperands(unsigned long) -oox::xls::FormulaProcessorBase::extractCellAddress(com::sun::star::table::CellAddress&, com::sun::star::uno::Sequence const&, bool) const -oox::xls::FormulaProcessorBase::generateApiAddressString(com::sun::star::table::CellAddress const&) const -oox::xls::FormulaProcessorBase::generateApiRangeListString(oox::xls::ApiCellRangeList const&) const oox::xls::FunctionParamInfoIterator::getParamInfo() const oox::xls::FunctionProvider::getFuncInfoFromOdfFuncName(rtl::OUString const&) const oox::xls::ShapeAnchor::getToCell() const @@ -1347,8 +1337,6 @@ oox::xls::SheetDataBuffer::XfIdRange::set(com::sun::star::table::CellAddress con oox::xls::SheetDataBuffer::XfIdRange::tryExpand(com::sun::star::table::CellAddress const&, int, int) oox::xls::SheetDataBuffer::XfIdRange::tryMerge(oox::xls::SheetDataBuffer::XfIdRange const&) oox::xls::SheetDataBuffer::XfIdRowRange::intersects(com::sun::star::table::CellRangeAddress const&) const -oox::xls::StylesBuffer::getDxf(int) const -oox::xls::StylesBuffer::writeStyleXfToPropertyMap(oox::PropertyMap&, int) const oox::xls::UnitConverter::calcOoxErrorCode(unsigned char) const oox::xls::WorkbookHelper::getBiffFilter() const oox::xls::WorkbookHelper::setTextEncoding(unsigned short) -- 1.7.7.msysgit.1