INTEGRATION: CWS sb88 (1.68.10); FILE MERGED

2008/06/03 15:29:46 sb 1.68.10.1: #i89553 applied patch by cmc
This commit is contained in:
Rüdiger Timm
2008-06-16 12:32:08 +00:00
parent 54c5e794e6
commit f738912c37

View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: providerimpl.cxx,v $
* $Revision: 1.68 $
* $Revision: 1.69 $
*
* This file is part of OpenOffice.org.
*
@@ -67,7 +67,6 @@ namespace configmgr
using configapi::NodeElement;
using configuration::RootTree;
using configuration::SpecialTemplateProvider;
namespace configapi
{
@@ -337,10 +336,6 @@ namespace configmgr
}
}
//-----------------------------------------------------------------------------
// access to the factory for writable elements
configapi::Factory& OProviderImpl::getWriterFactory() {return m_pNewProviders->getWriterFactory();}
//-----------------------------------------------------------------------------
// access to the raw notifications
IConfigBroadcaster* OProviderImpl::getNotifier() CFG_NOTHROW()
@@ -604,14 +599,6 @@ namespace configmgr
};
OUString OProviderImpl::FactoryArguments::getArgumentName(Argument _which) CFG_NOTHROW()
{
OSL_ASSERT(sizeof asciiArgumentNames/sizeof 0[asciiArgumentNames] == _arg_count);
OSL_PRECOND(_which < _arg_count, "Illegal argument selector in OProviderImpl::FactoryArguments::getArgumentName");
return OUString::createFromAscii(asciiArgumentNames[_which]);
}
OProviderImpl::FactoryArguments::Argument
OProviderImpl::FactoryArguments::lookupArgument(const rtl::OUString& rName)
CFG_NOTHROW()