HierarchicalNameCheck doesn't need a pimpl

already module private≈

Change-Id: Id5ea44b88c5cd6776d41fc71ac6c5fa4d639aab9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139366
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 8 insertions, 16 deletions

diff --git a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
index 157f201ddc6a..c75528940e15 100644
--- a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
+++ b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
@@ -31,14 +31,14 @@ namespace dbaui
 {
 
     // HierarchicalNameCheck
-    struct HierarchicalNameCheck_Impl;
     /** class implementing the IObjectNameCheck interface, and checking given object names
         against a hierarchical name container
     */
     class HierarchicalNameCheck :public IObjectNameCheck
     {
     private:
-        std::unique_ptr< HierarchicalNameCheck_Impl > m_pImpl;
+        css::uno::Reference< css::container::XHierarchicalNameAccess >  mxHierarchicalNames;
+        OUString msRelativeRoot;
 
     public:
         /** constructs a HierarchicalNameCheck instance
diff --git a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
index 809e90a777cc..d2a158d2b76e 100644
--- a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
+++ b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
@@ -67,21 +67,13 @@ namespace dbaui
 
     }
 
-    // HierarchicalNameCheck_Impl
-    struct HierarchicalNameCheck_Impl
-    {
-        Reference< XHierarchicalNameAccess >    xHierarchicalNames;
-        OUString                         sRelativeRoot;
-    };
-
     // HierarchicalNameCheck
     HierarchicalNameCheck::HierarchicalNameCheck( const Reference< XHierarchicalNameAccess >& _rxNames, const OUString& _rRelativeRoot )
-        :m_pImpl( new HierarchicalNameCheck_Impl )
     {
-        m_pImpl->xHierarchicalNames = _rxNames;
-        m_pImpl->sRelativeRoot = _rRelativeRoot;
+        mxHierarchicalNames = _rxNames;
+        msRelativeRoot = _rRelativeRoot;
 
-        if ( !m_pImpl->xHierarchicalNames.is() )
+        if ( !mxHierarchicalNames.is() )
             throw IllegalArgumentException();
     }
 
@@ -94,15 +86,15 @@ namespace dbaui
         try
         {
             OUStringBuffer aCompleteName;
-            if ( !m_pImpl->sRelativeRoot.isEmpty() )
+            if ( !msRelativeRoot.isEmpty() )
             {
-                aCompleteName.append( m_pImpl->sRelativeRoot );
+                aCompleteName.append( msRelativeRoot );
                 aCompleteName.append( "/" );
             }
             aCompleteName.append( _rObjectName );
 
             OUString sCompleteName( aCompleteName.makeStringAndClear() );
-            if ( !m_pImpl->xHierarchicalNames->hasByHierarchicalName( sCompleteName ) )
+            if ( !mxHierarchicalNames->hasByHierarchicalName( sCompleteName ) )
                 return true;
         }
         catch( const Exception& )