writerfilter: whitespace fixes in RtfFilter

Change-Id: Ic275ce70318d56010d40e483b299c8b1b13bf902

1 files changed, 44 insertions, 51 deletions

diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx
index 75f783a409d8..6fdd827b9c4b 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -36,13 +36,10 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/streamwrap.hxx>
 
-using namespace ::rtl;
-using namespace ::cppu;
 using namespace ::com::sun::star;
-using utl::MediaDescriptor;
 
-RtfFilter::RtfFilter( const uno::Reference< uno::XComponentContext >& rxContext)  :
-    m_xContext( rxContext )
+RtfFilter::RtfFilter(const uno::Reference< uno::XComponentContext >& rxContext)
+    : m_xContext(rxContext)
 {
 }
 
@@ -50,22 +47,21 @@ RtfFilter::~RtfFilter()
 {
 }
 
-sal_Bool RtfFilter::filter( const uno::Sequence< beans::PropertyValue >& aDescriptor )
-   throw (uno::RuntimeException)
+sal_Bool RtfFilter::filter(const uno::Sequence< beans::PropertyValue >& aDescriptor) throw(uno::RuntimeException)
 {
     sal_uInt32 nStartTime = osl_getGlobalTimer();
-    if( m_xSrcDoc.is() )
+    if (m_xSrcDoc.is())
     {
         uno::Reference< lang::XMultiServiceFactory > xMSF(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW);
-        uno::Reference< uno::XInterface > xIfc( xMSF->createInstance("com.sun.star.comp.Writer.RtfExport"), uno::UNO_QUERY_THROW);
+        uno::Reference< uno::XInterface > xIfc(xMSF->createInstance("com.sun.star.comp.Writer.RtfExport"), uno::UNO_QUERY_THROW);
         if (!xIfc.is())
             return sal_False;
-        uno::Reference< document::XExporter > xExprtr(xIfc, uno::UNO_QUERY_THROW);
-        uno::Reference< document::XFilter > xFltr(xIfc, uno::UNO_QUERY_THROW);
-        if (!xExprtr.is() || !xFltr.is())
+        uno::Reference< document::XExporter > xExporter(xIfc, uno::UNO_QUERY_THROW);
+        uno::Reference< document::XFilter > xFilter(xIfc, uno::UNO_QUERY_THROW);
+        if (!xExporter.is() || !xFilter.is())
             return sal_False;
-        xExprtr->setSourceDocument(m_xSrcDoc);
-        return xFltr->filter(aDescriptor);
+        xExporter->setSourceDocument(m_xSrcDoc);
+        return xFilter->filter(aDescriptor);
     }
 
     sal_Bool bResult(sal_False);
@@ -73,23 +69,23 @@ sal_Bool RtfFilter::filter( const uno::Sequence< beans::PropertyValue >& aDescri
 
     try
     {
-        MediaDescriptor aMediaDesc( aDescriptor );
-        bool bRepairStorage = aMediaDesc.getUnpackedValueOrDefault( "RepairPackage", false );
+        utl::MediaDescriptor aMediaDesc(aDescriptor);
+        bool bRepairStorage = aMediaDesc.getUnpackedValueOrDefault("RepairPackage", false);
         bool bIsNewDoc = !aMediaDesc.getUnpackedValueOrDefault("InsertMode", false);
-        uno::Reference<text::XTextRange> xInsertTextRange = aMediaDesc.getUnpackedValueOrDefault( "TextInsertModeRange", uno::Reference<text::XTextRange>());
+        uno::Reference<text::XTextRange> xInsertTextRange = aMediaDesc.getUnpackedValueOrDefault("TextInsertModeRange", uno::Reference<text::XTextRange>());
 #ifdef DEBUG_IMPORT
-        OUString sURL = aMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_URL(), OUString() );
-        ::std::string sURLc = OUStringToOString(sURL, RTL_TEXTENCODING_ASCII_US).getStr();
+        OUString sURL = aMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_URL(), OUString());
+        std::string sURLc = OUStringToOString(sURL, RTL_TEXTENCODING_ASCII_US).getStr();
 
         writerfilter::TagLogger::Pointer_t dmapperLogger
-            (writerfilter::TagLogger::getInstance("DOMAINMAPPER"));
+        (writerfilter::TagLogger::getInstance("DOMAINMAPPER"));
         dmapperLogger->setFileName(sURLc);
         dmapperLogger->startDocument();
 #endif
         uno::Reference< io::XInputStream > xInputStream;
 
         aMediaDesc.addInputStream();
-        aMediaDesc[ MediaDescriptor::PROP_INPUTSTREAM() ] >>= xInputStream;
+        aMediaDesc[ utl::MediaDescriptor::PROP_INPUTSTREAM() ] >>= xInputStream;
 
         // If this is set, write to this file, instead of the real document during paste.
         char* pEnv = getenv("SW_DEBUG_RTF_PASTE_TO");
@@ -98,7 +94,7 @@ sal_Bool RtfFilter::filter( const uno::Sequence< beans::PropertyValue >& aDescri
         {
             SvStream* pOut = utl::UcbStreamHelper::CreateStream(aOutStr, STREAM_WRITE);
             SvStream* pIn = utl::UcbStreamHelper::CreateStream(xInputStream);
-            pOut->WriteStream( *pIn );
+            pOut->WriteStream(*pIn);
             delete pOut;
             return true;
         }
@@ -114,16 +110,16 @@ sal_Bool RtfFilter::filter( const uno::Sequence< beans::PropertyValue >& aDescri
             xInputStream.set(xStream, uno::UNO_QUERY);
         }
 
-        uno::Reference<frame::XFrame> xFrame = aMediaDesc.getUnpackedValueOrDefault(MediaDescriptor::PROP_FRAME(),
-                uno::Reference<frame::XFrame>());
+        uno::Reference<frame::XFrame> xFrame = aMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_FRAME(),
+                                               uno::Reference<frame::XFrame>());
 
-        xStatusIndicator = aMediaDesc.getUnpackedValueOrDefault(MediaDescriptor::PROP_STATUSINDICATOR(),
-                uno::Reference<task::XStatusIndicator>());
+        xStatusIndicator = aMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_STATUSINDICATOR(),
+                           uno::Reference<task::XStatusIndicator>());
 
         writerfilter::Stream::Pointer_t pStream(
-                new writerfilter::dmapper::DomainMapper(m_xContext, xInputStream, m_xDstDoc, bRepairStorage, writerfilter::dmapper::DOCUMENT_RTF, xInsertTextRange, bIsNewDoc));
+            new writerfilter::dmapper::DomainMapper(m_xContext, xInputStream, m_xDstDoc, bRepairStorage, writerfilter::dmapper::DOCUMENT_RTF, xInsertTextRange, bIsNewDoc));
         writerfilter::rtftok::RTFDocument::Pointer_t const pDocument(
-                writerfilter::rtftok::RTFDocumentFactory::createDocument(m_xContext, xInputStream, m_xDstDoc, xFrame, xStatusIndicator));
+            writerfilter::rtftok::RTFDocumentFactory::createDocument(m_xContext, xInputStream, m_xDstDoc, xFrame, xStatusIndicator));
         pDocument->resolve(*pStream);
         bResult = sal_True;
 #ifdef DEBUG_IMPORT
@@ -148,62 +144,59 @@ sal_Bool RtfFilter::filter( const uno::Sequence< beans::PropertyValue >& aDescri
     return bResult;
 }
 
-void RtfFilter::cancel(  ) throw (uno::RuntimeException)
+void RtfFilter::cancel() throw(uno::RuntimeException)
 {
 }
 
-void RtfFilter::setSourceDocument( const uno::Reference< lang::XComponent >& xDoc )
-   throw (lang::IllegalArgumentException, uno::RuntimeException)
+void RtfFilter::setSourceDocument(const uno::Reference< lang::XComponent >& xDoc) throw(lang::IllegalArgumentException, uno::RuntimeException)
 {
-   m_xSrcDoc = xDoc;
+    m_xSrcDoc = xDoc;
 }
 
-void RtfFilter::setTargetDocument( const uno::Reference< lang::XComponent >& xDoc )
-   throw (lang::IllegalArgumentException, uno::RuntimeException)
+void RtfFilter::setTargetDocument(const uno::Reference< lang::XComponent >& xDoc) throw(lang::IllegalArgumentException, uno::RuntimeException)
 {
-   m_xDstDoc = xDoc;
+    m_xDstDoc = xDoc;
 }
 
-void RtfFilter::initialize( const uno::Sequence< uno::Any >& /*aArguments*/ ) throw (uno::Exception, uno::RuntimeException)
+void RtfFilter::initialize(const uno::Sequence< uno::Any >& /*aArguments*/) throw(uno::Exception, uno::RuntimeException)
 {
     // The DOCX exporter here extracts 'type' of the filter, ie 'Word' or
     // 'Word Template' but we don't need it for RTF.
 }
 
-OUString RtfFilter::getImplementationName(  ) throw (uno::RuntimeException)
+OUString RtfFilter::getImplementationName() throw(uno::RuntimeException)
 {
-   return RtfFilter_getImplementationName();
+    return RtfFilter_getImplementationName();
 }
 
-sal_Bool RtfFilter::supportsService( const OUString& rServiceName ) throw (uno::RuntimeException)
+sal_Bool RtfFilter::supportsService(const OUString& rServiceName) throw(uno::RuntimeException)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-uno::Sequence< OUString > RtfFilter::getSupportedServiceNames(  ) throw (uno::RuntimeException)
+uno::Sequence< OUString > RtfFilter::getSupportedServiceNames() throw(uno::RuntimeException)
 {
     return RtfFilter_getSupportedServiceNames();
 }
 
 /* Helpers, used by shared lib exports. */
-OUString RtfFilter_getImplementationName () throw (uno::RuntimeException)
+OUString RtfFilter_getImplementationName() throw(uno::RuntimeException)
 {
-   return OUString ( "com.sun.star.comp.Writer.RtfFilter" );
+    return OUString("com.sun.star.comp.Writer.RtfFilter");
 }
 
-uno::Sequence< OUString > RtfFilter_getSupportedServiceNames(  ) throw (uno::RuntimeException)
+uno::Sequence< OUString > RtfFilter_getSupportedServiceNames() throw(uno::RuntimeException)
 {
-   uno::Sequence < OUString > aRet(2);
-   OUString* pArray = aRet.getArray();
-   pArray[0] = "com.sun.star.document.ImportFilter";
-   pArray[1] = "com.sun.star.document.ExportFilter";
-   return aRet;
+    uno::Sequence < OUString > aRet(2);
+    OUString* pArray = aRet.getArray();
+    pArray[0] = "com.sun.star.document.ImportFilter";
+    pArray[1] = "com.sun.star.document.ExportFilter";
+    return aRet;
 }
 
-uno::Reference< uno::XInterface > RtfFilter_createInstance( const uno::Reference< uno::XComponentContext >& xContext)
-                throw( uno::Exception )
+uno::Reference< uno::XInterface > RtfFilter_createInstance(const uno::Reference< uno::XComponentContext >& xContext) throw(uno::Exception)
 {
-   return (cppu::OWeakObject*) new RtfFilter( xContext );
+    return (cppu::OWeakObject*) new RtfFilter(xContext);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */