From 16410cdcb91b3d358ab2964deefe8d357cae613b Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Tue, 27 Mar 2012 11:03:09 +0200 Subject: remove unused code (oox, sc) --- oox/inc/oox/dump/dumperbase.hxx | 4 ---- oox/inc/oox/mathml/importutils.hxx | 4 ---- oox/inc/oox/ppt/pptshape.hxx | 1 - oox/source/dump/dumperbase.cxx | 5 ----- oox/source/mathml/importutils.cxx | 10 ---------- oox/source/ppt/pptshape.cxx | 7 ------- 6 files changed, 31 deletions(-) (limited to 'oox') diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx index 534776b1e485..5989c1e3d9e4 100644 --- a/oox/inc/oox/dump/dumperbase.hxx +++ b/oox/inc/oox/dump/dumperbase.hxx @@ -1860,10 +1860,6 @@ public: const BinaryInputStreamRef& rxStrm, const ::rtl::OUString& rSysFileName ); - explicit XmlStreamObject( - const OutputObjectBase& rParent, - const BinaryInputStreamRef& rxStrm ); - protected: virtual void implDumpText( TextInputStream& rTextStrm ); }; diff --git a/oox/inc/oox/mathml/importutils.hxx b/oox/inc/oox/mathml/importutils.hxx index 9b90681ffb0a..fc0e276495ac 100644 --- a/oox/inc/oox/mathml/importutils.hxx +++ b/oox/inc/oox/mathml/importutils.hxx @@ -212,10 +212,6 @@ public: Position in the stream is set to make the tag current (i.e. it will be the next one read). */ bool findTag( int token ); - /** - Skips the given element (i.e. reads up to and including the matching closing tag). - */ - void skipElement( int token ); /** Handle the current (unexpected) tag. */ diff --git a/oox/inc/oox/ppt/pptshape.hxx b/oox/inc/oox/ppt/pptshape.hxx index e06fda634af9..07ab72373b47 100644 --- a/oox/inc/oox/ppt/pptshape.hxx +++ b/oox/inc/oox/ppt/pptshape.hxx @@ -67,7 +67,6 @@ public: static oox::drawingml::ShapePtr findPlaceholder( const sal_Int32 nMasterPlaceholder, std::vector< oox::drawingml::ShapePtr >& rShapes ); static oox::drawingml::ShapePtr findPlaceholderByIndex( const sal_Int32 nIdx, std::vector< oox::drawingml::ShapePtr >& rShapes ); - static oox::drawingml::ShapePtr findPlaceholder( sal_Int32 nFirstPlaceholder, sal_Int32 nSecondPlaceholder, std::vector< oox::drawingml::ShapePtr >& rShapes ); static oox::drawingml::TextListStylePtr getSubTypeTextListStyle( const SlidePersist& rSlidePersist, sal_Int32 nSubType ); diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index f078111caaef..366090ce1c93 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -2920,11 +2920,6 @@ XmlStreamObject::XmlStreamObject( const ObjectBase& rParent, TextStreamObjectBase::construct( rParent, rxStrm, RTL_TEXTENCODING_UTF8, rSysFileName ); } -XmlStreamObject::XmlStreamObject( const OutputObjectBase& rParent, const BinaryInputStreamRef& rxStrm ) -{ - TextStreamObjectBase::construct( rParent, rxStrm, RTL_TEXTENCODING_UTF8 ); -} - void XmlStreamObject::implDumpText( TextInputStream& rTextStrm ) { /* Buffers a start element and the following element text. Needed to dump diff --git a/oox/source/mathml/importutils.cxx b/oox/source/mathml/importutils.cxx index ab9d22483387..41a254d7d296 100644 --- a/oox/source/mathml/importutils.cxx +++ b/oox/source/mathml/importutils.cxx @@ -114,11 +114,6 @@ static OUString tokenToString( int token ) } // namespace -bool XmlStream::AttributeList::hasAttribute( int token ) const -{ - return attrs.find( token ) != attrs.end(); -} - rtl::OUString XmlStream::AttributeList::attribute( int token, const rtl::OUString& def ) const { std::map< int, rtl::OUString >::const_iterator find = attrs.find( token ); @@ -304,11 +299,6 @@ bool XmlStream::findTagInternal( int token, bool silent ) return false; } -void XmlStream::skipElement( int token ) -{ - return skipElementInternal( token, true ); // no debug about skipping if called from outside -} - void XmlStream::skipElementInternal( int token, bool silent ) { int closing = ( token & ~TAG_OPENING ) | TAG_CLOSING; // make it a closing tag diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index a72a10c54c4b..2b017f064f1d 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -423,13 +423,6 @@ oox::drawingml::ShapePtr PPTShape::findPlaceholderByIndex( const sal_Int32 nIdx, return aShapePtr; } -// if nFirstPlaceholder can't be found, it will be searched for nSecondPlaceholder -oox::drawingml::ShapePtr PPTShape::findPlaceholder( sal_Int32 nFirstPlaceholder, sal_Int32 nSecondPlaceholder, std::vector< oox::drawingml::ShapePtr >& rShapes ) -{ - oox::drawingml::ShapePtr pPlaceholder = findPlaceholder( nFirstPlaceholder, rShapes ); - return !nSecondPlaceholder || pPlaceholder.get() ? pPlaceholder : findPlaceholder( nSecondPlaceholder, rShapes ); -} - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit