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>
author: Noel Grandin <noel@peralex.com> 2015-10-13 14:19:14 +0200
committer: Noel Grandin <noelgrandin@gmail.com> 2015-10-14 06:36:34 +0000
commit: ba974ccc8c49766542ddd727c95ecc5db1cff198 (patch)
tree: 8abc8f43d1f223f3a0b365c64970662226fd67c7 /fpicker/source
parent: 8cd15d5356e26952a43b06abf875c47a086bbdf1 (diff)
53 files changed, 492 insertions, 500 deletions
diff --git a/fpicker/source/aqua/AquaFilePickerDelegate.mm b/fpicker/source/aqua/AquaFilePickerDelegate.mm
index 34385b6ebe64..af3805a5517a 100644
--- a/fpicker/source/aqua/AquaFilePickerDelegate.mm
+++ b/fpicker/source/aqua/AquaFilePickerDelegate.mm
@@ -56,7 +56,7 @@
 {
     (void)sender;
     if (filePicker != NULL) {
-        ::com::sun::star::ui::dialogs::FilePickerEvent evt;
+        css::ui::dialogs::FilePickerEvent evt;
         filePicker->fileSelectionChanged(evt);
     }
 }
@@ -66,7 +66,7 @@
     (void)sender;
     (void)path;
     if (filePicker != NULL) {
-        ::com::sun::star::ui::dialogs::FilePickerEvent evt;
+        css::ui::dialogs::FilePickerEvent evt;
         filePicker->directoryChanged(evt);
     }
 }
@@ -107,7 +107,7 @@
     uno::Any aValue;
     aValue <<= ([((NSButton*)sender) state] == NSOnState);
     
-    filePicker->setValue(::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION, 0, aValue);
+    filePicker->setValue(css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION, 0, aValue);
 }
 
 @end
diff --git a/fpicker/source/aqua/FilterHelper.hxx b/fpicker/source/aqua/FilterHelper.hxx
index 7c30d53cc62c..a11a28155e61 100644
--- a/fpicker/source/aqua/FilterHelper.hxx
+++ b/fpicker/source/aqua/FilterHelper.hxx
@@ -34,8 +34,8 @@
 #include <Cocoa/Cocoa.h>
 #include <postmac.h>
 
-typedef ::com::sun::star::beans::StringPair UnoFilterEntry;
-typedef ::com::sun::star::uno::Sequence< UnoFilterEntry >   UnoFilterList;  // can be transported more effectively
+typedef css::beans::StringPair UnoFilterEntry;
+typedef css::uno::Sequence< UnoFilterEntry >   UnoFilterList;  // can be transported more effectively
 typedef ::std::list<NSString *> NSStringList;
 typedef ::std::list<OUString> OUStringList;
 
@@ -82,17 +82,17 @@ public:
 
     //XFilterManager delegates
     void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter )
-        throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
+        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
 
     void SAL_CALL setCurrentFilter( const OUString& aTitle )
-        throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
+        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
 
     OUString SAL_CALL getCurrentFilter(  )
-        throw( ::com::sun::star::uno::RuntimeException );
+        throw( css::uno::RuntimeException );
 
     //XFilterGroupManager delegates
-    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);
+    void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters )
+        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
 
 
     //accessor
diff --git a/fpicker/source/aqua/FilterHelper.mm b/fpicker/source/aqua/FilterHelper.mm
index fecea53fee5b..808277deb011 100644
--- a/fpicker/source/aqua/FilterHelper.mm
+++ b/fpicker/source/aqua/FilterHelper.mm
@@ -310,13 +310,13 @@ void FilterHelper::SetFilters()
 }
 
 void FilterHelper::appendFilter(const ::rtl::OUString& aTitle, const ::rtl::OUString& aFilterString)
-throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) {
+throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ) {
     DBG_PRINT_ENTRY(CLASS_NAME, __func__, "title", aTitle, "filter", aFilterString);
 
     SolarMutexGuard aGuard;
 
     if( FilterNameExists( aTitle ) ) {
-        throw com::sun::star::lang::IllegalArgumentException();
+        throw css::lang::IllegalArgumentException();
     }
 
     // ensure that we have a filter list
@@ -331,7 +331,7 @@ throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::
 }
 
 void FilterHelper::setCurrentFilter( const ::rtl::OUString& aTitle )
-throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) {
+throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ) {
     DBG_PRINT_ENTRY(CLASS_NAME, __func__, "aTitle", OUStringToOString(aTitle, RTL_TEXTENCODING_UTF8).getStr());
 
     SetCurFilter(aTitle);
@@ -340,7 +340,7 @@ throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::
 }
 
 ::rtl::OUString SAL_CALL FilterHelper::getCurrentFilter(  )
-throw( ::com::sun::star::uno::RuntimeException ) {
+throw( css::uno::RuntimeException ) {
     DBG_PRINT_ENTRY(CLASS_NAME, __func__);
 
     ::rtl::OUString sReturn = (m_aCurrentFilter);
@@ -350,8 +350,8 @@ throw( ::com::sun::star::uno::RuntimeException ) {
     return sReturn;
 }
 
-void SAL_CALL FilterHelper::appendFilterGroup( const ::rtl::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) {
+void SAL_CALL FilterHelper::appendFilterGroup( const ::rtl::OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters )
+throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) {
 
     DBG_PRINT_ENTRY(CLASS_NAME, __func__, "title", OUStringToOString(sGroupTitle, RTL_TEXTENCODING_UTF8).getStr());
 
@@ -373,8 +373,8 @@ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::
         m_pFilterList->push_back(FilterEntry(dash, emptyList));
     }
 
-    const com::sun::star::beans::StringPair* pSubFilters   = aFilters.getConstArray();
-    const com::sun::star::beans::StringPair* pSubFiltersEnd = pSubFilters + aFilters.getLength();
+    const css::beans::StringPair* pSubFilters   = aFilters.getConstArray();
+    const css::beans::StringPair* pSubFiltersEnd = pSubFilters + aFilters.getLength();
     for( ; pSubFilters != pSubFiltersEnd; ++pSubFilters ) {
         appendFilter(pSubFilters->First, pSubFilters->Second);
     }
diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx
index 80c4486e5401..e33a4895261c 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.hxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.hxx
@@ -36,10 +36,10 @@
 // Implementation class for the XFilePicker Interface
 
 typedef ::cppu::WeakComponentImplHelper <
-            ::com::sun::star::ui::dialogs::XFilePicker3,
-            ::com::sun::star::ui::dialogs::XFilePickerControlAccess,
-            ::com::sun::star::lang::XInitialization,
-           ::com::sun::star::lang::XServiceInfo >  SalAquaFilePicker_Base;
+            css::ui::dialogs::XFilePicker3,
+            css::ui::dialogs::XFilePickerControlAccess,
+            css::lang::XInitialization,
+            css::lang::XServiceInfo >  SalAquaFilePicker_Base;
 
 class SalAquaFilePicker :
     public SalAquaPicker,
@@ -52,106 +52,106 @@ public:
 
     // XFilePickerNotifier
 
-    virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener )
-        throw( ::com::sun::star::uno::RuntimeException ) 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 ) override;
+    virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
+        throw( css::uno::RuntimeException ) override;
+    virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
+        throw( css::uno::RuntimeException ) override;
 
     // XExecutableDialog functions
 
     virtual void SAL_CALL setTitle( const OUString& aTitle )
-        throw( ::com::sun::star::uno::RuntimeException ) override;
+        throw( css::uno::RuntimeException ) override;
 
     virtual sal_Int16 SAL_CALL execute(  )
-        throw( ::com::sun::star::uno::RuntimeException ) override;
+        throw( css::uno::RuntimeException ) override;
 
     // XFilePicker functions
 
     virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode )
-        throw( ::com::sun::star::uno::RuntimeException ) override;
+        throw( css::uno::RuntimeException ) override;
 
     virtual void SAL_CALL setDefaultName( const OUString& aName )
-        throw( ::com::sun::star::uno::RuntimeException ) override;
+        throw( css::uno::RuntimeException ) override;
 
     virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory )
-        throw( com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::uno::RuntimeException ) override;
+        throw( css::lang::IllegalArgumentException,
+               css::uno::RuntimeException ) override;
 
     virtual OUString SAL_CALL getDisplayDirectory(  )
-        throw( ::com::sun::star::uno::RuntimeException ) override;
+        throw( css::uno::RuntimeException ) override;
 
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles(  )
-        throw( ::com::sun::star::uno::RuntimeException ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getFiles(  )
+        throw( css::uno::RuntimeException ) override;
 
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles(  )
-        throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles(  )
+        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 ) override;
+        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ) override;
 
     virtual void SAL_CALL setCurrentFilter( const OUString& aTitle )
-        throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) override;
+        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ) override;
 
     virtual OUString SAL_CALL getCurrentFilter(  )
-        throw( ::com::sun::star::uno::RuntimeException ) override;
+        throw( css::uno::RuntimeException ) 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) override;
+    virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters )
+        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override;
 
     // XFilePickerControlAccess functions
 
-    virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any& aValue )
-        throw (::com::sun::star::uno::RuntimeException) override;
+    virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const css::uno::Any& aValue )
+        throw (css::uno::RuntimeException) override;
 
-    virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction )
-        throw (::com::sun::star::uno::RuntimeException) override;
+    virtual css::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction )
+        throw (css::uno::RuntimeException) override;
 
     virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable )
-        throw(::com::sun::star::uno::RuntimeException ) override;
+        throw(css::uno::RuntimeException ) override;
 
     virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString& aLabel )
-        throw (::com::sun::star::uno::RuntimeException) override;
+        throw (css::uno::RuntimeException) override;
 
     virtual OUString SAL_CALL getLabel( sal_Int16 nControlId )
-        throw (::com::sun::star::uno::RuntimeException) override;
+        throw (css::uno::RuntimeException) override;
 
     // XInitialization
 
-    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) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
+        throw(css::uno::Exception, css::uno::RuntimeException) override;
 
     // XCancellable
 
     virtual void SAL_CALL cancel( )
-        throw( ::com::sun::star::uno::RuntimeException ) override;
+        throw( css::uno::RuntimeException ) override;
 
     // XEventListener
 
     using cppu::WeakComponentImplHelperBase::disposing;
-    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent )
-        throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent )
+        throw(css::uno::RuntimeException);
 
     // XServiceInfo
 
     virtual OUString SAL_CALL getImplementationName(  )
-        throw(::com::sun::star::uno::RuntimeException) override;
+        throw(css::uno::RuntimeException) override;
 
     virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw(::com::sun::star::uno::RuntimeException) override;
+        throw(css::uno::RuntimeException) override;
 
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw(::com::sun::star::uno::RuntimeException) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
+        throw(css::uno::RuntimeException) override;
 
     // FilePicker Event functions
 
-   void SAL_CALL fileSelectionChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent );
-   void SAL_CALL directoryChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent );
-   // OUString SAL_CALL helpRequested( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ) const;
-   void SAL_CALL controlStateChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent );
+   void SAL_CALL fileSelectionChanged( css::ui::dialogs::FilePickerEvent aEvent );
+   void SAL_CALL directoryChanged( css::ui::dialogs::FilePickerEvent aEvent );
+   // OUString SAL_CALL helpRequested( css::ui::dialogs::FilePickerEvent aEvent ) const;
+   void SAL_CALL controlStateChanged( css::ui::dialogs::FilePickerEvent aEvent );
    void SAL_CALL dialogSizeChanged( );
 
    inline AquaFilePickerDelegate * getDelegate() {
@@ -168,13 +168,9 @@ private:
 
     virtual void ensureFilterHelper();
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >
-    m_xListener;
-
+    css::uno::Reference< css::ui::dialogs::XFilePickerListener >  m_xListener;
     FilterHelper *m_pFilterHelper;
-
     OUString m_sSaveFileName;
-
     AquaFilePickerDelegate *m_pDelegate;
 
     void updateFilterUI();
@@ -187,7 +183,6 @@ public:
     void filterControlChanged();
 
     void implInitialize();
-
 };
 
 #endif // INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAFILEPICKER_HXX
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index 5ee58921e7a6..6eb3042c266a 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -631,7 +631,7 @@ void SAL_CALL SalAquaFilePicker::disposing( const lang::EventObject& aEvent ) th
 
     SolarMutexGuard aGuard;
 
-    uno::Reference<XFilePickerListener> xFilePickerListener( aEvent.Source, ::com::sun::star::uno::UNO_QUERY );
+    uno::Reference<XFilePickerListener> xFilePickerListener( aEvent.Source, css::uno::UNO_QUERY );
 
     if( xFilePickerListener.is() )
         removeFilePickerListener( xFilePickerListener );
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.hxx b/fpicker/source/aqua/SalAquaFolderPicker.hxx
index 89fd1ea6f56a..547cae2f5f38 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.hxx
+++ b/fpicker/source/aqua/SalAquaFolderPicker.hxx
@@ -38,74 +38,74 @@
 class SalAquaFolderPicker :
         public SalAquaPicker,
     public cppu::WeakImplHelper<
-    ::com::sun::star::ui::dialogs::XFolderPicker2,
-    ::com::sun::star::lang::XServiceInfo,
-    ::com::sun::star::lang::XEventListener >
+    css::ui::dialogs::XFolderPicker2,
+    css::lang::XServiceInfo,
+    css::lang::XEventListener >
 {
 public:
 
     // constructor
-    SalAquaFolderPicker( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceMgr );
+    SalAquaFolderPicker( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceMgr );
 
 
     // XExecutableDialog functions
 
 
     virtual void SAL_CALL setTitle( const OUString& aTitle )
-        throw( ::com::sun::star::uno::RuntimeException ) override;
+        throw( css::uno::RuntimeException ) override;
 
     virtual sal_Int16 SAL_CALL execute(  )
-        throw( ::com::sun::star::uno::RuntimeException ) override;
+        throw( css::uno::RuntimeException ) override;
 
 
     // XFolderPicker functions
 
 
     virtual void SAL_CALL setDisplayDirectory( const OUString& rDirectory )
-        throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException ) override;
+        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException ) override;
 
     virtual OUString SAL_CALL getDisplayDirectory(  )
-        throw( com::sun::star::uno::RuntimeException ) override;
+        throw( css::uno::RuntimeException ) override;
 
     virtual OUString SAL_CALL getDirectory( )
-        throw( com::sun::star::uno::RuntimeException ) override;
+        throw( css::uno::RuntimeException ) override;
 
     virtual void SAL_CALL setDescription( const OUString& rDescription )
-        throw( com::sun::star::uno::RuntimeException ) override;
+        throw( css::uno::RuntimeException ) override;
 
 
     // XServiceInfo
 
 
     virtual OUString SAL_CALL getImplementationName(  )
-        throw(::com::sun::star::uno::RuntimeException) override;
+        throw(css::uno::RuntimeException) override;
 
     virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw(::com::sun::star::uno::RuntimeException) override;
+        throw(css::uno::RuntimeException) override;
 
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw(::com::sun::star::uno::RuntimeException) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
+        throw(css::uno::RuntimeException) override;
 
 
     // XCancellable
 
 
     virtual void SAL_CALL cancel( )
-        throw( ::com::sun::star::uno::RuntimeException ) override;
+        throw( css::uno::RuntimeException ) override;
 
 
     // XEventListener
 
 
-    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent )
-        throw(::com::sun::star::uno::RuntimeException) override;
+    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent )
+        throw(css::uno::RuntimeException) override;
 
 private:
     SalAquaFolderPicker( const SalAquaFolderPicker& ) = delete;
     SalAquaFolderPicker& operator=( const SalAquaFolderPicker& ) = delete;
 
     // to instantiate own services
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceMgr;
+    css::uno::Reference< css::lang::XMultiServiceFactory > m_xServiceMgr;
 
 };
 
diff --git a/fpicker/source/aqua/SalAquaPicker.hxx b/fpicker/source/aqua/SalAquaPicker.hxx
index 076f22a1ecc2..2ff8345a0111 100644
--- a/fpicker/source/aqua/SalAquaPicker.hxx
+++ b/fpicker/source/aqua/SalAquaPicker.hxx
@@ -73,13 +73,13 @@ protected:
     NavigationServices_DialogType m_nDialogType;
 
     void implsetTitle( const OUString& aTitle )
-        throw( ::com::sun::star::uno::RuntimeException );
+        throw( css::uno::RuntimeException );
 
     void implsetDisplayDirectory( const OUString& rDirectory )
-        throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException );
+        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
 
     OUString implgetDisplayDirectory(  )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( css::uno::RuntimeException );
 
     void implInitialize( );
 
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 ); }
diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index d80c74020e25..b08e53b68ccf 100644
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -123,7 +123,7 @@ void SAL_CALL CFilePicker::removeFilePickerListener(const uno::Reference<XFilePi
 
 void SAL_CALL CFilePicker::disposing(const lang::EventObject& aEvent) throw(uno::RuntimeException)
 {
-    uno::Reference<XFilePickerListener> xFilePickerListener(aEvent.Source, ::com::sun::star::uno::UNO_QUERY);
+    uno::Reference<XFilePickerListener> xFilePickerListener(aEvent.Source, css::uno::UNO_QUERY);
 
     if (xFilePickerListener.is())
         removeFilePickerListener(xFilePickerListener);
diff --git a/fpicker/source/win32/filepicker/FilePicker.hxx b/fpicker/source/win32/filepicker/FilePicker.hxx
index c6231526195c..1c68cf029d4b 100644
--- a/fpicker/source/win32/filepicker/FilePicker.hxx
+++ b/fpicker/source/win32/filepicker/FilePicker.hxx
@@ -45,11 +45,11 @@ protected:
 };
 
 typedef ::cppu::WeakComponentImplHelper <
-            ::com::sun::star::ui::dialogs::XFilePicker3,
-            ::com::sun::star::ui::dialogs::XFilePickerControlAccess,
-            ::com::sun::star::ui::dialogs::XFilePreview,
-            ::com::sun::star::lang::XInitialization,
-            ::com::sun::star::lang::XServiceInfo >   CFilePicker_Base;
+            css::ui::dialogs::XFilePicker3,
+            css::ui::dialogs::XFilePickerControlAccess,
+            css::ui::dialogs::XFilePreview,
+            css::lang::XInitialization,
+            css::lang::XServiceInfo >   CFilePicker_Base;
 
 class CFilePicker :
     public CFilePickerDummy,
@@ -58,126 +58,126 @@ class CFilePicker :
 public:
 
     // ctor
-    CFilePicker( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceMgr );
+    CFilePicker( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceMgr );
 
     // XFilePickerNotifier
 
-    virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener )
-        throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener )
-        throw( ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
+        throw( css::uno::RuntimeException );
+    virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
+        throw( css::uno::RuntimeException );
 
     // XExecutableDialog functions
 
     virtual void SAL_CALL setTitle( const OUString& aTitle )
-        throw( ::com::sun::star::uno::RuntimeException );
+        throw( css::uno::RuntimeException );
 
     virtual sal_Int16 SAL_CALL execute(  )
-        throw( ::com::sun::star::uno::RuntimeException );
+        throw( css::uno::RuntimeException );
 
     // XFilePicker functions
 
     virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode )
-        throw( ::com::sun::star::uno::RuntimeException );
+        throw( css::uno::RuntimeException );
 
     virtual void SAL_CALL setDefaultName( const OUString& aName )
-        throw( ::com::sun::star::uno::RuntimeException );
+        throw( css::uno::RuntimeException );
 
     virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory )
-        throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
+        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
 
     virtual OUString SAL_CALL getDisplayDirectory(  )
-        throw( ::com::sun::star::uno::RuntimeException );
+        throw( css::uno::RuntimeException );
 
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles(  )
-        throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Sequence< OUString > SAL_CALL getFiles(  )
+        throw( css::uno::RuntimeException );
 
     // XFilePicker2 functions
 
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception);
+    virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles(  )
+        throw (css::uno::RuntimeException, std::exception);
 
     // XFilterManager functions
 
     virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter )
-        throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
+        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
 
     virtual void SAL_CALL setCurrentFilter( const OUString& aTitle )
-        throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
+        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
 
     virtual OUString SAL_CALL getCurrentFilter(  )
-        throw( ::com::sun::star::uno::RuntimeException );
+        throw( css::uno::RuntimeException );
 
     // 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);
+    virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters )
+        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
 
     // XFilePickerControlAccess functions
 
-    virtual void SAL_CALL setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const ::com::sun::star::uno::Any& aValue )
-        throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const css::uno::Any& aValue )
+        throw (css::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction )
-        throw (::com::sun::star::uno::RuntimeException);
+    virtual css::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction )
+        throw (css::uno::RuntimeException);
 
     virtual void SAL_CALL enableControl( sal_Int16 aControlId, sal_Bool bEnable )
-        throw(::com::sun::star::uno::RuntimeException );
+        throw(css::uno::RuntimeException );
 
     virtual void SAL_CALL setLabel( sal_Int16 aControlId, const OUString& aLabel )
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (css::uno::RuntimeException);
 
     virtual OUString SAL_CALL getLabel( sal_Int16 aControlId )
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (css::uno::RuntimeException);
 
     // XFilePreview
 
-    virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats(  ) throw (css::uno::RuntimeException);
 
-    virtual sal_Int32 SAL_CALL getTargetColorDepth(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getTargetColorDepth(  ) throw (css::uno::RuntimeException);
 
-    virtual sal_Int32 SAL_CALL getAvailableWidth(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getAvailableWidth(  ) throw (css::uno::RuntimeException);
 
-    virtual sal_Int32 SAL_CALL getAvailableHeight(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getAvailableHeight(  ) throw (css::uno::RuntimeException);
 
-    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);
+    virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
 
-    virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState ) throw (css::uno::RuntimeException);
 
-    virtual sal_Bool SAL_CALL getShowState(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL getShowState(  ) throw (css::uno::RuntimeException);
 
     // XInitialization
 
-    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);
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
+        throw(css::uno::Exception, css::uno::RuntimeException);
 
     // XCancellable
 
     virtual void SAL_CALL cancel( )
-        throw(::com::sun::star::uno::RuntimeException);
+        throw(css::uno::RuntimeException);
 
     // XEventListener
 
-    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent )
-        throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent )
+        throw(css::uno::RuntimeException);
 
     // XServiceInfo
 
     virtual OUString SAL_CALL getImplementationName(  )
-        throw(::com::sun::star::uno::RuntimeException);
+        throw(css::uno::RuntimeException);
 
     virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw(::com::sun::star::uno::RuntimeException);
+        throw(css::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw(::com::sun::star::uno::RuntimeException);
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
+        throw(css::uno::RuntimeException);
 
     // FilePicker Event functions
 
-    void SAL_CALL fileSelectionChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent );
-    void SAL_CALL directoryChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent );
-    OUString SAL_CALL helpRequested( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ) const;
-    void SAL_CALL controlStateChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent );
+    void SAL_CALL fileSelectionChanged( css::ui::dialogs::FilePickerEvent aEvent );
+    void SAL_CALL directoryChanged( css::ui::dialogs::FilePickerEvent aEvent );
+    OUString SAL_CALL helpRequested( css::ui::dialogs::FilePickerEvent aEvent ) const;
+    void SAL_CALL controlStateChanged( css::ui::dialogs::FilePickerEvent aEvent );
     void SAL_CALL dialogSizeChanged( );
 
     bool startupEventNotification(bool bStartupSuspended);
@@ -193,9 +193,9 @@ private:
     using WeakComponentImplHelperBase::disposing;
 
 private:
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceMgr;   // to instanciate own services
-    CAsyncEventNotifier                                                            m_aAsyncEventNotifier;
-    std::unique_ptr<CWinFileOpenImpl>                                                m_pImpl;
+    css::uno::Reference< css::lang::XMultiServiceFactory > m_xServiceMgr;   // to instanciate own services
+    CAsyncEventNotifier                                    m_aAsyncEventNotifier;
+    std::unique_ptr<CWinFileOpenImpl>                      m_pImpl;
 };
 
 #endif
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index 479d23d17f55..f6714cad191e 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -184,9 +184,9 @@ sal_Int16 SAL_CALL CWinFileOpenImpl::execute(  ) throw(uno::RuntimeException)
     sal_Int16 rc = CFileOpenDialog::doModal();
 
     if (1 == rc)
-        rc = ::com::sun::star::ui::dialogs::ExecutableDialogResults::OK;
+        rc = css::ui::dialogs::ExecutableDialogResults::OK;
     else if (0 == rc)
-        rc = ::com::sun::star::ui::dialogs::ExecutableDialogResults::CANCEL;
+        rc = css::ui::dialogs::ExecutableDialogResults::CANCEL;
     else
         throw uno::RuntimeException(
             "Error executing dialog",
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
index fd17c3fe362e..e25a2fa77759 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
@@ -56,76 +56,76 @@ public:
 
     // XExecutableDialog
 
-    virtual sal_Int16 SAL_CALL execute(  ) throw( ::com::sun::star::uno::RuntimeException );
+    virtual sal_Int16 SAL_CALL execute(  ) throw( css::uno::RuntimeException );
 
     // XFilePicker
 
     virtual void SAL_CALL setDefaultName( const OUString& aName )
-        throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
+        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
 
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles(  )
-        throw(::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Sequence< OUString > SAL_CALL getFiles(  )
+        throw(css::uno::RuntimeException );
 
     virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory )
-        throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
+        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
 
-    virtual OUString SAL_CALL getDisplayDirectory( ) throw ( ::com::sun::star::uno::RuntimeException );
+    virtual OUString SAL_CALL getDisplayDirectory( ) throw ( css::uno::RuntimeException );
 
     // XFilterManager
 
     virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter )
-        throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
+        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
 
     virtual void SAL_CALL setCurrentFilter( const OUString& aTitle )
-        throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
+        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
 
     virtual OUString  SAL_CALL getCurrentFilter( )
-        throw( ::com::sun::star::uno::RuntimeException );
+        throw( css::uno::RuntimeException );
 
     // XFilterGroupManager
 
-    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);
+    virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters )
+        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
 
     // XFilePickerControlAccess
 
-    virtual void SAL_CALL setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const ::com::sun::star::uno::Any& aValue )
-        throw( ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const css::uno::Any& aValue )
+        throw( css::uno::RuntimeException );
 
-    virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction )
-        throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction )
+        throw( css::uno::RuntimeException );
 
     virtual void SAL_CALL enableControl( sal_Int16 aControlId, sal_Bool bEnable )
-        throw( ::com::sun::star::uno::RuntimeException );
+        throw( css::uno::RuntimeException );
 
     virtual void SAL_CALL setLabel( sal_Int16 aControlId, const OUString& aLabel )
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (css::uno::RuntimeException);
 
     virtual OUString SAL_CALL getLabel( sal_Int16 aControlId )
-        throw ( ::com::sun::star::uno::RuntimeException);
+        throw ( css::uno::RuntimeException);
 
     // XFilePreview
 
-    virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats(  )
-        throw (::com::sun::star::uno::RuntimeException);
+    virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats(  )
+        throw (css::uno::RuntimeException);
 
     virtual sal_Int32 SAL_CALL getTargetColorDepth( )
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (css::uno::RuntimeException);
 
     virtual sal_Int32 SAL_CALL getAvailableWidth( )
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (css::uno::RuntimeException);
 
     virtual sal_Int32 SAL_CALL getAvailableHeight( )
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (css::uno::RuntimeException);
 
-    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);
+    virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage )
+        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
 
     virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState )
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (css::uno::RuntimeException);
 
     virtual sal_Bool SAL_CALL getShowState( )
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (css::uno::RuntimeException);
 
     // XCancelable
 
@@ -185,7 +185,7 @@ private:
     std::unique_ptr<CCustomControl>         m_CustomControls;
     CFilePicker*                            m_FilePicker;
     WNDPROC                                 m_pfnOldDlgProc;
-    OUString                           m_defaultName;
+    OUString                                m_defaultName;
     sal_Bool                                m_bInitialSelChanged;
     CHelpPopupWindow                        m_HelpPopupWindow;
     CFilePickerState*                       m_FilePickerState;
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.hxx b/fpicker/source/win32/filepicker/asynceventnotifier.hxx
index 14f65f053bc5..b5d4d1735c86 100644
--- a/fpicker/source/win32/filepicker/asynceventnotifier.hxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.hxx
@@ -62,10 +62,10 @@ public:
     // the CEventNotification instance
     void SAL_CALL notifyEvent(CEventNotification* EventNotification);
 
-    void SAL_CALL addListener   (const ::com::sun::star::uno::Type&                                           aType    ,
-                                 const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener);
-    void SAL_CALL removeListener(const ::com::sun::star::uno::Type&                                           aType    ,
-                                 const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener);
+    void SAL_CALL addListener   (const css::uno::Type&                                           aType    ,
+                                 const css::uno::Reference< css::uno::XInterface >& xListener);
+    void SAL_CALL removeListener(const css::uno::Type&                                           aType    ,
+                                 const css::uno::Reference< css::uno::XInterface >& xListener);
 
 private:
     size_t              SAL_CALL getEventListSize();
diff --git a/fpicker/source/win32/filepicker/controlaccess.hxx b/fpicker/source/win32/filepicker/controlaccess.hxx
index f3eb55243ea6..55544e3e42c8 100644
--- a/fpicker/source/win32/filepicker/controlaccess.hxx
+++ b/fpicker/source/win32/filepicker/controlaccess.hxx
@@ -33,8 +33,8 @@
 #endif
 #include <com/sun/star/uno/Any.hxx>
 
-typedef void ( SAL_CALL *CTRL_SETVALUE_FUNCTION_T)( HWND, const ::com::sun::star::uno::Any&, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >&, sal_Int16 );
-typedef ::com::sun::star::uno::Any ( SAL_CALL *CTRL_GETVALUE_FUNCTION_T )( HWND );
+typedef void ( SAL_CALL *CTRL_SETVALUE_FUNCTION_T)( HWND, const css::uno::Any&, const css::uno::Reference< css::uno::XInterface >&, sal_Int16 );
+typedef css::uno::Any ( SAL_CALL *CTRL_GETVALUE_FUNCTION_T )( HWND );
 
 // the currently supported control classes
 enum CTRL_CLASS
diff --git a/fpicker/source/win32/filepicker/controlcommand.cxx b/fpicker/source/win32/filepicker/controlcommand.cxx
index 6800e677ee54..c68f9a842985 100644
--- a/fpicker/source/win32/filepicker/controlcommand.cxx
+++ b/fpicker/source/win32/filepicker/controlcommand.cxx
@@ -102,7 +102,7 @@ sal_Int16 SAL_CALL CControlCommand::getControlId( ) const
 CValueControlCommand::CValueControlCommand(
         sal_Int16 aControlId,
         sal_Int16 aControlAction,
-        const ::com::sun::star::uno::Any& aValue ) :
+        const css::uno::Any& aValue ) :
     CControlCommand( aControlId ),
     m_aControlAction( aControlAction ),
     m_aValue( aValue )
@@ -170,7 +170,7 @@ sal_Int16 SAL_CALL CValueControlCommand::getControlAction( ) const
 
 
 
-::com::sun::star::uno::Any SAL_CALL CValueControlCommand::getValue( ) const
+css::uno::Any SAL_CALL CValueControlCommand::getValue( ) const
 {
     return m_aValue;
 }
diff --git a/fpicker/source/win32/filepicker/controlcommand.hxx b/fpicker/source/win32/filepicker/controlcommand.hxx
index b1d20d35c7c9..c843589c8617 100644
--- a/fpicker/source/win32/filepicker/controlcommand.hxx
+++ b/fpicker/source/win32/filepicker/controlcommand.hxx
@@ -75,7 +75,7 @@ public:
     CValueControlCommand(
         sal_Int16 aControlId,
         sal_Int16 aControlAction,
-        const ::com::sun::star::uno::Any& aValue );
+        const css::uno::Any& aValue );
 
     virtual void SAL_CALL exec( CFilePickerState* aFilePickerState );
 
@@ -83,11 +83,11 @@ public:
 
     sal_Int16 SAL_CALL getControlAction( ) const;
 
-    ::com::sun::star::uno::Any SAL_CALL getValue( ) const;
+    css::uno::Any SAL_CALL getValue( ) const;
 
 private:
-    sal_Int16                  m_aControlAction;
-    ::com::sun::star::uno::Any m_aValue;
+    sal_Int16     m_aControlAction;
+    css::uno::Any m_aValue;
 };
 
 
diff --git a/fpicker/source/win32/filepicker/controlcommandresult.hxx b/fpicker/source/win32/filepicker/controlcommandresult.hxx
index 2abd1e8bd54e..f32fff6ad79a 100644
--- a/fpicker/source/win32/filepicker/controlcommandresult.hxx
+++ b/fpicker/source/win32/filepicker/controlcommandresult.hxx
@@ -56,19 +56,19 @@ private:
 class CValueCommandResult : public CControlCommandResult
 {
 public:
-    CValueCommandResult( sal_Bool bResult, const ::com::sun::star::uno::Any& aValue ) :
+    CValueCommandResult( sal_Bool bResult, const css::uno::Any& aValue ) :
         CControlCommandResult( bResult ),
         m_aValue( aValue )
     {
     }
 
-    ::com::sun::star::uno::Any SAL_CALL getValue( ) const
+    css::uno::Any SAL_CALL getValue( ) const
     {
         return m_aValue;
     }
 
 private:
-    ::com::sun::star::uno::Any m_aValue;
+    css::uno::Any m_aValue;
 };
 
 
diff --git a/fpicker/source/win32/filepicker/dibpreview.hxx b/fpicker/source/win32/filepicker/dibpreview.hxx
index 14ab01a08b16..c88a51c269f9 100644
--- a/fpicker/source/win32/filepicker/dibpreview.hxx
+++ b/fpicker/source/win32/filepicker/dibpreview.hxx
@@ -54,22 +54,22 @@ public:
     // preview interface implementation
 
     virtual sal_Int32 SAL_CALL getTargetColorDepth()
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (css::uno::RuntimeException);
 
     virtual sal_Int32 SAL_CALL getAvailableWidth()
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (css::uno::RuntimeException);
 
     virtual sal_Int32 SAL_CALL getAvailableHeight()
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (css::uno::RuntimeException);
 
-    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);
+    virtual void SAL_CALL setImage(sal_Int16 aImageFormat, const css::uno::Any& aImage)
+        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
 
     virtual sal_Bool SAL_CALL setShowState(sal_Bool bShowState)
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (css::uno::RuntimeException);
 
     virtual sal_Bool SAL_CALL getShowState()
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (css::uno::RuntimeException);
 
     virtual HWND SAL_CALL getWindowHandle() const;
 
@@ -84,7 +84,7 @@ private:
 private:
     HINSTANCE  m_Instance;
     HWND       m_Hwnd;
-    com::sun::star::uno::Sequence<sal_Int8> m_Image;
+    css::uno::Sequence<sal_Int8> m_Image;
     osl::Mutex  m_PaintLock;
 
     // the preview window class has to be registered only
diff --git a/fpicker/source/win32/filepicker/eventnotification.hxx b/fpicker/source/win32/filepicker/eventnotification.hxx
index e726b91ee660..5f99f761ddb0 100644
--- a/fpicker/source/win32/filepicker/eventnotification.hxx
+++ b/fpicker/source/win32/filepicker/eventnotification.hxx
@@ -37,7 +37,7 @@ class CEventNotification
 public:
     virtual ~CEventNotification() { };
 
-    virtual void SAL_CALL notifyEventListener( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xListener ) = 0;
+    virtual void SAL_CALL notifyEventListener( css::uno::Reference< css::uno::XInterface > xListener ) = 0;
 };
 
 #endif
diff --git a/fpicker/source/win32/filepicker/filepickereventnotification.hxx b/fpicker/source/win32/filepicker/filepickereventnotification.hxx
index 7edac324a42c..bb9a0582055e 100644
--- a/fpicker/source/win32/filepicker/filepickereventnotification.hxx
+++ b/fpicker/source/win32/filepicker/filepickereventnotification.hxx
@@ -32,12 +32,12 @@
 class CFilePickerEventNotification : public CEventNotification
 {
 public:
-    typedef void (SAL_CALL ::com::sun::star::ui::dialogs::XFilePickerListener::*EventListenerMethod_t)();
+    typedef void (SAL_CALL css::ui::dialogs::XFilePickerListener::*EventListenerMethod_t)();
 
 public:
     CFilePickerEventNotification(EventListenerMethod_t EventListenerMethod);
 
-    virtual void SAL_CALL notifyEventListener( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xListener );
+    virtual void SAL_CALL notifyEventListener( css::uno::Reference< css::uno::XInterface > xListener );
 
 private:
     EventListenerMethod_t m_EventListenerMethod;
@@ -50,15 +50,15 @@ private:
 class CFilePickerParamEventNotification : public CEventNotification
 {
 public:
-    typedef void (SAL_CALL ::com::sun::star::ui::dialogs::XFilePickerListener::*EventListenerMethod_t)(const ::com::sun::star::ui::dialogs::FilePickerEvent&);
+    typedef void (SAL_CALL css::ui::dialogs::XFilePickerListener::*EventListenerMethod_t)(const css::ui::dialogs::FilePickerEvent&);
 
-    CFilePickerParamEventNotification(EventListenerMethod_t EventListenerMethod, const ::com::sun::star::ui::dialogs::FilePickerEvent& FilePickerEvent);
+    CFilePickerParamEventNotification(EventListenerMethod_t EventListenerMethod, const css::ui::dialogs::FilePickerEvent& FilePickerEvent);
 
-    virtual void SAL_CALL notifyEventListener( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xListener );
+    virtual void SAL_CALL notifyEventListener( css::uno::Reference< css::uno::XInterface > xListener );
 
 private:
-    EventListenerMethod_t                        m_EventListenerMethod;
-    com::sun::star::ui::dialogs::FilePickerEvent m_FilePickerEvent;
+    EventListenerMethod_t             m_EventListenerMethod;
+    css::ui::dialogs::FilePickerEvent m_FilePickerEvent;
 };
 
 
diff --git a/fpicker/source/win32/filepicker/filepickerstate.cxx b/fpicker/source/win32/filepicker/filepickerstate.cxx
index e1e80dcf8ef9..91e3e5ece9b0 100644
--- a/fpicker/source/win32/filepicker/filepickerstate.cxx
+++ b/fpicker/source/win32/filepicker/filepickerstate.cxx
@@ -370,7 +370,7 @@ CExecuteFilePickerState::CExecuteFilePickerState( HWND hwndDlg ) :
 void SAL_CALL CExecuteFilePickerState::setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const Any& aValue )
 {
     // we do not support SET_HELP_URL/GET_HELP_URL
-    if ( com::sun::star::ui::dialogs::ControlActions::SET_HELP_URL == aControlAction )
+    if ( css::ui::dialogs::ControlActions::SET_HELP_URL == aControlAction )
         return;
 
     HWND hwndCtrl = GetHwndDlgItem( aControlId );
@@ -412,7 +412,7 @@ void SAL_CALL CExecuteFilePickerState::setValue( sal_Int16 aControlId, sal_Int16
 Any SAL_CALL CExecuteFilePickerState::getValue( sal_Int16 aControlId, sal_Int16 aControlAction )
 {
     // we do not support SET_HELP_URL/GET_HELP_URL
-    if ( com::sun::star::ui::dialogs::ControlActions::GET_HELP_URL == aControlAction )
+    if ( css::ui::dialogs::ControlActions::GET_HELP_URL == aControlAction )
         return Any( );
 
     HWND hwndCtrl = GetHwndDlgItem( aControlId );
@@ -619,7 +619,7 @@ void SAL_CALL CExecuteFilePickerState::cacheControlState( HWND hwndControl, CFil
             aControlAction,
             lpfnGetValue( hwndControl ) );
 
-        aControlAction = ::com::sun::star::ui::dialogs::ControlActions::GET_SELECTED_ITEM_INDEX;
+        aControlAction = css::ui::dialogs::ControlActions::GET_SELECTED_ITEM_INDEX;
 
         lpfnGetValue = GetCtrlGetValueFunction( aCtrlClass, aControlAction );
 
diff --git a/fpicker/source/win32/filepicker/filepickerstate.hxx b/fpicker/source/win32/filepicker/filepickerstate.hxx
index 10953bc09012..fbf15f62747c 100644
--- a/fpicker/source/win32/filepicker/filepickerstate.hxx
+++ b/fpicker/source/win32/filepicker/filepickerstate.hxx
@@ -50,9 +50,9 @@ class CFilePickerState
 public:
     virtual ~CFilePickerState( );
 
-    virtual void SAL_CALL setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const ::com::sun::star::uno::Any& aValue ) = 0;
+    virtual void SAL_CALL setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const css::uno::Any& aValue ) = 0;
 
-    virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction ) = 0;
+    virtual css::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction ) = 0;
 
     virtual void SAL_CALL enableControl( sal_Int16 aControlId, sal_Bool bEnable ) = 0;
 
@@ -60,7 +60,7 @@ public:
 
     virtual OUString SAL_CALL getLabel( sal_Int16 aControlId ) = 0;
 
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( CFileOpenDialog* aFileOpenDialog ) = 0;
+    virtual css::uno::Sequence< OUString > SAL_CALL getFiles( CFileOpenDialog* aFileOpenDialog ) = 0;
 
     virtual OUString SAL_CALL getDisplayDirectory( CFileOpenDialog* aFileOpenDialog ) = 0;
 };
@@ -76,9 +76,9 @@ public:
 
     virtual ~CNonExecuteFilePickerState( );
 
-    virtual void SAL_CALL setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const ::com::sun::star::uno::Any& aValue );
+    virtual void SAL_CALL setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const css::uno::Any& aValue );
 
-    virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction );
+    virtual css::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction );
 
     virtual void SAL_CALL enableControl( sal_Int16 aControlId, sal_Bool bEnable );
 
@@ -86,7 +86,7 @@ public:
 
     virtual OUString SAL_CALL getLabel( sal_Int16 aControlId );
 
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( CFileOpenDialog* aFileOpenDialog );
+    virtual css::uno::Sequence< OUString > SAL_CALL getFiles( CFileOpenDialog* aFileOpenDialog );
 
     virtual OUString SAL_CALL getDisplayDirectory( CFileOpenDialog* aFileOpenDialog );
 
@@ -110,9 +110,9 @@ class CExecuteFilePickerState : public CFilePickerState
 public:
     CExecuteFilePickerState( HWND hwndDlg = NULL );
 
-    virtual void SAL_CALL setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const ::com::sun::star::uno::Any& aValue );
+    virtual void SAL_CALL setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const css::uno::Any& aValue );
 
-    virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction );
+    virtual css::uno::Any SAL_CALL getValue( sal_Int16 aControlId, sal_Int16 aControlAction );
 
     virtual void SAL_CALL enableControl( sal_Int16 aControlId, sal_Bool bEnable );
 
@@ -120,7 +120,7 @@ public:
 
     virtual OUString SAL_CALL getLabel( sal_Int16 aControlId );
 
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( CFileOpenDialog* aFileOpenDialog );
+    virtual css::uno::Sequence< OUString > SAL_CALL getFiles( CFileOpenDialog* aFileOpenDialog );
 
     virtual OUString SAL_CALL getDisplayDirectory( CFileOpenDialog* aFileOpenDialog );
 
diff --git a/fpicker/source/win32/filepicker/previewadapter.cxx b/fpicker/source/win32/filepicker/previewadapter.cxx
index 0cd90f3ebd04..1180d8856f29 100644
--- a/fpicker/source/win32/filepicker/previewadapter.cxx
+++ b/fpicker/source/win32/filepicker/previewadapter.cxx
@@ -462,8 +462,8 @@ CPreviewAdapter::~CPreviewAdapter()
 
 Sequence<sal_Int16> SAL_CALL CPreviewAdapter::getSupportedImageFormats()
 {
-    com::sun::star::uno::Sequence<sal_Int16> imgFormats(1);
-    imgFormats[0] = ::com::sun::star::ui::dialogs::FilePreviewImageFormats::BITMAP;
+    css::uno::Sequence<sal_Int16> imgFormats(1);
+    imgFormats[0] = css::ui::dialogs::FilePreviewImageFormats::BITMAP;
     return imgFormats;
 }
 
diff --git a/fpicker/source/win32/filepicker/previewadapter.hxx b/fpicker/source/win32/filepicker/previewadapter.hxx
index 9c813eb63ca5..c3cfe171b0f7 100644
--- a/fpicker/source/win32/filepicker/previewadapter.hxx
+++ b/fpicker/source/win32/filepicker/previewadapter.hxx
@@ -54,7 +54,7 @@ public:
 
     ~CPreviewAdapter();
 
-    ::com::sun::star::uno::Sequence<sal_Int16> SAL_CALL getSupportedImageFormats();
+    css::uno::Sequence<sal_Int16> SAL_CALL getSupportedImageFormats();
 
     sal_Int32 SAL_CALL getTargetColorDepth();
 
@@ -62,8 +62,8 @@ public:
 
     sal_Int32 SAL_CALL getAvailableHeight();
 
-    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);
+    void SAL_CALL setImage(sal_Int16 aImageFormat, const css::uno::Any& aImage)
+        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
 
     sal_Bool SAL_CALL setShowState(sal_Bool bShowState);
 
diff --git a/fpicker/source/win32/filepicker/previewbase.cxx b/fpicker/source/win32/filepicker/previewbase.cxx
index 8c189ffbef93..1e8ecea46114 100644
--- a/fpicker/source/win32/filepicker/previewbase.cxx
+++ b/fpicker/source/win32/filepicker/previewbase.cxx
@@ -30,7 +30,7 @@ using namespace com::sun::star::lang;
 
 
 PreviewBase::PreviewBase() :
-    m_ImageFormat(::com::sun::star::ui::dialogs::FilePreviewImageFormats::BITMAP),
+    m_ImageFormat(css::ui::dialogs::FilePreviewImageFormats::BITMAP),
     m_bShowState(sal_False)
 {
 }
@@ -74,10 +74,10 @@ sal_Int32 SAL_CALL PreviewBase::getAvailableHeight() throw (RuntimeException)
 
 
 
-void SAL_CALL PreviewBase::setImage( sal_Int16 aImageFormat, const ::com::sun::star::uno::Any& aImage )
+void SAL_CALL PreviewBase::setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage )
     throw (IllegalArgumentException, RuntimeException)
 {
-    if (aImageFormat != ::com::sun::star::ui::dialogs::FilePreviewImageFormats::BITMAP)
+    if (aImageFormat != css::ui::dialogs::FilePreviewImageFormats::BITMAP)
         throw IllegalArgumentException(
             "unsupported image format", 0, 1);
 
@@ -94,7 +94,7 @@ void SAL_CALL PreviewBase::setImage( sal_Int16 aImageFormat, const ::com::sun::s
 
 
 
-void SAL_CALL PreviewBase::getImage(sal_Int16& aImageFormat,com::sun::star::uno::Any& aImage)
+void SAL_CALL PreviewBase::getImage(sal_Int16& aImageFormat,css::uno::Any& aImage)
 {
     aImageFormat = m_ImageFormat;
     aImage       = m_ImageData;
diff --git a/fpicker/source/win32/filepicker/previewbase.hxx b/fpicker/source/win32/filepicker/previewbase.hxx
index 6a449da8210b..03a6e617b2ea 100644
--- a/fpicker/source/win32/filepicker/previewbase.hxx
+++ b/fpicker/source/win32/filepicker/previewbase.hxx
@@ -47,33 +47,33 @@ public:
     virtual ~PreviewBase();
 
     virtual sal_Int32 SAL_CALL getTargetColorDepth()
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (css::uno::RuntimeException);
 
     virtual sal_Int32 SAL_CALL getAvailableWidth()
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (css::uno::RuntimeException);
 
     virtual sal_Int32 SAL_CALL getAvailableHeight()
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (css::uno::RuntimeException);
 
-    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);
+    virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage )
+        throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
 
     virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState )
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (css::uno::RuntimeException);
 
     virtual sal_Bool SAL_CALL getShowState()
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (css::uno::RuntimeException);
 
-    virtual void SAL_CALL getImage(sal_Int16& aImageFormat,com::sun::star::uno::Any& aImage);
+    virtual void SAL_CALL getImage(sal_Int16& aImageFormat,css::uno::Any& aImage);
 
     sal_Bool SAL_CALL getImaginaryShowState() const;
 
     virtual HWND SAL_CALL getWindowHandle() const;
 
 protected:
-    ::com::sun::star::uno::Any m_ImageData;
-    sal_Int16                  m_ImageFormat;
-    sal_Bool                   m_bShowState;
+    css::uno::Any m_ImageData;
+    sal_Int16     m_ImageFormat;
+    sal_Bool      m_bShowState;
 };
 
 
diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
index fc5ed9f88a78..a2ba8fe9cdbd 100644
--- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
+++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
@@ -86,33 +86,33 @@ class FilePickerListener : public WeakImplHelper< XFilePickerListener >
 public:
 
     // XEventListener
-    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
-        throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
+        throw(css::uno::RuntimeException);
 
     // XFilePickerListener
-    virtual void SAL_CALL fileSelectionChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent )
-        throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL fileSelectionChanged( const css::ui::dialogs::FilePickerEvent& aEvent )
+        throw(css::uno::RuntimeException);
 
-    virtual void SAL_CALL directoryChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent )
-        throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL directoryChanged( const css::ui::dialogs::FilePickerEvent& aEvent )
+        throw(css::uno::RuntimeException);
 
-    virtual OUString SAL_CALL helpRequested( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent )
-        throw(::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL helpRequested( const css::ui::dialogs::FilePickerEvent& aEvent )
+        throw(css::uno::RuntimeException);
 
-    virtual void SAL_CALL controlStateChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent )
-        throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL controlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent )
+        throw(css::uno::RuntimeException);
 
     virtual void SAL_CALL dialogSizeChanged(  )
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (css::uno::RuntimeException);
 };
 
-void SAL_CALL FilePickerListener::disposing( const ::com::sun::star::lang::EventObject& Source )
-    throw(::com::sun::star::uno::RuntimeException)
+void SAL_CALL FilePickerListener::disposing( const css::lang::EventObject& Source )
+    throw(css::uno::RuntimeException)
 {
 }
 
-void SAL_CALL FilePickerListener::fileSelectionChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent )
-    throw(::com::sun::star::uno::RuntimeException)
+void SAL_CALL FilePickerListener::fileSelectionChanged( const css::ui::dialogs::FilePickerEvent& aEvent )
+    throw(css::uno::RuntimeException)
 {
     try
     {
@@ -178,20 +178,20 @@ void SAL_CALL FilePickerListener::fileSelectionChanged( const ::com::sun::star::
     }
 }
 
-void SAL_CALL FilePickerListener::directoryChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent )
-    throw(::com::sun::star::uno::RuntimeException)
+void SAL_CALL FilePickerListener::directoryChanged( const css::ui::dialogs::FilePickerEvent& aEvent )
+    throw(css::uno::RuntimeException)
 {
     Reference< XFilePickerControlAccess > rFilePickerCtrlAccess( aEvent.Source, UNO_QUERY );
 }
 
-OUString SAL_CALL FilePickerListener::helpRequested( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent )
-    throw(::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL FilePickerListener::helpRequested( const css::ui::dialogs::FilePickerEvent& aEvent )
+    throw(css::uno::RuntimeException)
 {
     return OUString( );
 }
 
-void SAL_CALL FilePickerListener::controlStateChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent )
-    throw(::com::sun::star::uno::RuntimeException)
+void SAL_CALL FilePickerListener::controlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent )
+    throw(css::uno::RuntimeException)
 {
     try
     {
@@ -225,7 +225,7 @@ void SAL_CALL FilePickerListener::controlStateChanged( const ::com::sun::star::u
 }
 
 void SAL_CALL FilePickerListener::dialogSizeChanged( )
-    throw(::com::sun::star::uno::RuntimeException)
+    throw(css::uno::RuntimeException)
 {
 }
 
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.hxx b/fpicker/source/win32/folderpicker/FolderPicker.hxx
index 44bffab787b6..d5612ee1095d 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.hxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.hxx
@@ -37,59 +37,59 @@
 
 class CFolderPicker :
     public  cppu::WeakImplHelper<
-                com::sun::star::ui::dialogs::XFolderPicker2,
-                com::sun::star::lang::XServiceInfo >
+                css::ui::dialogs::XFolderPicker2,
+                css::lang::XServiceInfo >
 {
 public:
 
     // ctor/dtor
-    CFolderPicker( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceMgr );
+    CFolderPicker( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceMgr );
 
 
     // XExecutableDialog
 
 
     virtual void SAL_CALL setTitle( const OUString& aTitle )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( css::uno::RuntimeException );
 
     virtual sal_Int16 SAL_CALL execute(  )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( css::uno::RuntimeException );
 
 
     // XFolderPicker functions
 
 
     virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory )
-        throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException );
+        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
 
     virtual OUString SAL_CALL getDisplayDirectory(  )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( css::uno::RuntimeException );
 
     virtual OUString SAL_CALL getDirectory( )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( css::uno::RuntimeException );
 
     virtual void SAL_CALL setDescription( const OUString& aDescription )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( css::uno::RuntimeException );
 
 
     // XServiceInfo
 
 
     virtual OUString SAL_CALL getImplementationName(  )
-        throw(::com::sun::star::uno::RuntimeException);
+        throw(css::uno::RuntimeException);
 
     virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw(::com::sun::star::uno::RuntimeException);
+        throw(css::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
-        throw(::com::sun::star::uno::RuntimeException);
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
+        throw(css::uno::RuntimeException);
 
 
     // XCancellable
 
 
     virtual void SAL_CALL cancel( )
-        throw(::com::sun::star::uno::RuntimeException);
+        throw(css::uno::RuntimeException);
 
 
     // overwrite base class method, which is called
@@ -99,9 +99,9 @@ public:
     virtual void SAL_CALL disposing();
 
 private:
-    com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xServiceMgr;
-    std::unique_ptr< CWinFolderPickerImpl >   m_pFolderPickerImpl;
-    osl::Mutex  m_aMutex;
+    css::uno::Reference< css::lang::XMultiServiceFactory >  m_xServiceMgr;
+    std::unique_ptr< CWinFolderPickerImpl >                 m_pFolderPickerImpl;
+    osl::Mutex                                              m_aMutex;
 
 // prevent copy and assignment
 private:
diff --git a/fpicker/source/win32/folderpicker/FopEvtDisp.hxx b/fpicker/source/win32/folderpicker/FopEvtDisp.hxx
index e2fb45f87055..8fc481f03922 100644
--- a/fpicker/source/win32/folderpicker/FopEvtDisp.hxx
+++ b/fpicker/source/win32/folderpicker/FopEvtDisp.hxx
@@ -28,7 +28,7 @@ class CFOPEventDispatcher
 public:
 
     // dispatches a FilePickerEvent to wherever
-    virtual void SAL_CALL helpRequested( ::com::sun::star::lang::EventObject aEvent ) const = 0;
+    virtual void SAL_CALL helpRequested( css::lang::EventObject aEvent ) const = 0;
 };
 
 #endif
diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
index 25b76dfd19da..481fc1f82354 100644
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
@@ -50,7 +50,7 @@ const OUString BACKSLASH( "\\" );
 CWinFolderPickerImpl::CWinFolderPickerImpl( CFolderPicker* aFolderPicker ) :
    CMtaFolderPicker( BIF_RETURNONLYFSDIRS | BIF_RETURNFSANCESTORS | BIF_EDITBOX | BIF_VALIDATE ),
    m_pFolderPicker( aFolderPicker ),
-   m_nLastDlgResult( ::com::sun::star::ui::dialogs::ExecutableDialogResults::CANCEL )
+   m_nLastDlgResult( css::ui::dialogs::ExecutableDialogResults::CANCEL )
 {
 }
 
@@ -134,8 +134,8 @@ OUString SAL_CALL CWinFolderPickerImpl::getDirectory( ) throw( RuntimeException
 sal_Int16 SAL_CALL CWinFolderPickerImpl::execute( ) throw( RuntimeException )
 {
     return m_nLastDlgResult = CMtaFolderPicker::browseForFolder( ) ?
-        ::com::sun::star::ui::dialogs::ExecutableDialogResults::OK :
-        ::com::sun::star::ui::dialogs::ExecutableDialogResults::CANCEL;
+        css::ui::dialogs::ExecutableDialogResults::OK :
+        css::ui::dialogs::ExecutableDialogResults::CANCEL;
 }
 
 
diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
index 1dd59cc6d61a..ecfe8ff4b8b8 100644
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx
@@ -40,20 +40,20 @@ public:
 
 
     virtual sal_Int16 SAL_CALL execute(  )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( css::uno::RuntimeException );
 
 
     // XFolderPicker
 
 
     virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory )
-        throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException );
+        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
 
     virtual OUString SAL_CALL getDisplayDirectory( )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( css::uno::RuntimeException );
 
     virtual OUString SAL_CALL getDirectory( )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( css::uno::RuntimeException );
 
 protected:
     virtual void SAL_CALL onSelChanged( const OUString& aNewPath );
diff --git a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
index 304175d88a99..84097f0ec9ac 100644
--- a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
+++ b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
@@ -117,7 +117,7 @@ int SAL_CALL main(int /*nArgc*/, char* /*Argv[]*/, char* /*Env[]*/  )
         rootDir = xFolderPicker->getDisplayDirectory( );
         selectedDir = xFolderPicker->getDirectory( );
     }
-    catch( ::com::sun::star::uno::Exception& )
+    catch( css::uno::Exception& )
     {
         MessageBox( NULL, "Exception caught!", "Error", MB_OK );
     }
diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx
index df12f544950e..28957e17eed5 100644
--- a/fpicker/source/win32/misc/WinImplHelper.cxx
+++ b/fpicker/source/win32/misc/WinImplHelper.cxx
@@ -350,7 +350,7 @@ Any SAL_CALL CheckboxGetState( HWND hwnd )
 
 
 void SAL_CALL CheckboxSetState(
-    HWND hwnd, const ::com::sun::star::uno::Any& aState, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos )
+    HWND hwnd, const css::uno::Any& aState, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos )
     throw( IllegalArgumentException )
 {
     OSL_ASSERT( IsWindow( hwnd ) );
diff --git a/fpicker/source/win32/misc/WinImplHelper.hxx b/fpicker/source/win32/misc/WinImplHelper.hxx
index 11fe51813f8f..b6f2751a2a8b 100644
--- a/fpicker/source/win32/misc/WinImplHelper.hxx
+++ b/fpicker/source/win32/misc/WinImplHelper.hxx
@@ -38,36 +38,36 @@ bool SAL_CALL IsWindowsVistaOrNewer();
 
 // set actions
 void SAL_CALL ListboxAddItem(
-    HWND hwnd, const ::com::sun::star::uno::Any& aItem, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rXInterface, sal_Int16 aArgPos )
-    throw( ::com::sun::star::lang::IllegalArgumentException );
+    HWND hwnd, const css::uno::Any& aItem, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos )
+    throw( css::lang::IllegalArgumentException );
 
 void SAL_CALL ListboxAddItems(
-    HWND hwnd, const ::com::sun::star::uno::Any& aItemList, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rXInterface, sal_Int16 aArgPos )
-    throw( ::com::sun::star::lang:: IllegalArgumentException );
+    HWND hwnd, const css::uno::Any& aItemList, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos )
+    throw( css::lang:: IllegalArgumentException );
 
 void SAL_CALL ListboxDeleteItem(
-    HWND hwnd, const ::com::sun::star::uno::Any& aPosition, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rXInterface, sal_Int16 aArgPos )
-    throw( ::com::sun::star::lang::IllegalArgumentException );
+    HWND hwnd, const css::uno::Any& aPosition, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos )
+    throw( css::lang::IllegalArgumentException );
 
 void SAL_CALL ListboxDeleteItems(
-    HWND hwnd, const ::com::sun::star::uno::Any& aUnused, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rXInterface, sal_Int16 aArgPos )
-    throw( ::com::sun::star::lang::IllegalArgumentException );
+    HWND hwnd, const css::uno::Any& aUnused, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos )
+    throw( css::lang::IllegalArgumentException );
 
 void SAL_CALL ListboxSetSelectedItem(
-    HWND hwnd, const ::com::sun::star::uno::Any& aPosition, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rXInterface, sal_Int16 aArgPos )
-    throw( ::com::sun::star::lang::IllegalArgumentException );
+    HWND hwnd, const css::uno::Any& aPosition, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos )
+    throw( css::lang::IllegalArgumentException );
 
 // get actions
-::com::sun::star::uno::Any SAL_CALL ListboxGetItems( HWND hwnd );
-::com::sun::star::uno::Any SAL_CALL ListboxGetSelectedItem( HWND hwnd );
-::com::sun::star::uno::Any SAL_CALL ListboxGetSelectedItemIndex( HWND hwnd );
+css::uno::Any SAL_CALL ListboxGetItems( HWND hwnd );
+css::uno::Any SAL_CALL ListboxGetSelectedItem( HWND hwnd );
+css::uno::Any SAL_CALL ListboxGetSelectedItemIndex( HWND hwnd );
 
 // checkbox helper functions
-::com::sun::star::uno::Any SAL_CALL CheckboxGetState( HWND hwnd );
+css::uno::Any SAL_CALL CheckboxGetState( HWND hwnd );
 
 void SAL_CALL CheckboxSetState(
-    HWND hwnd, const ::com::sun::star::uno::Any& aState, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rXInterface, sal_Int16 aArgPos )
-    throw( ::com::sun::star::lang::IllegalArgumentException );
+    HWND hwnd, const css::uno::Any& aState, const css::uno::Reference< css::uno::XInterface >& rXInterface, sal_Int16 aArgPos )
+    throw( css::lang::IllegalArgumentException );
 
 // calculates the length of '\0' separated and '\0\0'
 // ending strings used in some Win32 functions
author	Noel Grandin <noel@peralex.com>	2015-10-13 14:19:14 +0200
committer	Noel Grandin <noelgrandin@gmail.com>	2015-10-14 06:36:34 +0000
commit	ba974ccc8c49766542ddd727c95ecc5db1cff198 (patch)
tree	8abc8f43d1f223f3a0b365c64970662226fd67c7 /fpicker/source
parent	8cd15d5356e26952a43b06abf875c47a086bbdf1 (diff)