[Libreoffice-commits] core.git: dbaccess/source

[Noel Grandin (via logerrit)]

 dbaccess/source/ui/inc/defaultobjectnamecheck.hxx  |    5 +++--
 dbaccess/source/ui/misc/defaultobjectnamecheck.cxx |   17 ++++-------------
 2 files changed, 7 insertions(+), 15 deletions(-)

New commits:
commit 5f194a2705449698a4760982913fc2592720be6b
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sun Sep 4 15:04:52 2022 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Sep 5 08:56:41 2022 +0200

    DynamicTableOrQueryNameCheck doesn't need a pimpl
    
    it is already module private
    
    Change-Id: I7830730161393c70e29670500c475fa3c6027435
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139365
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx 
b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
index 59705fe61260..157f201ddc6a 100644
--- a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
+++ b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
@@ -23,6 +23,7 @@
 
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
+#include <com/sun/star/sdb/tools/XConnectionTools.hpp>
 
 #include <memory>
 
@@ -67,7 +68,6 @@ namespace dbaui
     };
 
     // DynamicTableOrQueryNameCheck
-    struct DynamicTableOrQueryNameCheck_Impl;
     /** class implementing the IObjectNameCheck interface, and checking a 
given name
         for being valid as either a query or a table name.
 
@@ -84,7 +84,8 @@ namespace dbaui
     class DynamicTableOrQueryNameCheck  :public IObjectNameCheck
     {
     private:
-        std::unique_ptr< DynamicTableOrQueryNameCheck_Impl > m_pImpl;
+        sal_Int32 mnCommandType;
+        css::uno::Reference< css::sdb::tools::XObjectNames >  mxObjectNames;
 
     public:
         /** constructs a DynamicTableOrQueryNameCheck instance
diff --git a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx 
b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
index 5c70cc421f61..809e90a777cc 100644
--- a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
+++ b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
@@ -24,7 +24,6 @@
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
-#include <com/sun/star/sdb/tools/XConnectionTools.hpp>
 #include <com/sun/star/sdbc/SQLException.hpp>
 
 #include <connectivity/dbexception.hxx>
@@ -115,26 +114,18 @@ namespace dbaui
         return false;
     }
 
-    // DynamicTableOrQueryNameCheck_Impl
-    struct DynamicTableOrQueryNameCheck_Impl
-    {
-        sal_Int32                   nCommandType;
-        Reference< XObjectNames >   xObjectNames;
-    };
-
     // DynamicTableOrQueryNameCheck
     DynamicTableOrQueryNameCheck::DynamicTableOrQueryNameCheck( const 
Reference< XConnection >& _rxSdbLevelConnection, sal_Int32 _nCommandType )
-        :m_pImpl( new DynamicTableOrQueryNameCheck_Impl )
     {
         Reference< XConnectionTools > xConnTools( _rxSdbLevelConnection, 
UNO_QUERY );
         if ( xConnTools.is() )
-            m_pImpl->xObjectNames.set( xConnTools->getObjectNames() );
-        if ( !m_pImpl->xObjectNames.is() )
+            mxObjectNames.set( xConnTools->getObjectNames() );
+        if ( !mxObjectNames.is() )
             throw IllegalArgumentException();
 
         if ( ( _nCommandType != CommandType::QUERY ) && ( _nCommandType != 
CommandType::TABLE ) )
             throw IllegalArgumentException();
-        m_pImpl->nCommandType = _nCommandType;
+        mnCommandType = _nCommandType;
     }
 
     DynamicTableOrQueryNameCheck::~DynamicTableOrQueryNameCheck()
@@ -145,7 +136,7 @@ namespace dbaui
     {
         try
         {
-            m_pImpl->xObjectNames->checkNameForCreate( m_pImpl->nCommandType, 
_rObjectName );
+            mxObjectNames->checkNameForCreate( mnCommandType, _rObjectName );
             return true;
         }
         catch( const SQLException& )