[Libreoffice-commits] core.git: comphelper/source connectivity/source cppuhelper/source include/comphelper include/connectivity
Noel Grandin
noel.grandin at collabora.co.uk
Thu Nov 10 06:52:20 UTC 2016
comphelper/source/misc/accessiblecontexthelper.cxx | 14 +++---
comphelper/source/misc/componentbase.cxx | 4 -
comphelper/source/misc/logging.cxx | 14 +-----
comphelper/source/misc/proxyaggregation.cxx | 16 ++----
connectivity/source/commontools/DriversConfig.cxx | 3 -
connectivity/source/commontools/formattedcolumnvalue.cxx | 8 ---
connectivity/source/commontools/sqlerror.cxx | 9 ---
connectivity/source/cpool/ZPoolCollection.cxx | 11 +---
connectivity/source/cpool/ZPoolCollection.hxx | 1
connectivity/source/drivers/file/FStatement.cxx | 7 ---
connectivity/source/drivers/jdbc/ContextClassLoader.cxx | 2
connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx | 23 +---------
connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx | 3 -
connectivity/source/drivers/odbc/OConnection.cxx | 7 ---
connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx | 4 -
connectivity/source/inc/file/FStatement.hxx | 2
connectivity/source/inc/java/ContextClassLoader.hxx | 4 -
connectivity/source/inc/odbc/OConnection.hxx | 2
connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx | 2
connectivity/source/parse/sqliterator.cxx | 4 +
cppuhelper/source/servicemanager.cxx | 4 -
cppuhelper/source/servicemanager.hxx | 4 -
cppuhelper/source/typemanager.cxx | 8 ---
cppuhelper/source/typemanager.hxx | 2
include/comphelper/accessiblecontexthelper.hxx | 10 ----
include/comphelper/componentbase.hxx | 10 ----
include/comphelper/proxyaggregation.hxx | 4 -
include/connectivity/DriversConfig.hxx | 3 -
include/connectivity/formattedcolumnvalue.hxx | 5 --
include/connectivity/sqliterator.hxx | 6 --
30 files changed, 47 insertions(+), 149 deletions(-)
New commits:
commit 5c2c2d8dc4449c9d4ac9d645f634772ba93373af
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Nov 9 15:14:57 2016 +0200
loplugin:expandablemethods in comphelper..cppuhelper
Change-Id: I9d5487af4729bd3ee4f6450092e4b77f74a12e6d
Reviewed-on: https://gerrit.libreoffice.org/30717
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/comphelper/source/misc/accessiblecontexthelper.cxx b/comphelper/source/misc/accessiblecontexthelper.cxx
index 55fbe23..5f855ed 100644
--- a/comphelper/source/misc/accessiblecontexthelper.cxx
+++ b/comphelper/source/misc/accessiblecontexthelper.cxx
@@ -81,15 +81,17 @@ namespace comphelper
}
- void OAccessibleContextHelper::forgetExternalLock()
+ OAccessibleContextHelper::~OAccessibleContextHelper( )
{
- m_pImpl->setExternalLock( nullptr );
- }
+ /* forgets the reference to the external lock, if present.
+ <p>This means any further locking will not be guard the external lock anymore, never.</p>
+
+ <p>To be used in derived classes which do not supply the external lock themself, but instead get
+ them passed from own derivees (or clients).</p>
+ */
+ m_pImpl->setExternalLock( nullptr );
- OAccessibleContextHelper::~OAccessibleContextHelper( )
- {
- forgetExternalLock();
// this ensures that the lock, which may be already destroyed as part of the derivee,
// is not used anymore
diff --git a/comphelper/source/misc/componentbase.cxx b/comphelper/source/misc/componentbase.cxx
index 2904e46..9baec23 100644
--- a/comphelper/source/misc/componentbase.cxx
+++ b/comphelper/source/misc/componentbase.cxx
@@ -33,14 +33,14 @@ namespace comphelper
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XInterface;
- void ComponentBase::impl_checkDisposed_throw() const
+ void ComponentBase::checkDisposed( GuardAccess ) const
{
if ( m_rBHelper.bDisposed )
throw DisposedException( OUString(), getComponent() );
}
- void ComponentBase::impl_checkInitialized_throw() const
+ void ComponentBase::checkInitialized( GuardAccess ) const
{
if ( !m_bInitialized )
throw NotInitializedException( OUString(), getComponent() );
diff --git a/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx
index 452d2a3..ed6a79c 100644
--- a/comphelper/source/misc/logging.cxx
+++ b/comphelper/source/misc/logging.cxx
@@ -52,22 +52,16 @@ namespace comphelper
Reference< XLogger > m_xLogger;
public:
- EventLogger_Impl( const Reference< XComponentContext >& _rxContext, const OUString& _rLoggerName )
- :m_aContext( _rxContext )
- ,m_sLoggerName( _rLoggerName )
- {
- impl_createLogger_nothrow();
- }
+ EventLogger_Impl( const Reference< XComponentContext >& _rxContext, const OUString& _rLoggerName );
bool isValid() const { return m_xLogger.is(); }
const Reference< XLogger >& getLogger() const { return m_xLogger; }
const Reference< XComponentContext >& getContext() const { return m_aContext; }
-
- private:
- void impl_createLogger_nothrow();
};
- void EventLogger_Impl::impl_createLogger_nothrow()
+ EventLogger_Impl::EventLogger_Impl( const Reference< XComponentContext >& _rxContext, const OUString& _rLoggerName )
+ :m_aContext( _rxContext )
+ ,m_sLoggerName( _rLoggerName )
{
try
{
diff --git a/comphelper/source/misc/proxyaggregation.cxx b/comphelper/source/misc/proxyaggregation.cxx
index 14de9ee..1f2181f 100644
--- a/comphelper/source/misc/proxyaggregation.cxx
+++ b/comphelper/source/misc/proxyaggregation.cxx
@@ -190,7 +190,11 @@ namespace comphelper
OComponentProxyAggregation::~OComponentProxyAggregation()
{
- implEnsureDisposeInDtor( );
+ if ( !rBHelper.bDisposed )
+ {
+ acquire(); // to prevent duplicate dtor calls
+ dispose();
+ }
}
@@ -213,16 +217,6 @@ namespace comphelper
}
- void OComponentProxyAggregation::implEnsureDisposeInDtor( )
- {
- if ( !rBHelper.bDisposed )
- {
- acquire(); // to prevent duplicate dtor calls
- dispose();
- }
- }
-
-
void SAL_CALL OComponentProxyAggregation::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception)
{
// Simply disambiguate---this is necessary for MSVC to distinguish
diff --git a/connectivity/source/commontools/DriversConfig.cxx b/connectivity/source/commontools/DriversConfig.cxx
index c40ed47..2da9b4d 100644
--- a/connectivity/source/commontools/DriversConfig.cxx
+++ b/connectivity/source/commontools/DriversConfig.cxx
@@ -91,7 +91,7 @@ DriversConfigImpl::DriversConfigImpl()
{
}
-void DriversConfigImpl::Load(const uno::Reference< uno::XComponentContext >& _rxORB) const
+const TInstalledDrivers& DriversConfigImpl::getInstalledDrivers(const uno::Reference< uno::XComponentContext >& _rxORB) const
{
if ( m_aDrivers.empty() )
{
@@ -119,6 +119,7 @@ void DriversConfigImpl::Load(const uno::Reference< uno::XComponentContext >& _rx
}
} // if ( m_aInstalled.isValid() )
}
+ return m_aDrivers;
}
DriversConfig::DriversConfig(const uno::Reference< uno::XComponentContext >& _rxORB)
diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx
index 8a75af3..bd582db 100644
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -220,15 +220,9 @@ namespace dbtools
}
- void FormattedColumnValue::clear()
- {
- lcl_clear_nothrow( *m_pData );
- }
-
-
FormattedColumnValue::~FormattedColumnValue()
{
- clear();
+ lcl_clear_nothrow( *m_pData );
}
sal_Int16 FormattedColumnValue::getKeyType() const
diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx
index 1febff0..f074257 100644
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
@@ -57,7 +57,6 @@ namespace connectivity
// versions of the public SQLError methods which are just delegated to this impl-class
static const OUString& getMessagePrefix();
OUString getErrorMessage( const ErrorCondition _eCondition, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 );
- OUString getSQLState( const ErrorCondition _eCondition );
static ErrorCode getErrorCode( const ErrorCondition _eCondition );
void raiseException( const ErrorCondition _eCondition, const Reference< XInterface >& _rxContext, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 );
void raiseException( const ErrorCondition _eCondition, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 );
@@ -148,12 +147,6 @@ namespace connectivity
}
- OUString SQLError_Impl::getSQLState( const ErrorCondition _eCondition )
- {
- return impl_getSQLState( _eCondition );
- }
-
-
ErrorCode SQLError_Impl::getErrorCode( const ErrorCondition _eCondition )
{
return 0 - ::sal::static_int_cast< ErrorCode, ErrorCondition >( _eCondition );
@@ -217,7 +210,7 @@ namespace connectivity
return SQLException(
getErrorMessage( _eCondition, _rParamValue1, _rParamValue2, _rParamValue3 ),
_rxContext,
- getSQLState( _eCondition ),
+ impl_getSQLState( _eCondition ),
getErrorCode( _eCondition ),
Any()
);
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index ad462ea..f502b5f 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -252,7 +252,9 @@ bool OPoolCollection::isPoolingEnabled()
Reference<XInterface> const & OPoolCollection::getConfigPoolRoot()
{
if(!m_xConfigNode.is())
- m_xConfigNode = createWithServiceFactory(getConnectionPoolNodeName());
+ m_xConfigNode = createWithProvider(
+ css::configuration::theDefaultProvider::get(m_xContext),
+ getConnectionPoolNodeName());
return m_xConfigNode;
}
@@ -312,13 +314,6 @@ OConnectionPool* OPoolCollection::getConnectionPool(const OUString& _sImplName,
return pRet;
}
-Reference< XInterface > OPoolCollection::createWithServiceFactory(const OUString& _rPath) const
-{
- return createWithProvider(
- css::configuration::theDefaultProvider::get(m_xContext),
- _rPath);
-}
-
Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMultiServiceFactory >& _rxConfProvider,
const OUString& _rPath)
{
diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx
index ea5e2d3..316fb7a 100644
--- a/connectivity/source/cpool/ZPoolCollection.hxx
+++ b/connectivity/source/cpool/ZPoolCollection.hxx
@@ -85,7 +85,6 @@ namespace connectivity
const css::uno::Reference< css::uno::XComponentContext >& _rxContext);
// some configuration helper methods
- css::uno::Reference< css::uno::XInterface > createWithServiceFactory(const OUString& _rPath) const;
css::uno::Reference< css::uno::XInterface > const & getConfigPoolRoot();
static css::uno::Reference< css::uno::XInterface > createWithProvider( const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxConfProvider,
const OUString& _rPath);
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 2db0409..36cf314 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -308,11 +308,6 @@ Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeExcep
return aRet.hasValue() ? aRet : OStatement_BASE2::queryInterface( rType);
}
-OSQLAnalyzer* OStatement_Base::createAnalyzer()
-{
- return new OSQLAnalyzer(m_pConnection.get());
-}
-
void OStatement_Base::anylizeSQL()
{
OSL_ENSURE(m_pSQLAnalyzer,"OResultSet::anylizeSQL: Analyzer isn't set!");
@@ -436,7 +431,7 @@ void OStatement_Base::construct(const OUString& sql) throw(SQLException, Runtim
// create the column mapping
createColumnMapping();
- m_pSQLAnalyzer = createAnalyzer();
+ m_pSQLAnalyzer = new OSQLAnalyzer(m_pConnection.get());
Reference<XIndexesSupplier> xIndexSup(xTunnel,UNO_QUERY);
if(xIndexSup.is())
diff --git a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
index c45b5ae..6c2d371 100644
--- a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
+++ b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
@@ -92,7 +92,7 @@ namespace connectivity { namespace jdbc
}
- void ContextClassLoaderScope::pop()
+ ContextClassLoaderScope::~ContextClassLoaderScope()
{
if ( isActive() )
{
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
index 82cc40e..a1f073dd 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
@@ -70,25 +70,9 @@ void MozillaBootstrap::disposing()
OMozillaBootstrap_BASE::disposing();
}
-// static ServiceInfo
-
-OUString MozillaBootstrap::getImplementationName_Static( ) throw(RuntimeException)
-{
- return OUString(MOZAB_MozillaBootstrap_IMPL_NAME);
-}
-
-Sequence< OUString > MozillaBootstrap::getSupportedServiceNames_Static( ) throw (RuntimeException)
-{
- // which service is supported
- // for more information @see com.sun.star.mozilla.MozillaBootstrap
- Sequence<OUString> aSNS { "com.sun.star.mozilla.MozillaBootstrap" };
- return aSNS;
-}
-
-
OUString SAL_CALL MozillaBootstrap::getImplementationName( ) throw(RuntimeException, std::exception)
{
- return getImplementationName_Static();
+ return OUString(MOZAB_MozillaBootstrap_IMPL_NAME);
}
sal_Bool SAL_CALL MozillaBootstrap::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
@@ -96,10 +80,11 @@ sal_Bool SAL_CALL MozillaBootstrap::supportsService( const OUString& _rServiceNa
return cppu::supportsService(this, _rServiceName);
}
-
Sequence< OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames( ) throw(RuntimeException, std::exception)
{
- return getSupportedServiceNames_Static();
+ // which service is supported
+ // for more information @see com.sun.star.mozilla.MozillaBootstrap
+ return { "com.sun.star.mozilla.MozillaBootstrap" };
}
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
index 9b1b9cb..2a61d88 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
@@ -49,9 +49,6 @@ namespace connectivity
// OComponentHelper
virtual void SAL_CALL disposing() override;
- // XInterface
- static OUString getImplementationName_Static( ) throw(css::uno::RuntimeException);
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (css::uno::RuntimeException);
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/connectivity/source/drivers/odbc/OConnection.cxx b/connectivity/source/drivers/odbc/OConnection.cxx
index 4eca0ab..66f3146 100644
--- a/connectivity/source/drivers/odbc/OConnection.cxx
+++ b/connectivity/source/drivers/odbc/OConnection.cxx
@@ -505,11 +505,6 @@ void OConnection::disposing()
dispose_ChildImpl();
}
-OConnection* OConnection::cloneConnection()
-{
- return new OConnection(m_pDriverHandleCopy,m_pDriver);
-}
-
SQLHANDLE OConnection::createStatementHandle()
{
OConnection* pConnectionTemp = this;
@@ -519,7 +514,7 @@ SQLHANDLE OConnection::createStatementHandle()
sal_Int32 nMaxStatements = getMetaData()->getMaxStatements();
if(nMaxStatements && nMaxStatements <= m_nStatementCount)
{
- OConnection* pConnection = cloneConnection();
+ OConnection* pConnection = new OConnection(m_pDriverHandleCopy,m_pDriver);
pConnection->acquire();
pConnection->Construct(m_sURL,getConnectionInfo());
pConnectionTemp = pConnection;
diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
index 1d29d68..1b85498 100644
--- a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
@@ -778,10 +778,10 @@ void ODatabaseMetaDataResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nH
rValue <<= getCursorName();
break;
case PROPERTY_ID_RESULTSETCONCURRENCY:
- rValue <<= getResultSetConcurrency();
+ rValue <<= sal_Int32(css::sdbc::ResultSetConcurrency::READ_ONLY);
break;
case PROPERTY_ID_RESULTSETTYPE:
- rValue <<= getResultSetType();
+ rValue <<= sal_Int32(css::sdbc::ResultSetType::FORWARD_ONLY);
break;
case PROPERTY_ID_FETCHDIRECTION:
rValue <<= getFetchDirection();
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index ffdc751..50059b8 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -106,8 +106,6 @@ namespace connectivity
connectivity::OSQLParseNode* pAscendingDescending);
virtual void initializeResultSet(OResultSet* _pResult);
- // create the analyzer
- OSQLAnalyzer* createAnalyzer();
void closeResultSet() throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
diff --git a/connectivity/source/inc/java/ContextClassLoader.hxx b/connectivity/source/inc/java/ContextClassLoader.hxx
index 01c4ed5..174c3e9 100644
--- a/connectivity/source/inc/java/ContextClassLoader.hxx
+++ b/connectivity/source/inc/java/ContextClassLoader.hxx
@@ -55,7 +55,7 @@ namespace connectivity { namespace jdbc
const css::uno::Reference< css::uno::XInterface >& _rxErrorContext
);
- ~ContextClassLoaderScope() { pop(); }
+ ~ContextClassLoaderScope();
bool isActive() const
{
@@ -67,8 +67,6 @@ namespace connectivity { namespace jdbc
ContextClassLoaderScope(ContextClassLoaderScope &) = delete;
void operator =(ContextClassLoaderScope &) = delete;
- void pop();
-
JNIEnv& m_environment;
LocalRef< jobject > m_currentThread;
LocalRef< jobject > m_oldContextClassLoader;
diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx
index 2dc2df4..a3c0067 100644
--- a/connectivity/source/inc/odbc/OConnection.hxx
+++ b/connectivity/source/inc/odbc/OConnection.hxx
@@ -76,8 +76,6 @@ namespace connectivity
SQLRETURN OpenConnection(const OUString& aConnectStr,sal_Int32 nTimeOut, bool bSilent);
- OConnection* cloneConnection(); // creates a new connection
-
public:
oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex) const;
SQLRETURN Construct( const OUString& url,const css::uno::Sequence< css::beans::PropertyValue >& info) throw(css::sdbc::SQLException, std::exception);
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
index 1ca0f69..5ab546e 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
@@ -83,8 +83,6 @@ namespace connectivity
// set the columncount of the driver
void checkColumnCount();
- static sal_Int32 getResultSetConcurrency() { return css::sdbc::ResultSetConcurrency::READ_ONLY; }
- static sal_Int32 getResultSetType() { return css::sdbc::ResultSetType::FORWARD_ONLY; }
static sal_Int32 getFetchDirection() { return css::sdbc::FetchDirection::FORWARD; }
static sal_Int32 getFetchSize() throw(css::sdbc::SQLException, css::uno::RuntimeException);
static OUString getCursorName() throw(css::sdbc::SQLException, css::uno::RuntimeException);
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 0f0e0d3..1534d79 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -1546,7 +1546,9 @@ void OSQLParseTreeIterator::traverseAll()
void OSQLParseTreeIterator::impl_traverse( TraversalParts _nIncludeMask )
{
- impl_resetErrors();
+ // resets our errors
+ m_aErrors = css::sdbc::SQLException();
+
m_pImpl->m_nIncludeMask = _nIncludeMask;
if ( !traverseTableNames( *m_pImpl->m_pTables ) )
diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx
index f2c1a4c..2241128 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -1410,9 +1410,9 @@ void cppuhelper::ServiceManager::removeEventListenerFromComponent(
}
}
-void cppuhelper::ServiceManager::readRdbs(rtl::OUString const & uris) {
+void cppuhelper::ServiceManager::init(rtl::OUString const & rdbUris) {
for (sal_Int32 i = 0; i != -1;) {
- rtl::OUString uri(uris.getToken(0, ' ', i));
+ rtl::OUString uri(rdbUris.getToken(0, ' ', i));
if (uri.isEmpty()) {
continue;
}
diff --git a/cppuhelper/source/servicemanager.hxx b/cppuhelper/source/servicemanager.hxx
index 6f23504..ca00213 100644
--- a/cppuhelper/source/servicemanager.hxx
+++ b/cppuhelper/source/servicemanager.hxx
@@ -194,7 +194,7 @@ public:
using ServiceManagerBase::acquire;
using ServiceManagerBase::release;
- void init(rtl::OUString const & rdbUris) { readRdbs(rdbUris); }
+ void init(rtl::OUString const & rdbUris);
void setContext(
css::uno::Reference< css::uno::XComponentContext > const & context)
@@ -357,8 +357,6 @@ private:
void removeEventListenerFromComponent(
css::uno::Reference< css::lang::XComponent > const & component);
- void readRdbs(rtl::OUString const & uris);
-
void readRdbDirectory(rtl::OUString const & uri, bool optional);
void readRdbFile(rtl::OUString const & uri, bool optional);
diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx
index f232c6c..7faddaf 100644
--- a/cppuhelper/source/typemanager.cxx
+++ b/cppuhelper/source/typemanager.cxx
@@ -1872,10 +1872,6 @@ cppuhelper::TypeManager::TypeManager():
manager_(new unoidl::Manager)
{}
-void cppuhelper::TypeManager::init(rtl::OUString const & rdbUris) {
- readRdbs(rdbUris);
-}
-
css::uno::Any cppuhelper::TypeManager::find(rtl::OUString const & name) {
//TODO: caching? (here or in unoidl::Manager?)
struct Simple {
@@ -2096,9 +2092,9 @@ cppuhelper::TypeManager::createTypeDescriptionEnumeration(
depth == css::reflection::TypeDescriptionSearchDepth_INFINITE);
}
-void cppuhelper::TypeManager::readRdbs(rtl::OUString const & uris) {
+void cppuhelper::TypeManager::init(rtl::OUString const & rdbUris) {
for (sal_Int32 i = 0; i != -1;) {
- rtl::OUString uri(uris.getToken(0, ' ', i));
+ rtl::OUString uri(rdbUris.getToken(0, ' ', i));
if (uri.isEmpty()) {
continue;
}
diff --git a/cppuhelper/source/typemanager.hxx b/cppuhelper/source/typemanager.hxx
index 945438a..1610319 100644
--- a/cppuhelper/source/typemanager.hxx
+++ b/cppuhelper/source/typemanager.hxx
@@ -116,8 +116,6 @@ private:
css::reflection::InvalidTypeNameException,
css::uno::RuntimeException, std::exception) override;
- void readRdbs(rtl::OUString const & uris);
-
void readRdbDirectory(rtl::OUString const & uri, bool optional);
void readRdbFile(rtl::OUString const & uri, bool optional);
diff --git a/include/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx
index 44ca282..1074d1e 100644
--- a/include/comphelper/accessiblecontexthelper.hxx
+++ b/include/comphelper/accessiblecontexthelper.hxx
@@ -140,16 +140,6 @@ namespace comphelper
css::uno::Reference< css::accessibility::XAccessible >
getAccessibleCreator( ) const;
- private:
- /** forgets the reference to the external lock, if present.
-
- <p>This means any further locking will not be guard the external lock anymore, never.</p>
-
- <p>To be used in derived classes which do not supply the external lock themself, but instead get
- them passed from own derivees (or clients).</p>
- */
- void forgetExternalLock();
-
public:
// XAccessibleEventBroadcaster
virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/include/comphelper/componentbase.hxx b/include/comphelper/componentbase.hxx
index b5cce3d..079c40d 100644
--- a/include/comphelper/componentbase.hxx
+++ b/include/comphelper/componentbase.hxx
@@ -73,9 +73,9 @@ namespace comphelper
/// retrieves the component's mutex
inline ::osl::Mutex& getMutex( GuardAccess ) { return getMutex(); }
/// checks whether the component is already disposed, throws a DisposedException if so.
- inline void checkDisposed( GuardAccess ) const { impl_checkDisposed_throw(); }
+ void checkDisposed( GuardAccess ) const;
/// checks whether the component is already initialized, throws a NotInitializedException if not.
- inline void checkInitialized( GuardAccess ) const { impl_checkInitialized_throw(); }
+ void checkInitialized( GuardAccess ) const;
protected:
/// retrieves the component's broadcast helper
@@ -85,12 +85,6 @@ namespace comphelper
/// determines whether the instance is already disposed
inline bool impl_isDisposed() const { return m_rBHelper.bDisposed; }
- /// checks whether the component is already disposed. Throws a DisposedException if so.
- void impl_checkDisposed_throw() const;
-
- /// checks whether the component is already initialized. Throws a NotInitializedException if not.
- void impl_checkInitialized_throw() const;
-
/// determines whether the component is already initialized
inline bool
impl_isInitialized_nothrow() const { return m_bInitialized; }
diff --git a/include/comphelper/proxyaggregation.hxx b/include/comphelper/proxyaggregation.hxx
index 7560042..2af3737 100644
--- a/include/comphelper/proxyaggregation.hxx
+++ b/include/comphelper/proxyaggregation.hxx
@@ -202,10 +202,6 @@ namespace comphelper
// XComponent/OComponentProxyAggregationHelper
virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override;
- protected:
- // be called from within the dtor of derived classes
- void implEnsureDisposeInDtor( );
-
private:
OComponentProxyAggregation( const OComponentProxyAggregation& ) = delete;
OComponentProxyAggregation& operator=( const OComponentProxyAggregation& ) = delete;
diff --git a/include/connectivity/DriversConfig.hxx b/include/connectivity/DriversConfig.hxx
index 4a40d9c..3427425 100644
--- a/include/connectivity/DriversConfig.hxx
+++ b/include/connectivity/DriversConfig.hxx
@@ -46,11 +46,10 @@ namespace connectivity
{
mutable ::utl::OConfigurationTreeRoot m_aInstalled;
mutable TInstalledDrivers m_aDrivers;
- void Load(const css::uno::Reference< css::uno::XComponentContext >& _rxORB) const;
public:
DriversConfigImpl();
- const TInstalledDrivers& getInstalledDrivers(const css::uno::Reference< css::uno::XComponentContext >& _rxORB) const { Load(_rxORB); return m_aDrivers; }
+ const TInstalledDrivers& getInstalledDrivers(const css::uno::Reference< css::uno::XComponentContext >& _rxORB) const;
};
// Allows to access all driver which are located in the configuration
diff --git a/include/connectivity/formattedcolumnvalue.hxx b/include/connectivity/formattedcolumnvalue.hxx
index d7f7d8a..c8976a8 100644
--- a/include/connectivity/formattedcolumnvalue.hxx
+++ b/include/connectivity/formattedcolumnvalue.hxx
@@ -71,13 +71,8 @@ namespace dbtools
const css::uno::Reference< css::beans::XPropertySet >& i_rColumn
);
- // note that all methods of this class need to be virtual, since it's
- // used in a load-on-demand context in module SVX
-
~FormattedColumnValue();
- void clear();
-
// access to the details of the formatting we determined
sal_Int16 getKeyType() const;
const css::uno::Reference< css::sdb::XColumn >&
diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx
index 4563004..1d72ee5 100644
--- a/include/connectivity/sqliterator.hxx
+++ b/include/connectivity/sqliterator.hxx
@@ -350,12 +350,6 @@ namespace connectivity
*/
void impl_appendError( const css::sdbc::SQLException& _rError );
- /** resets our errors
- */
- inline void impl_resetErrors()
- {
- m_aErrors = css::sdbc::SQLException();
- }
void impl_fillJoinConditions(const OSQLParseNode* i_pJoinCondition);
};
}
More information about the Libreoffice-commits
mailing list