diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-05-30 12:47:43 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-05-30 13:00:46 +0200 |
commit | 43a568630fd8cd2ed05584a689624e608160595e (patch) | |
tree | c9e1dddd2e5e12c7deece5db0222f794bc379926 | |
parent | reading from a stream must start at the beginning (diff) | |
download | core-43a568630fd8cd2ed05584a689624e608160595e.tar.gz core-43a568630fd8cd2ed05584a689624e608160595e.zip |
writerfilter: clean up 'using namespace ::rtl'
Most probably this is just a leftover when one had to spell out
rtl::OString and friends, and not using it ensures that rtl::Reference
vs css::uno::Reference is written out.
Change-Id: I13e20e6566a56a93b2a1a3f980c301d3bfc41d89
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 1 | ||||
-rw-r--r-- | writerfilter/source/filter/ImportFilter.cxx | 8 | ||||
-rw-r--r-- | writerfilter/source/filter/WriterFilter.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/filter/WriterFilterDetection.cxx | 4 |
4 files changed, 3 insertions, 14 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 816e85d44065..14330f44f86a 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -77,7 +77,6 @@ #include <filter/msfilter/util.hxx> using namespace ::com::sun::star; -using namespace ::rtl; namespace writerfilter { namespace dmapper{ diff --git a/writerfilter/source/filter/ImportFilter.cxx b/writerfilter/source/filter/ImportFilter.cxx index 2380d1f848ca..765234e341aa 100644 --- a/writerfilter/source/filter/ImportFilter.cxx +++ b/writerfilter/source/filter/ImportFilter.cxx @@ -38,9 +38,7 @@ #include <oox/ole/olestorage.hxx> #include <oox/ole/vbaproject.hxx> #include <oox/helper/graphichelper.hxx> -using namespace ::rtl; using namespace ::com::sun::star; -using utl::MediaDescriptor; @@ -62,7 +60,7 @@ sal_Bool WriterFilter::filter( const uno::Sequence< beans::PropertyValue >& aDes } else if (m_xDstDoc.is()) { - MediaDescriptor aMediaDesc( aDescriptor ); + utl::MediaDescriptor aMediaDesc( aDescriptor ); bool bRepairStorage = aMediaDesc.getUnpackedValueOrDefault( "RepairPackage", false ); uno::Reference< io::XInputStream > xInputStream; @@ -105,7 +103,7 @@ sal_Bool WriterFilter::filter( const uno::Sequence< beans::PropertyValue >& aDes if( eType == writerfilter::dmapper::DOCUMENT_OOXML ) { writerfilter::ooxml::OOXMLStream::Pointer_t pDocStream = writerfilter::ooxml::OOXMLDocumentFactory::createStream(m_xContext, xInputStream, bRepairStorage); - uno::Reference<task::XStatusIndicator> xStatusIndicator = aMediaDesc.getUnpackedValueOrDefault(MediaDescriptor::PROP_STATUSINDICATOR(), uno::Reference<task::XStatusIndicator>()); + uno::Reference<task::XStatusIndicator> xStatusIndicator = aMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_STATUSINDICATOR(), uno::Reference<task::XStatusIndicator>()); writerfilter::ooxml::OOXMLDocument::Pointer_t pDocument(writerfilter::ooxml::OOXMLDocumentFactory::createDocument(pDocStream, xStatusIndicator)); uno::Reference<frame::XModel> xModel(m_xDstDoc, uno::UNO_QUERY_THROW); @@ -163,7 +161,7 @@ sal_Bool WriterFilter::filter( const uno::Sequence< beans::PropertyValue >& aDes if( xVbaPrjStrg.get() && xVbaPrjStrg->isStorage() ) { ::oox::ole::VbaProject aVbaProject( m_xContext, xModel, "Writer" ); - 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 > () ); // if no XFrame try fallback to what we can glean from the Model if ( !xFrame.is() ) diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx index e739453010c7..d600e58c31c5 100644 --- a/writerfilter/source/filter/WriterFilter.cxx +++ b/writerfilter/source/filter/WriterFilter.cxx @@ -22,12 +22,8 @@ #include <WriterFilterDetection.hxx> #include <RtfFilter.hxx> -using namespace ::rtl; -using namespace ::cppu; using namespace ::com::sun::star; - - WriterFilter::WriterFilter( const uno::Reference< uno::XComponentContext >& rxContext) : m_xContext( rxContext ) { diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx b/writerfilter/source/filter/WriterFilterDetection.cxx index b417e8c04b92..7622d22f2400 100644 --- a/writerfilter/source/filter/WriterFilterDetection.cxx +++ b/writerfilter/source/filter/WriterFilterDetection.cxx @@ -25,12 +25,8 @@ #include <sot/storage.hxx> #include <unotools/ucbstreamhelper.hxx> -using namespace ::rtl; -using namespace ::cppu; using namespace ::com::sun::star; - - WriterFilterDetection::WriterFilterDetection( const uno::Reference< uno::XComponentContext >& rxContext) : m_xContext( rxContext ) |