1 files changed, 6 insertions, 8 deletions
diff --git a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
index e86f2575cf8c..c75528940e15 100644
--- a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
+++ b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DEFAULTOBJECTNAMECHECK_HXX
-#define INCLUDED_DBACCESS_SOURCE_UI_INC_DEFAULTOBJECTNAMECHECK_HXX
+#pragma once
 
 #include "objectnamecheck.hxx"
 
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
+#include <com/sun/star/sdb/tools/XConnectionTools.hpp>
 
 #include <memory>
 
@@ -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
@@ -68,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.
 
@@ -85,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
@@ -118,6 +118,4 @@ namespace dbaui
 
 } // namespace dbaui
 
-#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_DEFAULTOBJECTNAMECHECK_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */