com::sun::star-css in cppu,cppuhelper

Change-Id: I84a412f587fd66f6c0610f083e61cf0fa079d4d9
Reviewed-on: https://gerrit.libreoffice.org/17384Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

cppu/qa/cppumaker/test_cppumaker.cxx

@@ -369,7 +369,7 @@ namespace com { namespace sun { namespace star { namespace uno {
 
 std::ostream & operator <<(
     std::ostream & out,
-    SAL_UNUSED_PARAMETER com::sun::star::uno::Exception const &)
+    SAL_UNUSED_PARAMETER css::uno::Exception const &)
 {
     return out << "<UNO exception>";
 }
@@ -442,7 +442,7 @@ void Test::testBigStruct() {
     CPPUNIT_ASSERT_EQUAL(guard.p->m11, static_cast< sal_Unicode >(0));
     CPPUNIT_ASSERT_EQUAL(guard.p->m12.getLength(), static_cast< sal_Int32 >(0));
     CPPUNIT_ASSERT_EQUAL(
-        +guard.p->m13.getTypeClass(), +com::sun::star::uno::TypeClass_VOID);
+        +guard.p->m13.getTypeClass(), +css::uno::TypeClass_VOID);
     CPPUNIT_ASSERT_EQUAL(guard.p->m14.hasValue(), false);
     CPPUNIT_ASSERT_EQUAL(guard.p->m15.getLength(), static_cast< sal_Int32 >(0));
     CPPUNIT_ASSERT_EQUAL(
@@ -470,7 +470,7 @@ void Test::testBigStruct() {
 #endif
 #endif
 
-    com::sun::star::uno::Type t(
+    css::uno::Type t(
         cppu::UnoType< test::codemaker::cppumaker::BigStruct >::get());
     typelib_TypeDescription * td = NULL;
     t.getDescription(&td);
@@ -488,11 +488,11 @@ void Test::testPolyStruct() {
     CPPUNIT_ASSERT_EQUAL(
         rtl::OUString(
                 "test.codemaker.cppumaker.Struct<char,short>"),
-        (com::sun::star::uno::makeAny(
+        (css::uno::makeAny(
             test::codemaker::cppumaker::Struct< sal_Unicode, sal_Int16 >()).
          getValueType().getTypeName()));
 
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >
+    css::uno::Sequence< css::uno::Sequence< css::uno::Any > >
         aEmptySequence;
 
     CPPUNIT_ASSERT_EQUAL(
@@ -502,12 +502,12 @@ void Test::testPolyStruct() {
 }
 
 void Test::testExceptions() {
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >
+    css::uno::Sequence< css::uno::Sequence< css::uno::Any > >
         aEmptySequence;
 
     test::codemaker::cppumaker::TestException1 e11(
         rtl::OUString("abc"), 0, 1,
-        com::sun::star::uno::makeAny(123.0),
+        css::uno::makeAny(123.0),
         test::codemaker::cppumaker::HelperEnum_ONE,
         test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, aEmptySequence), 2);
     test::codemaker::cppumaker::TestException1 e12(e11);
@@ -517,7 +517,7 @@ void Test::testExceptions() {
     CPPUNIT_ASSERT_EQUAL(e11, e13);
     test::codemaker::cppumaker::TestException2 e21(
         rtl::OUString("abc"), 0, 1,
-        com::sun::star::uno::makeAny(123.0),
+        css::uno::makeAny(123.0),
         test::codemaker::cppumaker::HelperEnum_ONE,
         test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, aEmptySequence), 2);
     test::codemaker::cppumaker::TestException2 e22(e21);

cppu/source/LogBridge/LogBridge.cxx

@@ -169,7 +169,7 @@ bool LogBridge::v_isValid(rtl::OUString * pReason)
                 break;
             case typelib_TypeClass_TYPE:
                 {
-                    const ::rtl::OString sValue( ::rtl::OUStringToOString(static_cast<com::sun::star::uno::Type*>(pArg)->getTypeName(),osl_getThreadTextEncoding()));
+                    const ::rtl::OString sValue( ::rtl::OUStringToOString(static_cast<css::uno::Type*>(pArg)->getTypeName(),osl_getThreadTextEncoding()));
                    SAL_INFO("cppu.log", "" << sValue.getStr());
                 }
                 break;

cppu/source/uno/IdentityMapping.hxx

@@ -26,7 +26,7 @@ namespace com { namespace sun { namespace star { namespace uno {
 class Environment;
 }}}}
 
-uno_Mapping * createIdentityMapping(const ::com::sun::star::uno::Environment & rEnv);
+uno_Mapping * createIdentityMapping(const css::uno::Environment & rEnv);
 
 #endif
 

cppuhelper/source/component.cxx

@@ -90,7 +90,7 @@ void OComponentHelper::release() throw()
                 {
                     dispose();
                 }
-                catch (::com::sun::star::uno::RuntimeException & exc)
+                catch (css::uno::RuntimeException & exc)
                 {
                     // release should not throw exceptions
 #if OSL_DEBUG_LEVEL > 0
@@ -139,7 +139,7 @@ void OComponentHelper::disposing()
 
 // XComponent
 void OComponentHelper::dispose()
-    throw(::com::sun::star::uno::RuntimeException, std::exception)
+    throw(css::uno::RuntimeException, std::exception)
 {
     // An frequently programming error is to release the last
     // reference to this object in the disposing message.
@@ -212,7 +212,7 @@ void OComponentHelper::dispose()
 // XComponent
 void OComponentHelper::addEventListener(
     const Reference<XEventListener > & rxListener )
-    throw(::com::sun::star::uno::RuntimeException, std::exception)
+    throw(css::uno::RuntimeException, std::exception)
 {
     ClearableMutexGuard aGuard( rBHelper.rMutex );
     if (rBHelper.bDisposed || rBHelper.bInDispose)
@@ -230,7 +230,7 @@ void OComponentHelper::addEventListener(
 // XComponent
 void OComponentHelper::removeEventListener(
     const Reference<XEventListener > & rxListener )
-    throw(::com::sun::star::uno::RuntimeException, std::exception)
+    throw(css::uno::RuntimeException, std::exception)
 {
     rBHelper.removeListener( cppu::UnoType<decltype(rxListener)>::get(), rxListener );
 }

cppuhelper/source/interfacecontainer.cxx

@@ -370,7 +370,7 @@ Sequence< Type > OMultiTypeInterfaceContainerHelper::getContainedTypes() const
     nSize = pMap->size();
     if( nSize )
     {
-        ::com::sun::star::uno::Sequence< Type > aInterfaceTypes( nSize );
+        css::uno::Sequence< Type > aInterfaceTypes( nSize );
         Type * pArray = aInterfaceTypes.getArray();
 
         t_type2ptr::iterator iter = pMap->begin();
@@ -387,11 +387,11 @@ Sequence< Type > OMultiTypeInterfaceContainerHelper::getContainedTypes() const
         }
         if( (t_type2ptr::size_type)i != nSize ) {
             // may be empty container, reduce the sequence to the right size
-            aInterfaceTypes = ::com::sun::star::uno::Sequence< Type >( pArray, i );
+            aInterfaceTypes = css::uno::Sequence< Type >( pArray, i );
         }
         return aInterfaceTypes;
     }
-    return ::com::sun::star::uno::Sequence< Type >();
+    return css::uno::Sequence< Type >();
 }
 
 static t_type2ptr::iterator findType(t_type2ptr *pMap, const Type & rKey )
@@ -552,7 +552,7 @@ Sequence< sal_Int32 > OMultiTypeInterfaceContainerHelperInt32::getContainedTypes
     nSize = pMap ? pMap->size() : 0;
     if( nSize )
     {
-        ::com::sun::star::uno::Sequence< sal_Int32 > aInterfaceTypes( nSize );
+        css::uno::Sequence< sal_Int32 > aInterfaceTypes( nSize );
         sal_Int32 * pArray = aInterfaceTypes.getArray();
 
         t_long2ptr::iterator iter = pMap->begin();
@@ -569,11 +569,11 @@ Sequence< sal_Int32 > OMultiTypeInterfaceContainerHelperInt32::getContainedTypes
         }
         if( (t_long2ptr::size_type)i != nSize ) {
             // may be empty container, reduce the sequence to the right size
-            aInterfaceTypes = ::com::sun::star::uno::Sequence< sal_Int32 >( pArray, i );
+            aInterfaceTypes = css::uno::Sequence< sal_Int32 >( pArray, i );
         }
         return aInterfaceTypes;
     }
-    return ::com::sun::star::uno::Sequence< sal_Int32 >();
+    return css::uno::Sequence< sal_Int32 >();
 }
 
 OInterfaceContainerHelper * OMultiTypeInterfaceContainerHelperInt32::getContainer( const sal_Int32 & rKey ) const

cppuhelper/source/macro_expander.hxx

@@ -51,7 +51,7 @@ namespace detail {
  */
 ::rtl::OUString expandMacros(rtl::OUString const & text);
 
-com::sun::star::uno::Reference< com::sun::star::lang::XSingleComponentFactory >
+css::uno::Reference< css::lang::XSingleComponentFactory >
 create_bootstrap_macro_expander_factory();
 
 }

cppuhelper/source/weak.cxx

@@ -58,17 +58,17 @@ public:
         {}
 
     // XInterface
-    Any SAL_CALL        queryInterface( const Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    Any SAL_CALL        queryInterface( const Type & rType ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
     void SAL_CALL       acquire() throw() SAL_OVERRIDE;
     void SAL_CALL       release() throw() SAL_OVERRIDE;
 
     // XAdapter
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL queryAdapted() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    void SAL_CALL addReference( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XReference >& xRef ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    void SAL_CALL removeReference( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XReference >& xRef ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    css::uno::Reference< css::uno::XInterface > SAL_CALL queryAdapted() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    void SAL_CALL addReference( const css::uno::Reference< css::uno::XReference >& xRef ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    void SAL_CALL removeReference( const css::uno::Reference< css::uno::XReference >& xRef ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     /// Called from the weak object if the reference count goes to zero.
-    void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException);
+    void SAL_CALL dispose() throw(css::uno::RuntimeException);
 
 private:
     virtual ~OWeakConnectionPoint() {}
@@ -83,7 +83,7 @@ private:
 
 // XInterface
 Any SAL_CALL OWeakConnectionPoint::queryInterface( const Type & rType )
-    throw(com::sun::star::uno::RuntimeException, std::exception)
+    throw(css::uno::RuntimeException, std::exception)
 {
     return ::cppu::queryInterface(
         rType, static_cast< XAdapter * >( this ), static_cast< XInterface * >( this ) );
@@ -102,7 +102,7 @@ void SAL_CALL OWeakConnectionPoint::release() throw()
         delete this;
 }
 
-void SAL_CALL OWeakConnectionPoint::dispose() throw(::com::sun::star::uno::RuntimeException)
+void SAL_CALL OWeakConnectionPoint::dispose() throw(css::uno::RuntimeException)
 {
     Any ex;
     OInterfaceIteratorHelper aIt( m_aReferences );
@@ -112,7 +112,7 @@ void SAL_CALL OWeakConnectionPoint::dispose() throw(::com::sun::star::uno::Runti
         {
             static_cast<XReference *>(aIt.next())->dispose();
         }
-        catch (com::sun::star::lang::DisposedException &) {}
+        catch (css::lang::DisposedException &) {}
         catch (RuntimeException &)
         {
             ex = cppu::getCaughtException();
@@ -125,7 +125,7 @@ void SAL_CALL OWeakConnectionPoint::dispose() throw(::com::sun::star::uno::Runti
 }
 
 // XInterface
-Reference< XInterface > SAL_CALL OWeakConnectionPoint::queryAdapted() throw(::com::sun::star::uno::RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL OWeakConnectionPoint::queryAdapted() throw(css::uno::RuntimeException, std::exception)
 {
     Reference< XInterface > ret;
 
@@ -154,14 +154,14 @@ Reference< XInterface > SAL_CALL OWeakConnectionPoint::queryAdapted() throw(::co
 
 // XInterface
 void SAL_CALL OWeakConnectionPoint::addReference(const Reference< XReference >& rRef)
-    throw(::com::sun::star::uno::RuntimeException, std::exception)
+    throw(css::uno::RuntimeException, std::exception)
 {
     m_aReferences.addInterface( (const Reference< XInterface > &)rRef );
 }
 
 // XInterface
 void SAL_CALL OWeakConnectionPoint::removeReference(const Reference< XReference >& rRef)
-    throw(::com::sun::star::uno::RuntimeException, std::exception)
+    throw(css::uno::RuntimeException, std::exception)
 {
     m_aReferences.removeInterface( (const Reference< XInterface > &)rRef );
 }
@@ -181,7 +181,7 @@ OWeakObject::OWeakObject()
 #endif
 
 // XInterface
-Any SAL_CALL OWeakObject::queryInterface( const Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+Any SAL_CALL OWeakObject::queryInterface( const Type & rType ) throw(css::uno::RuntimeException, std::exception)
 {
     return ::cppu::queryInterface(
         rType,
@@ -231,7 +231,7 @@ OWeakObject::~OWeakObject()
 
 // XWeak
 Reference< XAdapter > SAL_CALL OWeakObject::queryAdapter()
-    throw (::com::sun::star::uno::RuntimeException, std::exception)
+    throw (css::uno::RuntimeException, std::exception)
 {
     if (!m_pWeakConnectionPoint)
     {
@@ -276,14 +276,14 @@ void OWeakAggObject::release() throw()
 }
 
 // XInterface
-Any OWeakAggObject::queryInterface( const Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+Any OWeakAggObject::queryInterface( const Type & rType ) throw(css::uno::RuntimeException, std::exception)
 {
     Reference< XInterface > x( xDelegator ); // harden ref
     return (x.is() ? x->queryInterface( rType ) : queryAggregation( rType ));
 }
 
 // XAggregation
-Any OWeakAggObject::queryAggregation( const Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+Any OWeakAggObject::queryAggregation( const Type & rType ) throw(css::uno::RuntimeException, std::exception)
 {
     return ::cppu::queryInterface(
         rType,
@@ -293,7 +293,7 @@ Any OWeakAggObject::queryAggregation( const Type & rType ) throw(::com::sun::sta
 }
 
 // XAggregation
-void OWeakAggObject::setDelegator( const Reference<XInterface > & rDelegator ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+void OWeakAggObject::setDelegator( const Reference<XInterface > & rDelegator ) throw(css::uno::RuntimeException, std::exception)
 {
     xDelegator = rDelegator;
 }
@@ -329,7 +329,7 @@ public:
     void SAL_CALL release() throw() SAL_OVERRIDE;
 
     // XReference
-    void SAL_CALL   dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    void SAL_CALL   dispose() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     /// The reference counter.
     oslInterlockedCount         m_aRefCount;
@@ -392,7 +392,7 @@ void SAL_CALL OWeakRefListener::release() throw()
 }
 
 void SAL_CALL OWeakRefListener::dispose()
-    throw(::com::sun::star::uno::RuntimeException, std::exception)
+    throw(css::uno::RuntimeException, std::exception)
 {
     Reference< XAdapter > xAdp;
     {

cppuhelper/test/cfg_test.cxx

@@ -129,19 +129,19 @@ void ServiceImpl0::initialize( const Sequence< Any >& rArgs )
 // XServiceInfo
 
 OUString ServiceImpl0::getImplementationName()
-    throw(::com::sun::star::uno::RuntimeException)
+    throw(css::uno::RuntimeException)
 {
     return impl0_getImplementationName();
 }
 
 Sequence< OUString > ServiceImpl0::getSupportedServiceNames()
-    throw(::com::sun::star::uno::RuntimeException)
+    throw(css::uno::RuntimeException)
 {
     return impl0_getSupportedServiceNames();
 }
 
 sal_Bool ServiceImpl0::supportsService( const OUString & rServiceName )
-    throw(::com::sun::star::uno::RuntimeException)
+    throw(css::uno::RuntimeException)
 {
     return cppu::supportsService(this, rServiceName);
 }
@@ -161,13 +161,13 @@ public:
 };
 
 OUString ServiceImpl1::getImplementationName()
-    throw(::com::sun::star::uno::RuntimeException)
+    throw(css::uno::RuntimeException)
 {
     return impl1_getImplementationName();
 }
 
 Sequence< OUString > ServiceImpl1::getSupportedServiceNames()
-    throw(::com::sun::star::uno::RuntimeException)
+    throw(css::uno::RuntimeException)
 {
     return impl1_getSupportedServiceNames();
 }

cppuhelper/test/testcmp/TestComponent.cxx

@@ -71,7 +71,7 @@ public:
     explicit TestComponent(uno::Reference<uno::XComponentContext> const & xCtx);
     virtual ~TestComponent();
 
-    uno::Any SAL_CALL queryInterface(uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException);
+    uno::Any SAL_CALL queryInterface(uno::Type const & rType ) throw (css::uno::RuntimeException);
     void SAL_CALL release() throw ();
     void SAL_CALL acquire() throw ();
 
@@ -136,7 +136,7 @@ void SAL_CALL TestComponent::release() throw ()
     cppu::WeakImplHelper1<lang::XServiceInfo>::release();
 }
 
-uno::Any SAL_CALL TestComponent::queryInterface(uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException)
+uno::Any SAL_CALL TestComponent::queryInterface(uno::Type const & rType ) throw (css::uno::RuntimeException)
 {
     return cppu::WeakImplHelper1<lang::XServiceInfo>::queryInterface(rType);
 }

cppuhelper/test/testcontainer.cxx

@@ -35,13 +35,13 @@ class TestListener : public WeakImplHelper1< XVetoableChangeListener >
 {
 public:
     // Methods
-    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& /*Source*/ ) throw(::com::sun::star::uno::RuntimeException)
+    virtual void SAL_CALL disposing( const css::lang::EventObject& /*Source*/ ) throw(css::uno::RuntimeException)
         {
 
         }
 
-    virtual void SAL_CALL vetoableChange( const ::com::sun::star::beans::PropertyChangeEvent& /*aEvent*/ )
-       throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException)
+    virtual void SAL_CALL vetoableChange( const css::beans::PropertyChangeEvent& /*aEvent*/ )
+       throw(css::beans::PropertyVetoException, css::uno::RuntimeException)
         {
 
         }

cppuhelper/test/testhelper.hxx

@@ -20,10 +20,10 @@
 #ifndef INCLUDED_CPPUHELPER_TEST_TESTHELPER_HXX
 #define INCLUDED_CPPUHELPER_TEST_TESTHELPER_HXX
 
-void testidlclass( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > &r);
+void testidlclass( const css::uno::Reference < css::lang::XMultiServiceFactory > &r);
 void testPropertyTypeHelper();
 void test_PropertySetHelper();
-void test_ImplHelper( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory > & xSF );
+void test_ImplHelper( const css::uno::Reference < css::lang::XMultiServiceFactory > & xSF );
 void test_interfacecontainer();
 
 #endif // INCLUDED_CPPUHELPER_TEST_TESTHELPER_HXX

cppuhelper/test/testpropshlp.cxx

@@ -353,7 +353,7 @@ public:
                     }
 
     // XInterface
-    Any             SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(RuntimeException)
+    Any             SAL_CALL queryInterface( const css::uno::Type & rType ) throw(RuntimeException)
                     {
                         Any aRet( OPropertySetHelper::queryInterface( rType ) );
                         return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));

cppuhelper/test/testproptyphlp.cxx

@@ -54,7 +54,7 @@ void testPropertyTypeHelper()
     convertPropertyValue( f , a );
     OSL_ASSERT( 25. == f );
 
-    ::com::sun::star::beans::Property prop;
+    css::beans::Property prop;
 
     prop.Name = rtl::OUString("Huhu");
     prop.Handle = 5;
@@ -62,7 +62,7 @@ void testPropertyTypeHelper()
 
     a <<= prop;
 
-    ::com::sun::star::beans::Property prop2;
+    css::beans::Property prop2;
     convertPropertyValue( prop2 , a );
      OSL_ASSERT( prop.Handle == prop2.Handle && prop.Name == prop2.Name && prop.Attributes == prop2.Attributes );