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 /sd/source/ui/dlg/dlgfield.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 'sd/source/ui/dlg/dlgfield.cxx')
-rw-r--r-- | sd/source/ui/dlg/dlgfield.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index 0ff1eddb3c82..6270815d8ff0 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -179,8 +179,8 @@ void SdModifyFieldDlg::FillFormatList() //SVXDATEFORMAT_APPDEFAULT, // not used //SVXDATEFORMAT_SYSTEM, // not used - m_pLbFormat->InsertEntry( SD_RESSTR( STR_STANDARD_SMALL ) ); - m_pLbFormat->InsertEntry( SD_RESSTR( STR_STANDARD_BIG ) ); + m_pLbFormat->InsertEntry( SdResId( STR_STANDARD_SMALL ) ); + m_pLbFormat->InsertEntry( SdResId( STR_STANDARD_BIG ) ); SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter(); aDateField.SetFormat( SVXDATEFORMAT_A ); // 13.02.96 @@ -205,7 +205,7 @@ void SdModifyFieldDlg::FillFormatList() //SVXTIMEFORMAT_APPDEFAULT, // not used //SVXTIMEFORMAT_SYSTEM, // not used - m_pLbFormat->InsertEntry( SD_RESSTR( STR_STANDARD_NORMAL ) ); + m_pLbFormat->InsertEntry( SdResId( STR_STANDARD_NORMAL ) ); SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter(); aTimeField.SetFormat( SVXTIMEFORMAT_24_HM ); // 13:49 @@ -231,10 +231,10 @@ void SdModifyFieldDlg::FillFormatList() const SvxExtFileField* pFileField = static_cast<const SvxExtFileField*>( pField ); SvxExtFileField aFileField( *pFileField ); - m_pLbFormat->InsertEntry( SD_RESSTR( STR_FILEFORMAT_NAME_EXT ) ); - m_pLbFormat->InsertEntry( SD_RESSTR( STR_FILEFORMAT_FULLPATH ) ); - m_pLbFormat->InsertEntry( SD_RESSTR( STR_FILEFORMAT_PATH ) ); - m_pLbFormat->InsertEntry( SD_RESSTR( STR_FILEFORMAT_NAME ) ); + m_pLbFormat->InsertEntry( SdResId( STR_FILEFORMAT_NAME_EXT ) ); + m_pLbFormat->InsertEntry( SdResId( STR_FILEFORMAT_FULLPATH ) ); + m_pLbFormat->InsertEntry( SdResId( STR_FILEFORMAT_PATH ) ); + m_pLbFormat->InsertEntry( SdResId( STR_FILEFORMAT_NAME ) ); m_pLbFormat->SelectEntryPos( (sal_uInt16) ( pFileField->GetFormat() ) ); } |