core.git: 3 commits - comphelper/source connectivity/source include/comphelper
comphelper/source/property/propertycontainer.cxx |7 --
connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx |7 --
connectivity/source/drivers/ado/APreparedStatement.cxx | 30
--
connectivity/source/drivers/ado/AResultSet.cxx |7 --
connectivity/source/drivers/ado/AStatement.cxx |7 --
connectivity/source/inc/ado/APreparedStatement.hxx | 17 +
include/comphelper/propertycontainer.hxx |2
7 files changed, 14 insertions(+), 63 deletions(-)
New commits:
commit 8fdef548702ef240980b52e4076af36122534fed
Author: Mike Kaganski
AuthorDate: Sat Dec 7 02:38:08 2024 +0500
Commit: Mike Kaganski
CommitDate: Sat Dec 7 21:55:58 2024 +0100
Simplify OPropertyContainer::getBaseTypes
Change-Id: I438d510e05329163dabdc8ed42d3a97d49e19ef9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178055
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/comphelper/source/property/propertycontainer.cxx
b/comphelper/source/property/propertycontainer.cxx
index ad24c5f30aa7..0c17feb50234 100644
--- a/comphelper/source/property/propertycontainer.cxx
+++ b/comphelper/source/property/propertycontainer.cxx
@@ -42,12 +42,7 @@ OPropertyContainer::~OPropertyContainer()
Sequence< Type > OPropertyContainer::getBaseTypes()
{
// just the types from our one and only base class
-::cppu::OTypeCollection aTypes(
-cppu::UnoType::get(),
-cppu::UnoType::get(),
-cppu::UnoType::get()
-);
-return aTypes.getTypes();
+return cppu::OPropertySetHelper::getTypes();
}
sal_Bool OPropertyContainer::convertFastPropertyValue(
diff --git a/include/comphelper/propertycontainer.hxx
b/include/comphelper/propertycontainer.hxx
index 2c64b2cdfedf..0c663e7bacab 100644
--- a/include/comphelper/propertycontainer.hxx
+++ b/include/comphelper/propertycontainer.hxx
@@ -53,7 +53,7 @@ protected:
/// for scripting : the types of the interfaces supported by this class
///
/// @throws css::uno::RuntimeException
-static css::uno::Sequence< css::uno::Type > getBaseTypes();
+css::uno::Sequence< css::uno::Type > getBaseTypes();
// OPropertySetHelper overridables
virtual sal_Bool SAL_CALL convertFastPropertyValue(
commit 831700824d6c6c86ee798fec4617307aedded7df
Author: Mike Kaganski
AuthorDate: Sat Dec 7 02:01:07 2024 +0500
Commit: Mike Kaganski
CommitDate: Sat Dec 7 21:55:52 2024 +0100
Simplify getTypes implementations
Change-Id: Ia0f7e8497f628b17a108a4dd8ffebc60745b7d6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178054
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index 0e5c082d7fdf..5c96b394da0f 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -99,11 +99,8 @@ Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface(
const Type & rType )
css::uno::Sequence< css::uno::Type > SAL_CALL
ODatabaseMetaDataResultSet::getTypes( )
{
-::cppu::OTypeCollection aTypes(
cppu::UnoType::get(),
-
cppu::UnoType::get(),
-
cppu::UnoType::get());
-
-return
::comphelper::concatSequences(aTypes.getTypes(),ODatabaseMetaDataResultSet_BASE::getTypes());
+return comphelper::concatSequences(cppu::OPropertySetHelper::getTypes(),
+
ODatabaseMetaDataResultSet_BASE::getTypes());
}
void ODatabaseMetaDataResultSet::checkRecordSet()
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx
b/connectivity/source/drivers/ado/AResultSet.cxx
index f1357449d471..ae1013c1c177 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -132,11 +132,8 @@ Any SAL_CALL OResultSet::queryInterface( const Type &
rType )
css::uno::Sequence< css::uno::Type > SAL_CALL OResultSet::getTypes( )
{
-::cppu::OTypeCollection aTypes(
cppu::UnoType::get(),
-
cppu::UnoType::get(),
-
cppu::UnoType::get());
-
-return
::comphelper::concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes());
+return comphelper::concatSequences(cppu::OPropertySetHelper::getTypes(),
+ OResultSet_BASE::getTypes());
}
sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName )
diff --git a/connectivity/source/drivers/ado/AStatement.cxx
b/connectivity/source/drivers/ado/AStatement.cxx
index 935e361f8000..0764a4b335a5 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -120,11 +120,8 @@ Any SAL_CALL OStatement_Base::queryInterf
[Libreoffice-commits] core.git: 3 commits - comphelper/source connectivity/source include/comphelper
comphelper/source/misc/logging.cxx | 21 +
connectivity/source/drivers/jdbc/JDriver.cxx |2 +-
include/comphelper/logging.hxx | 11 +--
3 files changed, 3 insertions(+), 31 deletions(-)
New commits:
commit 8e9c618dd203972cfd0be94debff247026977647
Author: Caolán McNamara
Date: Thu Apr 27 16:20:13 2017 +0100
drop writeonly unused struct
Change-Id: I6a7d5881109264d86059a16b4a3a540f1491
diff --git a/comphelper/source/misc/logging.cxx
b/comphelper/source/misc/logging.cxx
index f5c0b1b8168e..0c00d9feb486 100644
--- a/comphelper/source/misc/logging.cxx
+++ b/comphelper/source/misc/logging.cxx
@@ -173,24 +173,9 @@ namespace comphelper
return false;
}
-struct ResourceBasedEventLogger_Data
-{
-/// did we already attempt to load the bundle?
-boolbBundleLoaded;
-/// the lazily loaded bundle
-Reference< XResourceBundle >xBundle;
-
-ResourceBasedEventLogger_Data()
-:bBundleLoaded( false )
-,xBundle()
-{
-}
-};
-
ResourceBasedEventLogger::ResourceBasedEventLogger( const Reference<
XComponentContext >& _rxContext,
const sal_Char* _pAsciiLoggerName )
:EventLogger( _rxContext, _pAsciiLoggerName )
-,m_pData( new ResourceBasedEventLogger_Data )
{
}
} // namespace comphelper
diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx
index 30226a405f25..326572c5aac3 100644
--- a/include/comphelper/logging.hxx
+++ b/include/comphelper/logging.hxx
@@ -472,15 +472,11 @@ namespace comphelper
//= ResourceBasedEventLogger
-struct ResourceBasedEventLogger_Data;
/** extends the EventLogger class with functionality to load log messages
from
a resource bundle.
*/
class COMPHELPER_DLLPUBLIC ResourceBasedEventLogger : public EventLogger
{
-private:
-std::shared_ptr< ResourceBasedEventLogger_Data >m_pData;
-
public:
/** creates a resource based event logger
@param _rxContext
commit 65330ab268cace6c9c163d56832450808010cc52
Author: Caolán McNamara
Date: Thu Apr 27 16:16:25 2017 +0100
the only use of this argument is sdbcl which is a deleted resource file
Change-Id: I31c140dcab9a291c4ede62e56d296a224dcd47c8
diff --git a/comphelper/source/misc/logging.cxx
b/comphelper/source/misc/logging.cxx
index 52ded0e7801e..f5c0b1b8168e 100644
--- a/comphelper/source/misc/logging.cxx
+++ b/comphelper/source/misc/logging.cxx
@@ -175,27 +175,23 @@ namespace comphelper
struct ResourceBasedEventLogger_Data
{
-/// the base name of the resource bundle
-OUString sBundleBaseName;
/// did we already attempt to load the bundle?
boolbBundleLoaded;
/// the lazily loaded bundle
Reference< XResourceBundle >xBundle;
ResourceBasedEventLogger_Data()
-:sBundleBaseName()
-,bBundleLoaded( false )
+:bBundleLoaded( false )
,xBundle()
{
}
};
-ResourceBasedEventLogger::ResourceBasedEventLogger( const Reference<
XComponentContext >& _rxContext, const sal_Char* _pResourceBundleBaseName,
+ResourceBasedEventLogger::ResourceBasedEventLogger( const Reference<
XComponentContext >& _rxContext,
const sal_Char* _pAsciiLoggerName )
:EventLogger( _rxContext, _pAsciiLoggerName )
,m_pData( new ResourceBasedEventLogger_Data )
{
-m_pData->sBundleBaseName = OUString::createFromAscii(
_pResourceBundleBaseName );
}
} // namespace comphelper
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx
b/connectivity/source/drivers/jdbc/JDriver.cxx
index 32fdd4ccc9ae..6bd2dd22ebd1 100644
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -43,7 +43,7 @@ using namespace ::com::sun::star::lang;
java_sql_Driver::java_sql_Driver(const Reference< css::uno::XComponentContext
>& _rxContext)
:m_aContext( _rxContext )
-,m_aLogger( _rxContext, "sdbcl", "org.openoffice.sdbc.jdbcBridge" )
+,m_aLogger( _rxContext, "org.openoffice.sdbc.jdbcBridge" )
{
}
diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx
index d6aeb675d822..30226a405f25 100644
--- a/include/comphelper/logging.hxx
+++ b/include/comphelper/logging.hxx
@@ -485,9 +485,6 @@ namespace comphelper
/** creates a resource based event logger
@param _rxContext
the component context for creating new components
-@param _pResourceBundleBaseName
-the ASCII base name of the resource bundle to use. Will be used
-in conjunction with XResourceBundleLoader::loadResource.
@param _pAsciiLoggerName
the ASCII name of the logger to
