com::sun::star->css in fpicker/

Change-Id: I211687bfeaf456e0f9639567bff401083011cd74
Reviewed-on: https://gerrit.libreoffice.org/19353
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

20 files changed, 193 insertions, 196 deletions

diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx
index 63cde88c4b4d..79a9fe5a6ac3 100644
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -263,7 +263,7 @@ namespace svt
     }
 
 
-    void OControlAccess::setControlProperty( const OUString& _rControlName, const OUString& _rControlProperty, const ::com::sun::star::uno::Any& _rValue )
+    void OControlAccess::setControlProperty( const OUString& _rControlName, const OUString& _rControlProperty, const css::uno::Any& _rValue )
     {
         // look up the control
         sal_Int16 nControlId = -1;
diff --git a/fpicker/source/office/OfficeControlAccess.hxx b/fpicker/source/office/OfficeControlAccess.hxx
index 36373af4d8ab..3355e42c3dbc 100644
--- a/fpicker/source/office/OfficeControlAccess.hxx
+++ b/fpicker/source/office/OfficeControlAccess.hxx
@@ -52,20 +52,20 @@ namespace svt
         OControlAccess( IFilePickerController* _pController, SvtFileView* _pFileView );
 
         // XControlAccess implementation
-        void setControlProperty( const OUString& _rControlName, const OUString& _rControlProperty, const ::com::sun::star::uno::Any& _rValue );
-        ::com::sun::star::uno::Any  getControlProperty( const OUString& _rControlName, const OUString& _rControlProperty );
+        void setControlProperty( const OUString& _rControlName, const OUString& _rControlProperty, const css::uno::Any& _rValue );
+        css::uno::Any  getControlProperty( const OUString& _rControlName, const OUString& _rControlProperty );
 
         // XControlInformation implementation
-        ::com::sun::star::uno::Sequence< OUString >  getSupportedControls(  );
-        ::com::sun::star::uno::Sequence< OUString >  getSupportedControlProperties( const OUString& _rControlName );
-        static bool                                  isControlSupported( const OUString& _rControlName );
-        bool                                         isControlPropertySupported( const OUString& _rControlName, const OUString& _rControlProperty );
+        css::uno::Sequence< OUString >  getSupportedControls(  );
+        css::uno::Sequence< OUString >  getSupportedControlProperties( const OUString& _rControlName );
+        static bool                     isControlSupported( const OUString& _rControlName );
+        bool                            isControlPropertySupported( const OUString& _rControlName, const OUString& _rControlProperty );
 
         // XFilePickerControlAccess
-        void                        setValue( sal_Int16 _nId, sal_Int16 _nCtrlAction, const ::com::sun::star::uno::Any& _rValue );
-        ::com::sun::star::uno::Any  getValue( sal_Int16 _nId, sal_Int16 _nCtrlAction ) const;
+        void                        setValue( sal_Int16 _nId, sal_Int16 _nCtrlAction, const css::uno::Any& _rValue );
+        css::uno::Any               getValue( sal_Int16 _nId, sal_Int16 _nCtrlAction ) const;
         void                        setLabel( sal_Int16 _nId, const OUString& _rValue );
-        OUString             getLabel( sal_Int16 _nId ) const;
+        OUString                    getLabel( sal_Int16 _nId ) const;
         void                        enableControl( sal_Int16 _nId, bool _bEnable );
 
         static void             setHelpURL( vcl::Window* _pControl, const OUString& _rURL, bool _bFileView );
@@ -88,7 +88,7 @@ namespace svt
         */
         void                        implSetControlProperty(
                                         sal_Int16 _nControlId,
-                                        Control* _pControl, sal_Int16 _nProperty, const ::com::sun::star::uno::Any& _rValue,
+                                        Control* _pControl, sal_Int16 _nProperty, const css::uno::Any& _rValue,
                                         bool _bIgnoreIllegalArgument = true );
 
         Control* implGetControl( const OUString& _rControlName, sal_Int16* _pId = NULL, sal_Int32* _pPropertyMask = NULL ) const;
@@ -103,9 +103,9 @@ namespace svt
                 See PROPERTY_FLAG_*
             @return
         */
-        ::com::sun::star::uno::Any  implGetControlProperty( Control* _pControl, sal_Int16 _nProperty ) const;
+        css::uno::Any  implGetControlProperty( Control* _pControl, sal_Int16 _nProperty ) const;
 
-        static void implDoListboxAction( ListBox* _pListbox, sal_Int16 _nCtrlAction, const ::com::sun::star::uno::Any& _rValue );
+        static void implDoListboxAction( ListBox* _pListbox, sal_Int16 _nCtrlAction, const css::uno::Any& _rValue );
 
     };
 
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index 454c144b8331..a2ac1c8ff42b 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -222,7 +222,7 @@ IMPL_LINK( SvtFilePicker, DialogClosedHdl, Dialog*, pDlg )
     if ( m_xDlgClosedListener.is() )
     {
         sal_Int16 nRet = static_cast< sal_Int16 >( pDlg->GetResult() );
-        ::com::sun::star::ui::dialogs::DialogClosedEvent aEvent( *this, nRet );
+        css::ui::dialogs::DialogClosedEvent aEvent( *this, nRet );
         m_xDlgClosedListener->dialogClosed( aEvent );
         m_xDlgClosedListener.clear();
     }
@@ -517,7 +517,7 @@ void SAL_CALL SvtFilePicker::setDialogTitle( const OUString& _rTitle ) throw (Ru
 }
 
 
-void SAL_CALL SvtFilePicker::startExecuteModal( const Reference< ::com::sun::star::ui::dialogs::XDialogClosedListener >& xListener )
+void SAL_CALL SvtFilePicker::startExecuteModal( const Reference< css::ui::dialogs::XDialogClosedListener >& xListener )
     throw (RuntimeException,
            std::exception)
 {
@@ -925,7 +925,7 @@ sal_Bool SAL_CALL SvtFilePicker::setShowState( sal_Bool )
     // else we would have to change the layout
     // of the file dialog dynamically
     // support for set/getShowState is opionally
-    // see com::sun::star::ui::dialogs::XFilePreview
+    // see css::ui::dialogs::XFilePreview
 
         bRet = false;
     }
diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx
index c9b8b78c40f7..78032c162fa0 100644
--- a/fpicker/source/office/OfficeFilePicker.hxx
+++ b/fpicker/source/office/OfficeFilePicker.hxx
@@ -41,20 +41,20 @@ class Dialog;
 struct FilterEntry;
 struct ElementEntry_Impl;
 
-typedef ::std::list< FilterEntry >                          FilterList;     // can be maintained more effectively
-typedef ::std::list < ElementEntry_Impl >                   ElementList;
+typedef ::std::list< FilterEntry >             FilterList;     // can be maintained more effectively
+typedef ::std::list < ElementEntry_Impl >      ElementList;
 
-typedef ::com::sun::star::beans::StringPair                 UnoFilterEntry;
-typedef ::com::sun::star::uno::Sequence< UnoFilterEntry >   UnoFilterList;  // can be transported more effectively
-typedef ::com::sun::star::uno::Sequence< OUString >  OUStringList;   // can be transported more effectively
+typedef css::beans::StringPair                 UnoFilterEntry;
+typedef css::uno::Sequence< UnoFilterEntry >   UnoFilterList;  // can be transported more effectively
+typedef css::uno::Sequence< OUString >         OUStringList;   // can be transported more effectively
 
 // class SvtFilePicker ---------------------------------------------------
 
-typedef ::cppu::ImplHelper5 <   ::com::sun::star::ui::dialogs::XFilePicker3
-                            ,   ::com::sun::star::ui::dialogs::XFilePickerControlAccess
-                            ,   ::com::sun::star::ui::dialogs::XFilePreview
-                            ,   ::com::sun::star::lang::XServiceInfo
-                            ,   ::com::sun::star::ui::dialogs::XAsynchronousExecutableDialog
+typedef ::cppu::ImplHelper5 <   css::ui::dialogs::XFilePicker3
+                            ,   css::ui::dialogs::XFilePickerControlAccess
+                            ,   css::ui::dialogs::XFilePreview
+                            ,   css::lang::XServiceInfo
+                            ,   css::ui::dialogs::XAsynchronousExecutableDialog
                             >   SvtFilePicker_Base;
 
 class SvtFilePicker :public SvtFilePicker_Base
@@ -76,13 +76,13 @@ protected:
     OUString            m_aStandardDir;
     OUStringList        m_aBlackList;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >
+    css::uno::Reference< css::ui::dialogs::XFilePickerListener >
                         m_xListener;
-    ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XDialogClosedListener >
+    css::uno::Reference< css::ui::dialogs::XDialogClosedListener >
                         m_xDlgClosedListener;
 
 public:
-                       SvtFilePicker( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory >& xFactory );
+                       SvtFilePicker( const css::uno::Reference < css::lang::XMultiServiceFactory >& xFactory );
     virtual           ~SvtFilePicker();
 
 
@@ -98,108 +98,108 @@ public:
 
     // XExecutableDialog functions
 
-    virtual void SAL_CALL setTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL execute(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setTitle( const OUString& _rTitle ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL execute(  ) throw (css::uno::RuntimeException, std::exception) override;
 
 
     // XAsynchronousExecutableDialog functions
 
-    virtual void SAL_CALL setDialogTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL startExecuteModal( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XDialogClosedListener >& xListener )
-        throw (::com::sun::star::uno::RuntimeException,
+    virtual void SAL_CALL setDialogTitle( const OUString& _rTitle ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL startExecuteModal( const css::uno::Reference< css::ui::dialogs::XDialogClosedListener >& xListener )
+        throw (css::uno::RuntimeException,
                std::exception) override;
 
 
     // XFilePicker functions
 
 
-    virtual void SAL_CALL           setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL           setDefaultName( const OUString& aName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL           setDisplayDirectory( const OUString& aDirectory ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL    getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           setMultiSelectionMode( sal_Bool bMode ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           setDefaultName( const OUString& aName ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           setDisplayDirectory( const OUString& aDirectory ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL    getDisplayDirectory() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getFiles() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles() throw( css::uno::RuntimeException, std::exception ) override;
 
 
     // XFilePickerControlAccess functions
 
 
-    virtual void SAL_CALL           setValue( sal_Int16 ElementID, sal_Int16 ControlAction, const com::sun::star::uno::Any& value ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual com::sun::star::uno::Any SAL_CALL           getValue( sal_Int16 ElementID, sal_Int16 ControlAction ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL           setLabel( sal_Int16 ElementID, const OUString& aValue ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL    getLabel( sal_Int16 ElementID ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL           enableControl( sal_Int16 ElementID, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           setValue( sal_Int16 ElementID, sal_Int16 ControlAction, const css::uno::Any& value ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL           getValue( sal_Int16 ElementID, sal_Int16 ControlAction ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           setLabel( sal_Int16 ElementID, const OUString& aValue ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL    getLabel( sal_Int16 ElementID ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           enableControl( sal_Int16 ElementID, sal_Bool bEnable ) throw( css::uno::RuntimeException, std::exception ) override;
 
 
     // XFilePickerNotifier functions
 
 
-    virtual void SAL_CALL           addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL           removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) throw ( css::uno::RuntimeException, std::exception ) override;
 
 
     // XFilePreview functions
 
 
-    virtual com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual sal_Int32 SAL_CALL      getTargetColorDepth() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual sal_Int32 SAL_CALL      getAvailableWidth() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual sal_Int32 SAL_CALL      getAvailableHeight() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL           setImage( sal_Int16 aImageFormat, const com::sun::star::uno::Any& aImage ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL       setShowState( sal_Bool bShowState ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL       getShowState() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL      getTargetColorDepth() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL      getAvailableWidth() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int32 SAL_CALL      getAvailableHeight() throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL       setShowState( sal_Bool bShowState ) throw ( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL       getShowState() throw ( css::uno::RuntimeException, std::exception ) override;
 
 
     // XFilterManager functions
 
 
-    virtual void SAL_CALL           appendFilter( const OUString& aTitle, const OUString& aFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL           setCurrentFilter( const OUString& aTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL    getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           appendFilter( const OUString& aTitle, const OUString& aFilter ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           setCurrentFilter( const OUString& aTitle ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL       getCurrentFilter() throw( css::uno::RuntimeException, std::exception ) override;
 
 
     // XFilterGroupManager functions
 
-    virtual void SAL_CALL           appendFilterGroup( const OUString& sGroupTitle, const com::sun::star::uno::Sequence< com::sun::star::beans::StringPair >& aFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL           appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
 
 
 
     // these methods are here because they're ambiguous
 
-    virtual void SAL_CALL           cancel() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override
+    virtual void SAL_CALL           cancel() throw( css::uno::RuntimeException, std::exception ) override
      { ::svt::OCommonPicker::cancel(); }
-    virtual void SAL_CALL           dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override
+    virtual void SAL_CALL           dispose() throw( css::uno::RuntimeException, std::exception ) override
      { ::svt::OCommonPicker::dispose(); }
-    virtual void SAL_CALL           addEventListener(const com::sun::star::uno::Reference<com::sun::star::lang::XEventListener>& l) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override
+    virtual void SAL_CALL           addEventListener(const css::uno::Reference<css::lang::XEventListener>& l) throw( css::uno::RuntimeException, std::exception ) override
      { ::svt::OCommonPicker::addEventListener(l); }
-    virtual void SAL_CALL           removeEventListener(const com::sun::star::uno::Reference<com::sun::star::lang::XEventListener>& l) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override
+    virtual void SAL_CALL           removeEventListener(const css::uno::Reference<css::lang::XEventListener>& l) throw( css::uno::RuntimeException, std::exception ) override
      { ::svt::OCommonPicker::removeEventListener(l); }
 
 
     // XInitialization functions
 
 
-    virtual void SAL_CALL           initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) throw ( com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
 
 
     // XServiceInfo functions
 
 
     /* XServiceInfo */
-    virtual OUString SAL_CALL    getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL       supportsService( const OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
-                                    getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL       getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL       supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL
+                                    getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
 
     /* Helper for XServiceInfo */
-    static com::sun::star::uno::Sequence< OUString >
+    static css::uno::Sequence< OUString >
                                     impl_getStaticSupportedServiceNames();
-    static OUString          impl_getStaticImplementationName();
+    static OUString                 impl_getStaticImplementationName();
 
     /* Helper for registry */
-    static ::com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL impl_createInstance (
-        const ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext )
-        throw( com::sun::star::uno::Exception );
+    static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance (
+        const css::uno::Reference< css::uno::XComponentContext >& rxContext )
+        throw( css::uno::Exception );
 
 protected:
 
@@ -209,7 +209,7 @@ protected:
     virtual sal_Int16       implExecutePicker( ) override;
     virtual bool            implHandleInitializationArgument(
                                 const OUString& _rName,
-                                const ::com::sun::star::uno::Any& _rValue
+                                const css::uno::Any& _rValue
                             ) override;
 
 protected:
@@ -231,7 +231,7 @@ protected:
 class SvtRemoteFilePicker : public SvtFilePicker
 {
 public:
-    SvtRemoteFilePicker( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory >& xFactory );
+    SvtRemoteFilePicker( const css::uno::Reference < css::lang::XMultiServiceFactory >& xFactory );
 
     virtual VclPtr<SvtFileDialog_Base> implCreateDialog( vcl::Window* _pParent ) override;
 
@@ -244,19 +244,19 @@ public:
     DECLARE_XTYPEPROVIDER( )
 
     /* XServiceInfo */
-    virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
-                                    getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL
+                                    getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
 
     /* Helper for XServiceInfo */
-    static com::sun::star::uno::Sequence< OUString > impl_getStaticSupportedServiceNames();
+    static css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames();
     static OUString impl_getStaticImplementationName();
 
     /* Helper for registry */
-    static ::com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL impl_createInstance (
-        const ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext )
-        throw( com::sun::star::uno::Exception );
+    static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance (
+        const css::uno::Reference< css::uno::XComponentContext >& rxContext )
+        throw( css::uno::Exception );
 };
 
 #endif // INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFILEPICKER_HXX
diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx
index 6fbb6424ec05..28fd1cfb610f 100644
--- a/fpicker/source/office/OfficeFolderPicker.cxx
+++ b/fpicker/source/office/OfficeFolderPicker.cxx
@@ -60,7 +60,7 @@ void SAL_CALL SvtFolderPicker::setDialogTitle( const OUString& _rTitle) throw (R
     setTitle( _rTitle );
 }
 
-void SAL_CALL SvtFolderPicker::startExecuteModal( const Reference< ::com::sun::star::ui::dialogs::XDialogClosedListener >& xListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SvtFolderPicker::startExecuteModal( const Reference< css::ui::dialogs::XDialogClosedListener >& xListener ) throw (RuntimeException, std::exception)
 {
     m_xListener = xListener;
     prepareDialog();
@@ -103,7 +103,7 @@ IMPL_LINK( SvtFolderPicker, DialogClosedHdl, Dialog*, pDlg )
     if ( m_xListener.is() )
     {
         sal_Int16 nRet = static_cast< sal_Int16 >( pDlg->GetResult() );
-        ::com::sun::star::ui::dialogs::DialogClosedEvent aEvent( *this, nRet );
+        css::ui::dialogs::DialogClosedEvent aEvent( *this, nRet );
         m_xListener->dialogClosed( aEvent );
         m_xListener.clear();
     }
diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx
index 762c0f2ea80f..11175fc23efe 100644
--- a/fpicker/source/office/OfficeFolderPicker.hxx
+++ b/fpicker/source/office/OfficeFolderPicker.hxx
@@ -32,9 +32,9 @@ class Dialog;
 
 typedef
     cppu::ImplInheritanceHelper<
-        svt::OCommonPicker, com::sun::star::ui::dialogs::XFolderPicker2,
-        com::sun::star::ui::dialogs::XAsynchronousExecutableDialog,
-        com::sun::star::lang::XServiceInfo >
+        svt::OCommonPicker, css::ui::dialogs::XFolderPicker2,
+        css::ui::dialogs::XAsynchronousExecutableDialog,
+        css::lang::XServiceInfo >
     SvtFolderPicker_Base;
 
 class SvtFolderPicker: public SvtFolderPicker_Base
@@ -42,58 +42,58 @@ class SvtFolderPicker: public SvtFolderPicker_Base
 private:
     OUString         m_aDescription;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XDialogClosedListener >
+    css::uno::Reference< css::ui::dialogs::XDialogClosedListener >
                             m_xListener;
 
     void                            prepareExecute( );
     DECL_LINK(                      DialogClosedHdl, Dialog* );
 
 public:
-                                    SvtFolderPicker( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory >& xFactory );
+                                    SvtFolderPicker( const css::uno::Reference < css::lang::XMultiServiceFactory >& xFactory );
     virtual                        ~SvtFolderPicker();
 
 
     // XFolderPicker2 functions
 
 
-    virtual void SAL_CALL           setDisplayDirectory( const OUString& aDirectory ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL    getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual OUString SAL_CALL    getDirectory() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual void SAL_CALL           setDescription( const OUString& aDescription ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           setDisplayDirectory( const OUString& aDirectory ) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL       getDisplayDirectory() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL       getDirectory() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL           setDescription( const OUString& aDescription ) throw ( css::uno::RuntimeException, std::exception ) override;
 
     virtual void SAL_CALL cancel()
-        throw (com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
 
     // XExecutableDialog functions
 
-    virtual void SAL_CALL setTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL execute(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setTitle( const OUString& _rTitle ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL execute(  ) throw (css::uno::RuntimeException, std::exception) override;
 
 
     // XAsynchronousExecutableDialog functions
 
-    virtual void SAL_CALL       setDialogTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL       startExecuteModal( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XDialogClosedListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL       setDialogTitle( const OUString& _rTitle ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL       startExecuteModal( const css::uno::Reference< css::ui::dialogs::XDialogClosedListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
 
 
     // XServiceInfo functions
 
 
     /* XServiceInfo */
-    virtual OUString SAL_CALL    getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL       supportsService( const OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
-                                    getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual OUString SAL_CALL    getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
+    virtual sal_Bool SAL_CALL       supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL
+                                    getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
 
     /* Helper for XServiceInfo */
-    static com::sun::star::uno::Sequence< OUString > impl_getStaticSupportedServiceNames();
+    static css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames();
     static OUString impl_getStaticImplementationName();
 
     /* Helper for registry */
-    static ::com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL impl_createInstance (
-        const ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext )
-        throw( com::sun::star::uno::Exception );
+    static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance (
+        const css::uno::Reference< css::uno::XComponentContext >& rxContext )
+        throw( css::uno::Exception );
 
 protected:
 
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index 3b10c4339728..086db2cf916d 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -1179,13 +1179,13 @@ void RemoteFilesDialog::SetHasFilename( bool )
 {
 }
 
-void RemoteFilesDialog::SetBlackList( const ::com::sun::star::uno::Sequence< OUString >& rBlackList )
+void RemoteFilesDialog::SetBlackList( const css::uno::Sequence< OUString >& rBlackList )
 {
     m_aBlackList = rBlackList;
     m_pTreeView->SetBlackList( rBlackList );
 }
 
-const ::com::sun::star::uno::Sequence< OUString >& RemoteFilesDialog::GetBlackList() const
+const css::uno::Sequence< OUString >& RemoteFilesDialog::GetBlackList() const
 {
     return m_aBlackList;
 }
@@ -1233,7 +1233,7 @@ void RemoteFilesDialog::setCurrentFileText( const OUString& rText, bool bSelectA
 
 void RemoteFilesDialog::AddFilterGroup(
                                   const OUString& rFilter,
-                                  const com::sun::star::uno::Sequence< com::sun::star::beans::StringPair >& rFilters )
+                                  const css::uno::Sequence< css::beans::StringPair >& rFilters )
 {
     AddFilter( rFilter, OUString() );
     const StringPair* pSubFilters       =               rFilters.getConstArray();
@@ -1446,7 +1446,7 @@ sal_Int32 RemoteFilesDialog::getAvailableHeight()
     return 0;
 }
 
-void RemoteFilesDialog::setImage( sal_Int16, const ::com::sun::star::uno::Any& )
+void RemoteFilesDialog::setImage( sal_Int16, const css::uno::Any& )
 {
     // This dialog doesn't contain preview
 }
diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx
index 4e97093c741e..cf5bdd5d1cd4 100644
--- a/fpicker/source/office/RemoteFilesDialog.hxx
+++ b/fpicker/source/office/RemoteFilesDialog.hxx
@@ -64,7 +64,7 @@ enum SvtRemoteDlgType
 };
 
 typedef std::shared_ptr< Place > ServicePtr;
-typedef ::com::sun::star::uno::Sequence< OUString >  OUStringList;
+typedef css::uno::Sequence< OUString >  OUStringList;
 
 class FileViewContainer;
 
@@ -84,8 +84,8 @@ public:
     virtual SvtFileView* GetView() override;
 
     virtual void SetHasFilename( bool ) override;
-    virtual void SetBlackList( const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) override;
-    virtual const ::com::sun::star::uno::Sequence< OUString >& GetBlackList() const override;
+    virtual void SetBlackList( const css::uno::Sequence< OUString >& rBlackList ) override;
+    virtual const css::uno::Sequence< OUString >& GetBlackList() const override;
     virtual void SetStandardDir( const OUString& rStdDir ) override;
     virtual const OUString& GetStandardDir() const override;
     virtual void SetPath( const OUString& rNewURL ) override;
@@ -99,7 +99,7 @@ public:
 
     virtual void AddFilter( const OUString& rFilter, const OUString& rType ) override;
     virtual void AddFilterGroup( const OUString& _rFilter,
-                                const com::sun::star::uno::Sequence< com::sun::star::beans::StringPair >& rFilters ) override;
+                                const css::uno::Sequence< css::beans::StringPair >& rFilters ) override;
     virtual OUString GetCurFilter() const override;
     virtual void SetCurFilter( const OUString& rFilter ) override;
     virtual void FilterSelect() override;
@@ -115,7 +115,7 @@ public:
     virtual sal_Int32 getAvailableWidth() override;
     virtual sal_Int32 getAvailableHeight() override;
 
-    virtual void setImage( sal_Int16 aImageFormat, const ::com::sun::star::uno::Any& rImage ) override;
+    virtual void setImage( sal_Int16 aImageFormat, const css::uno::Any& rImage ) override;
 
     virtual bool getShowState() override;
 
@@ -146,7 +146,7 @@ private:
 
     ::rtl::Reference< ::svt::AsyncPickerAction > m_pCurrentAsyncAction;
 
-    ::com::sun::star::uno::Sequence< OUString > m_aBlackList;
+    css::uno::Sequence< OUString > m_aBlackList;
     ::svt::IFilePickerListener* m_pFileNotifier;
 
     VclPtr< PushButton > m_pOk_btn;
diff --git a/fpicker/source/office/asyncfilepicker.cxx b/fpicker/source/office/asyncfilepicker.cxx
index e99665b36128..1a693f76697b 100644
--- a/fpicker/source/office/asyncfilepicker.cxx
+++ b/fpicker/source/office/asyncfilepicker.cxx
@@ -147,7 +147,7 @@ namespace svt
 
         if ( eTimeout == eResult )
         {
-            SvtFileDialog::displayIOException( m_sURL, ::com::sun::star::ucb::IOErrorCode_CANT_READ );
+            SvtFileDialog::displayIOException( m_sURL, css::ucb::IOErrorCode_CANT_READ );
             return;
         }
 
diff --git a/fpicker/source/office/asyncfilepicker.hxx b/fpicker/source/office/asyncfilepicker.hxx
index 1deb5869f6f5..ef4f84121480 100644
--- a/fpicker/source/office/asyncfilepicker.hxx
+++ b/fpicker/source/office/asyncfilepicker.hxx
@@ -30,7 +30,7 @@
 class SvtFileView;
 class SvtFileDialog_Base;
 
-typedef ::com::sun::star::uno::Sequence< OUString >  OUStringList;
+typedef css::uno::Sequence< OUString >  OUStringList;
 
 
 namespace svt
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index 553214ebe3fa..0b796da3aee4 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -46,7 +46,7 @@ namespace svt
     using namespace     ::comphelper;
 
 
-    OCommonPicker::OCommonPicker( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory )
+    OCommonPicker::OCommonPicker( const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory )
         :OCommonPicker_Base( m_aMutex )
         ,OPropertyContainer( GetBroadcastHelper() )
         ,m_xORB( _rxFactory )
diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx
index da0885734790..f8e50a4a9c7a 100644
--- a/fpicker/source/office/commonpicker.hxx
+++ b/fpicker/source/office/commonpicker.hxx
@@ -43,11 +43,11 @@ namespace svt
 {
 
 
-    typedef ::cppu::WeakComponentImplHelper    <   ::com::sun::star::ui::dialogs::XControlAccess
-                                                ,   ::com::sun::star::ui::dialogs::XControlInformation
-                                                ,   ::com::sun::star::lang::XEventListener
-                                                ,   ::com::sun::star::util::XCancellable
-                                                ,   ::com::sun::star::lang::XInitialization
+    typedef ::cppu::WeakComponentImplHelper    <   css::ui::dialogs::XControlAccess
+                                                ,   css::ui::dialogs::XControlInformation
+                                                ,   css::lang::XEventListener
+                                                ,   css::util::XCancellable
+                                                ,   css::lang::XInitialization
                                                 >   OCommonPicker_Base;
     /** implements common functionality for the 2 UNO picker components
     */
@@ -58,21 +58,21 @@ namespace svt
                     ,public ::comphelper::OPropertyArrayUsageHelper< OCommonPicker >
     {
     private:
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    m_xORB;
+        css::uno::Reference< css::lang::XMultiServiceFactory >    m_xORB;
 
         // <properties>
-        OUString                                                     m_sHelpURL;
-        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >  m_xWindow;
+        OUString                                                  m_sHelpURL;
+        css::uno::Reference< css::awt::XWindow >                  m_xWindow;
         // </properties>
 
         VclPtr<SvtFileDialog_Base>      m_pDlg;
-        ImplSVEvent *       m_nCancelEvent;
-        bool            m_bExecuting;
+        ImplSVEvent *                   m_nCancelEvent;
+        bool                            m_bExecuting;
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >  m_xDialogParent;
+        css::uno::Reference< css::awt::XWindow >      m_xDialogParent;
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >  m_xWindowListenerAdapter;
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >  m_xParentListenerAdapter;
+        css::uno::Reference< css::lang::XComponent >  m_xWindowListenerAdapter;
+        css::uno::Reference< css::lang::XComponent >  m_xParentListenerAdapter;
 
     protected:
         OUString     m_aTitle;
@@ -85,7 +85,7 @@ namespace svt
         inline          ::cppu::OBroadcastHelper&   GetBroadcastHelper()        { return OCommonPicker_Base::rBHelper; }
 
     public:
-        OCommonPicker( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory );
+        OCommonPicker( const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory );
 
     protected:
         virtual ~OCommonPicker();
@@ -116,14 +116,14 @@ namespace svt
 
         // XEventListner
 
-        virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
 
 
         // property set related methods
 
 
         // XPropertySet pure methods
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
         // OPropertySetHelper pure methods
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
         // OPropertyArrayUsageHelper pure methods
@@ -131,38 +131,38 @@ namespace svt
 
         // OPropertySetHelper overridden methods
         virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
-                sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::uno::Exception, std::exception) override;
+                sal_Int32 _nHandle, const css::uno::Any& _rValue ) throw (css::uno::Exception, std::exception) override;
 
 
         // XExecutableDialog functions
 
-        virtual void SAL_CALL           setTitle( const OUString& _rTitle ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
-        virtual sal_Int16 SAL_CALL      execute() throw( ::com::sun::star::uno::RuntimeException, std::exception );
+        virtual void SAL_CALL           setTitle( const OUString& _rTitle ) throw( css::uno::RuntimeException, std::exception );
+        virtual sal_Int16 SAL_CALL      execute() throw( css::uno::RuntimeException, std::exception );
 
 
         // XControlAccess functions
 
-        virtual void SAL_CALL setControlProperty( const OUString& aControlName, const OUString& aControlProperty, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Any SAL_CALL getControlProperty( const OUString& aControlName, const OUString& aControlProperty ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL setControlProperty( const OUString& aControlName, const OUString& aControlProperty, const css::uno::Any& aValue ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Any SAL_CALL getControlProperty( const OUString& aControlName, const OUString& aControlProperty ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
 
 
         // XControlInformation functions
 
-        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedControls(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isControlSupported( const OUString& aControlName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedControlProperties( const OUString& aControlName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL isControlPropertySupported( const OUString& aControlName, const OUString& aControlProperty ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedControls(  ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL isControlSupported( const OUString& aControlName ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Sequence< OUString > SAL_CALL getSupportedControlProperties( const OUString& aControlName ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+        virtual sal_Bool SAL_CALL isControlPropertySupported( const OUString& aControlName, const OUString& aControlProperty ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
 
 
         // XCancellable functions
 
-        virtual void SAL_CALL cancel(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL cancel(  ) throw (css::uno::RuntimeException, std::exception) override;
 
 
         // XInitialization functions
 
 
-        virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw ( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ) override;
+        virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
 
 
         // misc
@@ -180,7 +180,7 @@ namespace svt
         */
         virtual bool    implHandleInitializationArgument(
                                 const OUString& _rName,
-                                const ::com::sun::star::uno::Any& _rValue
+                                const css::uno::Any& _rValue
                             );
 
     private:
diff --git a/fpicker/source/office/fpdialogbase.hxx b/fpicker/source/office/fpdialogbase.hxx
index 749670129653..48bdfec3b544 100644
--- a/fpicker/source/office/fpdialogbase.hxx
+++ b/fpicker/source/office/fpdialogbase.hxx
@@ -31,10 +31,6 @@
 
 #include <set>
 
-// @@@ using namespace com::sun::star::ucb;
-
-
-
 class SvTabListBox;
 class SvtFileView;
 class SvtFileDialogFilter_Impl;
@@ -73,8 +69,8 @@ public:
     virtual SvtFileView* GetView() = 0;
 
     virtual void SetHasFilename( bool bHasFilename ) = 0;
-    virtual void SetBlackList( const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) = 0;
-    virtual const ::com::sun::star::uno::Sequence< OUString >& GetBlackList() const = 0;
+    virtual void SetBlackList( const css::uno::Sequence< OUString >& rBlackList ) = 0;
+    virtual const css::uno::Sequence< OUString >& GetBlackList() const = 0;
     virtual void SetStandardDir( const OUString& rStdDir ) = 0;
     virtual const OUString& GetStandardDir() const = 0;
     virtual void SetPath( const OUString& rNewURL ) = 0;
@@ -87,7 +83,7 @@ public:
 
     virtual void AddFilter( const OUString& rFilter, const OUString& rType ) = 0;
     virtual void AddFilterGroup( const OUString& _rFilter,
-                                const com::sun::star::uno::Sequence< com::sun::star::beans::StringPair >& rFilters ) = 0;
+                                const css::uno::Sequence< css::beans::StringPair >& rFilters ) = 0;
     virtual OUString GetCurFilter() const = 0;
     virtual void SetCurFilter( const OUString& rFilter ) = 0;
     virtual void FilterSelect() = 0;
@@ -103,7 +99,7 @@ public:
     virtual sal_Int32 getAvailableWidth() = 0;
     virtual sal_Int32 getAvailableHeight() = 0;
 
-    virtual void setImage( sal_Int16 aImageFormat, const ::com::sun::star::uno::Any& rImage ) = 0;
+    virtual void setImage( sal_Int16 aImageFormat, const css::uno::Any& rImage ) = 0;
 
     virtual bool getShowState() = 0;
 };
diff --git a/fpicker/source/office/fpinteraction.cxx b/fpicker/source/office/fpinteraction.cxx
index e6b4e315af5f..d82612c13a76 100644
--- a/fpicker/source/office/fpinteraction.cxx
+++ b/fpicker/source/office/fpinteraction.cxx
@@ -33,7 +33,7 @@ namespace svt
     using namespace ::com::sun::star::task;
     using namespace ::com::sun::star::ucb;
 
-    OFilePickerInteractionHandler::OFilePickerInteractionHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxMaster )
+    OFilePickerInteractionHandler::OFilePickerInteractionHandler( const css::uno::Reference< css::task::XInteractionHandler >& _rxMaster )
         :m_xMaster( _rxMaster )
         ,m_bUsed( false )
         ,m_eInterceptions( OFilePickerInteractionHandler::E_NOINTERCEPTION )
diff --git a/fpicker/source/office/fpinteraction.hxx b/fpicker/source/office/fpinteraction.hxx
index 4acfb9e0057e..bfac7d9bc9e3 100644
--- a/fpicker/source/office/fpinteraction.hxx
+++ b/fpicker/source/office/fpinteraction.hxx
@@ -31,7 +31,7 @@ namespace svt
 
     //= OFilePickerInteractionHandler
 
-    typedef ::cppu::WeakImplHelper <   ::com::sun::star::task::XInteractionHandler
+    typedef ::cppu::WeakImplHelper <   css::task::XInteractionHandler
                                     >   OFilePickerInteractionHandler_Base;
 
     /** a InteractionHandler implementation which extends another handler with some customizability
@@ -51,13 +51,13 @@ namespace svt
         };
 
     protected:
-        ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > m_xMaster        ; // our master handler
-        ::com::sun::star::uno::Any                                                      m_aException     ; // the last handled request
-        bool                                                                        m_bUsed          ; // indicates using of this interaction handler instance
-        EInterceptedInteractions                                                        m_eInterceptions ; // enable/disable interception of some special interactions
+        css::uno::Reference< css::task::XInteractionHandler > m_xMaster;    // our master handler
+        css::uno::Any                                         m_aException; // the last handled request
+        bool                                                  m_bUsed;      // indicates using of this interaction handler instance
+        EInterceptedInteractions                              m_eInterceptions; // enable/disable interception of some special interactions
 
     public:
-        OFilePickerInteractionHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxMaster );
+        OFilePickerInteractionHandler( const css::uno::Reference< css::task::XInteractionHandler >& _rxMaster );
 
         // some generic functions
         void     enableInterceptions( EInterceptedInteractions eInterceptions );
@@ -70,7 +70,7 @@ namespace svt
 
     protected:
         // XInteractionHandler
-        virtual void SAL_CALL handle( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& _rxRequest ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& _rxRequest ) throw (css::uno::RuntimeException, std::exception) override;
 
     private:
         virtual ~OFilePickerInteractionHandler();
diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx
index 3774e8bcdc2b..3ece1bee1a96 100644
--- a/fpicker/source/office/fpsmartcontent.cxx
+++ b/fpicker/source/office/fpsmartcontent.cxx
@@ -231,7 +231,7 @@ namespace svt
             // from here on, we definitely know that the content is valid
             m_eState = VALID;
         }
-        catch( const ::com::sun::star::uno::Exception& )
+        catch( const css::uno::Exception& )
         {
             // now we're definitely invalid
             m_eState = INVALID;
diff --git a/fpicker/source/office/fpsmartcontent.hxx b/fpicker/source/office/fpsmartcontent.hxx
index 06eb103a1e84..c37db2f933be 100644
--- a/fpicker/source/office/fpsmartcontent.hxx
+++ b/fpicker/source/office/fpsmartcontent.hxx
@@ -49,12 +49,12 @@ namespace svt
         };
 
     private:
-        OUString                                                                  m_sURL;
-        ::ucbhelper::Content*                                                            m_pContent;
-        State                                                                            m_eState;
-        ::com::sun::star::uno::Reference < ::com::sun::star::ucb::XCommandEnvironment >  m_xCmdEnv;
-        ::com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionHandler > m_xOwnInteraction;
-        ::svt::OFilePickerInteractionHandler*                                            m_pOwnInteraction;
+        OUString                                               m_sURL;
+        ::ucbhelper::Content*                                  m_pContent;
+        State                                                  m_eState;
+        css::uno::Reference < css::ucb::XCommandEnvironment >  m_xCmdEnv;
+        css::uno::Reference < css::task::XInteractionHandler > m_xOwnInteraction;
+        ::svt::OFilePickerInteractionHandler*                  m_pOwnInteraction;
 
     private:
         enum Type { Folder, Document };
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index bdeb6d367f54..c3186704222d 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -222,7 +222,7 @@ namespace
                         {
                             bRealExtensions = !_pDialog->ContentIsFolder( aURL.GetMainURL( INetURLObject::NO_DECODE ) );
                         }
-                        catch( const ::com::sun::star::uno::Exception& )
+                        catch( const css::uno::Exception& )
                         {
                             DBG_WARNING( "Exception in lcl_autoUpdateFileExtension" );
                         }
@@ -1866,7 +1866,7 @@ void SvtFileDialog::displayIOException( const OUString& _rURL, IOErrorCode _eCod
 
         // let and interaction handler handle this exception
         ::comphelper::OInteractionRequest* pRequest = NULL;
-        Reference< ::com::sun::star::task::XInteractionRequest > xRequest = pRequest =
+        Reference< css::task::XInteractionRequest > xRequest = pRequest =
             new ::comphelper::OInteractionRequest( makeAny( aException ) );
         pRequest->addContinuation( new ::comphelper::OInteractionAbort( ) );
 
@@ -2157,14 +2157,14 @@ void SvtFileDialog::SetStandardDir( const OUString& rStdDir )
     _pImp->SetStandardDir( aObj.GetMainURL( INetURLObject::NO_DECODE ) );
 }
 
-void SvtFileDialog::SetBlackList( const ::com::sun::star::uno::Sequence< OUString >& rBlackList )
+void SvtFileDialog::SetBlackList( const css::uno::Sequence< OUString >& rBlackList )
 {
     _pImp->SetBlackList( rBlackList );
 }
 
 
 
-const ::com::sun::star::uno::Sequence< OUString >& SvtFileDialog::GetBlackList() const
+const css::uno::Sequence< OUString >& SvtFileDialog::GetBlackList() const
 {
     return _pImp->GetBlackList();
 }
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index a79347c532a2..1f02d690a65d 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -54,16 +54,16 @@ class CustomContainer;
 class SvtFileDialog : public SvtFileDialog_Base
 {
 private:
-    VclPtr<CheckBox>                   _pCbReadOnly;
-    VclPtr<CheckBox>                   _pCbLinkBox;
-    VclPtr<CheckBox>                   _pCbPreviewBox;
-    VclPtr<CheckBox>                   _pCbSelection;
-    VclPtr<PushButton>                 _pPbPlay;
-    VclPtr<vcl::Window>                _pPrevWin;
-    VclPtr<FixedBitmap>                _pPrevBmp;
-    VclPtr<CustomContainer>            _pContainer;
-    VclPtr<SvtFileView>                _pFileView;
-    VclPtr<Splitter>                   _pSplitter;
+    VclPtr<CheckBox>            _pCbReadOnly;
+    VclPtr<CheckBox>            _pCbLinkBox;
+    VclPtr<CheckBox>            _pCbPreviewBox;
+    VclPtr<CheckBox>            _pCbSelection;
+    VclPtr<PushButton>          _pPbPlay;
+    VclPtr<vcl::Window>         _pPrevWin;
+    VclPtr<FixedBitmap>         _pPrevBmp;
+    VclPtr<CustomContainer>     _pContainer;
+    VclPtr<SvtFileView>         _pFileView;
+    VclPtr<Splitter>            _pSplitter;
     ::svt::IFilePickerListener* _pFileNotifier;
     SvtExpFileDlg_Impl*         _pImp;
     WinBits                     _nExtraBits;
@@ -72,17 +72,18 @@ private:
     ImageList                   m_aImages;
     ::svt::SmartContent         m_aContent;
 
-    ::std::set< VclPtr<Control> >      m_aDisabledControls;
+    ::std::set< VclPtr<Control> >
+                                m_aDisabledControls;
 
     ::utl::OConfigurationNode   m_aConfiguration;
     ::rtl::Reference< ::svt::AsyncPickerAction >
                                 m_pCurrentAsyncAction;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::ui::dialogs::XDialogClosedListener >
+    css::uno::Reference< css::ui::dialogs::XDialogClosedListener >
                                 m_xListener;
     bool                        m_bInExecuteAsync;
     bool                        m_bHasFilename;
-    ::com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_context;
+    css::uno::Reference < css::uno::XComponentContext >
+                                m_context;
 
     DECL_LINK_TYPED(            FilterSelectHdl_Impl, ListBox&, void );
     DECL_LINK_TYPED(            FilterSelectTimerHdl_Impl, Timer*, void );
@@ -171,8 +172,8 @@ public:
             void                FileSelect();
             void                FilterSelect() override;
 
-    void                        SetBlackList( const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) override;
-    const ::com::sun::star::uno::Sequence< OUString >& GetBlackList() const override;
+    void                        SetBlackList( const css::uno::Sequence< OUString >& rBlackList ) override;
+    const css::uno::Sequence< OUString >& GetBlackList() const override;
     void                        SetStandardDir( const OUString& rStdDir ) override;
     const OUString&             GetStandardDir() const override;
     std::vector<OUString>       GetPathList() const override;        // for MultiSelection
@@ -182,7 +183,7 @@ public:
 
             void                AddFilterGroup(
                                   const OUString& _rFilter,
-                                  const com::sun::star::uno::Sequence< com::sun::star::beans::StringPair >& rFilters ) override;
+                                  const css::uno::Sequence< css::beans::StringPair >& rFilters ) override;
 
             void                SetCurFilter( const OUString& rFilter ) override;
             OUString            GetCurFilter() const override;
@@ -206,7 +207,7 @@ public:
     sal_Int32                   getTargetColorDepth() override;
     sal_Int32                   getAvailableWidth() override;
     sal_Int32                   getAvailableHeight() override;
-    void                        setImage( sal_Int16 aImageFormat, const ::com::sun::star::uno::Any& rImage ) override;
+    void                        setImage( sal_Int16 aImageFormat, const css::uno::Any& rImage ) override;
     bool                        getShowState() override;
     bool                        isAutoExtensionEnabled();
 
@@ -218,7 +219,7 @@ public:
 
     void                        RemovablePlaceSelected(bool enable = true);
 
-    static void                 displayIOException( const OUString& _rURL, ::com::sun::star::ucb::IOErrorCode _eCode );
+    static void                 displayIOException( const OUString& _rURL, css::ucb::IOErrorCode _eCode );
 
     // inline
     inline void                 SetPath( const OUString& rNewURL ) override;
diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index e89793ce9057..3db543b0a243 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -124,7 +124,7 @@ private:
     const SvtFileDialogFilter_Impl* _pCurFilter;
     OUString                        m_sCurrentFilterDisplayName;    // may differ from _pCurFilter->GetName in case it is a cached entry
 
-    ::com::sun::star::uno::Sequence< OUString > _aBlackList;
+    css::uno::Sequence< OUString > _aBlackList;
 
 public:
     SvtFileDialogFilterList_Impl    m_aFilter;
@@ -187,8 +187,8 @@ public:
                             ~SvtExpFileDlg_Impl();
 
 
-    inline void             SetBlackList( const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) { _aBlackList = rBlackList; }
-    inline const ::com::sun::star::uno::Sequence< OUString >& GetBlackList() const { return _aBlackList; }
+    inline void             SetBlackList( const css::uno::Sequence< OUString >& rBlackList ) { _aBlackList = rBlackList; }
+    inline const css::uno::Sequence< OUString >& GetBlackList() const { return _aBlackList; }
     void                    SetStandardDir( const OUString& _rDir );
     inline const OUString&  GetStandardDir() const          { return _aStdDir; }
     inline void             DisableFilterBoxAutoWidth()     { _pLbFilter->EnableDDAutoWidth( false ); }