From d21d910796ff8502232aa4485a2ecd58d394b9c9 Mon Sep 17 00:00:00 2001 From: Elton Chung Date: Sat, 11 Feb 2012 19:13:44 +0800 Subject: [PATCH] Remove unused code --- oox/inc/oox/core/filterbase.hxx | 8 ------ oox/inc/oox/core/relations.hxx | 2 - oox/inc/oox/drawingml/drawingmltypes.hxx | 10 ------- oox/inc/oox/helper/binaryinputstream.hxx | 7 ----- oox/source/core/filterbase.cxx | 10 ------- oox/source/core/relations.cxx | 6 ---- oox/source/drawingml/diagram/diagram.cxx | 10 ------- oox/source/drawingml/diagram/diagram.hxx | 1 - oox/source/drawingml/drawingmltypes.cxx | 39 ------------------------------ oox/source/helper/binaryinputstream.cxx | 5 ---- unusedcode.easy | 8 ------ 11 files changed, 0 insertions(+), 106 deletions(-) diff --git a/oox/inc/oox/core/filterbase.hxx b/oox/inc/oox/core/filterbase.hxx index cbc9379..7c09707 100644 --- a/oox/inc/oox/core/filterbase.hxx +++ b/oox/inc/oox/core/filterbase.hxx @@ -128,10 +128,6 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& getComponentContext() const; - /** Returns the component service factory (always existing). */ - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiComponentFactory >& - getComponentFactory() const; - /** Returns the multi service factory of the component (always existing). */ const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getServiceFactory() const; @@ -156,10 +152,6 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator >& getStatusIndicator() const; - /** Returns the status interaction handler (may be null). */ - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& - getInteractionHandler() const; - /** Returns the media descriptor. */ ::comphelper::MediaDescriptor& getMediaDescriptor() const; diff --git a/oox/inc/oox/core/relations.hxx b/oox/inc/oox/core/relations.hxx index 64027ef..1b504f0 100644 --- a/oox/inc/oox/core/relations.hxx +++ b/oox/inc/oox/core/relations.hxx @@ -87,8 +87,6 @@ public: /** Returns the external target of the relation with the passed relation identifier. */ ::rtl::OUString getExternalTargetFromRelId( const ::rtl::OUString& rRelId ) const; - /** Returns the external target of the first relation with the passed type. */ - ::rtl::OUString getExternalTargetFromFirstType( const ::rtl::OUString& rType ) const; /** Returns the full fragment path for the target of the passed relation. */ ::rtl::OUString getFragmentPathFromRelation( const Relation& rRelation ) const; diff --git a/oox/inc/oox/drawingml/drawingmltypes.hxx b/oox/inc/oox/drawingml/drawingmltypes.hxx index c66d729..600b1bc 100644 --- a/oox/inc/oox/drawingml/drawingmltypes.hxx +++ b/oox/inc/oox/drawingml/drawingmltypes.hxx @@ -89,9 +89,6 @@ typedef ::boost::shared_ptr< TableProperties > TablePropertiesPtr; // ============================================================================ -/** converts the attributes from an CT_Point2D into an awt Point with 1/100th mm */ -com::sun::star::awt::Point GetPoint2D( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes ); - /** converts the attributes from an CT_TLPoint into an awt Point with 1/1000% */ com::sun::star::awt::Point GetPointPercent( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs ); @@ -102,11 +99,6 @@ com::sun::star::awt::Size GetSize2D( const ::com::sun::star::uno::Reference< ::c /** converts the attributes from a CT_RelativeRect to an IntegerRectangle2D */ com::sun::star::geometry::IntegerRectangle2D GetRelativeRect( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes ); -/** converts an emu string into 1/100th mmm but constrain as per ST_TextMargin - * see 5.1.12.73 - */ -sal_Int32 GetTextMargin( const ::rtl::OUString& sValue ); - /** converts EMUs into 1/100th mmm */ sal_Int32 GetCoordinate( sal_Int32 nValue ); @@ -126,8 +118,6 @@ float GetTextSize( const ::rtl::OUString& rValue ); sal_Int32 GetTextSpacingPoint( const ::rtl::OUString& sValue ); sal_Int32 GetTextSpacingPoint( const sal_Int32 nValue ); -::com::sun::star::drawing::TextVerticalAdjust GetTextVerticalAdjust( sal_Int32 nToken ); - /** */ ::com::sun::star::style::TabAlign GetTabAlign( ::sal_Int32 aToken ); diff --git a/oox/inc/oox/helper/binaryinputstream.hxx b/oox/inc/oox/helper/binaryinputstream.hxx index 7c8783d..5add5f4 100644 --- a/oox/inc/oox/helper/binaryinputstream.hxx +++ b/oox/inc/oox/helper/binaryinputstream.hxx @@ -168,13 +168,6 @@ public: */ ::rtl::OString readNulCharArray(); - /** Reads a NUL-terminated byte character array and returns a Unicode string. - - @param eTextEnc - The text encoding used to create the Unicode string. - */ - ::rtl::OUString readNulCharArrayUC( rtl_TextEncoding eTextEnc ); - /** Reads a NUL-terminated Unicode character array and returns the string. */ ::rtl::OUString readNulUnicodeArray(); diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx index c8acd4d..40288ef 100644 --- a/oox/source/core/filterbase.cxx +++ b/oox/source/core/filterbase.cxx @@ -259,11 +259,6 @@ const Reference< XComponentContext >& FilterBase::getComponentContext() const return mxImpl->mxComponentContext; } -const Reference< XMultiComponentFactory >& FilterBase::getComponentFactory() const -{ - return mxImpl->mxComponentFactory; -} - const Reference< XMultiServiceFactory >& FilterBase::getServiceFactory() const { return mxImpl->mxServiceFactory; @@ -294,11 +289,6 @@ const Reference< XStatusIndicator >& FilterBase::getStatusIndicator() const return mxImpl->mxStatusIndicator; } -const Reference< XInteractionHandler >& FilterBase::getInteractionHandler() const -{ - return mxImpl->mxInteractionHandler; -} - MediaDescriptor& FilterBase::getMediaDescriptor() const { return mxImpl->maMediaDesc; diff --git a/oox/source/core/relations.cxx b/oox/source/core/relations.cxx index f1e39d4..ef9510c 100644 --- a/oox/source/core/relations.cxx +++ b/oox/source/core/relations.cxx @@ -92,12 +92,6 @@ OUString Relations::getExternalTargetFromRelId( const OUString& rRelId ) const return (pRelation && pRelation->mbExternal) ? pRelation->maTarget : OUString(); } -OUString Relations::getExternalTargetFromFirstType( const OUString& rType ) const -{ - const Relation* pRelation = getRelationFromFirstType( rType ); - return (pRelation && pRelation->mbExternal) ? pRelation->maTarget : OUString(); -} - OUString Relations::getFragmentPathFromRelation( const Relation& rRelation ) const { // no target, no fragment path diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx index 9194001..58c8de8 100644 --- a/oox/source/drawingml/diagram/diagram.cxx +++ b/oox/source/drawingml/diagram/diagram.cxx @@ -344,16 +344,6 @@ void Diagram::addTo( const ShapePtr & pParentShape ) mpLayout->getNode()->accept( aCreationVisitor ); } -OUString Diagram::getLayoutId() const -{ - OUString sLayoutId; - if( mpLayout ) - { - sLayoutId = mpLayout->getUniqueId(); - } - return sLayoutId; -} - uno::Reference loadFragment( core::XmlFilterBase& rFilter, const rtl::Reference< core::FragmentHandler >& rxHandler ) diff --git a/oox/source/drawingml/diagram/diagram.hxx b/oox/source/drawingml/diagram/diagram.hxx index 6dc9c61..633f452 100644 --- a/oox/source/drawingml/diagram/diagram.hxx +++ b/oox/source/drawingml/diagram/diagram.hxx @@ -302,7 +302,6 @@ public: const DiagramColorMap& getColors() const { return maColors; } void addTo( const ShapePtr & pShape ); - ::rtl::OUString getLayoutId() const; private: void build( ); DiagramDataPtr mpData; diff --git a/oox/source/drawingml/drawingmltypes.cxx b/oox/source/drawingml/drawingmltypes.cxx index b0135bb..ac88533 100644 --- a/oox/source/drawingml/drawingmltypes.cxx +++ b/oox/source/drawingml/drawingmltypes.cxx @@ -47,23 +47,6 @@ namespace drawingml { // ============================================================================ -/** converts an emu string into 1/100th mmm but constrain as per ST_TextMargin - * see 5.1.12.73 - */ -sal_Int32 GetTextMargin( const OUString& sValue ) -{ - sal_Int32 nRet = 0; - if( !::sax::Converter::convertNumber( nRet, sValue ) ) - nRet = 0; - else if( nRet < 0 ) - nRet = 0; - else if( nRet > 51206400 ) - nRet = 51206400; - - nRet /= 360; - return nRet; -} - /** converts EMUs into 1/100th mmm */ sal_Int32 GetCoordinate( sal_Int32 nValue ) { @@ -97,12 +80,6 @@ double GetPositiveFixedPercentage( const OUString& sValue ) // -------------------------------------------------------------------- -/** converts the attributes from an CT_Point2D into an awt Point with 1/100thmm */ -Point GetPoint2D( const Reference< XFastAttributeList >& xAttribs ) -{ - return Point( GetCoordinate( xAttribs->getOptionalValue( XML_x ) ), GetCoordinate( xAttribs->getOptionalValue( XML_y ) ) ); -} - /** converts the attributes from an CT_TLPoint into an awt Point with 1/1000% */ Point GetPointPercent( const Reference< XFastAttributeList >& xAttribs ) { @@ -136,22 +113,6 @@ sal_Int32 GetTextSpacingPoint( const sal_Int32 nValue ) return ( nValue * 254 + 360 ) / 720; } -TextVerticalAdjust GetTextVerticalAdjust( sal_Int32 nToken ) -{ - TextVerticalAdjust rVal = TextVerticalAdjust_TOP; - - switch( nToken ) { - case XML_b: - rVal = TextVerticalAdjust_BOTTOM; - break; - case XML_ctr: - rVal = TextVerticalAdjust_CENTER; - break; - } - - return rVal; -} - float GetFontHeight( sal_Int32 nHeight ) { // convert 1/100 points to points diff --git a/oox/source/helper/binaryinputstream.cxx b/oox/source/helper/binaryinputstream.cxx index 541b319..21229ae 100644 --- a/oox/source/helper/binaryinputstream.cxx +++ b/oox/source/helper/binaryinputstream.cxx @@ -65,11 +65,6 @@ OString BinaryInputStream::readNulCharArray() return aBuffer.makeStringAndClear(); } -OUString BinaryInputStream::readNulCharArrayUC( rtl_TextEncoding eTextEnc ) -{ - return OStringToOUString( readNulCharArray(), eTextEnc ); -} - OUString BinaryInputStream::readNulUnicodeArray() { OUStringBuffer aBuffer; diff --git a/unusedcode.easy b/unusedcode.easy index ae9652a..71fcc97 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1249,18 +1249,14 @@ ooo::vba::extractIntFromAny(com::sun::star::uno::Any const&, int) oox::(anonymous namespace)::GenericPropertySet::GenericPropertySet() oox::AttributeList::getHyperHex(int, long) const oox::AttributeList::getUnsignedHex(int, unsigned int) const -oox::BinaryInputStream::readNulCharArrayUC(unsigned short) oox::ContainerHelper::insertByIndex(com::sun::star::uno::Reference const&, int, com::sun::star::uno::Any const&) oox::GraphicHelper::convertScreenPixelToHmm(com::sun::star::awt::Point const&) const oox::ObjectContainer::getObject(rtl::OUString const&) const oox::PropertyMap::dump() oox::PropertyMap::getProperty(int) const oox::PropertySet::getProperties(com::sun::star::uno::Sequence&, com::sun::star::uno::Sequence const&) const -oox::core::FilterBase::getComponentFactory() const -oox::core::FilterBase::getInteractionHandler() const oox::core::PowerPointExport::WriteAnimationNodeCommonPropsEnd(boost::shared_ptr) oox::core::PowerPointExport::WriteTextStyles(boost::shared_ptr) -oox::core::Relations::getExternalTargetFromFirstType(rtl::OUString const&) const oox::core::XmlFilterBase::getChartConverter() oox::drawingml::ChartExport::exportDataSeq(com::sun::star::uno::Reference const&, int) oox::drawingml::ChartExport::exportXAxis(oox::drawingml::AxisIdPair) @@ -1268,11 +1264,7 @@ oox::drawingml::ChartExport::exportYAxis(oox::drawingml::AxisIdPair) oox::drawingml::ColorPropertySet::getColor() oox::drawingml::ColorPropertySet::setColor(int) oox::drawingml::CustomShapeProperties::getValue(std::__debug::vector > const&, unsigned int) const -oox::drawingml::Diagram::getLayoutId() const oox::drawingml::DiagramLayout::layout(std::__debug::vector > const&, com::sun::star::awt::Point const&) -oox::drawingml::GetPoint2D(com::sun::star::uno::Reference const&) -oox::drawingml::GetTextMargin(rtl::OUString const&) -oox::drawingml::GetTextVerticalAdjust(int) oox::drawingml::GraphicProperties::assignUsed(oox::drawingml::GraphicProperties const&) oox::drawingml::TextBodyProperties::pushToPropMap(oox::PropertyMap&) const oox::drawingml::TextListStyle::dump() const -- 1.7.7.msysgit.1