[Libreoffice-commits] core.git: svtools/inc svtools/source

Fri, 30 Oct 2015 02:59:13 -0700 

 svtools/inc/table/gridtablerenderer.hxx                |    4 
 svtools/inc/vclxaccessibleheaderbar.hxx                |   16 
 svtools/inc/vclxaccessibleheaderbaritem.hxx            |   48 -
 svtools/source/brwbox/brwbox3.cxx                      |    4 
 svtools/source/brwbox/brwimpl.hxx                      |    9 
 svtools/source/brwbox/editbrowseboximpl.hxx            |    2 
 svtools/source/config/apearcfg.cxx                     |    2 
 svtools/source/config/fontsubstconfig.cxx              |    2 
 svtools/source/config/helpopt.cxx                      |    4 
 svtools/source/config/htmlcfg.cxx                      |    2 
 svtools/source/config/optionsdrawinglayer.cxx          |    4 
 svtools/source/contnr/contentenumeration.cxx           |    4 
 svtools/source/contnr/contentenumeration.hxx           |   11 
 svtools/source/contnr/fileview.cxx                     |   16 
 svtools/source/contnr/foldertree.cxx                   |    2 
 svtools/source/contnr/ivctrl.cxx                       |    8 
 svtools/source/contnr/svimpbox.cxx                     |    4 
 svtools/source/contnr/svtabbx.cxx                      |    6 
 svtools/source/contnr/treelistbox.cxx                  |   11 
 svtools/source/control/accessibleruler.cxx             |    4 
 svtools/source/control/headbar.cxx                     |   10 
 svtools/source/control/inettbc.cxx                     |    6 
 svtools/source/control/toolbarmenu.cxx                 |   20 
 svtools/source/control/toolbarmenuimp.hxx              |  156 +++---
 svtools/source/control/valueacc.cxx                    |   18 
 svtools/source/control/valueimp.hxx                    |  152 +++---
 svtools/source/control/vclxaccessibleheaderbar.cxx     |   14 
 svtools/source/control/vclxaccessibleheaderbaritem.cxx |    4 
 svtools/source/dialogs/addresstemplate.cxx             |   15 
 svtools/source/dialogs/colrdlg.cxx                     |    4 
 svtools/source/filter/exportdialog.cxx                 |   10 
 svtools/source/filter/exportdialog.hxx                 |   35 -
 svtools/source/graphic/descriptor.hxx                  |   28 -
 svtools/source/graphic/graphic.cxx                     |    6 
 svtools/source/graphic/graphic.hxx                     |   34 -
 svtools/source/graphic/transformer.hxx                 |   26 -
 svtools/source/hatchwindow/documentcloser.cxx          |   18 
 svtools/source/hatchwindow/hatchwindow.cxx             |    4 
 svtools/source/hatchwindow/ipwin.cxx                   |    2 
 svtools/source/inc/hatchwindow.hxx                     |   30 -
 svtools/source/inc/provider.hxx                        |   32 -
 svtools/source/inc/renderer.hxx                        |   30 -
 svtools/source/inc/unoiface.hxx                        |  354 +++++++-------
 svtools/source/java/javainteractionhandler.cxx         |   10 
 svtools/source/misc/acceleratorexecute.cxx             |   60 +-
 svtools/source/misc/bindablecontrolhelper.cxx          |    2 
 svtools/source/misc/cliplistener.cxx                   |    2 
 svtools/source/misc/embedhlp.cxx                       |    8 
 svtools/source/misc/embedtransfer.cxx                  |   10 
 svtools/source/misc/imagemgr.cxx                       |   34 -
 svtools/source/misc/imageresourceaccess.cxx            |    8 
 svtools/source/misc/openfiledroptargetlistener.cxx     |    8 
 svtools/source/misc/sampletext.cxx                     |   20 
 svtools/source/misc/svtaccessiblefactory.cxx           |   56 +-
 svtools/source/misc/templatefoldercache.cxx            |    2 
 svtools/source/misc/transfer.cxx                       |   65 +-
 svtools/source/misc/transfer2.cxx                      |   12 
 svtools/source/table/cellvalueconversion.hxx           |    2 
 svtools/source/table/tablecontrol_impl.cxx             |    8 
 svtools/source/table/tablecontrol_impl.hxx             |   12 
 svtools/source/toolpanel/dummypanel.hxx                |    4 
 svtools/source/toolpanel/paneltabbarpeer.hxx           |    4 
 svtools/source/toolpanel/toolpaneldeckpeer.hxx         |    4 
 svtools/source/toolpanel/toolpaneldrawer.hxx           |    2 
 svtools/source/toolpanel/toolpaneldrawerpeer.hxx       |    2 
 svtools/source/uno/addrtempuno.cxx                     |   18 
 svtools/source/uno/contextmenuhelper.cxx               |    4 
 svtools/source/uno/framestatuslistener.cxx             |   30 -
 svtools/source/uno/generictoolboxcontroller.cxx        |   22 
 svtools/source/uno/genericunodialog.cxx                |    8 
 svtools/source/uno/miscservices.cxx                    |    4 
 svtools/source/uno/popupmenucontrollerbase.cxx         |   24 
 svtools/source/uno/popupwindowcontroller.cxx           |    6 
 svtools/source/uno/statusbarcontroller.cxx             |   64 +-
 svtools/source/uno/svtxgridcontrol.cxx                 |   62 +-
 svtools/source/uno/svtxgridcontrol.hxx                 |   66 +-
 svtools/source/uno/toolboxcontroller.cxx               |   54 +-
 svtools/source/uno/treecontrolpeer.cxx                 |   60 +-
 svtools/source/uno/treecontrolpeer.hxx                 |  136 ++---
 svtools/source/uno/unocontroltablemodel.cxx            |   50 +-
 svtools/source/uno/unocontroltablemodel.hxx            |   50 +-
 svtools/source/uno/unoevent.cxx                        |   16 
 svtools/source/uno/unogridcolumnfacade.cxx             |   30 -
 svtools/source/uno/unogridcolumnfacade.hxx             |    6 
 svtools/source/uno/unoiface.cxx                        |  424 ++++++++---------
 svtools/source/uno/unoimap.cxx                         |   14 
 svtools/source/uno/wizard/unowizard.cxx                |   52 +-
 svtools/source/uno/wizard/wizardpagecontroller.cxx     |   30 -
 svtools/source/uno/wizard/wizardpagecontroller.hxx     |    8 
 svtools/source/uno/wizard/wizardshell.cxx              |   32 -
 svtools/source/uno/wizard/wizardshell.hxx              |    8 
 91 files changed, 1387 insertions(+), 1397 deletions(-)

New commits:
commit 669b9cd5b8924a121114540adac91cd7e2f8b0ad
Author: Noel Grandin <n...@peralex.com>
Date:   Fri Oct 30 10:16:38 2015 +0200

    com::sun::star->css in svtools
    
    Change-Id: I95fd8317ab1142068e0c7b50fc62643fe9f95dc2
    Reviewed-on: https://gerrit.libreoffice.org/19683
    Reviewed-by: Noel Grandin <noelgran...@gmail.com>
    Tested-by: Noel Grandin <noelgran...@gmail.com>

diff --git a/svtools/inc/table/gridtablerenderer.hxx 
b/svtools/inc/table/gridtablerenderer.hxx
index 79f28d7..fba9c2c 100644
--- a/svtools/inc/table/gridtablerenderer.hxx
+++ b/svtools/inc/table/gridtablerenderer.hxx
@@ -86,11 +86,11 @@ namespace svt { namespace table
         virtual void    ShowCellCursor( vcl::Window& _rView, const Rectangle& 
_rCursorRect) override;
         virtual void    HideCellCursor( vcl::Window& _rView, const Rectangle& 
_rCursorRect) override;
         virtual bool    FitsIntoCell(
-                            ::com::sun::star::uno::Any const & i_cellContent,
+                            css::uno::Any const & i_cellContent,
                             OutputDevice& i_targetDevice, Rectangle const & 
i_targetArea
                         ) const override;
         virtual bool    GetFormattedCellString(
-                            ::com::sun::star::uno::Any const & i_cellValue,
+                            css::uno::Any const & i_cellValue,
                             OUString & o_cellString
                         ) const override;
 
diff --git a/svtools/inc/vclxaccessibleheaderbar.hxx 
b/svtools/inc/vclxaccessibleheaderbar.hxx
index b608752..165793a 100644
--- a/svtools/inc/vclxaccessibleheaderbar.hxx
+++ b/svtools/inc/vclxaccessibleheaderbar.hxx
@@ -29,7 +29,7 @@ class HeaderBar;
 //  class VCLXAccessibleHeaderBar
 
 
-typedef std::vector< ::com::sun::star::uno::WeakReference< 
::com::sun::star::accessibility::XAccessible > >
+typedef std::vector< css::uno::WeakReference< css::accessibility::XAccessible 
> >
     ListItems;
 
 class VCLXAccessibleHeaderBar : public VCLXAccessibleComponent
@@ -45,18 +45,18 @@ public:
     VCLXAccessibleHeaderBar( VCLXWindow* pVCLXindow );
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( 
sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, 
css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw 
(css::uno::RuntimeException, std::exception) override;
 
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName() throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL 
getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, 
std::exception) override;
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL 
getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) 
override;
 
 public:
     virtual void SAL_CALL disposing() override;
-    ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible > CreateChild(sal_Int32 i);
+    css::uno::Reference< css::accessibility::XAccessible > 
CreateChild(sal_Int32 i);
 
 private:
     ListItems m_aAccessibleChildren;
@@ -70,7 +70,7 @@ public:
     VCLXHeaderBar(vcl::Window* pHeaderBar);
     virtual ~VCLXHeaderBar();
 
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() 
override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > 
CreateAccessibleContext() override;
 
 };
 
diff --git a/svtools/inc/vclxaccessibleheaderbaritem.hxx 
b/svtools/inc/vclxaccessibleheaderbaritem.hxx
index 4aa6dff..fea0fef 100644
--- a/svtools/inc/vclxaccessibleheaderbaritem.hxx
+++ b/svtools/inc/vclxaccessibleheaderbaritem.hxx
@@ -46,8 +46,8 @@ class AccessibleStateSetHelper;
 typedef ::comphelper::OAccessibleExtendedComponentHelper    
AccessibleExtendedComponentHelper_BASE;
 
 typedef ::cppu::ImplHelper2<
-::com::sun::star::accessibility::XAccessible,
-::com::sun::star::lang::XServiceInfo > VCLXAccessibleHeaderBarItem_BASE;
+    css::accessibility::XAccessible,
+    css::lang::XServiceInfo > VCLXAccessibleHeaderBarItem_BASE;
 
 class VCLXAccessibleHeaderBarItem :    public 
AccessibleExtendedComponentHelper_BASE,
                         public VCLXAccessibleHeaderBarItem_BASE
@@ -62,7 +62,7 @@ protected:
     void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& 
rStateSet );
 
     // OCommonAccessibleComponent
-    virtual ::com::sun::star::awt::Rectangle implGetBounds(  ) throw 
(::com::sun::star::uno::RuntimeException) override;
+    virtual css::awt::Rectangle implGetBounds(  ) throw 
(css::uno::RuntimeException) override;
 
     // XComponent
     virtual void SAL_CALL    disposing() override;
@@ -78,35 +78,35 @@ 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& rServiceName ) 
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& rServiceName ) 
throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 
throw (css::uno::RuntimeException, std::exception) override;
 
     // XAccessible
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessibleContext > SAL_CALL 
getAccessibleContext(  ) throw (::com::sun::star::uno::RuntimeException, 
std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > 
SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, 
std::exception) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( 
sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) 
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL 
getAccessibleRelationSet(  ) throw (::com::sun::star::uno::RuntimeException, 
std::exception) override;
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL 
getAccessibleStateSet(  ) throw (::com::sun::star::uno::RuntimeException, 
std::exception) override;
-    virtual ::com::sun::star::lang::Locale SAL_CALL getLocale(  ) throw 
(::com::sun::star::accessibility::IllegalAccessibleComponentStateException, 
::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, 
css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) 
override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAccessibleDescription(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > 
SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, 
std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > 
SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, 
std::exception) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) throw 
(css::accessibility::IllegalAccessibleComponentStateException, 
css::uno::RuntimeException, std::exception) override;
 
     // XAccessibleComponent
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( 
const ::com::sun::star::awt::Point& aPoint ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override {};
-    virtual sal_Int32 SAL_CALL getForeground() throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground() throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleAtPoint( const css::awt::Point& aPoint ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, 
std::exception) override {};
+    virtual sal_Int32 SAL_CALL getForeground() throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackground() throw 
(css::uno::RuntimeException, std::exception) override;
 
     // XAccessibleExtendedComponent
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > 
SAL_CALL getFont(    ) throw (::com::sun::star::uno::RuntimeException, 
std::exception) override;
-    virtual OUString SAL_CALL getTitledBorderText(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getToolTipText(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(    ) 
throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getTitledBorderText(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getToolTipText(  ) throw 
(css::uno::RuntimeException, std::exception) override;
 };
 
 #endif // INCLUDED_SVTOOLS_INC_VCLXACCESSIBLEHEADERBARITEM_HXX
diff --git a/svtools/source/brwbox/brwbox3.cxx 
b/svtools/source/brwbox/brwbox3.cxx
index d600235..fd8ead6 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -482,7 +482,7 @@ sal_Int32 BrowseBox::GetSelectedColumnCount() const
     return pColumnSel ? pColumnSel->GetSelectCount() : 0;
 }
 
-void BrowseBox::GetAllSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 
>& _rRows ) const
+void BrowseBox::GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& _rRows ) 
const
 {
     sal_Int32 nCount = GetSelectRowCount();
     if( nCount )
@@ -496,7 +496,7 @@ void BrowseBox::GetAllSelectedRows( 
::com::sun::star::uno::Sequence< sal_Int32 >
     }
 }
 
-void BrowseBox::GetAllSelectedColumns( ::com::sun::star::uno::Sequence< 
sal_Int32 >& _rColumns ) const
+void BrowseBox::GetAllSelectedColumns( css::uno::Sequence< sal_Int32 >& 
_rColumns ) const
 {
     const MultiSelection* pColumnSel = GetColumnSelection();
     sal_Int32 nCount = GetSelectedColumnCount();
diff --git a/svtools/source/brwbox/brwimpl.hxx 
b/svtools/source/brwbox/brwimpl.hxx
index 997769d..4738f5b 100644
--- a/svtools/source/brwbox/brwimpl.hxx
+++ b/svtools/source/brwbox/brwimpl.hxx
@@ -37,15 +37,14 @@ namespace svt
         {
             inline void operator()(const THeaderCellMap::value_type& _aType)
             {
-                ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XComponent > xComp(
-                    _aType.second, ::com::sun::star::uno::UNO_QUERY );
+                css::uno::Reference< css::lang::XComponent > xComp( 
_aType.second, css::uno::UNO_QUERY );
                 OSL_ENSURE( xComp.is() || !_aType.second.is(), 
"THeaderCellMapFunctorDispose: invalid accessible cell (no XComponent)!" );
                 if ( xComp.is() )
                     try
                     {
                         xComp->dispose();
                     }
-                    catch( const ::com::sun::star::uno::Exception& )
+                    catch( const css::uno::Exception& )
                     {
                         OSL_FAIL( "THeaderCellMapFunctorDispose: caught an 
exception!" );
                     }
@@ -65,11 +64,11 @@ namespace svt
 
 
         /// @see AccessibleBrowseBox::getHeaderBar
-        ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible >
+        css::uno::Reference< css::accessibility::XAccessible >
             getAccessibleHeaderBar( AccessibleBrowseBoxObjType _eObjType );
 
         /// @see AccessibleBrowseBox::getTable
-        ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible >
+        css::uno::Reference< css::accessibility::XAccessible >
             getAccessibleTable( );
 
     };
diff --git a/svtools/source/brwbox/editbrowseboximpl.hxx 
b/svtools/source/brwbox/editbrowseboximpl.hxx
index 217a3eb..e9055b3 100644
--- a/svtools/source/brwbox/editbrowseboximpl.hxx
+++ b/svtools/source/brwbox/editbrowseboximpl.hxx
@@ -27,7 +27,7 @@ namespace svt
     class EditBrowseBoxImpl
     {
     public:
-        ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible >    m_xActiveCell;
+        css::uno::Reference< css::accessibility::XAccessible >    
m_xActiveCell;
 
         void clearActiveCell();
     };
diff --git a/svtools/source/config/apearcfg.cxx 
b/svtools/source/config/apearcfg.cxx
index 466da3d..ee4b134 100644
--- a/svtools/source/config/apearcfg.cxx
+++ b/svtools/source/config/apearcfg.cxx
@@ -136,7 +136,7 @@ void  SvtTabAppearanceCfg::ImplCommit()
     PutProperties(rNames, aValues);
 }
 
-void SvtTabAppearanceCfg::Notify( const com::sun::star::uno::Sequence< 
OUString >& )
+void SvtTabAppearanceCfg::Notify( const css::uno::Sequence< OUString >& )
 {
 }
 
diff --git a/svtools/source/config/fontsubstconfig.cxx 
b/svtools/source/config/fontsubstconfig.cxx
index 8f37ba8..7586336 100644
--- a/svtools/source/config/fontsubstconfig.cxx
+++ b/svtools/source/config/fontsubstconfig.cxx
@@ -94,7 +94,7 @@ SvtFontSubstConfig::~SvtFontSubstConfig()
     delete pImpl;
 }
 
-void SvtFontSubstConfig::Notify( const com::sun::star::uno::Sequence< OUString 
>& )
+void SvtFontSubstConfig::Notify( const css::uno::Sequence< OUString >& )
 {
 }
 
diff --git a/svtools/source/config/helpopt.cxx 
b/svtools/source/config/helpopt.cxx
index db2b964..ba494a5 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -65,8 +65,8 @@ class SvtHelpOptions_Impl : public utl::ConfigItem
 public:
                     SvtHelpOptions_Impl();
 
-    virtual void    Notify( const com::sun::star::uno::Sequence< OUString >& 
aPropertyNames ) override;
-    void            Load( const ::com::sun::star::uno::Sequence< OUString>& 
aPropertyNames);
+    virtual void    Notify( const css::uno::Sequence< OUString >& 
aPropertyNames ) override;
+    void            Load( const css::uno::Sequence< OUString>& aPropertyNames);
 
     void            SetExtendedHelp( bool b )           { bExtendedHelp= b; 
SetModified(); }
     bool            IsExtendedHelp() const                  { return 
bExtendedHelp; }
diff --git a/svtools/source/config/htmlcfg.cxx 
b/svtools/source/config/htmlcfg.cxx
index 84c6cb8..db190b0 100644
--- a/svtools/source/config/htmlcfg.cxx
+++ b/svtools/source/config/htmlcfg.cxx
@@ -241,7 +241,7 @@ void    SvxHtmlOptions::ImplCommit()
     PutProperties(aNames, aValues);
 }
 
-void SvxHtmlOptions::Notify( const com::sun::star::uno::Sequence< OUString >& )
+void SvxHtmlOptions::Notify( const css::uno::Sequence< OUString >& )
 {
     Load( GetPropertyNames() );
 }
diff --git a/svtools/source/config/optionsdrawinglayer.cxx 
b/svtools/source/config/optionsdrawinglayer.cxx
index 68e010f..b7dbadf 100644
--- a/svtools/source/config/optionsdrawinglayer.cxx
+++ b/svtools/source/config/optionsdrawinglayer.cxx
@@ -168,7 +168,7 @@ public:
 
 //  override methods of baseclass
 
-    virtual void Notify( const com::sun::star::uno::Sequence<OUString>& 
aPropertyNames) override;
+    virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames) 
override;
 
 
 //  public interface
@@ -673,7 +673,7 @@ void SvtOptionsDrawinglayer_Impl::ImplCommit()
     PutProperties( aSeqNames, aSeqValues );
 }
 
-void SvtOptionsDrawinglayer_Impl::Notify( const 
com::sun::star::uno::Sequence<OUString>& )
+void SvtOptionsDrawinglayer_Impl::Notify( const css::uno::Sequence<OUString>& )
 {
 }
 
diff --git a/svtools/source/contnr/contentenumeration.cxx 
b/svtools/source/contnr/contentenumeration.cxx
index bb07a8b..f4eed43 100644
--- a/svtools/source/contnr/contentenumeration.cxx
+++ b/svtools/source/contnr/contentenumeration.cxx
@@ -83,7 +83,7 @@ namespace svt
         ,m_pTranslator           ( _pTranslator    )
         ,m_pResultHandler        ( NULL            )
         ,m_bCancelled            ( false           )
-        ,m_rBlackList            ( ::com::sun::star::uno::Sequence< OUString 
>() )
+        ,m_rBlackList            ( css::uno::Sequence< OUString >() )
     {
     }
 
@@ -106,7 +106,7 @@ namespace svt
 
     EnumerationResult FileViewContentEnumerator::enumerateFolderContentSync(
         const FolderDescriptor& _rFolder,
-        const ::com::sun::star::uno::Sequence< OUString >& rBlackList )
+        const css::uno::Sequence< OUString >& rBlackList )
     {
         {
             ::osl::MutexGuard aGuard( m_aMutex );
diff --git a/svtools/source/contnr/contentenumeration.hxx 
b/svtools/source/contnr/contentenumeration.hxx
index 1791a21..8c63ef9 100644
--- a/svtools/source/contnr/contentenumeration.hxx
+++ b/svtools/source/contnr/contentenumeration.hxx
@@ -189,17 +189,16 @@ namespace svt
         mutable ::osl::Mutex            m_aMutex;
 
         FolderDescriptor                m_aFolder;
-        ::com::sun::star::uno::Reference< 
::com::sun::star::ucb::XCommandEnvironment >
+        css::uno::Reference< css::ucb::XCommandEnvironment >
                                         m_xCommandEnv;
         const IContentTitleTranslation* m_pTranslator;
         IEnumerationResultHandler*      m_pResultHandler;
         bool                            m_bCancelled;
 
-        mutable ::com::sun::star::uno::Reference<
-            ::com::sun::star::document::XDocumentProperties>
+        mutable css::uno::Reference< css::document::XDocumentProperties>
                                         m_xDocProps;
 
-        ::com::sun::star::uno::Sequence< OUString > m_rBlackList;
+        css::uno::Sequence< OUString > m_rBlackList;
 
         bool URLOnBlackList ( const OUString& sRealURL );
 
@@ -214,7 +213,7 @@ namespace svt
                 an instance which should be used to translate content titles. 
May be <NULL/>
         */
         FileViewContentEnumerator(
-            const ::com::sun::star::uno::Reference< 
::com::sun::star::ucb::XCommandEnvironment >& _rxCommandEnv,
+            const css::uno::Reference< css::ucb::XCommandEnvironment >& 
_rxCommandEnv,
             ContentData& _rContentToFill,
             ::osl::Mutex& _rContentMutex,
             const IContentTitleTranslation* _pTranslator
@@ -238,7 +237,7 @@ namespace svt
         */
         EnumerationResult   enumerateFolderContentSync(
                     const FolderDescriptor& _rFolder,
-                    const ::com::sun::star::uno::Sequence< OUString >& 
rBlackList = ::com::sun::star::uno::Sequence< OUString >()
+                    const css::uno::Sequence< OUString >& rBlackList = 
css::uno::Sequence< OUString >()
                 );
 
         /** cancels the running operation.
diff --git a/svtools/source/contnr/fileview.cxx 
b/svtools/source/contnr/fileview.cxx
index 7c84374..98b0173 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -357,12 +357,12 @@ public:
     FileViewResult          GetFolderContent_Impl(
         const OUString& rFolder,
         const FileViewAsyncAction* pAsyncDescriptor,
-        const ::com::sun::star::uno::Sequence< OUString >& rBlackList = 
::com::sun::star::uno::Sequence< OUString >() );
+        const css::uno::Sequence< OUString >& rBlackList = css::uno::Sequence< 
OUString >() );
 
     FileViewResult          GetFolderContent_Impl(
         const FolderDescriptor& _rFolder,
         const FileViewAsyncAction* pAsyncDescriptor,
-        const ::com::sun::star::uno::Sequence< OUString >& rBlackList = 
::com::sun::star::uno::Sequence< OUString >());
+        const css::uno::Sequence< OUString >& rBlackList = css::uno::Sequence< 
OUString >());
     void                    FilterFolderContent_Impl( const OUString &rFilter 
);
     void                    CancelRunningAsyncAction();
 
@@ -954,7 +954,7 @@ bool ViewTabListBox_Impl::Kill( const OUString& rContent )
         ::ucbhelper::Content aCnt( rContent, mxCmdEnv, 
comphelper::getProcessComponentContext() );
         aCnt.executeCommand( OUString( "delete" ), makeAny( true ) );
     }
-    catch( ::com::sun::star::ucb::CommandAbortedException const & )
+    catch( css::ucb::CommandAbortedException const & )
     {
         SAL_INFO( "svtools", "CommandAbortedException" );
         bRet = false;
@@ -1077,7 +1077,7 @@ bool SvtFileView::GetParentURL( OUString& rParentURL ) 
const
     {
         ::ucbhelper::Content aCnt( mpImp->maViewURL, mpImp->mxCmdEnv, 
comphelper::getProcessComponentContext() );
         Reference< XContent > xContent( aCnt.get() );
-        Reference< com::sun::star::container::XChild > xChild( xContent, 
UNO_QUERY );
+        Reference< css::container::XChild > xChild( xContent, UNO_QUERY );
         if ( xChild.is() )
         {
             Reference< XContent > xParent( xChild->getParent(), UNO_QUERY );
@@ -1127,7 +1127,7 @@ void SvtFileView::SetPosSizePixel( const Point& rNewPos, 
const Size& rNewSize )
 }
 
 
-bool SvtFileView::Initialize( const ::com::sun::star::uno::Reference< 
::com::sun::star::ucb::XContent>& _xContent, const OUString& rFilter  )
+bool SvtFileView::Initialize( const css::uno::Reference< css::ucb::XContent>& 
_xContent, const OUString& rFilter  )
 {
     WaitObject aWaitCursor( this );
 
@@ -1153,7 +1153,7 @@ FileViewResult SvtFileView::Initialize(
     const OUString& rURL,
     const OUString& rFilter,
     const FileViewAsyncAction* pAsyncDescriptor,
-    const ::com::sun::star::uno::Sequence< OUString >& rBlackList  )
+    const css::uno::Sequence< OUString >& rBlackList  )
 {
     WaitObject aWaitCursor( this );
     mpBlackList = rBlackList;
@@ -1514,7 +1514,7 @@ void SvtFileView_Impl::Clear()
 FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
     const OUString& rFolder,
     const FileViewAsyncAction* pAsyncDescriptor,
-    const ::com::sun::star::uno::Sequence< OUString >& rBlackList )
+    const css::uno::Sequence< OUString >& rBlackList )
 {
     ::osl::ClearableMutexGuard aGuard( maMutex );
     INetURLObject aFolderObj( rFolder );
@@ -1533,7 +1533,7 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
 FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
     const FolderDescriptor& _rFolder,
     const FileViewAsyncAction* pAsyncDescriptor,
-    const ::com::sun::star::uno::Sequence< OUString >& rBlackList )
+    const css::uno::Sequence< OUString >& rBlackList )
 {
     DBG_TESTSOLARMUTEX();
     ::osl::ClearableMutexGuard aGuard( maMutex );
diff --git a/svtools/source/contnr/foldertree.cxx 
b/svtools/source/contnr/foldertree.cxx
index acf54ac..3c7e3cb 100644
--- a/svtools/source/contnr/foldertree.cxx
+++ b/svtools/source/contnr/foldertree.cxx
@@ -153,7 +153,7 @@ void FolderTree::SetTreePath( OUString const & sUrl )
     }
 }
 
-void FolderTree::SetBlackList( const ::com::sun::star::uno::Sequence< OUString 
>& rBlackList )
+void FolderTree::SetBlackList( const css::uno::Sequence< OUString >& 
rBlackList )
 {
     m_aBlackList = rBlackList;
 }
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index de4293c..e512931 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -441,18 +441,18 @@ void SvtIconChoiceCtrl::CallImplEventListeners(sal_uLong 
nEvent, void* pData)
 {
     CallEventListeners(nEvent, pData);
 }
-::com::sun::star::uno::Reference< XAccessible > 
SvtIconChoiceCtrl::CreateAccessible()
+css::uno::Reference< XAccessible > SvtIconChoiceCtrl::CreateAccessible()
 {
     vcl::Window* pParent = GetAccessibleParentWindow();
     DBG_ASSERT( pParent, "SvTreeListBox::CreateAccessible - accessible parent 
not found" );
 
-    ::com::sun::star::uno::Reference< XAccessible > xAccessible;
+    css::uno::Reference< XAccessible > xAccessible;
     if ( pParent )
     {
-        ::com::sun::star::uno::Reference< XAccessible > xAccParent = 
pParent->GetAccessible();
+        css::uno::Reference< XAccessible > xAccParent = 
pParent->GetAccessible();
         if ( xAccParent.is() )
         {
-            ::com::sun::star::uno::Reference< 
::com::sun::star::awt::XWindowPeer > xTemp(GetComponentInterface());
+            css::uno::Reference< css::awt::XWindowPeer > 
xTemp(GetComponentInterface());
             xAccessible = 
_pImp->GetAccessibleFactory().createAccessibleIconChoiceCtrl( *this, xAccParent 
);
         }
     }
diff --git a/svtools/source/contnr/svimpbox.cxx 
b/svtools/source/contnr/svimpbox.cxx
index 9069191..7cf3a8c 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -132,12 +132,12 @@ SvImpLBox::~SvImpLBox()
 
 void SvImpLBox::UpdateStringSorter()
 {
-    const ::com::sun::star::lang::Locale& rNewLocale = 
Application::GetSettings().GetLanguageTag().getLocale();
+    const css::lang::Locale& rNewLocale = 
Application::GetSettings().GetLanguageTag().getLocale();
 
     if( m_pStringSorter )
     {
         // different Locale from the older one, drop it and force recreate
-        const ::com::sun::star::lang::Locale &aLocale = 
m_pStringSorter->getLocale();
+        const css::lang::Locale &aLocale = m_pStringSorter->getLocale();
         if( aLocale.Language != rNewLocale.Language ||
             aLocale.Country != rNewLocale.Country ||
             aLocale.Variant != rNewLocale.Variant )
diff --git a/svtools/source/contnr/svtabbx.cxx 
b/svtools/source/contnr/svtabbx.cxx
index 2a8400b..f12c49b 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -620,7 +620,7 @@ IMPL_LINK_NOARG_TYPED(SvHeaderTabListBox, 
CreateAccessibleHdl_Impl, HeaderBar*,
     DBG_ASSERT( pParent, "SvHeaderTabListBox..CreateAccessibleHdl_Impl - 
accessible parent not found" );
     if ( pParent )
     {
-        ::com::sun::star::uno::Reference< XAccessible > xAccParent = 
pParent->GetAccessible();
+        css::uno::Reference< XAccessible > xAccParent = 
pParent->GetAccessible();
         if ( xAccParent.is() )
         {
             Reference< XAccessible > xAccessible = 
m_pImpl->m_aFactoryAccess.getFactory().createAccessibleBrowseBoxHeaderBar(
@@ -777,11 +777,11 @@ bool SvHeaderTabListBox::IsColumnSelected( long ) const
     return false;
 }
 
-void SvHeaderTabListBox::GetAllSelectedRows( ::com::sun::star::uno::Sequence< 
sal_Int32 >& ) const
+void SvHeaderTabListBox::GetAllSelectedRows( css::uno::Sequence< sal_Int32 >& 
) const
 {
 }
 
-void SvHeaderTabListBox::GetAllSelectedColumns( 
::com::sun::star::uno::Sequence< sal_Int32 >& ) const
+void SvHeaderTabListBox::GetAllSelectedColumns( css::uno::Sequence< sal_Int32 
>& ) const
 {
 }
 
diff --git a/svtools/source/contnr/treelistbox.cxx 
b/svtools/source/contnr/treelistbox.cxx
index 36a9ccc..2c907e2 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -1275,8 +1275,7 @@ void SvTreeListBox::StartDrag( sal_Int8, const Point& 
rPosPixel )
     }
 
     TransferDataContainer* pContainer = new TransferDataContainer;
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::datatransfer::XTransferable > xRef( pContainer );
+    css::uno::Reference< css::datatransfer::XTransferable > xRef( pContainer );
     nDragDropMode = NotifyStartDrag( *pContainer, pEntry );
     if( nDragDropMode == DragDropMode::NONE || 0 == GetSelectionCount() )
     {
@@ -3834,19 +3833,19 @@ void SvTreeListBox::EnableList( bool _bEnable )
     Invalidate(Rectangle(Point(), GetSizePixel()));
 }
 
-::com::sun::star::uno::Reference< XAccessible > 
SvTreeListBox::CreateAccessible()
+css::uno::Reference< XAccessible > SvTreeListBox::CreateAccessible()
 {
     vcl::Window* pParent = GetAccessibleParentWindow();
     DBG_ASSERT( pParent, "SvTreeListBox::CreateAccessible - accessible parent 
not found" );
 
-    ::com::sun::star::uno::Reference< XAccessible > xAccessible;
+    css::uno::Reference< XAccessible > xAccessible;
     if ( pParent )
     {
-        ::com::sun::star::uno::Reference< XAccessible > xAccParent = 
pParent->GetAccessible();
+        css::uno::Reference< XAccessible > xAccParent = 
pParent->GetAccessible();
         if ( xAccParent.is() )
         {
             // need to be done here to get the vclxwindow later on in the 
accessible
-            ::com::sun::star::uno::Reference< 
::com::sun::star::awt::XWindowPeer > xTemp(GetComponentInterface());
+            css::uno::Reference< css::awt::XWindowPeer > 
xTemp(GetComponentInterface());
             xAccessible = 
pImp->m_aFactoryAccess.getFactory().createAccessibleTreeListBox( *this, 
xAccParent );
         }
     }
diff --git a/svtools/source/control/accessibleruler.cxx 
b/svtools/source/control/accessibleruler.cxx
index bec4a32..849a620 100644
--- a/svtools/source/control/accessibleruler.cxx
+++ b/svtools/source/control/accessibleruler.cxx
@@ -289,7 +289,7 @@ void SAL_CALL SvtRulerAccessible::grabFocus() throw( 
RuntimeException, std::exce
 }
 
 sal_Int32 SvtRulerAccessible::getForeground(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception)
+        throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard     aSolarGuard;
     ::osl::MutexGuard   aGuard( m_aMutex );
@@ -298,7 +298,7 @@ sal_Int32 SvtRulerAccessible::getForeground(  )
     return mpRepr->GetControlForeground().GetColor();
 }
 sal_Int32 SvtRulerAccessible::getBackground(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception)
+        throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard     aSolarGuard;
     ::osl::MutexGuard   aGuard( m_aMutex );
diff --git a/svtools/source/control/headbar.cxx 
b/svtools/source/control/headbar.cxx
index db3192a..4391d6a 100644
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.cxx
@@ -1383,7 +1383,7 @@ Size HeaderBar::CalcWindowSizePixel() const
     return aSize;
 }
 
-::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible 
> HeaderBar::CreateAccessible()
+css::uno::Reference< css::accessibility::XAccessible > 
HeaderBar::CreateAccessible()
 {
     if ( !mxAccessible.is() )
     {
@@ -1396,18 +1396,18 @@ Size HeaderBar::CalcWindowSizePixel() const
     return mxAccessible;
 }
 
-void HeaderBar::SetAccessible( ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible > _xAccessible )
+void HeaderBar::SetAccessible( css::uno::Reference< 
css::accessibility::XAccessible > _xAccessible )
 {
     mxAccessible = _xAccessible;
 }
 
-::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > 
HeaderBar::GetComponentInterface( bool bCreate )
+css::uno::Reference< css::awt::XWindowPeer > HeaderBar::GetComponentInterface( 
bool bCreate )
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > 
xPeer
+    css::uno::Reference< css::awt::XWindowPeer > xPeer
         (Window::GetComponentInterface(false));
     if ( !xPeer.is() && bCreate )
     {
-        ::com::sun::star::awt::XWindowPeer* mxPeer = new VCLXHeaderBar(this);
+        css::awt::XWindowPeer* mxPeer = new VCLXHeaderBar(this);
         m_pVCLXHeaderBar = static_cast<VCLXHeaderBar*>(mxPeer);
         SetComponentInterface(mxPeer);
         return mxPeer;
diff --git a/svtools/source/control/inettbc.cxx 
b/svtools/source/control/inettbc.cxx
index 5807711..60c459a 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -386,7 +386,7 @@ void SvtMatchContext_Impl::ReadFolder( const OUString& rURL,
                 xResultSet = xDynamicResultSet->getStaticResultSet();
             }
         }
-        catch( ::com::sun::star::uno::Exception& ) {}
+        catch( css::uno::Exception& ) {}
 
         if ( xResultSet.is() )
         {
@@ -448,12 +448,12 @@ void SvtMatchContext_Impl::ReadFolder( const OUString& 
rURL,
                     }
                 }
             }
-            catch( ::com::sun::star::uno::Exception& )
+            catch( css::uno::Exception& )
             {
             }
         }
     }
-    catch( ::com::sun::star::uno::Exception& )
+    catch( css::uno::Exception& )
     {
     }
 }
diff --git a/svtools/source/control/toolbarmenu.cxx 
b/svtools/source/control/toolbarmenu.cxx
index 3e44d86..69fbbef 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -188,7 +188,7 @@ Reference< XAccessible > 
ToolbarMenuEntry::getAccessibleChild( sal_Int32 index )
 
 
 
-ToolbarMenu_Impl::ToolbarMenu_Impl( ToolbarMenu& rMenu, const 
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame )
+ToolbarMenu_Impl::ToolbarMenu_Impl( ToolbarMenu& rMenu, const 
css::uno::Reference< css::frame::XFrame >& xFrame )
 : mrMenu( rMenu )
 , mxFrame( xFrame )
 , mnCheckPos(0)
@@ -222,7 +222,7 @@ void ToolbarMenu_Impl::setAccessible( ToolbarMenuAcc* 
pAccessible )
 
 
 
-void ToolbarMenu_Impl::fireAccessibleEvent( short nEventId, const 
::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& 
rNewValue )
+void ToolbarMenu_Impl::fireAccessibleEvent( short nEventId, const 
css::uno::Any& rOldValue, const css::uno::Any& rNewValue )
 {
     if( mxAccessible.is() )
         mxAccessible->FireAccessibleEvent( nEventId, rOldValue, rNewValue );
@@ -1520,7 +1520,7 @@ void ToolbarMenu::Command( const CommandEvent& rCEvt )
 
 
 
-Reference< ::com::sun::star::accessibility::XAccessible > 
ToolbarMenu::CreateAccessible()
+Reference< css::accessibility::XAccessible > ToolbarMenu::CreateAccessible()
 {
     mpImpl->setAccessible( new ToolbarMenuAcc( *mpImpl ) );
     return Reference< XAccessible >( mpImpl->mxAccessible.get() );
@@ -1537,7 +1537,7 @@ void ToolbarMenu::AddStatusListener( const OUString& 
rCommandURL )
 
 
 
-void ToolbarMenu::statusChanged( const 
::com::sun::star::frame::FeatureStateEvent& /*Event*/ ) throw ( 
::com::sun::star::uno::RuntimeException, std::exception )
+void ToolbarMenu::statusChanged( const css::frame::FeatureStateEvent& 
/*Event*/ ) throw ( css::uno::RuntimeException, std::exception )
 {
 }
 
@@ -1546,11 +1546,11 @@ void ToolbarMenu::statusChanged( const 
::com::sun::star::frame::FeatureStateEven
 class ToolbarMenuStatusListener : public svt::FrameStatusListener
 {
 public:
-    ToolbarMenuStatusListener( const ::com::sun::star::uno::Reference< 
::com::sun::star::frame::XFrame >& xFrame,
+    ToolbarMenuStatusListener( const css::uno::Reference< css::frame::XFrame 
>& xFrame,
                                ToolbarMenu& rToolbarMenu );
 
-    virtual void SAL_CALL dispose() throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL statusChanged( const 
::com::sun::star::frame::FeatureStateEvent& Event ) throw ( 
::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, 
std::exception) override;
+    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& 
Event ) throw ( css::uno::RuntimeException, std::exception ) override;
 
     VclPtr<ToolbarMenu> mpMenu;
 };
@@ -1558,7 +1558,7 @@ public:
 
 
 ToolbarMenuStatusListener::ToolbarMenuStatusListener(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& 
xFrame,
+    const css::uno::Reference< css::frame::XFrame >& xFrame,
     ToolbarMenu& rToolbarMenu )
 : svt::FrameStatusListener( ::comphelper::getProcessComponentContext(), xFrame 
)
 , mpMenu( &rToolbarMenu )
@@ -1567,7 +1567,7 @@ ToolbarMenuStatusListener::ToolbarMenuStatusListener(
 
 
 
-void SAL_CALL ToolbarMenuStatusListener::dispose() throw 
(::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL ToolbarMenuStatusListener::dispose() throw 
(css::uno::RuntimeException, std::exception)
 {
     mpMenu.clear();
     svt::FrameStatusListener::dispose();
@@ -1575,7 +1575,7 @@ void SAL_CALL ToolbarMenuStatusListener::dispose() throw 
(::com::sun::star::uno:
 
 
 
-void SAL_CALL ToolbarMenuStatusListener::statusChanged( const 
::com::sun::star::frame::FeatureStateEvent& Event ) throw ( 
::com::sun::star::uno::RuntimeException, std::exception )
+void SAL_CALL ToolbarMenuStatusListener::statusChanged( const 
css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, 
std::exception )
 {
     if( mpMenu )
         mpMenu->statusChanged( Event );
diff --git a/svtools/source/control/toolbarmenuimp.hxx 
b/svtools/source/control/toolbarmenuimp.hxx
index 46296c1..b57c0c9 100644
--- a/svtools/source/control/toolbarmenuimp.hxx
+++ b/svtools/source/control/toolbarmenuimp.hxx
@@ -47,7 +47,7 @@ struct ToolbarMenu_Impl;
 class ToolbarMenu;
 class ToolbarMenuEntry;
 
-typedef ::std::vector< ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessibleEventListener > > 
EventListenerVector;
+typedef ::std::vector< css::uno::Reference< 
css::accessibility::XAccessibleEventListener > > EventListenerVector;
 typedef std::vector< ToolbarMenuEntry * > ToolbarMenuEntryVector;
 
 const int SEPARATOR_HEIGHT = 4;
@@ -78,7 +78,7 @@ public:
     VclPtr<Control> mpControl;
     Rectangle maRect;
 
-    ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessibleContext > mxAccContext;
+    css::uno::Reference< css::accessibility::XAccessibleContext > mxAccContext;
 
 public:
     ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const OUString& rText, 
MenuItemBits nBits );
@@ -88,10 +88,10 @@ public:
 
     void init( int nEntryId, MenuItemBits nBits );
 
-    const ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessibleContext >& GetAccessible( bool 
bCreate = false );
+    const css::uno::Reference< css::accessibility::XAccessibleContext >& 
GetAccessible( bool bCreate = false );
 
-    sal_Int32 getAccessibleChildCount() throw 
(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible > getAccessibleChild( sal_Int32 
index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::uno::RuntimeException);
+    sal_Int32 getAccessibleChildCount() throw (css::uno::RuntimeException);
+    css::uno::Reference< css::accessibility::XAccessible > getAccessibleChild( 
sal_Int32 index ) throw (css::lang::IndexOutOfBoundsException, 
css::uno::RuntimeException);
 
     bool HasCheck() const
     {
@@ -104,11 +104,11 @@ public:
 
 
 typedef ::cppu::WeakComponentImplHelper<
-    ::com::sun::star::accessibility::XAccessible,
-    ::com::sun::star::accessibility::XAccessibleEventBroadcaster,
-    ::com::sun::star::accessibility::XAccessibleContext,
-    ::com::sun::star::accessibility::XAccessibleComponent,
-    ::com::sun::star::accessibility::XAccessibleSelection >
+    css::accessibility::XAccessible,
+    css::accessibility::XAccessibleEventBroadcaster,
+    css::accessibility::XAccessibleContext,
+    css::accessibility::XAccessibleComponent,
+    css::accessibility::XAccessibleSelection >
     ToolbarMenuAccComponentBase;
 
 class ToolbarMenuAcc :
@@ -120,49 +120,49 @@ public:
     explicit ToolbarMenuAcc( ToolbarMenu_Impl& rParent );
     virtual ~ToolbarMenuAcc();
 
-    void                FireAccessibleEvent( short nEventId, const 
::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& 
rNewValue );
+    void                FireAccessibleEvent( short nEventId, const 
css::uno::Any& rOldValue, const css::uno::Any& rNewValue );
     bool                HasAccessibleListeners() const { return( 
mxEventListeners.size() > 0 ); }
 
 public:
 
     // XAccessible
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessibleContext > SAL_CALL 
getAccessibleContext(  ) throw (::com::sun::star::uno::RuntimeException, 
std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > 
SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, 
std::exception) override;
 
     // XAccessibleEventBroadcaster
-    virtual void SAL_CALL addAccessibleEventListener( const 
::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeAccessibleEventListener( const 
::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addAccessibleEventListener( const 
css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener 
) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeAccessibleEventListener( const 
css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener 
) throw (css::uno::RuntimeException, std::exception) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( 
sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) 
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL 
getAccessibleRelationSet(  ) throw (::com::sun::star::uno::RuntimeException, 
std::exception) override;
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL 
getAccessibleStateSet(  ) throw (::com::sun::star::uno::RuntimeException, 
std::exception) override;
-    virtual ::com::sun::star::lang::Locale SAL_CALL getLocale(  ) throw 
(::com::sun::star::accessibility::IllegalAccessibleComponentStateException, 
::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, 
css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) 
override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAccessibleDescription(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > 
SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, 
std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > 
SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, 
std::exception) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) throw 
(css::accessibility::IllegalAccessibleComponentStateException, 
css::uno::RuntimeException, std::exception) override;
 
     // XAccessibleComponent
-    virtual sal_Bool SAL_CALL containsPoint( const 
::com::sun::star::awt::Point& aPoint ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( 
const ::com::sun::star::awt::Point& aPoint ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Point SAL_CALL getLocation(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen(  ) 
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Size SAL_CALL getSize(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) 
throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleAtPoint( const css::awt::Point& aPoint ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocation(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Size SAL_CALL getSize(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, 
std::exception) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) throw 
(css::uno::RuntimeException, std::exception) override;
 
     // XAccessibleSelection
-    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw 
(::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex 
) throw (::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clearAccessibleSelection(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL selectAllAccessibleChildren(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible > SAL_CALL 
getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw 
(::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 
nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw 
(css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, 
std::exception) override;
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex 
) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, 
std::exception) override;
+    virtual void SAL_CALL clearAccessibleSelection(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL selectAllAccessibleChildren(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw 
(css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, 
std::exception) override;
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 
nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, 
css::uno::RuntimeException, std::exception) override;
 
     DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void );
 
@@ -184,17 +184,17 @@ private:
         DisposedException is thrown to inform the (indirect) caller of the
         foul deed.
     */
-    void ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException);
+    void ThrowIfDisposed() throw (css::lang::DisposedException);
 };
 
 
 // - ToolbarMenuEntryAcc -
 
 
-typedef ::cppu::WeakComponentImplHelper< 
::com::sun::star::accessibility::XAccessible,
-                                                     
::com::sun::star::accessibility::XAccessibleEventBroadcaster,
-                                                     
::com::sun::star::accessibility::XAccessibleContext,
-                                                     
::com::sun::star::accessibility::XAccessibleComponent > ToolbarMenuEntryAccBase;
+typedef ::cppu::WeakComponentImplHelper< css::accessibility::XAccessible,
+                                                     
css::accessibility::XAccessibleEventBroadcaster,
+                                                     
css::accessibility::XAccessibleContext,
+                                                     
css::accessibility::XAccessibleComponent > ToolbarMenuEntryAccBase;
 
 class ToolbarMenuEntryAcc : public ::comphelper::OBaseMutex,
                             public ToolbarMenuEntryAccBase
@@ -204,34 +204,34 @@ public:
     virtual ~ToolbarMenuEntryAcc();
 
     // XAccessible
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessibleContext > SAL_CALL 
getAccessibleContext(  ) throw (::com::sun::star::uno::RuntimeException, 
std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > 
SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, 
std::exception) override;
 
     // XAccessibleEventBroadcaster
-    virtual void SAL_CALL addAccessibleEventListener( const 
::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeAccessibleEventListener( const 
::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addAccessibleEventListener( const 
css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener 
) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeAccessibleEventListener( const 
css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener 
) throw (css::uno::RuntimeException, std::exception) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( 
sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) 
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL 
getAccessibleRelationSet(  ) throw (::com::sun::star::uno::RuntimeException, 
std::exception) override;
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL 
getAccessibleStateSet(  ) throw (::com::sun::star::uno::RuntimeException, 
std::exception) override;
-    virtual ::com::sun::star::lang::Locale SAL_CALL getLocale(  ) throw 
(::com::sun::star::accessibility::IllegalAccessibleComponentStateException, 
::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, 
css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) 
override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAccessibleDescription(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > 
SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, 
std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > 
SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, 
std::exception) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) throw 
(css::accessibility::IllegalAccessibleComponentStateException, 
css::uno::RuntimeException, std::exception) override;
 
     // XAccessibleComponent
-    virtual sal_Bool SAL_CALL containsPoint( const 
::com::sun::star::awt::Point& aPoint ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( 
const ::com::sun::star::awt::Point& aPoint ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Point SAL_CALL getLocation(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen(  ) 
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Size SAL_CALL getSize(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) 
throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleAtPoint( const css::awt::Point& aPoint ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocation(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Size SAL_CALL getSize(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, 
std::exception) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) throw 
(css::uno::RuntimeException, std::exception) override;
 
 private:
     EventListenerVector    mxEventListeners;
@@ -250,10 +250,10 @@ struct ToolbarMenu_Impl
 {
     ToolbarMenu& mrMenu;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >        
      mxFrame;
-    rtl::Reference< svt::FrameStatusListener >                                 
      mxStatusListener;
-    rtl::Reference< ToolbarMenuAcc >                                           
      mxAccessible;
-    ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible > mxOldSelection;
+    css::uno::Reference< css::frame::XFrame >              mxFrame;
+    rtl::Reference< svt::FrameStatusListener >             mxStatusListener;
+    rtl::Reference< ToolbarMenuAcc >                       mxAccessible;
+    css::uno::Reference< css::accessibility::XAccessible > mxOldSelection;
 
     ToolbarMenuEntryVector  maEntryVector;
 
@@ -269,20 +269,20 @@ struct ToolbarMenu_Impl
 
     Link<ToolbarMenu*,void>          maSelectHdl;
 
-    ToolbarMenu_Impl( ToolbarMenu& rMenu, const 
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame );
+    ToolbarMenu_Impl( ToolbarMenu& rMenu, const css::uno::Reference< 
css::frame::XFrame >& xFrame );
     ~ToolbarMenu_Impl();
 
     void setAccessible( ToolbarMenuAcc* pAccessible );
 
-    void fireAccessibleEvent( short nEventId, const 
::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& 
rNewValue );
+    void fireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, 
const css::uno::Any& rNewValue );
     bool hasAccessibleListeners();
 
-    sal_Int32 getAccessibleChildCount() throw 
(::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible > getAccessibleChild( sal_Int32 
index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible > getAccessibleChild( Control* 
pControl, sal_Int32 childIndex ) throw 
(::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::uno::RuntimeException);
+    sal_Int32 getAccessibleChildCount() throw (css::uno::RuntimeException);
+    css::uno::Reference< css::accessibility::XAccessible > getAccessibleChild( 
sal_Int32 index ) throw (css::lang::IndexOutOfBoundsException, 
css::uno::RuntimeException);
+    css::uno::Reference< css::accessibility::XAccessible > getAccessibleChild( 
Control* pControl, sal_Int32 childIndex ) throw 
(css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
 
-    void selectAccessibleChild( sal_Int32 nChildIndex ) throw 
(::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::uno::RuntimeException);
-    bool isAccessibleChildSelected( sal_Int32 nChildIndex ) throw 
(::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::uno::RuntimeException);
+    void selectAccessibleChild( sal_Int32 nChildIndex ) throw 
(css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
+    bool isAccessibleChildSelected( sal_Int32 nChildIndex ) throw 
(css::lang::IndexOutOfBoundsException, css::uno::RuntimeException);
     void clearAccessibleSelection();
 
     ToolbarMenuEntry* implGetEntry( int nEntry ) const;
diff --git a/svtools/source/control/valueacc.cxx 
b/svtools/source/control/valueacc.cxx
index ee388f8..89eb075 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -132,7 +132,7 @@ ValueSetAcc* ValueSetAcc::getImplementation( const 
uno::Reference< uno::XInterfa
         uno::Reference< lang::XUnoTunnel > xUnoTunnel( rxData, uno::UNO_QUERY 
);
         return( xUnoTunnel.is() ? 
reinterpret_cast<ValueSetAcc*>(sal::static_int_cast<sal_IntPtr>(xUnoTunnel->getSomething(
 ValueSetAcc::getUnoTunnelId() ))) : NULL );
     }
-    catch(const ::com::sun::star::uno::Exception&)
+    catch(const css::uno::Exception&)
     {
         return NULL;
     }
@@ -146,10 +146,10 @@ void ValueSetAcc::GetFocus()
     mbIsFocused = true;
 
     // Broadcast the state change.
-    ::com::sun::star::uno::Any aOldState, aNewState;
-    aNewState <<= 
::com::sun::star::accessibility::AccessibleStateType::FOCUSED;
+    css::uno::Any aOldState, aNewState;
+    aNewState <<= css::accessibility::AccessibleStateType::FOCUSED;
     FireAccessibleEvent(
-        ::com::sun::star::accessibility::AccessibleEventId::STATE_CHANGED,
+        css::accessibility::AccessibleEventId::STATE_CHANGED,
         aOldState, aNewState);
 }
 
@@ -160,10 +160,10 @@ void ValueSetAcc::LoseFocus()
     mbIsFocused = false;
 
     // Broadcast the state change.
-    ::com::sun::star::uno::Any aOldState, aNewState;
-    aOldState <<= 
::com::sun::star::accessibility::AccessibleStateType::FOCUSED;
+    css::uno::Any aOldState, aNewState;
+    aOldState <<= css::accessibility::AccessibleStateType::FOCUSED;
     FireAccessibleEvent(
-        ::com::sun::star::accessibility::AccessibleEventId::STATE_CHANGED,
+        css::accessibility::AccessibleEventId::STATE_CHANGED,
         aOldState, aNewState);
 }
 
@@ -740,7 +740,7 @@ ValueSetItem* ValueSetAcc::getItem (sal_uInt16 nIndex) const
 
 
 void ValueSetAcc::ThrowIfDisposed()
-    throw (::com::sun::star::lang::DisposedException)
+    throw (css::lang::DisposedException)
 {
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
@@ -820,7 +820,7 @@ ValueItemAcc* ValueItemAcc::getImplementation( const 
uno::Reference< uno::XInter
         uno::Reference< lang::XUnoTunnel > xUnoTunnel( rxData, uno::UNO_QUERY 
);
         return( xUnoTunnel.is() ? 
reinterpret_cast<ValueItemAcc*>(sal::static_int_cast<sal_IntPtr>(xUnoTunnel->getSomething(
 ValueItemAcc::getUnoTunnelId() ))) : NULL );
     }
-    catch(const ::com::sun::star::uno::Exception&)
+    catch(const css::uno::Exception&)
     {
         return NULL;
     }
diff --git a/svtools/source/control/valueimp.hxx 
b/svtools/source/control/valueimp.hxx
index f1c1ac5..eef2fcf 100644
--- a/svtools/source/control/valueimp.hxx
+++ b/svtools/source/control/valueimp.hxx
@@ -64,17 +64,17 @@ struct ValueSetItem
     explicit ValueSetItem( ValueSet& rParent );
     ~ValueSetItem();
 
-    ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible >
+    css::uno::Reference< css::accessibility::XAccessible >
                         GetAccessible( bool bIsTransientChildrenDisabled );
 };
 
 typedef ::cppu::WeakComponentImplHelper<
-    ::com::sun::star::accessibility::XAccessible,
-    ::com::sun::star::accessibility::XAccessibleEventBroadcaster,
-    ::com::sun::star::accessibility::XAccessibleContext,
-    ::com::sun::star::accessibility::XAccessibleComponent,
-    ::com::sun::star::accessibility::XAccessibleSelection,
-    ::com::sun::star::lang::XUnoTunnel >
+    css::accessibility::XAccessible,
+    css::accessibility::XAccessibleEventBroadcaster,
+    css::accessibility::XAccessibleContext,
+    css::accessibility::XAccessibleComponent,
+    css::accessibility::XAccessibleSelection,
+    css::lang::XUnoTunnel >
     ValueSetAccComponentBase;
 
 class ValueSetAcc :
@@ -86,10 +86,10 @@ public:
     ValueSetAcc( ValueSet* pParent, bool bIsTransientChildrenDisabled );
     virtual ~ValueSetAcc();
 
-    void                FireAccessibleEvent( short nEventId, const 
::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& 
rNewValue );
+    void                FireAccessibleEvent( short nEventId, const 
css::uno::Any& rOldValue, const css::uno::Any& rNewValue );
     bool                HasAccessibleListeners() const { return( 
mxEventListeners.size() > 0 ); }
 
-    static ValueSetAcc* getImplementation( const 
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) 
throw();
+    static ValueSetAcc* getImplementation( const css::uno::Reference< 
css::uno::XInterface >& rxData ) throw();
 
 public:
 
@@ -104,56 +104,56 @@ public:
     void LoseFocus();
 
     // XAccessible
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessibleContext > SAL_CALL 
getAccessibleContext(  ) throw (::com::sun::star::uno::RuntimeException, 
std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > 
SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, 
std::exception) override;
 
     // XAccessibleEventBroadcaster
-    virtual void SAL_CALL addAccessibleEventListener( const 
::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeAccessibleEventListener( const 
::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addAccessibleEventListener( const 
css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener 
) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeAccessibleEventListener( const 
css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener 
) throw (css::uno::RuntimeException, std::exception) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( 
sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) 
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL 
getAccessibleRelationSet(  ) throw (::com::sun::star::uno::RuntimeException, 
std::exception) override;
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL 
getAccessibleStateSet(  ) throw (::com::sun::star::uno::RuntimeException, 
std::exception) override;
-    virtual ::com::sun::star::lang::Locale SAL_CALL getLocale(  ) throw 
(::com::sun::star::accessibility::IllegalAccessibleComponentStateException, 
::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, 
css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) 
override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAccessibleDescription(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > 
SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, 
std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > 
SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, 
std::exception) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) throw 
(css::accessibility::IllegalAccessibleComponentStateException, 
css::uno::RuntimeException, std::exception) override;
 
     // XAccessibleComponent
-    virtual sal_Bool SAL_CALL containsPoint( const 
::com::sun::star::awt::Point& aPoint ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( 
const ::com::sun::star::awt::Point& aPoint ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Point SAL_CALL getLocation(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen(  ) 
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Size SAL_CALL getSize(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) 
throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleAtPoint( const css::awt::Point& aPoint ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocation(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Size SAL_CALL getSize(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, 
std::exception) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) throw 
(css::uno::RuntimeException, std::exception) override;
 
     // XAccessibleSelection
-    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw 
(::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex 
) throw (::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clearAccessibleSelection(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL selectAllAccessibleChildren(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible > SAL_CALL 
getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw 
(::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 
nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw 
(css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, 
std::exception) override;
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex 
) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, 
std::exception) override;
+    virtual void SAL_CALL clearAccessibleSelection(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL selectAllAccessibleChildren(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw 
(css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, 
std::exception) override;
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 
nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, 
css::uno::RuntimeException, std::exception) override;
 
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const 
::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( 
::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< 
sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) override;
 
 private:
-    ::std::vector< ::com::sun::star::uno::Reference<
-        ::com::sun::star::accessibility::XAccessibleEventListener > >   
mxEventListeners;
+    ::std::vector< css::uno::Reference<
+        css::accessibility::XAccessibleEventListener > >                
mxEventListeners;
     VclPtr<ValueSet>                                                    
mpParent;
     bool                                                                
mbIsTransientChildrenDisabled;
     /// The current FOCUSED state.
     bool mbIsFocused;
 
-    static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId();
+    static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
 
     /** Tell all listeners that the object is dying.  This callback is
         usually called from the WeakComponentImplHelper class.
@@ -181,7 +181,7 @@ private:
         foul deed.
     */
     void ThrowIfDisposed()
-        throw (::com::sun::star::lang::DisposedException);
+        throw (css::lang::DisposedException);
 
     /** Check whether the value set has a 'none' field, i.e. a field (button)
         that deselects any items (selects none of them).
@@ -192,21 +192,21 @@ private:
     bool HasNoneField() const;
 };
 
-class ValueItemAcc : public ::cppu::WeakImplHelper< 
::com::sun::star::accessibility::XAccessible,
-                                                     
::com::sun::star::accessibility::XAccessibleEventBroadcaster,
-                                                     
::com::sun::star::accessibility::XAccessibleContext,
-                                                     
::com::sun::star::accessibility::XAccessibleComponent,
-                                                     
::com::sun::star::lang::XUnoTunnel >
+class ValueItemAcc : public ::cppu::WeakImplHelper< 
css::accessibility::XAccessible,
+                                                     
css::accessibility::XAccessibleEventBroadcaster,
+                                                     
css::accessibility::XAccessibleContext,
+                                                     
css::accessibility::XAccessibleComponent,
+                                                     css::lang::XUnoTunnel >
 {
 private:
 
-    ::std::vector< ::com::sun::star::uno::Reference<
-        ::com::sun::star::accessibility::XAccessibleEventListener > >   
mxEventListeners;
+    ::std::vector< css::uno::Reference<
+        css::accessibility::XAccessibleEventListener > >                
mxEventListeners;
     ::osl::Mutex                                                        
maMutex;
     ValueSetItem*                                                       
mpParent;
     bool                                                                
mbIsTransientChildrenDisabled;
 
-    static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId();
+    static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
 
 public:
 
@@ -215,44 +215,44 @@ public:
 
     void    ParentDestroyed();
 
-    void    FireAccessibleEvent( short nEventId, const 
::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& 
rNewValue );
+    void    FireAccessibleEvent( short nEventId, const css::uno::Any& 
rOldValue, const css::uno::Any& rNewValue );
 
-    static ValueItemAcc* getImplementation( const 
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) 
throw();
+    static ValueItemAcc* getImplementation( const css::uno::Reference< 
css::uno::XInterface >& rxData ) throw();
 
 public:
 
     // XAccessible
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessibleContext > SAL_CALL 
getAccessibleContext(  ) throw (::com::sun::star::uno::RuntimeException, 
std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > 
SAL_CALL getAccessibleContext(  ) throw (css::uno::RuntimeException, 
std::exception) override;
 
     // XAccessibleEventBroadcaster
-    virtual void SAL_CALL addAccessibleEventListener( const 
::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeAccessibleEventListener( const 
::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addAccessibleEventListener( const 
css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener 
) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeAccessibleEventListener( const 
css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener 
) throw (css::uno::RuntimeException, std::exception) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( 
sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) 
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleDescription(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getAccessibleName(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL 
getAccessibleRelationSet(  ) throw (::com::sun::star::uno::RuntimeException, 
std::exception) override;
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL 
getAccessibleStateSet(  ) throw (::com::sun::star::uno::RuntimeException, 
std::exception) override;
-    virtual ::com::sun::star::lang::Locale SAL_CALL getLocale(  ) throw 
(::com::sun::star::accessibility::IllegalAccessibleComponentStateException, 
::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, 
css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleParent(  ) throw (css::uno::RuntimeException, std::exception) 
override;
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAccessibleDescription(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getAccessibleName(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > 
SAL_CALL getAccessibleRelationSet(  ) throw (css::uno::RuntimeException, 
std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > 
SAL_CALL getAccessibleStateSet(  ) throw (css::uno::RuntimeException, 
std::exception) override;
+    virtual css::lang::Locale SAL_CALL getLocale(  ) throw 
(css::accessibility::IllegalAccessibleComponentStateException, 
css::uno::RuntimeException, std::exception) override;
 
     // XAccessibleComponent
-    virtual sal_Bool SAL_CALL containsPoint( const 
::com::sun::star::awt::Point& aPoint ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( 
const ::com::sun::star::awt::Point& aPoint ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Point SAL_CALL getLocation(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen(  ) 
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Size SAL_CALL getSize(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) 
throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleAtPoint( const css::awt::Point& aPoint ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocation(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Size SAL_CALL getSize(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL grabFocus(  ) throw (css::uno::RuntimeException, 
std::exception) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) throw 
(css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) throw 
(css::uno::RuntimeException, std::exception) override;
 
     // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const 
::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( 
::com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< 
sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) override;
 };
 
 #endif // INCLUDED_SVTOOLS_SOURCE_CONTROL_VALUEIMP_HXX
diff --git a/svtools/source/control/vclxaccessibleheaderbar.cxx 
b/svtools/source/control/vclxaccessibleheaderbar.cxx
index 7c92837..aa14705 100644
--- a/svtools/source/control/vclxaccessibleheaderbar.cxx
+++ b/svtools/source/control/vclxaccessibleheaderbar.cxx
@@ -46,7 +46,7 @@ VCLXHeaderBar::~VCLXHeaderBar()
 {
 }
 
-::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessibleContext > 
VCLXHeaderBar::CreateAccessibleContext()
+css::uno::Reference< css::accessibility::XAccessibleContext > 
VCLXHeaderBar::CreateAccessibleContext()
 {
     return new VCLXAccessibleHeaderBar(this);
 }
@@ -99,7 +99,7 @@ Sequence< ::rtl::OUString > 
VCLXAccessibleHeaderBar::getSupportedServiceNames()
 // =======XAccessibleContext=======
 
 sal_Int32 SAL_CALL VCLXAccessibleHeaderBar::getAccessibleChildCount(  )
-        throw (::com::sun::star::uno::RuntimeException, std::exception)
+        throw (css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard g;
 
@@ -109,8 +109,8 @@ sal_Int32 SAL_CALL 
VCLXAccessibleHeaderBar::getAccessibleChildCount(  )
 
     return nCount;
 }
-::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible 
> SAL_CALL
-        VCLXAccessibleHeaderBar::getAccessibleChild( sal_Int32 i )  throw 
(::com::sun::star::lang::IndexOutOfBoundsException, 
::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
+        VCLXAccessibleHeaderBar::getAccessibleChild( sal_Int32 i )  throw 
(css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, 
std::exception)
 {
     SolarMutexGuard g;
 
@@ -130,9 +130,9 @@ sal_Int32 SAL_CALL 
VCLXAccessibleHeaderBar::getAccessibleChildCount(  )
     return xChild;
 }
 
-sal_Int16 SAL_CALL VCLXAccessibleHeaderBar::getAccessibleRole(  ) throw 
(::com::sun::star::uno::RuntimeException, std::exception)
+sal_Int16 SAL_CALL VCLXAccessibleHeaderBar::getAccessibleRole(  ) throw 
(css::uno::RuntimeException, std::exception)
 {
-    return com::sun::star::accessibility::AccessibleRole::LIST;
+    return css::accessibility::AccessibleRole::LIST;
 }
 
 void SAL_CALL VCLXAccessibleHeaderBar::disposing()
@@ -143,7 +143,7 @@ void SAL_CALL VCLXAccessibleHeaderBar::disposing()
     VCLXAccessibleComponent::disposing();
 }
 
-::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible 
> VCLXAccessibleHeaderBar::CreateChild (sal_Int32 i)
+css::uno::Reference< css::accessibility::XAccessible > 
VCLXAccessibleHeaderBar::CreateChild (sal_Int32 i)
 {
     Reference<XAccessible> xChild;
 
diff --git a/svtools/source/control/vclxaccessibleheaderbaritem.cxx 
b/svtools/source/control/vclxaccessibleheaderbaritem.cxx
index dd50406..c55bf0b 100644
--- a/svtools/source/control/vclxaccessibleheaderbaritem.cxx
+++ b/svtools/source/control/vclxaccessibleheaderbaritem.cxx
@@ -83,7 +83,7 @@ awt::Rectangle VCLXAccessibleHeaderBarItem::implGetBounds() 
throw (RuntimeExcept
     awt::Rectangle aBounds;
     OExternalLockGuard aGuard( this );
 
-    ::com::sun::star::awt::Size aSize;
+    css::awt::Size aSize;
 
     if ( m_pHeadBar )
         aBounds = AWTRectangle( m_pHeadBar->GetItemRect( sal_uInt16( 
m_nIndexInParent ) ) );
@@ -248,7 +248,7 @@ Reference< XAccessibleStateSet > 
VCLXAccessibleHeaderBarItem::getAccessibleState
 
 
 
-com::sun::star::lang::Locale VCLXAccessibleHeaderBarItem::getLocale() throw 
(IllegalAccessibleComponentStateException, RuntimeException, std::exception)
+css::lang::Locale VCLXAccessibleHeaderBarItem::getLocale() throw 
(IllegalAccessibleComponentStateException, RuntimeException, std::exception)
 {
     OExternalLockGuard aGuard( this );
 
diff --git a/svtools/source/dialogs/addresstemplate.cxx 
b/svtools/source/dialogs/addresstemplate.cxx
index bc3be74..756ac3d 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -252,14 +252,11 @@ public:
         StringBag       m_aStoredFields;
 
     protected:
-        ::com::sun::star::uno::Any
-                        getProperty(const OUString& _rLocalName) const;
-        ::com::sun::star::uno::Any
-                        getProperty(const sal_Char* _pLocalName) const;
+        css::uno::Any   getProperty(const OUString& _rLocalName) const;
+        css::uno::Any   getProperty(const sal_Char* _pLocalName) const;
 
-        OUString getStringProperty(const sal_Char* _pLocalName) const;
-
-        OUString getStringProperty(const OUString& _rLocalName) const;
+        OUString        getStringProperty(const sal_Char* _pLocalName) const;
+        OUString        getStringProperty(const OUString& _rLocalName) const;
 
         void            setStringProperty(const sal_Char* _pLocalName, const 
OUString& _rValue);
 
@@ -278,7 +275,7 @@ public:
         virtual void    setDatasourceName(const OUString& _rName) override;
         virtual void    setCommand(const OUString& _rCommand) override;
 
-        virtual void    Notify( const com::sun::star::uno::Sequence<OUString>& 
aPropertyNames) override;
+        virtual void    Notify( const css::uno::Sequence<OUString>& 
aPropertyNames) override;
 
     private:
         virtual void    ImplCommit() override;
@@ -286,7 +283,7 @@ public:
     };
 
 
-void AssignmentPersistentData::Notify( const 
com::sun::star::uno::Sequence<OUString>& )
+void AssignmentPersistentData::Notify( const css::uno::Sequence<OUString>& )
 {
 }
 
diff --git a/svtools/source/dialogs/colrdlg.cxx 
b/svtools/source/dialogs/colrdlg.cxx
index 96ad7da..ac14723 100644
--- a/svtools/source/dialogs/colrdlg.cxx
+++ b/svtools/source/dialogs/colrdlg.cxx
@@ -75,9 +75,9 @@ short SvColorDialog::Execute()
         const OUString sColor( "Color" );
         Reference< XComponentContext > xContext( 
::comphelper::getProcessComponentContext() );
 
-        Reference< com::sun::star::awt::XWindow > xParent( 
VCLUnoHelper::GetInterface( mpParent ) );
+        Reference< css::awt::XWindow > xParent( VCLUnoHelper::GetInterface( 
mpParent ) );
 
-        Reference< XExecutableDialog > xDialog = 
com::sun::star::cui::ColorPicker::createWithParent(xContext, xParent);
+        Reference< XExecutableDialog > xDialog = 
css::cui::ColorPicker::createWithParent(xContext, xParent);
         Reference< XPropertyAccess > xPropertyAccess( xDialog, UNO_QUERY_THROW 
);
 
         Sequence< PropertyValue > props( 2 );
diff --git a/svtools/source/filter/exportdialog.cxx 
b/svtools/source/filter/exportdialog.cxx
index 0278a59..5ccc99e 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -343,7 +343,7 @@ awt::Size ExportDialog::GetOriginalSize()
         {
             sal_Int32 nWidth = 0;
             sal_Int32 nHeight= 0;
-            com::sun::star::uno::Any aAny;
+            css::uno::Any aAny;
             aAny = xPagePropSet->getPropertyValue("Width");
             aAny >>= nWidth;
             aAny = xPagePropSet->getPropertyValue("Height");
@@ -356,7 +356,7 @@ awt::Size ExportDialog::GetOriginalSize()
         uno::Reference< graphic::XPrimitiveFactory2D > xPrimitiveFactory = 
graphic::PrimitiveFactory2D::create( mxContext );
 
         basegfx::B2DHomMatrix aViewTransformation( 
Application::GetDefaultDevice()->GetViewTransformation() );
-        com::sun::star::geometry::AffineMatrix2D aTransformation;
+        css::geometry::AffineMatrix2D aTransformation;
         aTransformation.m00 = aViewTransformation.get(0,0);
         aTransformation.m01 = aViewTransformation.get(0,1);
         aTransformation.m02 = aViewTransformation.get(0,2);
@@ -502,7 +502,7 @@ Bitmap ExportDialog::GetGraphicBitmap( SvStream& 
rInputStream )
     Bitmap aRet;
     Graphic aGraphic;
     GraphicFilter aFilter( false );
-    if ( aFilter.ImportGraphic( aGraphic, "", rInputStream, 
GRFILTER_FORMAT_NOTFOUND, NULL, GraphicFilterImportFlags::NONE, 
static_cast<com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue 
>*>(NULL) ) == GRFILTER_OK )
+    if ( aFilter.ImportGraphic( aGraphic, "", rInputStream, 
GRFILTER_FORMAT_NOTFOUND, NULL, GraphicFilterImportFlags::NONE, 
static_cast<css::uno::Sequence< css::beans::PropertyValue >*>(NULL) ) == 
GRFILTER_OK )
     {
         aRet = aGraphic.GetBitmap();
     }
@@ -551,8 +551,8 @@ bool ExportDialog::IsTempExportAvailable() const
 }
 
 ExportDialog::ExportDialog(FltCallDialogParameter& rPara,
-    const com::sun::star::uno::Reference< 
com::sun::star::uno::XComponentContext >& rxContext,
-    const com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent 
>& rxSourceDocument,
+    const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+    const css::uno::Reference< css::lang::XComponent >& rxSourceDocument,
     bool bExportSelection, bool bIsPixelFormat)
     : ModalDialog(rPara.pWindow, "GraphicExportDialog", 
"svt/ui/graphicexport.ui")
     , mrFltCallPara(rPara)
diff --git a/svtools/source/filter/exportdialog.hxx 
b/svtools/source/filter/exportdialog.hxx
index ef16700..bf1c9649 100644
--- a/svtools/source/filter/exportdialog.hxx
+++ b/svtools/source/filter/exportdialog.hxx
@@ -46,12 +46,12 @@ class ExportDialog : public ModalDialog
 {
 private:
 
-    FltCallDialogParameter& mrFltCallPara;
+    FltCallDialogParameter&    mrFltCallPara;
 
-    const com::sun::star::uno::Reference< 
com::sun::star::uno::XComponentContext >
-        mxContext;
-    const com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >&
-        mxSourceDocument;
+    const css::uno::Reference< css::uno::XComponentContext >
+                               mxContext;
+    const css::uno::Reference< css::lang::XComponent >&
+                               mxSourceDocument;
 
     VclPtr<NumericField>       mpMfSizeX;
     VclPtr<ListBox>            mpLbSizeX;
@@ -119,10 +119,8 @@ private:
     SvStream*           mpTempStream;
     Bitmap              maBitmap;
 
-    com::sun::star::awt::Size
-                        maOriginalSize;     // the original graphic size in 
1/100mm
-    com::sun::star::awt::Size
-                        maSize;             // for vector graphics it always 
contains the logical size in 1/100mm
+    css::awt::Size      maOriginalSize;     // the original graphic size in 
1/100mm
+    css::awt::Size      maSize;             // for vector graphics it always 
contains the logical size in 1/100mm
 
     bool                mbIsPixelFormat;
     bool                mbExportSelection;
@@ -131,14 +129,13 @@ private:
     sal_Int32           mnInitialResolutionUnit;
 

... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to