diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-05-18 21:14:00 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-05-19 15:40:40 +0200 |
| commit | 2155e04d6343638ca9815d394cbc4f78c2b17c3a (patch) | |
| tree | 0378142f6ce9edb63074291aed45527568e7b254 /sw/source/uibase/dbui/dbmgr.cxx | |
| parent | cee02e81cd3b55fb46eacf5db5713e8bf4363bcd (diff) | |
make string translation loading more uniform
change various ResId classes that use conversion operator to OUString to
functions that return a OUString
drop various defines
drop unnecessary toString calls
Change-Id: Ibeccdf2b91a46a2ed5b4b74e6024e301a023bc92
Reviewed-on: https://gerrit.libreoffice.org/37817
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/uibase/dbui/dbmgr.cxx')
| -rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 05f541ecc730..421ed22c59c9 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1395,7 +1395,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, PrintMonitor *pPrintMonDlg = static_cast<PrintMonitor*>( pProgressDlg.get() ); pPrintMonDlg->m_pPrinter->SetText( bNeedsTempFiles ? aTempFileURL->GetBase() : pSourceDocSh->GetTitle( 22 ) ); - OUString sStat( SW_RES(STR_STATSTR_LETTER) ); + OUString sStat( SwResId(STR_STATSTR_LETTER) ); sStat += " " + OUString::number( nDocNo ); pPrintMonDlg->m_pPrintInfo->SetText( sStat ); } @@ -2563,17 +2563,17 @@ OUString SwDBManager::LoadAndRegisterDataSource(SwDocShell* pDocShell) uno::Reference<ui::dialogs::XFilterManager> xFltMgr(xFP, uno::UNO_QUERY); - OUString sFilterAll(SW_RES(STR_FILTER_ALL)); - OUString sFilterAllData(SW_RES(STR_FILTER_ALL_DATA)); - OUString sFilterSXB(SW_RES(STR_FILTER_SXB)); - OUString sFilterSXC(SW_RES(STR_FILTER_SXC)); - OUString sFilterDBF(SW_RES(STR_FILTER_DBF)); - OUString sFilterXLS(SW_RES(STR_FILTER_XLS)); - OUString sFilterTXT(SW_RES(STR_FILTER_TXT)); - OUString sFilterCSV(SW_RES(STR_FILTER_CSV)); + OUString sFilterAll(SwResId(STR_FILTER_ALL)); + OUString sFilterAllData(SwResId(STR_FILTER_ALL_DATA)); + OUString sFilterSXB(SwResId(STR_FILTER_SXB)); + OUString sFilterSXC(SwResId(STR_FILTER_SXC)); + OUString sFilterDBF(SwResId(STR_FILTER_DBF)); + OUString sFilterXLS(SwResId(STR_FILTER_XLS)); + OUString sFilterTXT(SwResId(STR_FILTER_TXT)); + OUString sFilterCSV(SwResId(STR_FILTER_CSV)); #ifdef _WIN32 - OUString sFilterMDB(SW_RES(STR_FILTER_MDB)); - OUString sFilterACCDB(SW_RES(STR_FILTER_ACCDB)); + OUString sFilterMDB(SwResId(STR_FILTER_MDB)); + OUString sFilterACCDB(SwResId(STR_FILTER_ACCDB)); #endif xFltMgr->appendFilter( sFilterAll, "*" ); xFltMgr->appendFilter( sFilterAllData, "*.ods;*.sxc;*.dbf;*.xls;*.txt;*.csv"); |