Kaydet (Commit) f3b44f63 authored tarafından Andreas Bille's avatar Andreas Bille

#98767# now using ucbhelper::cancelCommandExcecution;…

#98767# now using ucbhelper::cancelCommandExcecution; UnsupportedCommandException instead of CommandAborted
üst 5622d56f
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: provider.cxx,v $ * $RCSfile: provider.cxx,v $
* *
* $Revision: 1.13 $ * $Revision: 1.14 $
* *
* last change: $Author: kso $ $Date: 2002-08-02 15:19:00 $ * last change: $Author: abi $ $Date: 2002-10-30 09:59:17 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -295,7 +295,7 @@ void ContentProvider::init() ...@@ -295,7 +295,7 @@ void ContentProvider::init()
aAny >>= m_xContainer; aAny >>= m_xContainer;
if(m_xContainer.is()) if(m_xContainer.is())
m_xContainer->addContainerListener(this); m_xContainer->addContainerListener(this);
} catch(const com::sun::star::uno::Exception& e) { } catch(const com::sun::star::uno::Exception&) {
} }
/** /**
...@@ -367,10 +367,12 @@ Reference< XMultiServiceFactory > ContentProvider::getConfiguration() const ...@@ -367,10 +367,12 @@ Reference< XMultiServiceFactory > ContentProvider::getConfiguration() const
try try
{ {
rtl::OUString sProviderService = rtl::OUString sProviderService =
rtl::OUString::createFromAscii( "com.sun.star.configuration.ConfigurationProvider" ); rtl::OUString::createFromAscii(
"com.sun.star.configuration.ConfigurationProvider" );
sProvider = sProvider =
Reference< XMultiServiceFactory >( Reference< XMultiServiceFactory >(
m_xSMgr->createInstanceWithArguments( sProviderService,seq ), m_xSMgr->createInstanceWithArguments(
sProviderService,seq ),
UNO_QUERY ); UNO_QUERY );
} }
catch( const com::sun::star::uno::Exception& ) catch( const com::sun::star::uno::Exception& )
...@@ -416,8 +418,9 @@ ContentProvider::getHierAccess( const Reference< XMultiServiceFactory >& sProvid ...@@ -416,8 +418,9 @@ ContentProvider::getHierAccess( const Reference< XMultiServiceFactory >& sProvid
rtl::OUString rtl::OUString
ContentProvider::getKey( const Reference< XHierarchicalNameAccess >& xHierAccess, ContentProvider::getKey(const Reference<
const char* key ) const XHierarchicalNameAccess >& xHierAccess,
const char* key) const
{ {
rtl::OUString instPath; rtl::OUString instPath;
if( xHierAccess.is() ) if( xHierAccess.is() )
...@@ -426,7 +429,8 @@ ContentProvider::getKey( const Reference< XHierarchicalNameAccess >& xHierAccess ...@@ -426,7 +429,8 @@ ContentProvider::getKey( const Reference< XHierarchicalNameAccess >& xHierAccess
try try
{ {
aAny = aAny =
xHierAccess->getByHierarchicalName( rtl::OUString::createFromAscii( key ) ); xHierAccess->getByHierarchicalName(
rtl::OUString::createFromAscii(key));
} }
catch( const com::sun::star::container::NoSuchElementException& ) catch( const com::sun::star::container::NoSuchElementException& )
{ {
...@@ -450,7 +454,7 @@ void ContentProvider::subst( rtl::OUString& instpath ) const ...@@ -450,7 +454,7 @@ void ContentProvider::subst( rtl::OUString& instpath ) const
m_xSMgr->createInstance( rtl::OUString::createFromAscii( "com.sun.star.config.SpecialConfigManager" ) ), m_xSMgr->createInstance( rtl::OUString::createFromAscii( "com.sun.star.config.SpecialConfigManager" ) ),
UNO_QUERY ); UNO_QUERY );
} }
catch( const com::sun::star::uno::Exception& e ) catch( const com::sun::star::uno::Exception&)
{ {
OSL_ENSURE( xCfgMgr.is()," cant instantiate the special config manager " ); OSL_ENSURE( xCfgMgr.is()," cant instantiate the special config manager " );
} }
......
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