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>

1 files changed, 13 insertions, 14 deletions

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;