diff options
Diffstat (limited to 'sd/source/ui/app/sdpopup.cxx')
| -rw-r--r-- | sd/source/ui/app/sdpopup.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx index 110254775a52..880bd3132ec1 100644 --- a/sd/source/ui/app/sdpopup.cxx +++ b/sd/source/ui/app/sdpopup.cxx @@ -51,8 +51,8 @@ void SdFieldPopup::Fill( LanguageType eLanguage ) { sal_uInt16 nID = 1; sal_uInt16 nStyle = MIB_RADIOCHECK | MIB_AUTOCHECK; - InsertItem( nID++, String( SdResId( STR_FIX ) ), nStyle ); - InsertItem( nID++, String( SdResId( STR_VAR ) ), nStyle ); + InsertItem( nID++, SD_RESSTR( STR_FIX ), nStyle ); + InsertItem( nID++, SD_RESSTR( STR_VAR ), nStyle ); InsertSeparator(); if( pField->ISA( SvxDateField ) ) @@ -67,8 +67,8 @@ void SdFieldPopup::Fill( LanguageType eLanguage ) //SVXDATEFORMAT_APPDEFAULT, // is not used //SVXDATEFORMAT_SYSTEM, // is not used - InsertItem( nID++, String( SdResId( STR_STANDARD_SMALL ) ), nStyle ); - InsertItem( nID++, String( SdResId( STR_STANDARD_BIG ) ), nStyle ); + InsertItem( nID++, SD_RESSTR( STR_STANDARD_SMALL ), nStyle ); + InsertItem( nID++, SD_RESSTR( STR_STANDARD_BIG ), nStyle ); SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter(); aDateField.SetFormat( SVXDATEFORMAT_A ); // 13.02.96 @@ -99,7 +99,7 @@ void SdFieldPopup::Fill( LanguageType eLanguage ) //SVXTIMEFORMAT_APPDEFAULT, // is not used //SVXTIMEFORMAT_SYSTEM, // is not used - InsertItem( nID++, String( SdResId( STR_STANDARD_NORMAL ) ), nStyle ); + InsertItem( nID++, SD_RESSTR( STR_STANDARD_NORMAL ), nStyle ); SvNumberFormatter* pNumberFormatter = SD_MOD()->GetNumberFormatter(); aTimeField.SetFormat( SVXTIMEFORMAT_24_HM ); // 13:49 @@ -131,10 +131,10 @@ void SdFieldPopup::Fill( LanguageType eLanguage ) else CheckItem( 2 ); - InsertItem( nID++, String( SdResId( STR_FILEFORMAT_NAME_EXT ) ), nStyle ); - InsertItem( nID++, String( SdResId( STR_FILEFORMAT_FULLPATH ) ), nStyle ); - InsertItem( nID++, String( SdResId( STR_FILEFORMAT_PATH ) ), nStyle ); - InsertItem( nID++, String( SdResId( STR_FILEFORMAT_NAME ) ), nStyle ); + InsertItem( nID++, SD_RESSTR( STR_FILEFORMAT_NAME_EXT ), nStyle ); + InsertItem( nID++, SD_RESSTR( STR_FILEFORMAT_FULLPATH ), nStyle ); + InsertItem( nID++, SD_RESSTR( STR_FILEFORMAT_PATH ), nStyle ); + InsertItem( nID++, SD_RESSTR( STR_FILEFORMAT_NAME ), nStyle ); CheckItem( (sal_uInt16) ( pFileField->GetFormat() ) + 3 ); } @@ -262,7 +262,7 @@ SvxFieldData* SdFieldPopup::GetField() { SvxExtFileField aFileField( *pFileField ); - String aName; + OUString aName; if( pDocSh->HasName() ) aName = pDocSh->GetMedium()->GetName(); |