[Libreoffice-commits] .: writerfilter/source

[Cédric Bosdonnat]

 writerfilter/source/filter/RtfFilter.cxx       |    6 +-----
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   10 ----------
 2 files changed, 1 insertion(+), 15 deletions(-)

New commits:
commit 2075a648aced631422eede159d35e2e7804334ca
Author: Cédric Bosdonnat <cedric.bosdonnat at free.fr>
Date:   Fri Dec 9 15:13:07 2011 +0100

    Removed useless code due to the move to SAL_INFO

diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx
index 80fba44..b2316fb 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -101,11 +101,7 @@ sal_Bool RtfFilter::filter( const uno::Sequence< beans::PropertyValue >& aDescri
     }
     catch (const uno::Exception& e)
     {
-#if OSL_DEBUG_LEVEL > 1
-        SAL_INFO("writerfilter", "Exception caught: " <<
-                rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
-#endif
-        (void)e;
+        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 06f0580..a60a77b 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1226,9 +1226,7 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
             m_aStates.top().nDestinationState = DESTINATION_SKIP;
             break;
         default:
-#if OSL_DEBUG_LEVEL > 1
             SAL_INFO("writerfilter", OSL_THIS_FUNC << ": TODO handle destination '" << lcl_RtfToString(nKeyword) << "'");
-#endif
             // Make sure we skip destinations (even without \*) till we don't handle them
             m_aStates.top().nDestinationState = DESTINATION_SKIP;
             aSkip.setParsed(false);
@@ -1411,9 +1409,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
             // Nothing to do, dmapper assumes this is the default.
             break;
         default:
-#if OSL_DEBUG_LEVEL > 1
             SAL_INFO("writerfilter", OSL_THIS_FUNC << ": TODO handle symbol '" << lcl_RtfToString(nKeyword) << "'");
-#endif
             aSkip.setParsed(false);
             break;
     }
@@ -1869,9 +1865,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
         case RTF_POSXL: m_aStates.top().aFrame.nHoriAlign = NS_ooxml::LN_Value_wordprocessingml_ST_XAlign_left; break;
         case RTF_POSXR: m_aStates.top().aFrame.nHoriAlign = NS_ooxml::LN_Value_wordprocessingml_ST_XAlign_right; break;
         default:
-#if OSL_DEBUG_LEVEL > 1
             SAL_INFO("writerfilter", OSL_THIS_FUNC << ": TODO handle flag '" << lcl_RtfToString(nKeyword) << "'");
-#endif
             aSkip.setParsed(false);
             break;
     }
@@ -2514,9 +2508,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
             m_aStates.top().aPicture.eWMetafile = nParam;
             break;
         default:
-#if OSL_DEBUG_LEVEL > 1
             SAL_INFO("writerfilter", OSL_THIS_FUNC << ": TODO handle value '" << lcl_RtfToString(nKeyword) << "'");
-#endif
             aSkip.setParsed(false);
             break;
     }
@@ -2613,9 +2605,7 @@ int RTFDocumentImpl::dispatchToggle(RTFKeyword nKeyword, bool bParam, int nParam
             }
             break;
         default:
-#if OSL_DEBUG_LEVEL > 1
             SAL_INFO("writerfilter", OSL_THIS_FUNC << ": TODO handle toggle '" << lcl_RtfToString(nKeyword) << "'");
-#endif
             aSkip.setParsed(false);
             break;
     }