com::sun::star->css in framework

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

7 files changed, 25 insertions, 25 deletions

diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx b/framework/source/uifactory/addonstoolbarfactory.cxx
index f5fd986af902..ba6d53f6cc77 100644
--- a/framework/source/uifactory/addonstoolbarfactory.cxx
+++ b/framework/source/uifactory/addonstoolbarfactory.cxx
@@ -90,7 +90,7 @@ private:
 };
 
 AddonsToolBarFactory::AddonsToolBarFactory(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) :
+    const css::uno::Reference< css::uno::XComponentContext >& xContext ) :
     m_xContext( xContext )
     , m_xModuleManager( ModuleManager::create( xContext ) )
 {
@@ -172,9 +172,9 @@ bool AddonsToolBarFactory::hasButtonsInContext(
 Reference< XUIElement > SAL_CALL AddonsToolBarFactory::createUIElement(
     const OUString& ResourceURL,
     const Sequence< PropertyValue >& Args )
-throw ( ::com::sun::star::container::NoSuchElementException,
-        ::com::sun::star::lang::IllegalArgumentException,
-        ::com::sun::star::uno::RuntimeException, std::exception )
+throw ( css::container::NoSuchElementException,
+        css::lang::IllegalArgumentException,
+        css::uno::RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -196,7 +196,7 @@ throw ( ::com::sun::star::container::NoSuchElementException,
         throw IllegalArgumentException();
 
     // Identify frame and determine module identifier to look for context based buttons
-    Reference< ::com::sun::star::ui::XUIElement > xToolBar;
+    Reference< css::ui::XUIElement > xToolBar;
     if ( xFrame.is() &&
          ( aConfigData.getLength()> 0 ) &&
          hasButtonsInContext( aConfigData, xFrame ))
@@ -215,7 +215,7 @@ throw ( ::com::sun::star::container::NoSuchElementException,
 
         SolarMutexGuard aGuard;
         AddonsToolBarWrapper* pToolBarWrapper = new AddonsToolBarWrapper( m_xContext );
-        xToolBar = Reference< ::com::sun::star::ui::XUIElement >( static_cast<OWeakObject *>(pToolBarWrapper), UNO_QUERY );
+        xToolBar = Reference< css::ui::XUIElement >( static_cast<OWeakObject *>(pToolBarWrapper), UNO_QUERY );
         Reference< XInitialization > xInit( xToolBar, UNO_QUERY );
         xInit->initialize( aPropSeq );
     }
diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx
index 2a7da9943082..7c7be1c67c25 100644
--- a/framework/source/uifactory/factoryconfiguration.cxx
+++ b/framework/source/uifactory/factoryconfiguration.cxx
@@ -277,11 +277,11 @@ bool ConfigurationAccess_ControllerFactory::impl_getElementProps( const Any& aEl
             xPropertySet->getPropertyValue( m_aPropController ) >>= aServiceSpecifier;
             xPropertySet->getPropertyValue( m_aPropValue ) >>= aValue;
         }
-        catch ( const com::sun::star::beans::UnknownPropertyException& )
+        catch ( const css::beans::UnknownPropertyException& )
         {
             return false;
         }
-        catch ( const com::sun::star::lang::WrappedTargetException& )
+        catch ( const css::lang::WrappedTargetException& )
         {
             return false;
         }
diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx
index 75e5ca4647f1..e9d9f79ce5ab 100644
--- a/framework/source/uifactory/menubarfactory.cxx
+++ b/framework/source/uifactory/menubarfactory.cxx
@@ -43,7 +43,7 @@ using namespace ::com::sun::star::ui;
 namespace framework
 {
 
-MenuBarFactory::MenuBarFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext )
+MenuBarFactory::MenuBarFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext )
     : m_xContext( xContext )
 {
 }
@@ -56,9 +56,9 @@ MenuBarFactory::~MenuBarFactory()
 Reference< XUIElement > SAL_CALL MenuBarFactory::createUIElement(
     const OUString& ResourceURL,
     const Sequence< PropertyValue >& Args )
-throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception )
+throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception )
 {
-    Reference< ::com::sun::star::ui::XUIElement > xMenuBar(
+    Reference< css::ui::XUIElement > xMenuBar(
             static_cast<OWeakObject *>(new MenuBarWrapper(m_xContext)), UNO_QUERY);
     CreateUIElement(ResourceURL, Args, "MenuOnly", "private:resource/menubar/", xMenuBar, m_xContext);
     return xMenuBar;
@@ -68,8 +68,8 @@ void MenuBarFactory::CreateUIElement(const OUString& ResourceURL
                                      ,const Sequence< PropertyValue >& Args
                                      ,const char* _pExtraMode
                                      ,const OUString& ResourceType
-                                     ,const Reference< ::com::sun::star::ui::XUIElement >& _xMenuBar
-                                     ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext)
+                                     ,const Reference< css::ui::XUIElement >& _xMenuBar
+                                     ,const css::uno::Reference< css::uno::XComponentContext >& _rxContext)
 {
     Reference< XUIConfigurationManager > xCfgMgr;
     Reference< XUIConfigurationManager > xConfigSource;
@@ -116,7 +116,7 @@ void MenuBarFactory::CreateUIElement(const OUString& ResourceURL
 
         if ( !bHasSettings )
         {
-            Reference< ::com::sun::star::frame::XModuleManager2 > xModuleManager =
+            Reference< css::frame::XModuleManager2 > xModuleManager =
                 ModuleManager::create( _rxContext );
             OUString aModuleIdentifier = xModuleManager->identify( Reference<XInterface>( xFrame, UNO_QUERY ) );
             if ( !aModuleIdentifier.isEmpty() )
diff --git a/framework/source/uifactory/statusbarfactory.cxx b/framework/source/uifactory/statusbarfactory.cxx
index 7a675beb669e..1cb00a3e06b4 100644
--- a/framework/source/uifactory/statusbarfactory.cxx
+++ b/framework/source/uifactory/statusbarfactory.cxx
@@ -66,7 +66,7 @@ public:
     virtual css::uno::Reference< css::ui::XUIElement > SAL_CALL createUIElement( const OUString& ResourceURL, const css::uno::Sequence< css::beans::PropertyValue >& Args ) throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
 };
 
-StatusBarFactory::StatusBarFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) :
+StatusBarFactory::StatusBarFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext ) :
     MenuBarFactory( xContext )
 {
 }
@@ -75,9 +75,9 @@ StatusBarFactory::StatusBarFactory( const ::com::sun::star::uno::Reference< ::co
 Reference< XUIElement > SAL_CALL StatusBarFactory::createUIElement(
     const OUString& ResourceURL,
     const Sequence< PropertyValue >& Args )
-throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception )
+throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception )
 {
-    Reference< ::com::sun::star::ui::XUIElement > xStatusBar(
+    Reference< css::ui::XUIElement > xStatusBar(
             static_cast<OWeakObject *>(new StatusBarWrapper(m_xContext)), UNO_QUERY);
     MenuBarFactory::CreateUIElement(ResourceURL, Args, NULL, "private:resource/statusbar/", xStatusBar, m_xContext);
     return xStatusBar;
diff --git a/framework/source/uifactory/toolbarfactory.cxx b/framework/source/uifactory/toolbarfactory.cxx
index 6762f422c522..8f4bd096eae0 100644
--- a/framework/source/uifactory/toolbarfactory.cxx
+++ b/framework/source/uifactory/toolbarfactory.cxx
@@ -66,7 +66,7 @@ public:
         throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception ) override;
 };
 
-ToolBarFactory::ToolBarFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) :
+ToolBarFactory::ToolBarFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext ) :
     MenuBarFactory( xContext )
 {
 }
@@ -75,9 +75,9 @@ ToolBarFactory::ToolBarFactory( const ::com::sun::star::uno::Reference< ::com::s
 Reference< XUIElement > SAL_CALL ToolBarFactory::createUIElement(
     const OUString& ResourceURL,
     const Sequence< PropertyValue >& Args )
-throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception )
+throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception )
 {
-    Reference< ::com::sun::star::ui::XUIElement > xToolBar(
+    Reference< css::ui::XUIElement > xToolBar(
            static_cast<OWeakObject *>(new ToolBarWrapper(m_xContext)), UNO_QUERY);
     CreateUIElement(ResourceURL, Args, "PopupMode", "private:resource/toolbar/", xToolBar, m_xContext);
     return xToolBar;
diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx
index 74e9cb7db84c..c65e819b9c22 100644
--- a/framework/source/uifactory/uielementfactorymanager.cxx
+++ b/framework/source/uifactory/uielementfactorymanager.cxx
@@ -330,11 +330,11 @@ bool ConfigurationAccess_FactoryManager::impl_getElementProps( const Any& aEleme
             xPropertySet->getPropertyValue( m_aPropModule ) >>= rModule;
             xPropertySet->getPropertyValue( m_aPropFactory ) >>= rServiceSpecifier;
         }
-        catch ( const com::sun::star::beans::UnknownPropertyException& )
+        catch ( const css::beans::UnknownPropertyException& )
         {
             return false;
         }
-        catch ( const com::sun::star::lang::WrappedTargetException& )
+        catch ( const css::lang::WrappedTargetException& )
         {
             return false;
         }
@@ -424,7 +424,7 @@ void SAL_CALL UIElementFactoryManager::disposing()
 Reference< XUIElement > SAL_CALL UIElementFactoryManager::createUIElement(
     const OUString& ResourceURL,
     const Sequence< PropertyValue >& Args )
-throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception )
+throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception )
 {
     Reference< XFrame > xFrame;
     OUString aModuleId;
diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx
index 69f3b58cf358..34af27d673fa 100644
--- a/framework/source/uifactory/windowcontentfactorymanager.cxx
+++ b/framework/source/uifactory/windowcontentfactorymanager.cxx
@@ -41,8 +41,8 @@ using namespace framework;
 namespace {
 
 typedef ::cppu::WeakComponentImplHelper<
-    com::sun::star::lang::XServiceInfo,
-    com::sun::star::lang::XSingleComponentFactory > WindowContentFactoryManager_BASE;
+    css::lang::XServiceInfo,
+    css::lang::XSingleComponentFactory > WindowContentFactoryManager_BASE;
 
 class WindowContentFactoryManager : private cppu::BaseMutex,
                                     public WindowContentFactoryManager_BASE