[Libreoffice-commits] core.git: filter/source

[Eike Rathke]

 filter/source/graphic/GraphicExportFilter.cxx |   16 +++++++++-------
 filter/source/graphic/GraphicExportFilter.hxx |   26 ++++++++++----------------
 2 files changed, 19 insertions(+), 23 deletions(-)

New commits:
commit 9faffc71a077349ddbabb52361188159f1ece31a
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Sep 22 16:50:59 2017 +0200

    No using namespace in header file
    
    And using namespace css is sufficient, it's actually good to see some
    namespace..
    
    Change-Id: I8cd3418e04769bb2fd1c632d6d671b368aae06b3
    Reviewed-on: https://gerrit.libreoffice.org/42665
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/filter/source/graphic/GraphicExportFilter.cxx b/filter/source/graphic/GraphicExportFilter.cxx
index 882e53f0cabd..c25bda1b84c5 100644
--- a/filter/source/graphic/GraphicExportFilter.cxx
+++ b/filter/source/graphic/GraphicExportFilter.cxx
@@ -25,7 +25,9 @@
 #include <svl/outstrm.hxx>
 #include <svtools/DocumentToGraphicRenderer.hxx>
 
-GraphicExportFilter::GraphicExportFilter( const Reference<XComponentContext>& rxContext  )
+using namespace css;
+
+GraphicExportFilter::GraphicExportFilter( const uno::Reference< uno::XComponentContext > & rxContext  )
     : mxContext(rxContext)
     , mTargetWidth(0)
     , mTargetHeight(0)
@@ -35,13 +37,13 @@ GraphicExportFilter::GraphicExportFilter( const Reference<XComponentContext>& rx
 GraphicExportFilter::~GraphicExportFilter()
 {}
 
-void GraphicExportFilter::gatherProperties( const Sequence<PropertyValue>& rProperties )
+void GraphicExportFilter::gatherProperties( const uno::Sequence< beans::PropertyValue > & rProperties )
 {
     OUString aInternalFilterName;
 
     for ( sal_Int32 i = 0; i < rProperties.getLength(); i++ )
     {
-        PropertyValue aProperty = rProperties[i];
+        beans::PropertyValue aProperty = rProperties[i];
 
         if ( aProperty.Name == "FilterName" )
         {
@@ -113,7 +115,7 @@ void GraphicExportFilter::gatherProperties( const Sequence<PropertyValue>& rProp
     }
 }
 
-sal_Bool SAL_CALL GraphicExportFilter::filter( const Sequence<PropertyValue>& rDescriptor )
+sal_Bool SAL_CALL GraphicExportFilter::filter( const uno::Sequence< beans::PropertyValue > & rDescriptor )
 {
     gatherProperties(rDescriptor);
 
@@ -151,7 +153,7 @@ bool GraphicExportFilter::filterRenderDocument() const
 
     GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
 
-    Sequence< PropertyValue > aFilterData( mFilterDataSequence );
+    uno::Sequence< beans::PropertyValue > aFilterData( mFilterDataSequence );
     sal_Int32 nAdd = 0;
     if (!maCompression.hasValue())
         ++nAdd;
@@ -249,12 +251,12 @@ void SAL_CALL GraphicExportFilter::cancel( )
 {
 }
 
-void SAL_CALL GraphicExportFilter::setSourceDocument( const Reference<XComponent>& xDocument )
+void SAL_CALL GraphicExportFilter::setSourceDocument( const uno::Reference< lang::XComponent > & xDocument )
 {
     mxDocument = xDocument;
 }
 
-void SAL_CALL GraphicExportFilter::initialize( const Sequence<Any>& )
+void SAL_CALL GraphicExportFilter::initialize( const uno::Sequence< uno::Any > & )
 {
 }
 
diff --git a/filter/source/graphic/GraphicExportFilter.hxx b/filter/source/graphic/GraphicExportFilter.hxx
index 697592b82286..707f7c30b07b 100644
--- a/filter/source/graphic/GraphicExportFilter.hxx
+++ b/filter/source/graphic/GraphicExportFilter.hxx
@@ -35,24 +35,18 @@ namespace com { namespace sun { namespace star {
     }
 }}}
 
-using namespace css;
-using namespace css::uno;
-using namespace css::lang;
-using namespace css::beans;
-using namespace css::document;
-
 class GraphicExportFilter :
-    public cppu::WeakImplHelper < XFilter, XExporter, XInitialization >
+    public cppu::WeakImplHelper < css::document::XFilter, css::document::XExporter, css::lang::XInitialization >
 {
-    Reference<XComponentContext>        mxContext;
-    Reference<XComponent>               mxDocument;
-    Reference<io::XOutputStream>        mxOutputStream;
+    css::uno::Reference< css::uno::XComponentContext >  mxContext;
+    css::uno::Reference< css::lang::XComponent >        mxDocument;
+    css::uno::Reference< css::io::XOutputStream >       mxOutputStream;
 
-    void gatherProperties( const Sequence<PropertyValue>& rDescriptor );
+    void gatherProperties( const css::uno::Sequence< css::beans::PropertyValue > & rDescriptor );
 
     OUString    mFilterExtension;
 
-    Sequence<PropertyValue> mFilterDataSequence;
+    css::uno::Sequence< css::beans::PropertyValue > mFilterDataSequence;
 
     sal_Int32 mTargetWidth;
     sal_Int32 mTargetHeight;
@@ -70,18 +64,18 @@ class GraphicExportFilter :
             const css::uno::Reference< css::drawing::XShape > & rxShape ) const;
 
 public:
-    explicit GraphicExportFilter( const Reference<XComponentContext>& rxContext );
+    explicit GraphicExportFilter( const css::uno::Reference< css::uno::XComponentContext > & rxContext );
     virtual ~GraphicExportFilter() override;
 
     // XFilter
-    virtual sal_Bool SAL_CALL filter( const Sequence<PropertyValue>& rDescriptor ) override;
+    virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue > & rDescriptor ) override;
     virtual void SAL_CALL cancel( ) override;
 
     // XExporter
-    virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDocument ) override;
+    virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent > & xDocument ) override;
 
     // XInitialization
-    virtual void SAL_CALL initialize( const Sequence<Any>& aArguments ) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any > & rArguments ) override;
 };
 
 #endif