[PATCH] remove unused code (oox, sd)
Petr Vorel
petr.vorel at gmail.com
Thu Mar 15 03:40:15 PDT 2012
---
oox/inc/oox/helper/attributelist.hxx | 6 ------
oox/inc/oox/helper/containerhelper.hxx | 16 ----------------
oox/inc/oox/helper/graphichelper.hxx | 2 --
oox/source/helper/attributelist.cxx | 10 ----------
oox/source/helper/containerhelper.cxx | 18 ------------------
oox/source/helper/graphichelper.cxx | 5 -----
sd/source/filter/eppt/epptooxml.hxx | 1 -
sd/source/filter/eppt/pptx-epptooxml.cxx | 10 ----------
unusedcode.easy | 5 -----
9 files changed, 0 insertions(+), 73 deletions(-)
diff --git a/oox/inc/oox/helper/attributelist.hxx b/oox/inc/oox/helper/attributelist.hxx
index d0a0600..c60c6f8 100644
--- a/oox/inc/oox/helper/attributelist.hxx
+++ b/oox/inc/oox/helper/attributelist.hxx
@@ -66,12 +66,6 @@ public:
/** Returns the 32-bit signed integer value from the passed string (hexadecimal). */
static sal_Int32 decodeIntegerHex( const ::rtl::OUString& rValue );
-
- /** Returns the 32-bit unsigned integer value from the passed string (hexadecimal). */
- static sal_uInt32 decodeUnsignedHex( const ::rtl::OUString& rValue );
-
- /** Returns the 64-bit signed integer value from the passed string (hexadecimal). */
- static sal_Int64 decodeHyperHex( const ::rtl::OUString& rValue );
};
// ============================================================================
diff --git a/oox/inc/oox/helper/containerhelper.hxx b/oox/inc/oox/helper/containerhelper.hxx
index 5c9dc88..eef9429 100644
--- a/oox/inc/oox/helper/containerhelper.hxx
+++ b/oox/inc/oox/helper/containerhelper.hxx
@@ -173,22 +173,6 @@ public:
static ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >
createIndexContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
- /** Inserts an object into an indexed container.
-
- @param rxIndexContainer com.sun.star.container.XIndexContainer
- interface of the indexed container.
-
- @param nIndex Insertion index for the object.
-
- @param rObject The object to be inserted.
-
- @return True = object successfully inserted.
- */
- static bool insertByIndex(
- const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rxIndexContainer,
- sal_Int32 nIndex,
- const ::com::sun::star::uno::Any& rObject );
-
// com.sun.star.container.XNameContainer ----------------------------------
/** Creates a new name container object from scratch. */
diff --git a/oox/inc/oox/helper/graphichelper.hxx b/oox/inc/oox/helper/graphichelper.hxx
index d3507fa..9881200 100644
--- a/oox/inc/oox/helper/graphichelper.hxx
+++ b/oox/inc/oox/helper/graphichelper.hxx
@@ -93,8 +93,6 @@ public:
sal_Int32 convertScreenPixelXToHmm( double fPixelX ) const;
/** Converts the passed value from vertical screen pixels to 1/100 mm. */
sal_Int32 convertScreenPixelYToHmm( double fPixelY ) const;
- /** Converts the passed point from screen pixels to 1/100 mm. */
- ::com::sun::star::awt::Point convertScreenPixelToHmm( const ::com::sun::star::awt::Point& rPixel ) const;
/** Converts the passed size from screen pixels to 1/100 mm. */
::com::sun::star::awt::Size convertScreenPixelToHmm( const ::com::sun::star::awt::Size& rPixel ) const;
diff --git a/oox/source/helper/attributelist.cxx b/oox/source/helper/attributelist.cxx
index 33f4ed5..f1d114d 100644
--- a/oox/source/helper/attributelist.cxx
+++ b/oox/source/helper/attributelist.cxx
@@ -122,16 +122,6 @@ sal_Int32 AttributeConversion::decodeIntegerHex( const OUString& rValue )
return rValue.toInt32( 16 );
}
-sal_uInt32 AttributeConversion::decodeUnsignedHex( const OUString& rValue )
-{
- return getLimitedValue< sal_uInt32, sal_Int64 >( rValue.toInt64( 16 ), 0, SAL_MAX_UINT32 );
-}
-
-sal_Int64 AttributeConversion::decodeHyperHex( const OUString& rValue )
-{
- return rValue.toInt64( 16 );
-}
-
// ============================================================================
AttributeList::AttributeList( const Reference< XFastAttributeList >& rxAttribs ) :
diff --git a/oox/source/helper/containerhelper.cxx b/oox/source/helper/containerhelper.cxx
index 23bad22..a19e9b4 100644
--- a/oox/source/helper/containerhelper.cxx
+++ b/oox/source/helper/containerhelper.cxx
@@ -119,24 +119,6 @@ Reference< XIndexContainer > ContainerHelper::createIndexContainer( const Refere
return xContainer;
}
-bool ContainerHelper::insertByIndex(
- const Reference< XIndexContainer >& rxIndexContainer,
- sal_Int32 nIndex, const Any& rObject )
-{
- OSL_ENSURE( rxIndexContainer.is(), "ContainerHelper::insertByIndex - missing XIndexContainer interface" );
- bool bRet = false;
- try
- {
- rxIndexContainer->insertByIndex( nIndex, rObject );
- bRet = true;
- }
- catch( Exception& )
- {
- }
- OSL_ENSURE( bRet, "ContainerHelper::insertByIndex - cannot insert object" );
- return bRet;
-}
-
Reference< XNameContainer > ContainerHelper::createNameContainer( const Reference< XComponentContext >& rxContext )
{
Reference< XNameContainer > xContainer;
diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx
index ddca88f..66f6313 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -185,11 +185,6 @@ sal_Int32 GraphicHelper::convertScreenPixelYToHmm( double fPixelY ) const
return lclConvertScreenPixelToHmm( fPixelY, mfPixelPerHmmY );
}
-awt::Point GraphicHelper::convertScreenPixelToHmm( const awt::Point& rPixel ) const
-{
- return awt::Point( convertScreenPixelXToHmm( rPixel.X ), convertScreenPixelYToHmm( rPixel.Y ) );
-}
-
awt::Size GraphicHelper::convertScreenPixelToHmm( const awt::Size& rPixel ) const
{
return awt::Size( convertScreenPixelXToHmm( rPixel.Width ), convertScreenPixelYToHmm( rPixel.Height ) );
diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx
index 8182ed9..0fb9801 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -125,7 +125,6 @@ protected:
void WriteAnimationProperty( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Any& rAny );
void WriteAnimationTarget( ::sax_fastparser::FSHelperPtr pFS, ::com::sun::star::uno::Any aTarget );
bool WriteComments( sal_uInt32 nPageNum );
- void WriteTextStyle( ::sax_fastparser::FSHelperPtr pFS, int nInstance, sal_Int32 xmlToken );
void WriteTextStyleLevel( ::sax_fastparser::FSHelperPtr pFS, int nInstance, int nLevel );
void ImplWriteBackground( ::sax_fastparser::FSHelperPtr pFS, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet );
void WriteTransition( ::sax_fastparser::FSHelperPtr pFS );
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index a826634..0ff53d5 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1551,16 +1551,6 @@ void PowerPointExport::WriteTextStyleLevel( FSHelperPtr pFS, int nInstance, int
pFS->endElementNS( XML_a, PowerPointExport::nStyleLevelToken[ nLevel ] );
}
-void PowerPointExport::WriteTextStyle( FSHelperPtr pFS, int nInstance, sal_Int32 xmlToken )
-{
- pFS->startElementNS( XML_p, xmlToken, FSEND );
-
- for( int nLevel = 0; nLevel < 5; nLevel ++ )
- WriteTextStyleLevel( pFS, nInstance, nLevel );
-
- pFS->endElementNS( XML_p, xmlToken );
-}
-
void PowerPointExport::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertySet > aXBackgroundPropSet )
{
DBG(printf("write slide master: %" SAL_PRIuUINT32 "\n----------------\n", nPageNum));
diff --git a/unusedcode.easy b/unusedcode.easy
index 5e63e06..ac7a640 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -888,11 +888,6 @@ nullcanvas::SpriteCanvasHelper::scrollUpdate(basegfx::B2DRange const&, basegfx::
o3tltests::cow_wrapper_client2::queryUnmodified() const
o3tltests::cow_wrapper_client3::queryUnmodified() const
ooo::vba::extractIntFromAny(com::sun::star::uno::Any const&)
-oox::AttributeConversion::decodeHyperHex(rtl::OUString const&)
-oox::AttributeConversion::decodeUnsignedHex(rtl::OUString const&)
-oox::ContainerHelper::insertByIndex(com::sun::star::uno::Reference<com::sun::star::container::XIndexContainer> const&, int, com::sun::star::uno::Any const&)
-oox::GraphicHelper::convertScreenPixelToHmm(com::sun::star::awt::Point const&) const
-oox::core::PowerPointExport::WriteTextStyle(boost::shared_ptr<sax_fastparser::FastSerializerHelper>, int, int)
oox::drawingml::ChartExport::exportDataSeq(com::sun::star::uno::Reference<com::sun::star::chart2::data::XDataSequence> const&, int)
oox::drawingml::ChartExport::exportXAxis(oox::drawingml::AxisIdPair)
oox::drawingml::ChartExport::exportYAxis(oox::drawingml::AxisIdPair)
--
1.7.9
--rwEMma7ioTxnRzrJ--
More information about the LibreOffice
mailing list