diff options
Diffstat (limited to 'dbaccess/source/ui/browser/brwctrlr.cxx')
| -rw-r--r-- | dbaccess/source/ui/browser/brwctrlr.cxx | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 4256ff2f36c1..b3e7ba256657 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -20,8 +20,10 @@ #include "browserids.hxx" #include "brwctrlr.hxx" #include "brwview.hxx" -#include "dbu_brw.hrc" -#include "dbustrings.hrc" +#include "strings.hrc" +#include "strings.hxx" +#include "core_resource.hxx" +#include "stringconstants.hxx" #include "queryfilter.hxx" #include "queryorder.hxx" #include "sqlmessage.hxx" @@ -536,8 +538,8 @@ SbaXDataBrowserController::SbaXDataBrowserController(const Reference< css::uno:: ,m_nRowSetPrivileges(0) ,m_aAsyncGetCellFocus(LINK(this, SbaXDataBrowserController, OnAsyncGetCellFocus)) ,m_aAsyncDisplayError( LINK( this, SbaXDataBrowserController, OnAsyncDisplayError ) ) - ,m_sStateSaveRecord(ModuleRes(RID_STR_SAVE_CURRENT_RECORD)) - ,m_sStateUndoRecord(ModuleRes(RID_STR_UNDO_MODIFY_RECORD)) + ,m_sStateSaveRecord(DBA_RES(RID_STR_SAVE_CURRENT_RECORD)) + ,m_sStateUndoRecord(DBA_RES(RID_STR_UNDO_MODIFY_RECORD)) ,m_sModuleIdentifier( OUString( "com.sun.star.sdb.DataSourceBrowser" ) ) ,m_pFormControllerImpl(nullptr) ,m_nFormActionNestingLevel(0) @@ -751,7 +753,7 @@ bool SbaXDataBrowserController::Construct(vcl::Window* pParent) // marry them Reference< css::container::XNameContainer > xNameCont(m_xRowSet, UNO_QUERY); { - OUString sText(ModuleRes(STR_DATASOURCE_GRIDCONTROL_NAME)); + OUString sText(DBA_RES(STR_DATASOURCE_GRIDCONTROL_NAME)); xNameCont->insertByName(sText, makeAny(m_xGridModel)); } @@ -1371,7 +1373,7 @@ void SbaXDataBrowserController::resetted(const css::lang::EventObject& rEvent) sal_Bool SbaXDataBrowserController::confirmDelete(const css::sdb::RowChangeEvent& /*aEvent*/) { - if (ScopedVclPtrInstance<MessageDialog>(getBrowserView(), ModuleRes(STR_QUERY_BRW_DELETE_ROWS), VclMessageType::Question, VclButtonsType::YesNo)->Execute() != RET_YES) + if (ScopedVclPtrInstance<MessageDialog>(getBrowserView(), DBA_RES(STR_QUERY_BRW_DELETE_ROWS), VclMessageType::Question, VclButtonsType::YesNo)->Execute() != RET_YES) return false; return true; @@ -1983,7 +1985,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property HANDLE_SQL_ERRORS( xParser->setOrder(OUString()); xParser->appendOrderByColumn(xField, bSortUp), bParserSuccess, - ModuleRes(SBA_BROWSER_SETTING_ORDER), + DBA_RES(SBA_BROWSER_SETTING_ORDER), "SbaXDataBrowserController::Execute : caught an exception while composing the new filter !" ) @@ -2040,7 +2042,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property HANDLE_SQL_ERRORS( xParser->appendHavingClauseByColumn(xField,true,nOp), bParserSuccess, - ModuleRes(SBA_BROWSER_SETTING_FILTER), + DBA_RES(SBA_BROWSER_SETTING_FILTER), "SbaXDataBrowserController::Execute : caught an exception while composing the new filter !" ) } @@ -2049,7 +2051,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property HANDLE_SQL_ERRORS( xParser->appendFilterByColumn(xField,true,nOp), bParserSuccess, - ModuleRes(SBA_BROWSER_SETTING_FILTER), + DBA_RES(SBA_BROWSER_SETTING_FILTER), "SbaXDataBrowserController::Execute : caught an exception while composing the new filter !" ) } |