Another unused code removed.
From 226fccc7f2fd022ed9d329ac9c6bb373fbeff265 Mon Sep 17 00:00:00 2001
From: Petr Vorel <petr.vorel@gmail.com>
Date: Sat, 3 Mar 2012 02:16:31 +0100
Subject: [PATCH] remove unused code
---
oox/inc/oox/helper/binaryinputstream.hxx | 4 ----
oox/inc/oox/helper/modelobjecthelper.hxx | 3 ---
oox/inc/oox/helper/propertymap.hxx | 1 -
oox/inc/oox/helper/propertyset.hxx | 14 +++-----------
oox/source/drawingml/customshapeproperties.cxx | 1 -
oox/source/helper/binaryinputstream.cxx | 8 --------
oox/source/helper/modelobjecthelper.cxx | 13 -------------
oox/source/helper/propertymap.cxx | 5 -----
oox/source/helper/propertyset.cxx | 24 ------------------------
sd/source/filter/eppt/epptooxml.hxx | 2 --
sd/source/filter/eppt/pptx-epptooxml.cxx | 16 ----------------
unusedcode.easy | 6 ------
12 files changed, 3 insertions(+), 94 deletions(-)
diff --git a/oox/inc/oox/helper/binaryinputstream.hxx b/oox/inc/oox/helper/binaryinputstream.hxx
index 5add5f4..6e952a2 100644
--- a/oox/inc/oox/helper/binaryinputstream.hxx
+++ b/oox/inc/oox/helper/binaryinputstream.hxx
@@ -164,10 +164,6 @@ public:
template< typename Type >
void skipArray( sal_Int32 nElemCount );
- /** Reads a NUL-terminated byte character array and returns the string.
- */
- ::rtl::OString readNulCharArray();
-
/** Reads a NUL-terminated Unicode character array and returns the string.
*/
::rtl::OUString readNulUnicodeArray();
diff --git a/oox/inc/oox/helper/modelobjecthelper.hxx b/oox/inc/oox/helper/modelobjecthelper.hxx
index 86459ec..10131de 100644
--- a/oox/inc/oox/helper/modelobjecthelper.hxx
+++ b/oox/inc/oox/helper/modelobjecthelper.hxx
@@ -56,9 +56,6 @@ public:
/** Returns true, if the object with the passed name exists in the container. */
bool hasObject( const ::rtl::OUString& rObjName ) const;
- /** Returns the object with the passed name from the container. */
- ::com::sun::star::uno::Any getObject( const ::rtl::OUString& rObjName ) const;
-
/** Inserts the passed object into the container, returns its final name. */
::rtl::OUString insertObject(
const ::rtl::OUString& rObjName,
diff --git a/oox/inc/oox/helper/propertymap.hxx b/oox/inc/oox/helper/propertymap.hxx
index 2696d49..dabd2e4 100644
--- a/oox/inc/oox/helper/propertymap.hxx
+++ b/oox/inc/oox/helper/propertymap.hxx
@@ -102,7 +102,6 @@ public:
#if OSL_DEBUG_LEVEL > 0
#ifdef DBG_UTIL
static void dump( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
rXPropSet);
- void dump();
#endif
static void dumpCode( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
rXPropSet);
void dumpCode();
diff --git a/oox/inc/oox/helper/propertyset.hxx b/oox/inc/oox/helper/propertyset.hxx
index fd0c1a7..14ca79b 100644
--- a/oox/inc/oox/helper/propertyset.hxx
+++ b/oox/inc/oox/helper/propertyset.hxx
@@ -50,9 +50,9 @@ class PropertyMap;
com.sun.star.beans.XPropertySet interface then). The reference to the
property set will be kept as long as the instance of this class is alive.
- The functions getProperties() and setProperties() try to handle all passed
- values at once, using the com.sun.star.beans.XMultiPropertySet interface.
- If the implementation does not support the XMultiPropertySet interface, all
+ The functions setProperties() tries to handle all passed values at once,
+ using the com.sun.star.beans.XMultiPropertySet interface. If the
+ implementation does not support the XMultiPropertySet interface, all
properties are handled separately in a loop.
*/
class PropertySet
@@ -103,14 +103,6 @@ public:
@return true = property contains true; false = property contains false or error occurred.
*/
inline bool getBoolProperty( sal_Int32 nPropId ) const
{ bool bValue = false; return getProperty( bValue, nPropId ) &&
bValue; }
-
- /** Gets the specified properties from the property set. Tries to use the XMultiPropertySet
interface.
- @param orValues (out-parameter) The related property values.
- @param rPropNames The property names. MUST be ordered alphabetically. */
- void getProperties(
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >&
orValues,
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rPropNames )
const;
-
// Set properties ---------------------------------------------------------
/** Puts the passed any into the property set. */
diff --git a/oox/source/drawingml/customshapeproperties.cxx
b/oox/source/drawingml/customshapeproperties.cxx
index ab99e82..29844b8 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -348,7 +348,6 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi
aPropertyMap[ PROP_Handles ] <<= aHandles;
#ifdef DEBUG
- //aPropertyMap.dump();
OSL_TRACE("==cscode== begin");
aPropertyMap.dumpCode();
OSL_TRACE("==cscode== end");
diff --git a/oox/source/helper/binaryinputstream.cxx b/oox/source/helper/binaryinputstream.cxx
index 21229ae..0a0b51c 100644
--- a/oox/source/helper/binaryinputstream.cxx
+++ b/oox/source/helper/binaryinputstream.cxx
@@ -57,14 +57,6 @@ const sal_Int32 INPUTSTREAM_BUFFERSIZE = 0x8000;
// ============================================================================
-OString BinaryInputStream::readNulCharArray()
-{
- OStringBuffer aBuffer;
- for( sal_uInt8 nChar = readuInt8(); !mbEof && (nChar > 0); readValue( nChar ) )
- aBuffer.append( static_cast< sal_Char >( nChar ) );
- return aBuffer.makeStringAndClear();
-}
-
OUString BinaryInputStream::readNulUnicodeArray()
{
OUStringBuffer aBuffer;
diff --git a/oox/source/helper/modelobjecthelper.cxx b/oox/source/helper/modelobjecthelper.cxx
index f0c31f9..951f2d0 100644
--- a/oox/source/helper/modelobjecthelper.cxx
+++ b/oox/source/helper/modelobjecthelper.cxx
@@ -67,19 +67,6 @@ bool ObjectContainer::hasObject( const OUString& rObjName ) const
return mxContainer.is() && mxContainer->hasByName( rObjName );
}
-Any ObjectContainer::getObject( const OUString& rObjName ) const
-{
- createContainer();
- if( mxContainer.is() ) try
- {
- return mxContainer->getByName( rObjName );
- }
- catch( Exception& )
- {
- }
- return Any();
-}
-
OUString ObjectContainer::insertObject( const OUString& rObjName, const Any& rObj, bool
bInsertByUnusedName )
{
createContainer();
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index 6b3a2d4..99ca67a 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -450,11 +450,6 @@ void PropertyMap::dump( Reference< XPropertySet > rXPropSet )
}
}
}
-
-void PropertyMap::dump()
-{
- dump( Reference< XPropertySet >( makePropertySet(), UNO_QUERY ) );
-}
#endif
static void printLevel (int level)
diff --git a/oox/source/helper/propertyset.cxx b/oox/source/helper/propertyset.cxx
index e973318..8585a43 100644
--- a/oox/source/helper/propertyset.cxx
+++ b/oox/source/helper/propertyset.cxx
@@ -79,30 +79,6 @@ Any PropertySet::getAnyProperty( sal_Int32 nPropId ) const
return implGetPropertyValue( aValue, PropertyMap::getPropertyName( nPropId ) ) ? aValue :
Any();
}
-void PropertySet::getProperties( Sequence< Any >& orValues, const Sequence< OUString >& rPropNames
) const
-{
- if( mxMultiPropSet.is() ) try
- {
- orValues = mxMultiPropSet->getPropertyValues( rPropNames );
- return;
- }
- catch( Exception& )
- {
- OSL_FAIL( "PropertySet::getProperties - cannot get all property values - fallback to
single mode" );
- }
-
- if( mxPropSet.is() )
- {
- sal_Int32 nLen = rPropNames.getLength();
- const OUString* pPropName = rPropNames.getConstArray();
- const OUString* pPropNameEnd = pPropName + nLen;
- orValues.realloc( nLen );
- Any* pValue = orValues.getArray();
- for( ; pPropName != pPropNameEnd; ++pPropName, ++pValue )
- implGetPropertyValue( *pValue, *pPropName );
- }
-}
-
// Set properties -------------------------------------------------------------
bool PropertySet::setAnyProperty( sal_Int32 nPropId, const Any& rValue )
diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx
index 685c22a..8182ed9 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -122,11 +122,9 @@ protected:
void WriteAnimationNodeSeq( ::sax_fastparser::FSHelperPtr pFS, const
::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Int32
nXmlNodeType, sal_Bool bMainSeqChild );
void WriteAnimationNodeEffect( ::sax_fastparser::FSHelperPtr pFS, const
::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Int32
nXmlNodeType, sal_Bool bMainSeqChild );
void WriteAnimationNodeCommonPropsStart( ::sax_fastparser::FSHelperPtr pFS, const
::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Bool
bSingle, sal_Bool bMainSeqChild );
- void WriteAnimationNodeCommonPropsEnd( ::sax_fastparser::FSHelperPtr pFS );
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 WriteTextStyles( ::sax_fastparser::FSHelperPtr pFS );
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 );
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 1c11a69..a826634 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1145,11 +1145,6 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS,
cons
pFS->endElementNS( XML_p, XML_cTn );
}
-void PowerPointExport::WriteAnimationNodeCommonPropsEnd( FSHelperPtr pFS )
-{
- pFS->endElementNS( XML_p, XML_cTn );
-}
-
void PowerPointExport::WriteAnimationNodeSeq( FSHelperPtr pFS, const Reference< XAnimationNode >&
rXNode, sal_Int32, sal_Bool bMainSeqChild )
{
DBG(printf ("write animation node SEQ\n"));
@@ -1566,17 +1561,6 @@ void PowerPointExport::WriteTextStyle( FSHelperPtr pFS, int nInstance,
sal_Int32
pFS->endElementNS( XML_p, xmlToken );
}
-void PowerPointExport::WriteTextStyles( FSHelperPtr pFS )
-{
- pFS->startElementNS( XML_p, XML_txBody, FSEND );
-
- WriteTextStyle( pFS, EPP_TEXTTYPE_Title, XML_titleStyle );
- WriteTextStyle( pFS, EPP_TEXTTYPE_Body, XML_bodyStyle );
- WriteTextStyle( pFS, EPP_TEXTTYPE_Other, XML_otherStyle );
-
- pFS->endElementNS( XML_p, XML_txBody );
-}
-
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 8a5a54a..b679f63 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -979,14 +979,8 @@ ooo::vba::extractBoolFromAny(com::sun::star::uno::Any const&, bool)
ooo::vba::extractIntFromAny(com::sun::star::uno::Any const&, int)
oox::AttributeConversion::decodeHyperHex(rtl::OUString const&)
oox::AttributeConversion::decodeUnsignedHex(rtl::OUString const&)
-oox::BinaryInputStream::readNulCharArray()
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::ObjectContainer::getObject(rtl::OUString const&) const
-oox::PropertyMap::dump()
-oox::PropertySet::getProperties(com::sun::star::uno::Sequence<com::sun::star::uno::Any>&,
com::sun::star::uno::Sequence<rtl::OUString> const&) const
-oox::core::PowerPointExport::WriteAnimationNodeCommonPropsEnd(boost::shared_ptr<sax_fastparser::FastSerializerHelper>)
-oox::core::PowerPointExport::WriteTextStyles(boost::shared_ptr<sax_fastparser::FastSerializerHelper>)
oox::core::XmlFilterBase::getChartConverter()
oox::drawingml::ChartExport::exportDataSeq(com::sun::star::uno::Reference<com::sun::star::chart2::data::XDataSequence>
const&, int)
oox::drawingml::ChartExport::exportXAxis(oox::drawingml::AxisIdPair)
--
1.7.9.1
Context
- [PATCH] remove unused code · Petr Vorel
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.