[Libreoffice-commits] .: writerfilter/source

[Michael Stahl]

 writerfilter/source/filter/RtfFilter.cxx       |    5 ++---
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |    2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 1a6853e422a43c41a50db14a3a3b8cdf9cc7aa1b
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Dec 9 16:42:56 2011 +0100

    writerfilter: fix build breakers

diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx
index b2316fb..0d0e929 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -26,9 +26,8 @@
  *
  ************************************************************************/
 
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_
+#include <rtl/oustringostreaminserter.hxx>
 #include <cppuhelper/implementationentry.hxx>
-#endif
 #include <osl/module.hxx>
 #include <tools/solar.h>
 #include <RtfFilter.hxx>
@@ -101,7 +100,7 @@ sal_Bool RtfFilter::filter( const uno::Sequence< beans::PropertyValue >& aDescri
     }
     catch (const uno::Exception& e)
     {
-        SAL_INFO("writerfilter", "Exception caught: " << e.Message());
+        SAL_INFO("writerfilter", "Exception caught: " << e.Message);
         return sal_False;
     }
 }
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index a60a77b..b29fc5b 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -229,7 +229,6 @@ static writerfilter::Reference<Properties>::Pointer_t lcl_getBookmarkProperties(
     return lcl_getBookmarkProperties(nPos, aStr);
 }
 
-#if OSL_DEBUG_LEVEL > 1
 static const char* lcl_RtfToString(RTFKeyword nKeyword)
 {
     for (int i = 0; i < nRTFControlWords; i++)
@@ -239,7 +238,6 @@ static const char* lcl_RtfToString(RTFKeyword nKeyword)
     }
     return NULL;
 }
-#endif
 
 static util::DateTime lcl_getDateTime(std::stack<RTFParserState>& aStates)
 {