[Libreoffice-commits] .: oox/inc oox/source

[Thorsten Behrens]

 oox/inc/oox/drawingml/textparagraphproperties.hxx |    4 ++++
 oox/inc/oox/helper/propertymap.hxx                |    6 +++++-
 oox/inc/oox/helper/propertyset.hxx                |    5 ++++-
 oox/source/helper/propertymap.cxx                 |   14 ++++++++++++--
 oox/source/helper/propertyset.cxx                 |    7 +++++++
 5 files changed, 32 insertions(+), 4 deletions(-)

New commits:
commit 10c6f81edcc1706706a93a771d9f0bbeaa69afbc
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Fri Mar 18 22:54:11 2011 +0100

    Put dump() back into headers in oox
    
    Code was still there in cxx, so put back the method decls

diff --git a/oox/inc/oox/drawingml/textparagraphproperties.hxx b/oox/inc/oox/drawingml/textparagraphproperties.hxx
index a662ebe..c0af7c9 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 721037b..806aa96 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 9bdbcfc..f03a941 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 19cf295..b26dd44 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 bb70d15..b80485b 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