diff options
author | Petr Vorel <petr.vorel@gmail.com> | 2012-03-29 11:54:36 +0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-29 20:33:22 +0100 |
commit | 4b7e6d6eabed6ef6a3916bbd8376a24a7248f009 (patch) | |
tree | 686313d38939ea5b0fe95e2213d6e02c4297353f | |
parent | da2c7a91adc46ed01167b9b582d6cd65fac5e982 (diff) |
remove unused code (oox)
-rw-r--r-- | oox/inc/oox/dump/dffdumper.hxx | 1 | ||||
-rw-r--r-- | oox/inc/oox/dump/dumperbase.hxx | 10 | ||||
-rw-r--r-- | oox/inc/oox/dump/oledumper.hxx | 1 | ||||
-rw-r--r-- | oox/inc/oox/ole/vbaprojectfilter.hxx | 5 | ||||
-rw-r--r-- | oox/source/dump/dffdumper.cxx | 6 | ||||
-rw-r--r-- | oox/source/dump/dumperbase.cxx | 53 | ||||
-rw-r--r-- | oox/source/dump/oledumper.cxx | 5 | ||||
-rw-r--r-- | oox/source/ole/vbaprojectfilter.cxx | 5 | ||||
-rwxr-xr-x | unusedcode.easy | 12 |
9 files changed, 0 insertions, 98 deletions
diff --git a/oox/inc/oox/dump/dffdumper.hxx b/oox/inc/oox/dump/dffdumper.hxx index 10f84f3fac2e..de0913f79f53 100644 --- a/oox/inc/oox/dump/dffdumper.hxx +++ b/oox/inc/oox/dump/dffdumper.hxx @@ -49,7 +49,6 @@ protected: inline explicit DffStreamObject() {} using SequenceRecordObjectBase::construct; - void construct( const OutputObjectBase& rParent, const BinaryInputStreamRef& rxStrm ); virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ); virtual void implWriteExtHeader(); diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx index a8b16b008bb7..0dd1abcb7e3b 100644 --- a/oox/inc/oox/dump/dumperbase.hxx +++ b/oox/inc/oox/dump/dumperbase.hxx @@ -231,7 +231,6 @@ struct ItemFormat explicit ItemFormat(); void set( DataType eDataType, FormatType eFmtType, const ::rtl::OUString& rItemName ); - void set( DataType eDataType, FormatType eFmtType, const ::rtl::OUString& rItemName, const ::rtl::OUString& rListName ); /** Initializes the struct from a vector of strings containing the item format. @@ -398,7 +397,6 @@ public: static void appendToken( ::rtl::OUStringBuffer& rStr, const ::rtl::OUString& rToken, sal_Unicode cSep = OOX_DUMP_LISTSEP ); static void appendToken( ::rtl::OUStringBuffer& rStr, sal_Int64 nToken, sal_Unicode cSep = OOX_DUMP_LISTSEP ); static void prependToken( ::rtl::OUStringBuffer& rStr, const ::rtl::OUString& rToken, sal_Unicode cSep = OOX_DUMP_LISTSEP ); - static void prependToken( ::rtl::OUStringBuffer& rStr, sal_Int64 nToken, sal_Unicode cSep = OOX_DUMP_LISTSEP ); static void appendIndex( ::rtl::OUStringBuffer& rStr, const ::rtl::OUString& rIdx ); static void appendIndex( ::rtl::OUStringBuffer& rStr, sal_Int64 nIdx ); @@ -1047,11 +1045,9 @@ public: void incIndent(); void decIndent(); - void resetIndent(); void startTable( sal_Int32 nW1 ); void startTable( sal_Int32 nW1, sal_Int32 nW2 ); - void startTable( sal_Int32 nW1, sal_Int32 nW2, sal_Int32 nW3 ); void startTable( sal_Int32 nW1, sal_Int32 nW2, sal_Int32 nW3, sal_Int32 nW4 ); void startTable( size_t nColCount, const sal_Int32* pnColWidths ); void tab(); @@ -1209,8 +1205,6 @@ public: explicit StorageIterator( const StorageRef& rxStrg ); virtual ~StorageIterator(); - size_t getElementCount() const; - StorageIterator& operator++(); ::rtl::OUString getName() const; @@ -1251,8 +1245,6 @@ protected: // ------------------------------------------------------------------------ - void reconstructConfig( const ConfigRef& rxConfig ); - inline Config& cfg() const { return *mxConfig; } private: @@ -1564,8 +1556,6 @@ protected: ::rtl::OUString dumpNullCharArray( const String& rName, rtl_TextEncoding eTextEnc ); ::rtl::OUString dumpNullUnicodeArray( const String& rName ); - double dumpRk( const String& rName = EMPTY_STRING ); - sal_Int32 dumpColorABGR( const String& rName = EMPTY_STRING ); ::com::sun::star::util::DateTime dumpFileTime( const String& rName = EMPTY_STRING ); ::rtl::OUString dumpGuid( const String& rName = EMPTY_STRING ); diff --git a/oox/inc/oox/dump/oledumper.hxx b/oox/inc/oox/dump/oledumper.hxx index 42abf2db3b68..4d3ceaaa2f26 100644 --- a/oox/inc/oox/dump/oledumper.hxx +++ b/oox/inc/oox/dump/oledumper.hxx @@ -178,7 +178,6 @@ protected: using StorageObjectBase::construct; void construct( const ObjectBase& rParent, const StorageRef& rxStrg, const ::rtl::OUString& rSysPath ); - void construct( const ObjectBase& rParent ); virtual void implDumpStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, diff --git a/oox/inc/oox/ole/vbaprojectfilter.hxx b/oox/inc/oox/ole/vbaprojectfilter.hxx index 03d49dfb71f1..50c6e3e5f9ee 100644 --- a/oox/inc/oox/ole/vbaprojectfilter.hxx +++ b/oox/inc/oox/ole/vbaprojectfilter.hxx @@ -60,11 +60,6 @@ private: class WordVbaProjectFilter : public VbaProjectFilterBase { -public: - explicit WordVbaProjectFilter( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) - throw( ::com::sun::star::uno::RuntimeException ); - private: virtual ::rtl::OUString implGetImplementationName() const; }; diff --git a/oox/source/dump/dffdumper.cxx b/oox/source/dump/dffdumper.cxx index 9a58cadcdd90..c7abc53d04f8 100644 --- a/oox/source/dump/dffdumper.cxx +++ b/oox/source/dump/dffdumper.cxx @@ -63,12 +63,6 @@ const sal_uInt16 DFF_OPT_FLAGSMASK = 0x003F; // ============================================================================ -void DffStreamObject::construct( const OutputObjectBase& rParent, const BinaryInputStreamRef& rxStrm ) -{ - SequenceRecordObjectBase::construct( rParent, rxStrm, "DFF-RECORD-NAMES" ); - constructDffObj(); -} - bool DffStreamObject::implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) { sal_uInt16 nRecId; diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index 0a10907c27ae..481d68e20c83 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -188,12 +188,6 @@ void ItemFormat::set( DataType eDataType, FormatType eFmtType, const OUString& r maListName = OUString(); } -void ItemFormat::set( DataType eDataType, FormatType eFmtType, const OUString& rItemName, const OUString& rListName ) -{ - set( eDataType, eFmtType, rItemName ); - maListName = rListName; -} - OUStringVector::const_iterator ItemFormat::parse( const OUStringVector& rFormatVec ) { set( DATATYPE_VOID, FORMATTYPE_NONE, OUString() ); @@ -636,13 +630,6 @@ void StringHelper::prependToken( OUStringBuffer& rStr, const OUString& rToken, s rStr.insert( 0, rToken ); } -void StringHelper::prependToken( OUStringBuffer& rStr, sal_Int64 nToken, sal_Unicode cSep ) -{ - OUStringBuffer aToken; - appendDec( aToken, nToken ); - prependToken( rStr, aToken.makeStringAndClear(), cSep ); -} - void StringHelper::appendIndex( OUStringBuffer& rStr, const OUString& rIdx ) { rStr.append( sal_Unicode( '[' ) ).append( rIdx ).append( sal_Unicode( ']' ) ); @@ -1695,11 +1682,6 @@ void Output::decIndent() maIndent = maIndent.copy( OOX_DUMP_INDENT ); } -void Output::resetIndent() -{ - maIndent = OUString(); -} - void Output::startTable( sal_Int32 nW1 ) { startTable( 1, &nW1 ); @@ -1713,15 +1695,6 @@ void Output::startTable( sal_Int32 nW1, sal_Int32 nW2 ) startTable( 2, pnColWidths ); } -void Output::startTable( sal_Int32 nW1, sal_Int32 nW2, sal_Int32 nW3 ) -{ - sal_Int32 pnColWidths[ 3 ]; - pnColWidths[ 0 ] = nW1; - pnColWidths[ 1 ] = nW2; - pnColWidths[ 2 ] = nW3; - startTable( 3, pnColWidths ); -} - void Output::startTable( sal_Int32 nW1, sal_Int32 nW2, sal_Int32 nW3, sal_Int32 nW4 ) { sal_Int32 pnColWidths[ 4 ]; @@ -1971,11 +1944,6 @@ StorageIterator::~StorageIterator() { } -size_t StorageIterator::getElementCount() const -{ - return maNames.size(); -} - StorageIterator& StorageIterator::operator++() { if( maIt != maNames.end() ) @@ -2041,12 +2009,6 @@ void ObjectBase::implDump() { } -void ObjectBase::reconstructConfig( const ConfigRef& rxConfig ) -{ - if( isValid( rxConfig ) ) - mxConfig = rxConfig; -} - // ============================================================================ // ============================================================================ @@ -2585,21 +2547,6 @@ OUString InputObjectBase::dumpNullUnicodeArray( const String& rName ) return aString; } -double InputObjectBase::dumpRk( const String& rName ) -{ - sal_Int32 nRk; - *mxStrm >> nRk; - return writeRkItem( rName( "rk-value" ), nRk ); -} - -sal_Int32 InputObjectBase::dumpColorABGR( const String& rName ) -{ - sal_Int32 nColor; - *mxStrm >> nColor; - writeColorABGRItem( rName( "color" ), nColor ); - return nColor; -} - DateTime InputObjectBase::dumpFileTime( const String& rName ) { DateTime aDateTime; diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx index bb3f115eff6e..6a22a438eeab 100644 --- a/oox/source/dump/oledumper.cxx +++ b/oox/source/dump/oledumper.cxx @@ -671,11 +671,6 @@ void OleStorageObject::construct( const ObjectBase& rParent, const StorageRef& r StorageObjectBase::construct( rParent, rxStrg, rSysPath ); } -void OleStorageObject::construct( const ObjectBase& rParent ) -{ - StorageObjectBase::construct( rParent ); -} - void OleStorageObject::implDumpStream( const Reference< XInputStream >& rxStrm, const OUString& /*rStrgPath*/, const OUString& rStrmName, const OUString& rSysFileName ) { if( rStrmName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "\001CompObj" ) ) ) diff --git a/oox/source/ole/vbaprojectfilter.cxx b/oox/source/ole/vbaprojectfilter.cxx index f4698faefbfc..5f993ed8a3d1 100644 --- a/oox/source/ole/vbaprojectfilter.cxx +++ b/oox/source/ole/vbaprojectfilter.cxx @@ -79,11 +79,6 @@ OUString SAL_CALL WordVbaProjectFilter_getImplementationName() throw() // ---------------------------------------------------------------------------- -WordVbaProjectFilter::WordVbaProjectFilter( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) : - VbaProjectFilterBase( rxContext, CREATE_OUSTRING( "Writer" ), CREATE_OUSTRING( "Macros" ) ) -{ -} - OUString WordVbaProjectFilter::implGetImplementationName() const { return WordVbaProjectFilter_getImplementationName(); diff --git a/unusedcode.easy b/unusedcode.easy index d495104711a7..d314a91089b8 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -820,15 +820,6 @@ nullcanvas::SpriteCanvasHelper::genericUpdate(basegfx::B2DConnectedRanges<canvas nullcanvas::SpriteCanvasHelper::opaqueUpdate(basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&) nullcanvas::SpriteCanvasHelper::scrollUpdate(basegfx::B2DRange const&, basegfx::B2DRange const&, basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&) ooo::vba::extractIntFromAny(com::sun::star::uno::Any const&) -oox::PropertySet::dump() -oox::dump::DffStreamObject::construct(oox::dump::OutputObjectBase const&, oox::dump::BinaryInputStreamRef const&) -oox::dump::InputObjectBase::dumpColorABGR(oox::dump::String const&) -oox::dump::InputObjectBase::dumpRk(oox::dump::String const&) -oox::dump::ItemFormat::set(oox::dump::DataType, oox::dump::FormatType, rtl::OUString const&, rtl::OUString const&) -oox::dump::ObjectBase::reconstructConfig(boost::shared_ptr<oox::dump::Config> const&) -oox::dump::OleStorageObject::construct(oox::dump::ObjectBase const&) -oox::dump::Output::resetIndent() -oox::dump::Output::startTable(int, int, int) oox::dump::Output::writeAddress(oox::dump::Address const&) oox::dump::Output::writeRange(oox::dump::Range const&) oox::dump::Output::writeRangeList(std::__debug::vector<oox::dump::Range, std::allocator<oox::dump::Range> > const&) @@ -844,13 +835,10 @@ oox::dump::OutputObjectBase::writeTokenAddressItem(oox::dump::String const&, oox oox::dump::OutputObjectBase::writeTokenRange3dItem(oox::dump::String const&, rtl::OUString const&, oox::dump::TokenRange const&, bool) oox::dump::OutputObjectBase::writeTokenRangeItem(oox::dump::String const&, oox::dump::TokenRange const&, bool) oox::dump::StdHlinkObject::StdHlinkObject(oox::dump::InputObjectBase const&) -oox::dump::StorageIterator::getElementCount() const oox::dump::StringHelper::appendIndexedText(rtl::OUStringBuffer&, rtl::OUString const&, long) oox::dump::StringHelper::appendIndexedText(rtl::OUStringBuffer&, rtl::OUString const&, rtl::OUString const&) oox::dump::StringHelper::appendToken(rtl::OUStringBuffer&, long, unsigned short) -oox::dump::StringHelper::prependToken(rtl::OUStringBuffer&, long, unsigned short) oox::dump::TextStreamObjectBase::construct(oox::dump::InputObjectBase const&, unsigned short) -oox::ole::WordVbaProjectFilter::WordVbaProjectFilter(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) oox::xls::CellBlock::CellBlock(oox::xls::WorksheetHelper const&, oox::ValueRange const&, int) psp::PrinterGfx::DrawBitmap(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterBmp const&) psp::PrinterGfx::DrawMask(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterColor&) |