Kaydet (Commit) 2bdac353 authored tarafından Petr Vorel's avatar Petr Vorel Kaydeden (comit) Tor Lillqvist

remove unused code

üst b8550f6a
...@@ -164,10 +164,6 @@ public: ...@@ -164,10 +164,6 @@ public:
template< typename Type > template< typename Type >
void skipArray( sal_Int32 nElemCount ); 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. /** Reads a NUL-terminated Unicode character array and returns the string.
*/ */
::rtl::OUString readNulUnicodeArray(); ::rtl::OUString readNulUnicodeArray();
......
...@@ -56,9 +56,6 @@ public: ...@@ -56,9 +56,6 @@ public:
/** Returns true, if the object with the passed name exists in the container. */ /** Returns true, if the object with the passed name exists in the container. */
bool hasObject( const ::rtl::OUString& rObjName ) const; 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. */ /** Inserts the passed object into the container, returns its final name. */
::rtl::OUString insertObject( ::rtl::OUString insertObject(
const ::rtl::OUString& rObjName, const ::rtl::OUString& rObjName,
......
...@@ -102,7 +102,6 @@ public: ...@@ -102,7 +102,6 @@ public:
#if OSL_DEBUG_LEVEL > 0 #if OSL_DEBUG_LEVEL > 0
#ifdef DBG_UTIL #ifdef DBG_UTIL
static void dump( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet); static void dump( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet);
void dump();
#endif #endif
static void dumpCode( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet); static void dumpCode( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet);
void dumpCode(); void dumpCode();
......
...@@ -50,9 +50,9 @@ class PropertyMap; ...@@ -50,9 +50,9 @@ class PropertyMap;
com.sun.star.beans.XPropertySet interface then). The reference to the 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. 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 The functions setProperties() tries to handle all passed values at once,
values at once, using the com.sun.star.beans.XMultiPropertySet interface. using the com.sun.star.beans.XMultiPropertySet interface. If the
If the implementation does not support the XMultiPropertySet interface, all implementation does not support the XMultiPropertySet interface, all
properties are handled separately in a loop. properties are handled separately in a loop.
*/ */
class PropertySet class PropertySet
...@@ -103,14 +103,6 @@ public: ...@@ -103,14 +103,6 @@ public:
@return true = property contains true; false = property contains false or error occurred. */ @return true = property contains true; false = property contains false or error occurred. */
inline bool getBoolProperty( sal_Int32 nPropId ) const inline bool getBoolProperty( sal_Int32 nPropId ) const
{ bool bValue = false; return getProperty( bValue, nPropId ) && bValue; } { 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 --------------------------------------------------------- // Set properties ---------------------------------------------------------
/** Puts the passed any into the property set. */ /** Puts the passed any into the property set. */
......
...@@ -348,7 +348,6 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi ...@@ -348,7 +348,6 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi
aPropertyMap[ PROP_Handles ] <<= aHandles; aPropertyMap[ PROP_Handles ] <<= aHandles;
#ifdef DEBUG #ifdef DEBUG
//aPropertyMap.dump();
OSL_TRACE("==cscode== begin"); OSL_TRACE("==cscode== begin");
aPropertyMap.dumpCode(); aPropertyMap.dumpCode();
OSL_TRACE("==cscode== end"); OSL_TRACE("==cscode== end");
......
...@@ -57,14 +57,6 @@ const sal_Int32 INPUTSTREAM_BUFFERSIZE = 0x8000; ...@@ -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() OUString BinaryInputStream::readNulUnicodeArray()
{ {
OUStringBuffer aBuffer; OUStringBuffer aBuffer;
......
...@@ -67,19 +67,6 @@ bool ObjectContainer::hasObject( const OUString& rObjName ) const ...@@ -67,19 +67,6 @@ bool ObjectContainer::hasObject( const OUString& rObjName ) const
return mxContainer.is() && mxContainer->hasByName( rObjName ); 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 ) OUString ObjectContainer::insertObject( const OUString& rObjName, const Any& rObj, bool bInsertByUnusedName )
{ {
createContainer(); createContainer();
......
...@@ -450,11 +450,6 @@ void PropertyMap::dump( Reference< XPropertySet > rXPropSet ) ...@@ -450,11 +450,6 @@ void PropertyMap::dump( Reference< XPropertySet > rXPropSet )
} }
} }
} }
void PropertyMap::dump()
{
dump( Reference< XPropertySet >( makePropertySet(), UNO_QUERY ) );
}
#endif #endif
static void printLevel (int level) static void printLevel (int level)
......
...@@ -79,30 +79,6 @@ Any PropertySet::getAnyProperty( sal_Int32 nPropId ) const ...@@ -79,30 +79,6 @@ Any PropertySet::getAnyProperty( sal_Int32 nPropId ) const
return implGetPropertyValue( aValue, PropertyMap::getPropertyName( nPropId ) ) ? aValue : Any(); 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 ------------------------------------------------------------- // Set properties -------------------------------------------------------------
bool PropertySet::setAnyProperty( sal_Int32 nPropId, const Any& rValue ) bool PropertySet::setAnyProperty( sal_Int32 nPropId, const Any& rValue )
......
...@@ -122,11 +122,9 @@ protected: ...@@ -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 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 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 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 WriteAnimationProperty( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Any& rAny );
void WriteAnimationTarget( ::sax_fastparser::FSHelperPtr pFS, ::com::sun::star::uno::Any aTarget ); void WriteAnimationTarget( ::sax_fastparser::FSHelperPtr pFS, ::com::sun::star::uno::Any aTarget );
bool WriteComments( sal_uInt32 nPageNum ); bool WriteComments( sal_uInt32 nPageNum );
void WriteTextStyles( ::sax_fastparser::FSHelperPtr pFS );
void WriteTextStyle( ::sax_fastparser::FSHelperPtr pFS, int nInstance, sal_Int32 xmlToken ); void WriteTextStyle( ::sax_fastparser::FSHelperPtr pFS, int nInstance, sal_Int32 xmlToken );
void WriteTextStyleLevel( ::sax_fastparser::FSHelperPtr pFS, int nInstance, int nLevel ); 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 ImplWriteBackground( ::sax_fastparser::FSHelperPtr pFS, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet );
......
...@@ -1145,11 +1145,6 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons ...@@ -1145,11 +1145,6 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons
pFS->endElementNS( XML_p, XML_cTn ); 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 ) void PowerPointExport::WriteAnimationNodeSeq( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, sal_Int32, sal_Bool bMainSeqChild )
{ {
DBG(printf ("write animation node SEQ\n")); DBG(printf ("write animation node SEQ\n"));
...@@ -1566,17 +1561,6 @@ void PowerPointExport::WriteTextStyle( FSHelperPtr pFS, int nInstance, sal_Int32 ...@@ -1566,17 +1561,6 @@ void PowerPointExport::WriteTextStyle( FSHelperPtr pFS, int nInstance, sal_Int32
pFS->endElementNS( XML_p, xmlToken ); 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 ) void PowerPointExport::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertySet > aXBackgroundPropSet )
{ {
DBG(printf("write slide master: %" SAL_PRIuUINT32 "\n----------------\n", nPageNum)); DBG(printf("write slide master: %" SAL_PRIuUINT32 "\n----------------\n", nPageNum));
......
...@@ -975,14 +975,8 @@ ooo::vba::extractBoolFromAny(com::sun::star::uno::Any const&, bool) ...@@ -975,14 +975,8 @@ ooo::vba::extractBoolFromAny(com::sun::star::uno::Any const&, bool)
ooo::vba::extractIntFromAny(com::sun::star::uno::Any const&, int) ooo::vba::extractIntFromAny(com::sun::star::uno::Any const&, int)
oox::AttributeConversion::decodeHyperHex(rtl::OUString const&) oox::AttributeConversion::decodeHyperHex(rtl::OUString const&)
oox::AttributeConversion::decodeUnsignedHex(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::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::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::core::XmlFilterBase::getChartConverter()
oox::drawingml::ChartExport::exportDataSeq(com::sun::star::uno::Reference<com::sun::star::chart2::data::XDataSequence> const&, 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::exportXAxis(oox::drawingml::AxisIdPair)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment