From 2bdac353ce7e28611b546bcc8a5ea236c891f944 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Sat, 3 Mar 2012 02:16:31 +0100 Subject: 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 ------------------------ 9 files changed, 3 insertions(+), 70 deletions(-) (limited to 'oox') diff --git a/oox/inc/oox/helper/binaryinputstream.hxx b/oox/inc/oox/helper/binaryinputstream.hxx index 5add5f413afc..6e952a2b6436 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 86459ecb7386..10131def9668 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 2696d4980ea1..dabd2e470cbf 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 fd0c1a7a1fcd..14ca79bfc63d 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 ab99e82f016e..29844b8f173d 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 21229ae686f6..0a0b51c3d6f2 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 f0c31f900f75..951f2d0e0683 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 6b3a2d4a8769..99ca67a43c92 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 e9733185792c..8585a439d532 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 ) -- cgit