1 files changed, 10 insertions, 9 deletions

diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx
index 14918971caaf..e76ba60e5c64 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -24,7 +24,8 @@
 
 #include "defaultobjectnamecheck.hxx"
 #include "dbaccess_helpid.hrc"
-#include "dbu_misc.hrc"
+#include "strings.hrc"
+#include "core_resource.hxx"
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
@@ -35,7 +36,7 @@
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbtools.hxx>
 #include "UITools.hxx"
-#include "moduledbu.hxx"
+#include "core_resource.hxx"
 #include <cppuhelper/exc_hlp.hxx>
 
 using namespace ::dbaui;
@@ -95,7 +96,7 @@ OCopyTable::OCopyTable(vcl::Window * pParent)
         m_pEdKeyName->SetMaxTextLen(nMaxLen ? nMaxLen : EDIT_NOLIMIT);
     }
 
-    SetText(ModuleRes(STR_COPYTABLE_TITLE_COPY));
+    SetText(DBA_RES(STR_COPYTABLE_TITLE_COPY));
 }
 
 OCopyTable::~OCopyTable()
@@ -169,7 +170,7 @@ bool OCopyTable::LeavePage()
         SQLExceptionInfo aErrorInfo;
         if ( !aNameCheck.isNameValid( m_pEdTableName->GetText(), aErrorInfo ) )
         {
-            aErrorInfo.append( SQLExceptionInfo::TYPE::SQLContext, ModuleRes( STR_SUGGEST_APPEND_TABLE_DATA ) );
+            aErrorInfo.append( SQLExceptionInfo::TYPE::SQLContext, DBA_RES( STR_SUGGEST_APPEND_TABLE_DATA ) );
             m_pParent->showError(aErrorInfo.get());
 
             return false;
@@ -189,7 +190,7 @@ bool OCopyTable::LeavePage()
         sal_Int32 nMaxLength = xMeta->getMaxTableNameLength();
         if ( nMaxLength && sTable.getLength() > nMaxLength )
         {
-            m_pParent->showError(ModuleRes(STR_INVALID_TABLE_NAME_LENGTH));
+            m_pParent->showError(DBA_RES(STR_INVALID_TABLE_NAME_LENGTH));
             return false;
         }
 
@@ -197,7 +198,7 @@ bool OCopyTable::LeavePage()
         if (    m_pParent->m_bCreatePrimaryKeyColumn
             &&  m_pParent->m_aKeyName != m_pParent->createUniqueName(m_pParent->m_aKeyName) )
         {
-            m_pParent->showError(OUString(ModuleRes(STR_WIZ_NAME_ALREADY_DEFINED)) + " " + m_pParent->m_aKeyName);
+            m_pParent->showError(DBA_RES(STR_WIZ_NAME_ALREADY_DEFINED) + " " + m_pParent->m_aKeyName);
             return false;
         }
     }
@@ -228,7 +229,7 @@ bool OCopyTable::LeavePage()
 
     if(m_pParent->m_sName.isEmpty())
     {
-        m_pParent->showError(ModuleRes(STR_INVALID_TABLE_NAME));
+        m_pParent->showError(DBA_RES(STR_INVALID_TABLE_NAME));
         return false;
     }
 
@@ -245,7 +246,7 @@ void OCopyTable::ActivatePage()
 
 OUString OCopyTable::GetTitle() const
 {
-    return ModuleRes(STR_WIZ_TABLE_COPY);
+    return DBA_RES(STR_WIZ_TABLE_COPY);
 }
 
 void OCopyTable::Reset()
@@ -301,7 +302,7 @@ bool OCopyTable::checkAppendData()
 
     if ( !xTable.is() )
     {
-        m_pParent->showError(ModuleRes(STR_INVALID_TABLE_NAME));
+        m_pParent->showError(DBA_RES(STR_INVALID_TABLE_NAME));
         return false;
     }
     return true;