diff options
author | Thorsten Behrens <tbehrens@novell.com> | 2011-03-18 22:54:11 +0100 |
---|---|---|
committer | Thorsten Behrens <tbehrens@novell.com> | 2011-03-18 22:54:53 +0100 |
commit | 48b7ae25d490230ecb4cad6545d40098b81d7992 (patch) | |
tree | 6032ffbfe5be7bbbc2c4821d8824bb626bfd3be6 /oox | |
parent | cc8ca7aa5cd088449607c91790979c0fa7e21b13 (diff) |
Put dump() back into headers in oox
Code was still there in cxx, so put back the method decls
Diffstat (limited to 'oox')
-rw-r--r-- | oox/inc/oox/drawingml/textparagraphproperties.hxx | 4 | ||||
-rw-r--r-- | oox/inc/oox/helper/propertymap.hxx | 7 | ||||
-rw-r--r-- | oox/inc/oox/helper/propertyset.hxx | 6 | ||||
-rw-r--r-- | oox/source/helper/propertymap.cxx | 14 | ||||
-rw-r--r-- | oox/source/helper/propertyset.cxx | 7 |
5 files changed, 34 insertions, 4 deletions
diff --git a/oox/inc/oox/drawingml/textparagraphproperties.hxx b/oox/inc/oox/drawingml/textparagraphproperties.hxx index e037ff2c3726..b2c50964d8f7 100644 --- a/oox/inc/oox/drawingml/textparagraphproperties.hxx +++ b/oox/inc/oox/drawingml/textparagraphproperties.hxx @@ -114,6 +114,10 @@ public: size can be zero and the default value is returned. */ float getCharHeightPoints( float fDefault ) const; +#if OSL_DEBUG_LEVEL > 0 + void dump() const; +#endif + protected: TextCharacterProperties maTextCharacterProperties; diff --git a/oox/inc/oox/helper/propertymap.hxx b/oox/inc/oox/helper/propertymap.hxx index 31d92a14b639..b569b65a82b2 100644 --- a/oox/inc/oox/helper/propertymap.hxx +++ b/oox/inc/oox/helper/propertymap.hxx @@ -91,6 +91,11 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > makePropertySet() const; +#if OSL_DEBUG_LEVEL > 0 + static void dump( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet); + void dump(); +#endif + private: const PropertyNameVector* mpPropNames; }; @@ -101,4 +106,4 @@ private: #endif -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/inc/oox/helper/propertyset.hxx b/oox/inc/oox/helper/propertyset.hxx index 55792a1bfa60..e07709f0ef17 100644 --- a/oox/inc/oox/helper/propertyset.hxx +++ b/oox/inc/oox/helper/propertyset.hxx @@ -129,6 +129,10 @@ public: @param rPropertyMap The property map. */ void setProperties( const PropertyMap& rPropertyMap ); +#if OSL_DEBUG_LEVEL > 0 + void dump(); +#endif + // ------------------------------------------------------------------------ private: /** Gets the specified property from the property set. @@ -166,4 +170,4 @@ inline void PropertySet::setProperty( sal_Int32 nPropId, const Type& rValue ) #endif -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx index e54b02919d4d..ab6f96f05e9a 100644 --- a/oox/source/helper/propertymap.cxx +++ b/oox/source/helper/propertymap.cxx @@ -28,6 +28,16 @@ #include "oox/helper/propertymap.hxx" +#if OSL_DEBUG_LEVEL > 0 +# include <cstdio> +# include <com/sun/star/style/LineSpacing.hpp> +# include <com/sun/star/style/LineSpacingMode.hpp> +# include <com/sun/star/text/WritingMode.hpp> +# define USS(x) OUStringToOString( x, RTL_TEXTENCODING_UTF8 ).getStr() +using ::com::sun::star::style::LineSpacing; +using ::com::sun::star::text::WritingMode; +#endif + #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> @@ -196,7 +206,7 @@ Sequence< PropertyValue > PropertyMap::makePropertyValueSequence() const OSL_ENSURE( (0 <= aIt->first) && (aIt->first < PROP_COUNT), "PropertyMap::makePropertyValueSequence - invalid property identifier" ); pValues->Name = (*mpPropNames)[ aIt->first ]; pValues->Value = aIt->second; - pValues->State = ::com::sun::star::beans::PropertyState_DIRECT_VALUE; + pValues->State = PropertyState_DIRECT_VALUE; } } return aSeq; @@ -323,7 +333,7 @@ static void lclDumpAnyValue( Any value) void PropertyMap::dump( Reference< XPropertySet > rXPropSet ) { Reference< XPropertySetInfo > info = rXPropSet->getPropertySetInfo (); - Sequence< beans::Property > props = info->getProperties (); + Sequence< Property > props = info->getProperties (); OSL_TRACE("dump props, len: %d", props.getLength ()); diff --git a/oox/source/helper/propertyset.cxx b/oox/source/helper/propertyset.cxx index fbb94ccebdd3..18989a047069 100644 --- a/oox/source/helper/propertyset.cxx +++ b/oox/source/helper/propertyset.cxx @@ -173,6 +173,13 @@ void PropertySet::setAnyProperty( const OUString& rPropName, const Any& rValue ) } } +#if OSL_DEBUG_LEVEL > 0 +void PropertySet::dump() +{ + PropertyMap::dump( Reference< XPropertySet >( getXPropertySet(), UNO_QUERY ) ); +} +#endif + // ============================================================================ } // namespace oox |