Kaydet (Commit) ee74deca authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin

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

Change-Id: I01e3046caefdcfbf630f4a794f12e8890be6db40
Reviewed-on: https://gerrit.libreoffice.org/19902Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst e44119c5
......@@ -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();
......
......@@ -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 )
{
......
......@@ -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;
......
......@@ -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 )
......
......@@ -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.
......
......@@ -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() )
......
......@@ -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;
......
......@@ -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();
}
......
......@@ -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...
......
......@@ -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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment