summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2011-12-09 16:42:56 +0100
committerMichael Stahl <mstahl@redhat.com>2011-12-09 16:44:08 +0100
commit1a6853e422a43c41a50db14a3a3b8cdf9cc7aa1b (patch)
tree15a47443ae858e782c803189e3a4b155b7c6e340 /writerfilter
parenta92266c0e5d1eebac39352eace2f7f164132c21d (diff)
writerfilter: fix build breakers
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/filter/RtfFilter.cxx5
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx2
2 files changed, 2 insertions, 5 deletions
diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx
index b2316fbd621d..0d0e929d7979 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 a60a77b36b5b..b29fc5b56871 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)
{