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

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

11 files changed, 141 insertions, 156 deletions

diff --git a/ucbhelper/source/client/interceptedinteraction.cxx b/ucbhelper/source/client/interceptedinteraction.cxx
index 99c0e258df9e..8dff80345afd 100644
--- a/ucbhelper/source/client/interceptedinteraction.cxx
+++ b/ucbhelper/source/client/interceptedinteraction.cxx
@@ -39,7 +39,7 @@ void InterceptedInteraction::setInterceptions(const ::std::vector< InterceptedRe
 
 InterceptedInteraction::EInterceptionState InterceptedInteraction::intercepted(
     const InterceptedRequest&,
-    const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >&)
+    const css::uno::Reference< css::task::XInteractionRequest >&)
 {
     // default behaviour! see impl_interceptRequest() for further information ...
     return E_NOT_INTERCEPTED;
@@ -69,7 +69,7 @@ void SAL_CALL InterceptedInteraction::handle(const css::uno::Reference< css::tas
     impl_handleDefault(xRequest);
 }
 
-void InterceptedInteraction::impl_handleDefault(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest)
+void InterceptedInteraction::impl_handleDefault(const css::uno::Reference< css::task::XInteractionRequest >& xRequest)
 {
     EInterceptionState eState = impl_interceptRequest(xRequest);
 
@@ -98,7 +98,7 @@ void InterceptedInteraction::impl_handleDefault(const ::com::sun::star::uno::Ref
     }
 }
 
-InterceptedInteraction::EInterceptionState InterceptedInteraction::impl_interceptRequest(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest)
+InterceptedInteraction::EInterceptionState InterceptedInteraction::impl_interceptRequest(const css::uno::Reference< css::task::XInteractionRequest >& xRequest)
 {
     css::uno::Any                                                                    aRequest       = xRequest->getRequest();
     css::uno::Type                                                                   aRequestType   = aRequest.getValueType();
diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx
index 4e75bdc555df..f4126d44bf10 100644
--- a/ucbhelper/source/provider/contenthelper.cxx
+++ b/ucbhelper/source/provider/contenthelper.cxx
@@ -124,7 +124,7 @@ ContentImplHelper::ContentImplHelper(
             const uno::Reference< uno::XComponentContext >& rxContext,
             const rtl::Reference< ContentProviderImplHelper >& rxProvider,
             const uno::Reference<
-            com::sun::star::ucb::XContentIdentifier >& Identifier )
+            css::ucb::XContentIdentifier >& Identifier )
 : m_pImpl( new ContentImplHelper_Impl ),
   m_xContext( rxContext ),
   m_xIdentifier( Identifier ),
@@ -162,14 +162,14 @@ void SAL_CALL ContentImplHelper::release()
 uno::Any SAL_CALL ContentImplHelper::queryInterface( const uno::Type & rType )
     throw( uno::RuntimeException, std::exception )
 {
-    com::sun::star::uno::Any aRet = cppu::queryInterface( rType,
+    css::uno::Any aRet = cppu::queryInterface( rType,
             static_cast< lang::XTypeProvider * >(this),
             static_cast< lang::XServiceInfo * >(this),
             static_cast< lang::XComponent * >(this),
-            static_cast< com::sun::star::ucb::XContent * >(this),
-            static_cast< com::sun::star::ucb::XCommandProcessor * >(this),
+            static_cast< css::ucb::XContent * >(this),
+            static_cast< css::ucb::XCommandProcessor * >(this),
             static_cast< beans::XPropertiesChangeNotifier * >(this),
-            static_cast< com::sun::star::ucb::XCommandInfoChangeNotifier * >(this),
+            static_cast< css::ucb::XCommandInfoChangeNotifier * >(this),
             static_cast< beans::XPropertyContainer * >(this),
             static_cast< beans::XPropertySetInfoChangeNotifier * >(this),
             static_cast< container::XChild * >(this));
@@ -180,10 +180,10 @@ XTYPEPROVIDER_IMPL_10( ContentImplHelper,
                        lang::XTypeProvider,
                        lang::XServiceInfo,
                        lang::XComponent,
-                       com::sun::star::ucb::XContent,
-                       com::sun::star::ucb::XCommandProcessor,
+                       css::ucb::XContent,
+                       css::ucb::XCommandProcessor,
                        beans::XPropertiesChangeNotifier,
-                       com::sun::star::ucb::XCommandInfoChangeNotifier,
+                       css::ucb::XCommandInfoChangeNotifier,
                        beans::XPropertyContainer,
                        beans::XPropertySetInfoChangeNotifier,
                        container::XChild );
@@ -214,7 +214,7 @@ void SAL_CALL ContentImplHelper::dispose()
          m_pImpl->m_pContentEventListeners->getLength() )
     {
         lang::EventObject aEvt;
-        aEvt.Source = static_cast< com::sun::star::ucb::XContent * >( this );
+        aEvt.Source = static_cast< css::ucb::XContent * >( this );
         m_pImpl->m_pContentEventListeners->disposeAndClear( aEvt );
     }
 
@@ -231,7 +231,7 @@ void SAL_CALL ContentImplHelper::dispose()
          m_pImpl->m_pCommandChangeListeners->getLength() )
     {
         lang::EventObject aEvt;
-        aEvt.Source = static_cast<  com::sun::star::ucb::XCommandInfoChangeNotifier * >( this );
+        aEvt.Source = static_cast<  css::ucb::XCommandInfoChangeNotifier * >( this );
         m_pImpl->m_pCommandChangeListeners->disposeAndClear( aEvt );
     }
 
@@ -270,7 +270,7 @@ void SAL_CALL ContentImplHelper::removeEventListener(
 }
 
 // virtual
-uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL
+uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
 ContentImplHelper::getIdentifier()
     throw( uno::RuntimeException, std::exception )
 {
@@ -279,7 +279,7 @@ ContentImplHelper::getIdentifier()
 
 // virtual
 void SAL_CALL ContentImplHelper::addContentEventListener(
-        const uno::Reference< com::sun::star::ucb::XContentEventListener >& Listener )
+        const uno::Reference< css::ucb::XContentEventListener >& Listener )
     throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
@@ -293,7 +293,7 @@ void SAL_CALL ContentImplHelper::addContentEventListener(
 
 // virtual
 void SAL_CALL ContentImplHelper::removeContentEventListener(
-        const uno::Reference< com::sun::star::ucb::XContentEventListener >& Listener )
+        const uno::Reference< css::ucb::XContentEventListener >& Listener )
     throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
@@ -379,7 +379,7 @@ void SAL_CALL ContentImplHelper::removePropertiesChangeListener(
 
 // virtual
 void SAL_CALL ContentImplHelper::addCommandInfoChangeListener(
-        const uno::Reference< com::sun::star::ucb::XCommandInfoChangeListener >& Listener )
+        const uno::Reference< css::ucb::XCommandInfoChangeListener >& Listener )
     throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
@@ -393,7 +393,7 @@ void SAL_CALL ContentImplHelper::addCommandInfoChangeListener(
 
 // virtual
 void SAL_CALL ContentImplHelper::removeCommandInfoChangeListener(
-        const uno::Reference< com::sun::star::ucb::XCommandInfoChangeListener >& Listener )
+        const uno::Reference< css::ucb::XCommandInfoChangeListener >& Listener )
     throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
@@ -420,7 +420,7 @@ void SAL_CALL ContentImplHelper::addProperty(
     // @@@ Need real command environment here, but where to get it from?
     //     XPropertyContainer interface should be replaced by
     //     XCommandProcessor commands!
-    uno::Reference< com::sun::star::ucb::XCommandEnvironment > xEnv;
+    uno::Reference< css::ucb::XCommandEnvironment > xEnv;
 
     if ( getPropertySetInfo( xEnv )->hasPropertyByName( Name ) )
     {
@@ -430,7 +430,7 @@ void SAL_CALL ContentImplHelper::addProperty(
 
     // Add a new dynamic property.
     // Open/create persistent property set.
-    uno::Reference< com::sun::star::ucb::XPersistentPropertySet > xSet(
+    uno::Reference< css::ucb::XPersistentPropertySet > xSet(
                                     getAdditionalPropertySet( true ) );
 
     OSL_ENSURE( xSet.is(),
@@ -506,7 +506,7 @@ void SAL_CALL ContentImplHelper::removeProperty( const OUString& Name )
         // @@@ Need real command environment here, but where to get it from?
         //     XPropertyContainer interface should be replaced by
         //     XCommandProcessor commands!
-        uno::Reference< com::sun::star::ucb::XCommandEnvironment > xEnv;
+        uno::Reference< css::ucb::XCommandEnvironment > xEnv;
 
         beans::Property aProp
             = getPropertySetInfo( xEnv )->getPropertyByName( Name );
@@ -525,7 +525,7 @@ void SAL_CALL ContentImplHelper::removeProperty( const OUString& Name )
 
     // Try to remove property from dynamic property set.
     // Open persistent property set, if exists.
-    uno::Reference< com::sun::star::ucb::XPersistentPropertySet > xSet(
+    uno::Reference< css::ucb::XPersistentPropertySet > xSet(
         getAdditionalPropertySet( false ) );
     if ( xSet.is() )
     {
@@ -561,7 +561,7 @@ void SAL_CALL ContentImplHelper::removeProperty( const OUString& Name )
             if ( xSet->getPropertySetInfo()->getProperties().getLength() == 0 )
             {
                 // Remove empty propertyset from registry.
-                uno::Reference< com::sun::star::ucb::XPropertySetRegistry >
+                uno::Reference< css::ucb::XPropertySetRegistry >
                     xReg = xSet->getRegistry();
                 if ( xReg.is() )
                 {
@@ -626,13 +626,13 @@ uno::Reference< uno::XInterface > SAL_CALL ContentImplHelper::getParent()
 
     if ( !aURL.isEmpty() )
     {
-        uno::Reference< com::sun::star::ucb::XContentIdentifier > xId(
+        uno::Reference< css::ucb::XContentIdentifier > xId(
             new ContentIdentifier( aURL ) );
         try
         {
             xParent.set( m_xProvider->queryContent( xId ) );
         }
-        catch ( com::sun::star::ucb::IllegalIdentifierException const & )
+        catch ( css::ucb::IllegalIdentifierException const & )
         {
         }
     }
@@ -648,7 +648,7 @@ void SAL_CALL ContentImplHelper::setParent(
     throw lang::NoSupportException();
 }
 
-uno::Reference< com::sun::star::ucb::XPersistentPropertySet >
+uno::Reference< css::ucb::XPersistentPropertySet >
 ContentImplHelper::getAdditionalPropertySet( bool bCreate )
 {
     // Get propertyset from provider.
@@ -784,7 +784,7 @@ void ContentImplHelper::notifyPropertySetInfoChange(
 }
 
 void ContentImplHelper::notifyContentEvent(
-    const com::sun::star::ucb::ContentEvent& evt ) const
+    const css::ucb::ContentEvent& evt ) const
 {
     if ( !m_pImpl->m_pContentEventListeners )
         return;
@@ -795,7 +795,7 @@ void ContentImplHelper::notifyContentEvent(
     {
         // Propagate event.
         uno::Reference<
-            com::sun::star::ucb::XContentEventListener > xListener(
+            css::ucb::XContentEventListener > xListener(
                 aIter.next(), uno::UNO_QUERY );
         if ( xListener.is() )
             xListener->contentEvent( evt );
@@ -815,9 +815,9 @@ void ContentImplHelper::inserted()
 
     if ( xParent.is() )
     {
-        com::sun::star::ucb::ContentEvent aEvt(
+        css::ucb::ContentEvent aEvt(
             static_cast< cppu::OWeakObject * >( xParent.get() ), // Source
-            com::sun::star::ucb::ContentAction::INSERTED,        // Action
+            css::ucb::ContentAction::INSERTED,        // Action
             this,                                                // Content
             xParent->getIdentifier() );                          // Id
         xParent->notifyContentEvent( aEvt );
@@ -826,7 +826,7 @@ void ContentImplHelper::inserted()
 
 void ContentImplHelper::deleted()
 {
-    uno::Reference< com::sun::star::ucb::XContent > xThis = this;
+    uno::Reference< css::ucb::XContent > xThis = this;
 
     rtl::Reference< ContentImplHelper > xParent
                     = m_xProvider->queryExistingContent( getParentURL() );
@@ -834,18 +834,18 @@ void ContentImplHelper::deleted()
     if ( xParent.is() )
     {
         // Let parent notify "REMOVED" event.
-        com::sun::star::ucb::ContentEvent aEvt(
+        css::ucb::ContentEvent aEvt(
             static_cast< cppu::OWeakObject * >( xParent.get() ),
-            com::sun::star::ucb::ContentAction::REMOVED,
+            css::ucb::ContentAction::REMOVED,
             this,
             xParent->getIdentifier()    );
         xParent->notifyContentEvent( aEvt );
     }
 
     // Notify "DELETED" event.
-    com::sun::star::ucb::ContentEvent aEvt1(
+    css::ucb::ContentEvent aEvt1(
         static_cast< cppu::OWeakObject * >( this ),
-        com::sun::star::ucb::ContentAction::DELETED,
+        css::ucb::ContentAction::DELETED,
         this,
         getIdentifier() );
     notifyContentEvent( aEvt1 );
@@ -854,9 +854,9 @@ void ContentImplHelper::deleted()
 }
 
 bool ContentImplHelper::exchange(
-    const uno::Reference< com::sun::star::ucb::XContentIdentifier >& rNewId )
+    const uno::Reference< css::ucb::XContentIdentifier >& rNewId )
 {
-    uno::Reference< com::sun::star::ucb::XContent > xThis = this;
+    uno::Reference< css::ucb::XContent > xThis = this;
 
     osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -870,7 +870,7 @@ bool ContentImplHelper::exchange(
         return false;
     }
 
-    uno::Reference< com::sun::star::ucb::XContentIdentifier > xOldId
+    uno::Reference< css::ucb::XContentIdentifier > xOldId
         = getIdentifier();
 
     // Re-insert at provider.
@@ -881,18 +881,18 @@ bool ContentImplHelper::exchange(
     aGuard.clear();
 
     // Notify "EXCHANGED" event.
-    com::sun::star::ucb::ContentEvent aEvt(
+    css::ucb::ContentEvent aEvt(
         static_cast< cppu::OWeakObject * >( this ),
-        com::sun::star::ucb::ContentAction::EXCHANGED,
+        css::ucb::ContentAction::EXCHANGED,
         this,
         xOldId );
     notifyContentEvent( aEvt );
     return true;
 }
 
-uno::Reference< com::sun::star::ucb::XCommandInfo >
+uno::Reference< css::ucb::XCommandInfo >
 ContentImplHelper::getCommandInfo(
-    const uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv,
+    const uno::Reference< css::ucb::XCommandEnvironment > & xEnv,
     bool bCache )
 {
     osl::MutexGuard aGuard( m_aMutex );
@@ -903,13 +903,13 @@ ContentImplHelper::getCommandInfo(
     else if ( !bCache )
         m_pImpl->m_xCommandsInfo->reset();
 
-    return uno::Reference< com::sun::star::ucb::XCommandInfo >(
+    return uno::Reference< css::ucb::XCommandInfo >(
         m_pImpl->m_xCommandsInfo.get() );
 }
 
 uno::Reference< beans::XPropertySetInfo >
 ContentImplHelper::getPropertySetInfo(
-    const uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv,
+    const uno::Reference< css::ucb::XCommandEnvironment > & xEnv,
     bool bCache )
 {
     osl::MutexGuard aGuard( m_aMutex );
diff --git a/ucbhelper/source/provider/contentidentifier.cxx b/ucbhelper/source/provider/contentidentifier.cxx
index dfd25cdf167f..86780ba76a3e 100644
--- a/ucbhelper/source/provider/contentidentifier.cxx
+++ b/ucbhelper/source/provider/contentidentifier.cxx
@@ -142,7 +142,7 @@ ContentIdentifier::getImplementationId()
 
 
 // virtual
-Sequence< com::sun::star::uno::Type > SAL_CALL
+Sequence< css::uno::Type > SAL_CALL
 ContentIdentifier::getTypes()
     throw( RuntimeException, std::exception )
 {
diff --git a/ucbhelper/source/provider/contentinfo.cxx b/ucbhelper/source/provider/contentinfo.cxx
index cf38231fa8c3..4b3987ccd3bd 100644
--- a/ucbhelper/source/provider/contentinfo.cxx
+++ b/ucbhelper/source/provider/contentinfo.cxx
@@ -43,7 +43,7 @@ using namespace com::sun::star;
 namespace ucbhelper {
 
 PropertySetInfo::PropertySetInfo(
-    const uno::Reference< com::sun::star::ucb::XCommandEnvironment >& rxEnv,
+    const uno::Reference< css::ucb::XCommandEnvironment >& rxEnv,
     ContentImplHelper* pContent )
 : m_xEnv( rxEnv ),
   m_pProps( nullptr ),
@@ -126,7 +126,7 @@ uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties()
             // Get info for additional properties.
 
 
-            uno::Reference< com::sun::star::ucb::XPersistentPropertySet >
+            uno::Reference< css::ucb::XPersistentPropertySet >
                 xSet ( m_pContent->getAdditionalPropertySet( false ) );
 
             if ( xSet.is() )
@@ -226,7 +226,7 @@ bool PropertySetInfo::queryProperty(
 
 
 CommandProcessorInfo::CommandProcessorInfo(
-    const uno::Reference< com::sun::star::ucb::XCommandEnvironment >& rxEnv,
+    const uno::Reference< css::ucb::XCommandEnvironment >& rxEnv,
     ContentImplHelper* pContent )
 : m_xEnv( rxEnv ),
   m_pCommands( nullptr ),
@@ -274,7 +274,7 @@ css::uno::Any SAL_CALL CommandProcessorInfo::queryInterface( const css::uno::Typ
 
 XTYPEPROVIDER_IMPL_2( CommandProcessorInfo,
                          lang::XTypeProvider,
-                         com::sun::star::ucb::XCommandInfo );
+                         css::ucb::XCommandInfo );
 
 
 
@@ -283,7 +283,7 @@ XTYPEPROVIDER_IMPL_2( CommandProcessorInfo,
 
 
 // virtual
-uno::Sequence< com::sun::star::ucb::CommandInfo > SAL_CALL
+uno::Sequence< css::ucb::CommandInfo > SAL_CALL
 CommandProcessorInfo::getCommands()
     throw( uno::RuntimeException, std::exception )
 {
@@ -298,11 +298,9 @@ CommandProcessorInfo::getCommands()
 
             try
             {
-                uno::Sequence< com::sun::star::ucb::CommandInfo > aCmds
+                uno::Sequence< css::ucb::CommandInfo > aCmds
                     = m_pContent->getCommands( m_xEnv );
-                m_pCommands
-                    = new uno::Sequence< com::sun::star::ucb::CommandInfo >(
-                        aCmds );
+                m_pCommands = new uno::Sequence< css::ucb::CommandInfo >( aCmds );
             }
             catch ( uno::RuntimeException const & )
             {
@@ -310,9 +308,7 @@ CommandProcessorInfo::getCommands()
             }
             catch ( uno::Exception const & )
             {
-                m_pCommands
-                    = new uno::Sequence< com::sun::star::ucb::CommandInfo >(
-                        0 );
+                m_pCommands = new uno::Sequence< css::ucb::CommandInfo >( 0 );
             }
         }
     }
@@ -321,31 +317,31 @@ CommandProcessorInfo::getCommands()
 
 
 // virtual
-com::sun::star::ucb::CommandInfo SAL_CALL
+css::ucb::CommandInfo SAL_CALL
 CommandProcessorInfo::getCommandInfoByName(
         const OUString& Name )
-    throw( com::sun::star::ucb::UnsupportedCommandException,
+    throw( css::ucb::UnsupportedCommandException,
            uno::RuntimeException, std::exception )
 {
-    com::sun::star::ucb::CommandInfo aInfo;
+    css::ucb::CommandInfo aInfo;
     if ( queryCommand( Name, aInfo ) )
         return aInfo;
 
-    throw com::sun::star::ucb::UnsupportedCommandException();
+    throw css::ucb::UnsupportedCommandException();
 }
 
 
 // virtual
-com::sun::star::ucb::CommandInfo SAL_CALL
+css::ucb::CommandInfo SAL_CALL
 CommandProcessorInfo::getCommandInfoByHandle( sal_Int32 Handle )
-    throw( com::sun::star::ucb::UnsupportedCommandException,
+    throw( css::ucb::UnsupportedCommandException,
            uno::RuntimeException, std::exception )
 {
-    com::sun::star::ucb::CommandInfo aInfo;
+    css::ucb::CommandInfo aInfo;
     if ( queryCommand( Handle, aInfo ) )
         return aInfo;
 
-    throw com::sun::star::ucb::UnsupportedCommandException();
+    throw css::ucb::UnsupportedCommandException();
 }
 
 
@@ -354,7 +350,7 @@ sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByName(
        const OUString& Name )
     throw( uno::RuntimeException, std::exception )
 {
-    com::sun::star::ucb::CommandInfo aInfo;
+    css::ucb::CommandInfo aInfo;
     return queryCommand( Name, aInfo );
 }
 
@@ -363,7 +359,7 @@ sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByName(
 sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByHandle( sal_Int32 Handle )
     throw( uno::RuntimeException, std::exception )
 {
-    com::sun::star::ucb::CommandInfo aInfo;
+    css::ucb::CommandInfo aInfo;
     return queryCommand( Handle, aInfo );
 }
 
@@ -384,18 +380,18 @@ void CommandProcessorInfo::reset()
 
 bool CommandProcessorInfo::queryCommand(
     const OUString& rName,
-    com::sun::star::ucb::CommandInfo& rCommand )
+    css::ucb::CommandInfo& rCommand )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
     getCommands();
 
-    const com::sun::star::ucb::CommandInfo* pCommands
+    const css::ucb::CommandInfo* pCommands
         = m_pCommands->getConstArray();
     sal_Int32 nCount = m_pCommands->getLength();
     for ( sal_Int32 n = 0; n < nCount; ++n )
     {
-        const com::sun::star::ucb::CommandInfo& rCurrCommand = pCommands[ n ];
+        const css::ucb::CommandInfo& rCurrCommand = pCommands[ n ];
         if ( rCurrCommand.Name == rName )
         {
             rCommand = rCurrCommand;
@@ -409,18 +405,17 @@ bool CommandProcessorInfo::queryCommand(
 
 bool CommandProcessorInfo::queryCommand(
     sal_Int32 nHandle,
-    com::sun::star::ucb::CommandInfo& rCommand )
+    css::ucb::CommandInfo& rCommand )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
     getCommands();
 
-    const com::sun::star::ucb::CommandInfo* pCommands
-        = m_pCommands->getConstArray();
+    const css::ucb::CommandInfo* pCommands = m_pCommands->getConstArray();
     sal_Int32 nCount = m_pCommands->getLength();
     for ( sal_Int32 n = 0; n < nCount; ++n )
     {
-        const com::sun::star::ucb::CommandInfo& rCurrCommand = pCommands[ n ];
+        const css::ucb::CommandInfo& rCurrCommand = pCommands[ n ];
         if ( rCurrCommand.Handle == nHandle )
         {
             rCommand = rCurrCommand;
diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx
index a4e53c9fb278..0e13c32573bf 100644
--- a/ucbhelper/source/provider/interactionrequest.cxx
+++ b/ucbhelper/source/provider/interactionrequest.cxx
@@ -47,10 +47,10 @@ namespace ucbhelper
 struct InteractionRequest_Impl
 {
     rtl::Reference< InteractionContinuation > m_xSelection;
-    com::sun::star::uno::Any m_aRequest;
-    com::sun::star::uno::Sequence<
-        com::sun::star::uno::Reference<
-            com::sun::star::task::XInteractionContinuation > > m_aContinuations;
+    css::uno::Any m_aRequest;
+    css::uno::Sequence<
+        css::uno::Reference<
+            css::task::XInteractionContinuation > > m_aContinuations;
 
     InteractionRequest_Impl() {}
     explicit InteractionRequest_Impl( const uno::Any & rRequest )
diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx
index df5edeb11098..9756dc24136e 100644
--- a/ucbhelper/source/provider/propertyvalueset.cxx
+++ b/ucbhelper/source/provider/propertyvalueset.cxx
@@ -697,16 +697,16 @@ void PropertyValueSet::appendPropertySet(
             {
                 // Efficient: Get all prop values with one ( remote) call.
 
-                Sequence< ::com::sun::star::beans::PropertyValue > aPropValues
+                Sequence< css::beans::PropertyValue > aPropValues
                     = xPropertyAccess->getPropertyValues();
 
-                const ::com::sun::star::beans::PropertyValue* pPropValues
+                const css::beans::PropertyValue* pPropValues
                       = aPropValues.getConstArray();
 
                 sal_Int32 nValuesCount = aPropValues.getLength();
                 for ( sal_Int32 n = 0; n < nValuesCount; ++n )
                 {
-                    const ::com::sun::star::beans::PropertyValue& rPropValue
+                    const css::beans::PropertyValue& rPropValue
                         = pPropValues[ n ];
 
                     // Find info for current property value.
diff --git a/ucbhelper/source/provider/providerhelper.cxx b/ucbhelper/source/provider/providerhelper.cxx
index 7385d9b86719..9c3c53a5ff41 100644
--- a/ucbhelper/source/provider/providerhelper.cxx
+++ b/ucbhelper/source/provider/providerhelper.cxx
@@ -49,10 +49,8 @@ Contents;
 
 struct ContentProviderImplHelper_Impl
 {
-    uno::Reference< com::sun::star::ucb::XPropertySetRegistry >
-        m_xPropertySetRegistry;
-    Contents
-        m_aContents;
+    uno::Reference< css::ucb::XPropertySetRegistry >  m_xPropertySetRegistry;
+    Contents                                          m_aContents;
 };
 
 } // namespace ucbhelper_impl
@@ -99,7 +97,7 @@ css::uno::Any SAL_CALL ContentProviderImplHelper::queryInterface( const css::uno
 XTYPEPROVIDER_IMPL_3( ContentProviderImplHelper,
                          lang::XTypeProvider,
                          lang::XServiceInfo,
-                         com::sun::star::ucb::XContentProvider );
+                         css::ucb::XContentProvider );
 
 // virtual
 sal_Bool SAL_CALL ContentProviderImplHelper::supportsService(
@@ -111,8 +109,8 @@ sal_Bool SAL_CALL ContentProviderImplHelper::supportsService(
 
 // virtual
 sal_Int32 SAL_CALL ContentProviderImplHelper::compareContentIds(
-        const uno::Reference< com::sun::star::ucb::XContentIdentifier >& Id1,
-        const uno::Reference< com::sun::star::ucb::XContentIdentifier >& Id2 )
+        const uno::Reference< css::ucb::XContentIdentifier >& Id1,
+        const uno::Reference< css::ucb::XContentIdentifier >& Id2 )
     throw( uno::RuntimeException, std::exception )
 {
     // Simply do a string compare.
@@ -162,8 +160,7 @@ void ContentProviderImplHelper::removeContent( ContentImplHelper* pContent )
 
 rtl::Reference< ContentImplHelper >
 ContentProviderImplHelper::queryExistingContent(
-    const uno::Reference< com::sun::star::ucb::XContentIdentifier >&
-        Identifier )
+    const uno::Reference< css::ucb::XContentIdentifier >& Identifier )
 {
     return queryExistingContent( Identifier->getContentIdentifier() );
 }
@@ -234,7 +231,7 @@ void ContentProviderImplHelper::registerNewContent(
     }
 }
 
-uno::Reference< com::sun::star::ucb::XPropertySetRegistry >
+uno::Reference< css::ucb::XPropertySetRegistry >
 ContentProviderImplHelper::getAdditionalPropertySetRegistry()
 {
     // Get propertyset registry.
@@ -243,8 +240,8 @@ ContentProviderImplHelper::getAdditionalPropertySetRegistry()
 
     if ( !m_pImpl->m_xPropertySetRegistry.is() )
     {
-        uno::Reference< com::sun::star::ucb::XPropertySetRegistryFactory >
-            xRegFac = com::sun::star::ucb::Store::create( m_xContext );
+        uno::Reference< css::ucb::XPropertySetRegistryFactory >
+            xRegFac = css::ucb::Store::create( m_xContext );
 
         // Open/create a registry.
         m_pImpl->m_xPropertySetRegistry
@@ -258,7 +255,7 @@ ContentProviderImplHelper::getAdditionalPropertySetRegistry()
     return m_pImpl->m_xPropertySetRegistry;
 }
 
-uno::Reference< com::sun::star::ucb::XPersistentPropertySet >
+uno::Reference< css::ucb::XPersistentPropertySet >
 ContentProviderImplHelper::getAdditionalPropertySet(
     const OUString& rKey, bool bCreate )
 {
@@ -268,12 +265,12 @@ ContentProviderImplHelper::getAdditionalPropertySet(
     if ( m_pImpl->m_xPropertySetRegistry.is() )
     {
         // Open/create persistent property set.
-        return uno::Reference< com::sun::star::ucb::XPersistentPropertySet >(
+        return uno::Reference< css::ucb::XPersistentPropertySet >(
             m_pImpl->m_xPropertySetRegistry->openPropertySet(
                 rKey, bCreate ) );
     }
 
-    return uno::Reference< com::sun::star::ucb::XPersistentPropertySet >();
+    return uno::Reference< css::ucb::XPersistentPropertySet >();
 }
 
 bool ContentProviderImplHelper::renameAdditionalPropertySet(
@@ -341,7 +338,7 @@ bool ContentProviderImplHelper::renameAdditionalPropertySet(
     else
     {
         // Get old property set, if exists.
-        uno::Reference< com::sun::star::ucb::XPersistentPropertySet > xOldSet
+        uno::Reference< css::ucb::XPersistentPropertySet > xOldSet
             = getAdditionalPropertySet( rOldKey, false );
         if ( xOldSet.is() )
         {
@@ -425,7 +422,7 @@ bool ContentProviderImplHelper::copyAdditionalPropertySet(
     else
     {
         // Get old property set, if exists.
-        uno::Reference< com::sun::star::ucb::XPersistentPropertySet >
+        uno::Reference< css::ucb::XPersistentPropertySet >
             xOldPropSet = getAdditionalPropertySet( rSourceKey, false );
         if ( !xOldPropSet.is() )
             return false;
@@ -451,7 +448,7 @@ bool ContentProviderImplHelper::copyAdditionalPropertySet(
         if ( nCount )
         {
             // Fail, if property set with new key already exists.
-            uno::Reference< com::sun::star::ucb::XPersistentPropertySet >
+            uno::Reference< css::ucb::XPersistentPropertySet >
                 xNewPropSet
                     = getAdditionalPropertySet( rTargetKey, false );
             if ( xNewPropSet.is() )
diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx
index ef7f45bed868..8d6194cab8c1 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -147,8 +147,8 @@ namespace ucbhelper
 
 struct ResultSet_Impl
 {
-    uno::Reference< uno::XComponentContext >    m_xContext;
-    uno::Reference< com::sun::star::ucb::XCommandEnvironment >  m_xEnv;
+    uno::Reference< uno::XComponentContext >        m_xContext;
+    uno::Reference< css::ucb::XCommandEnvironment > m_xEnv;
     uno::Reference< beans::XPropertySetInfo >       m_xPropSetInfo;
     uno::Reference< sdbc::XResultSetMetaData >      m_xMetaData;
     uno::Sequence< beans::Property >                m_aProperties;
@@ -164,8 +164,7 @@ struct ResultSet_Impl
         const uno::Reference< uno::XComponentContext >& rxContext,
         const uno::Sequence< beans::Property >& rProperties,
         const rtl::Reference< ResultSetDataSupplier >& rDataSupplier,
-        const uno::Reference< com::sun::star::ucb::XCommandEnvironment >&
-            rxEnv );
+        const uno::Reference< css::ucb::XCommandEnvironment >& rxEnv );
     inline ~ResultSet_Impl();
 };
 
@@ -173,7 +172,7 @@ inline ResultSet_Impl::ResultSet_Impl(
     const uno::Reference< uno::XComponentContext >& rxContext,
     const uno::Sequence< beans::Property >& rProperties,
     const rtl::Reference< ResultSetDataSupplier >& rDataSupplier,
-    const uno::Reference< com::sun::star::ucb::XCommandEnvironment >& rxEnv )
+    const uno::Reference< css::ucb::XCommandEnvironment >& rxEnv )
 : m_xContext( rxContext ),
   m_xEnv( rxEnv ),
   m_aProperties( rProperties ),
@@ -209,7 +208,7 @@ ResultSet::ResultSet(
                rxContext,
                rProperties,
                rDataSupplier,
-               uno::Reference< com::sun::star::ucb::XCommandEnvironment >() ) )
+               uno::Reference< css::ucb::XCommandEnvironment >() ) )
 {
     rDataSupplier->m_pResultSet = this;
 }
@@ -219,7 +218,7 @@ ResultSet::ResultSet(
     const uno::Reference< uno::XComponentContext >& rxContext,
     const uno::Sequence< beans::Property >& rProperties,
     const rtl::Reference< ResultSetDataSupplier >& rDataSupplier,
-    const uno::Reference< com::sun::star::ucb::XCommandEnvironment >& rxEnv )
+    const uno::Reference< css::ucb::XCommandEnvironment >& rxEnv )
 : m_pImpl( new ResultSet_Impl( rxContext, rProperties, rDataSupplier, rxEnv ) )
 {
     rDataSupplier->m_pResultSet = this;
@@ -271,9 +270,9 @@ css::uno::Any SAL_CALL ResultSet::queryInterface( const css::uno::Type & rType )
 
 XTYPEPROVIDER_IMPL_9( ResultSet,
                       lang::XTypeProvider,
-                         lang::XServiceInfo,
+                      lang::XServiceInfo,
                       lang::XComponent,
-                      com::sun::star::ucb::XContentAccess,
+                      css::ucb::XContentAccess,
                       sdbc::XResultSet,
                       sdbc::XResultSetMetaDataSupplier,
                       sdbc::XRow,
@@ -1278,7 +1277,7 @@ OUString SAL_CALL ResultSet::queryContentIdentifierString()
 
 
 // virtual
-uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL
+uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
 ResultSet::queryContentIdentifier()
     throw( uno::RuntimeException, std::exception )
 {
@@ -1286,19 +1285,19 @@ ResultSet::queryContentIdentifier()
         return m_pImpl->m_xDataSupplier->queryContentIdentifier(
                                                         m_pImpl->m_nPos - 1 );
 
-    return uno::Reference< com::sun::star::ucb::XContentIdentifier >();
+    return uno::Reference< css::ucb::XContentIdentifier >();
 }
 
 
 // virtual
-uno::Reference< com::sun::star::ucb::XContent > SAL_CALL
+uno::Reference< css::ucb::XContent > SAL_CALL
 ResultSet::queryContent()
     throw( uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
         return m_pImpl->m_xDataSupplier->queryContent( m_pImpl->m_nPos - 1 );
 
-    return uno::Reference< com::sun::star::ucb::XContent >();
+    return uno::Reference< css::ucb::XContent >();
 }
 
 
@@ -1535,7 +1534,7 @@ const uno::Sequence< beans::Property >& ResultSet::getProperties()
 }
 
 
-const uno::Reference< com::sun::star::ucb::XCommandEnvironment >&
+const uno::Reference< css::ucb::XCommandEnvironment >&
 ResultSet::getEnvironment()
 {
     return m_pImpl->m_xEnv;
diff --git a/ucbhelper/source/provider/resultsethelper.cxx b/ucbhelper/source/provider/resultsethelper.cxx
index 37a30d1a6961..c6a8129026cb 100644
--- a/ucbhelper/source/provider/resultsethelper.cxx
+++ b/ucbhelper/source/provider/resultsethelper.cxx
@@ -51,7 +51,7 @@ namespace ucbhelper {
 
 ResultSetImplHelper::ResultSetImplHelper(
     const uno::Reference< uno::XComponentContext >& rxContext,
-    const com::sun::star::ucb::OpenCommandArgument2& rCommand )
+    const css::ucb::OpenCommandArgument2& rCommand )
 : m_pDisposeEventListeners( nullptr ),
   m_bStatic( false ),
   m_bInitDone( false ),
@@ -100,8 +100,8 @@ css::uno::Any SAL_CALL ResultSetImplHelper::queryInterface( const css::uno::Type
 
 XTYPEPROVIDER_IMPL_3( ResultSetImplHelper,
                       lang::XTypeProvider,
-                         lang::XServiceInfo,
-                      com::sun::star::ucb::XDynamicResultSet );
+                      lang::XServiceInfo,
+                      css::ucb::XDynamicResultSet );
 
 
 
@@ -170,13 +170,13 @@ void SAL_CALL ResultSetImplHelper::removeEventListener(
 // virtual
 uno::Reference< sdbc::XResultSet > SAL_CALL
 ResultSetImplHelper::getStaticResultSet()
-    throw( com::sun::star::ucb::ListenerAlreadySetException,
+    throw( css::ucb::ListenerAlreadySetException,
            uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
     if ( m_xListener.is() )
-        throw com::sun::star::ucb::ListenerAlreadySetException();
+        throw css::ucb::ListenerAlreadySetException();
 
     init( true );
     return m_xResultSet1;
@@ -185,15 +185,14 @@ ResultSetImplHelper::getStaticResultSet()
 
 // virtual
 void SAL_CALL ResultSetImplHelper::setListener(
-        const uno::Reference< com::sun::star::ucb::XDynamicResultSetListener >&
-            Listener )
-    throw( com::sun::star::ucb::ListenerAlreadySetException,
+        const uno::Reference< css::ucb::XDynamicResultSetListener >& Listener )
+    throw( css::ucb::ListenerAlreadySetException,
            uno::RuntimeException, std::exception )
 {
     osl::ClearableMutexGuard aGuard( m_aMutex );
 
     if ( m_bStatic || m_xListener.is() )
-        throw com::sun::star::ucb::ListenerAlreadySetException();
+        throw css::ucb::ListenerAlreadySetException();
 
     m_xListener = Listener;
 
@@ -209,21 +208,20 @@ void SAL_CALL ResultSetImplHelper::setListener(
     init( false );
 
     uno::Any aInfo;
-    aInfo <<= com::sun::star::ucb::WelcomeDynamicResultSetStruct(
+    aInfo <<= css::ucb::WelcomeDynamicResultSetStruct(
         m_xResultSet1 /* "old" */,
         m_xResultSet2 /* "new" */ );
 
-    uno::Sequence< com::sun::star::ucb::ListAction > aActions( 1 );
-    aActions.getArray()[ 0 ]
-        = com::sun::star::ucb::ListAction(
+    uno::Sequence< css::ucb::ListAction > aActions {
+         css::ucb::ListAction(
             0, // Position; not used
             0, // Count; not used
-            com::sun::star::ucb::ListActionType::WELCOME,
-            aInfo );
+            css::ucb::ListActionType::WELCOME,
+            aInfo ) };
     aGuard.clear();
 
     Listener->notify(
-        com::sun::star::ucb::ListEvent(
+        css::ucb::ListEvent(
             static_cast< cppu::OWeakObject * >( this ), aActions ) );
 }
 
@@ -232,37 +230,33 @@ void SAL_CALL ResultSetImplHelper::setListener(
 sal_Int16 SAL_CALL ResultSetImplHelper::getCapabilities()
     throw( uno::RuntimeException, std::exception )
 {
-    // ! com::sun::star::ucb::ContentResultSetCapability::SORTED
+    // ! css::ucb::ContentResultSetCapability::SORTED
     return 0;
 }
 
 
 // virtual
 void SAL_CALL ResultSetImplHelper::connectToCache(
-        const uno::Reference< com::sun::star::ucb::XDynamicResultSet > &
-            xCache )
-    throw( com::sun::star::ucb::ListenerAlreadySetException,
-           com::sun::star::ucb::AlreadyInitializedException,
-           com::sun::star::ucb::ServiceNotFoundException,
+        const uno::Reference< css::ucb::XDynamicResultSet > & xCache )
+    throw( css::ucb::ListenerAlreadySetException,
+           css::ucb::AlreadyInitializedException,
+           css::ucb::ServiceNotFoundException,
            uno::RuntimeException, std::exception )
 {
     if ( m_xListener.is() )
-        throw com::sun::star::ucb::ListenerAlreadySetException();
+        throw css::ucb::ListenerAlreadySetException();
 
     if ( m_bStatic )
-        throw com::sun::star::ucb::ListenerAlreadySetException();
+        throw css::ucb::ListenerAlreadySetException();
 
-    uno::Reference< com::sun::star::ucb::XSourceInitialization >
-        xTarget( xCache, uno::UNO_QUERY );
+    uno::Reference< css::ucb::XSourceInitialization > xTarget( xCache, uno::UNO_QUERY );
     if ( xTarget.is() )
     {
-        uno::Reference<
-            com::sun::star::ucb::XCachedDynamicResultSetStubFactory >
-                xStubFactory;
+        uno::Reference< css::ucb::XCachedDynamicResultSetStubFactory >  xStubFactory;
         try
         {
             xStubFactory
-                = com::sun::star::ucb::CachedDynamicResultSetStubFactory::create(
+                = css::ucb::CachedDynamicResultSetStubFactory::create(
                       m_xContext );
         }
         catch ( uno::Exception const & )
@@ -276,7 +270,7 @@ void SAL_CALL ResultSetImplHelper::connectToCache(
             return;
         }
     }
-    throw com::sun::star::ucb::ServiceNotFoundException();
+    throw css::ucb::ServiceNotFoundException();
 }
 
 
diff --git a/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx b/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx
index 4ee851dccb7e..f8d08465e183 100644
--- a/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx
+++ b/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx
@@ -25,7 +25,7 @@ using namespace ucbhelper;
 
 
 SimpleCertificateValidationRequest::SimpleCertificateValidationRequest( const sal_Int32 & lCertificateValidity,
-                                                                        const com::sun::star::uno::Reference<com::sun::star::security::XCertificate>& certificate,
+                                                                        const css::uno::Reference<css::security::XCertificate>& certificate,
                                                                         const OUString & hostname)
 {
     // Fill request...
diff --git a/ucbhelper/source/provider/simplenameclashresolverequest.cxx b/ucbhelper/source/provider/simplenameclashresolverequest.cxx
index 7d74640872a2..5f29c2e51fa7 100644
--- a/ucbhelper/source/provider/simplenameclashresolverequest.cxx
+++ b/ucbhelper/source/provider/simplenameclashresolverequest.cxx
@@ -34,8 +34,8 @@ namespace ucbhelper {
   * supply a new name.
   */
 class InteractionSupplyName : public InteractionContinuation,
-                              public com::sun::star::lang::XTypeProvider,
-                              public com::sun::star::ucb::XInteractionSupplyName
+                              public css::lang::XTypeProvider,
+                              public css::ucb::XInteractionSupplyName
 {
     OUString m_aName;
 
@@ -44,29 +44,29 @@ public:
     : InteractionContinuation( pRequest ) {}
 
     // XInterface
-    virtual com::sun::star::uno::Any SAL_CALL
-    queryInterface( const com::sun::star::uno::Type & rType )
-        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL
+    queryInterface( const css::uno::Type & rType )
+        throw( css::uno::RuntimeException, std::exception ) override;
     virtual void SAL_CALL acquire()
         throw() override;
     virtual void SAL_CALL release()
         throw() override;
 
     // XTypeProvider
-    virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL
     getTypes()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
-    virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL
     getImplementationId()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+        throw( css::uno::RuntimeException, std::exception ) override;
 
     // XInteractionContinuation
     virtual void SAL_CALL select()
-        throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+        throw( css::uno::RuntimeException, std::exception ) override;
 
     // XInteractionSupplyName
     virtual void SAL_CALL setName( const OUString& Name )
-        throw ( com::sun::star::uno::RuntimeException, std::exception ) override;
+        throw ( css::uno::RuntimeException, std::exception ) override;
 
     // Non-interface methods.