[Libreoffice-commits] core.git: 3 commits - comphelper/source connectivity/source include/comphelper

[Caolán McNamara]

 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 <caolanm at redhat.com>
Date:   Thu Apr 27 16:20:13 2017 +0100

    drop writeonly unused struct
    
    Change-Id: I6a7d58899991109264d86059a16b4a3a540f1491

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?
-        bool                            bBundleLoaded;
-        /// 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 <caolanm at redhat.com>
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?
         bool                            bBundleLoaded;
         /// 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 work with. If NULL, the office-wide
                 default logger will be used.
@@ -495,11 +492,9 @@ namespace comphelper
         */
         ResourceBasedEventLogger(
             const css::uno::Reference< css::uno::XComponentContext >& _rxContext,
-            const sal_Char* _pResourceBundleBaseName,
             const sal_Char* _pAsciiLoggerName
         );
 
-
         //- XLogger::log equivalents/wrappers
         //- resource IDs
 
commit 52c8f47e8774304d207ef15c010b204ead291077
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Apr 27 16:04:30 2017 +0100

    un-default argument
    
    Change-Id: I5d60998b4c30f58ee9c734b37d3f97118db8d7cf

diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx
index 1725340b379b..d6aeb675d822 100644
--- a/include/comphelper/logging.hxx
+++ b/include/comphelper/logging.hxx
@@ -496,7 +496,7 @@ namespace comphelper
         ResourceBasedEventLogger(
             const css::uno::Reference< css::uno::XComponentContext >& _rxContext,
             const sal_Char* _pResourceBundleBaseName,
-            const sal_Char* _pAsciiLoggerName = nullptr
+            const sal_Char* _pAsciiLoggerName
         );