Kaydet (Commit) d13ff131 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Use replaceAll() correctly

Change-Id: Ic109d8c4777c4e927d665a5dc5dd76061763ba11
üst cbb9bc55
...@@ -798,7 +798,7 @@ void XMLFilterSettingsDialog::onDelete() ...@@ -798,7 +798,7 @@ void XMLFilterSettingsDialog::onDelete()
OUString aPlaceHolder( "%s" ); OUString aPlaceHolder( "%s" );
OUString aMessage(RESIDSTR(STR_WARN_DELETE)); OUString aMessage(RESIDSTR(STR_WARN_DELETE));
aMessage.replaceAll( aPlaceHolder, pInfo->maFilterName ); aMessage = aMessage.replaceAll( aPlaceHolder, pInfo->maFilterName );
WarningBox aWarnBox(this, (WinBits)(WB_YES_NO | WB_DEF_YES), aMessage ); WarningBox aWarnBox(this, (WinBits)(WB_YES_NO | WB_DEF_YES), aMessage );
if( aWarnBox.Execute() == RET_YES ) if( aWarnBox.Execute() == RET_YES )
...@@ -922,14 +922,14 @@ void XMLFilterSettingsDialog::onSave() ...@@ -922,14 +922,14 @@ void XMLFilterSettingsDialog::onSave()
if( nFilters > 0 ) if( nFilters > 0 )
{ {
aMsg = RESIDSTR(STR_FILTERS_HAVE_BEEN_SAVED); aMsg = RESIDSTR(STR_FILTERS_HAVE_BEEN_SAVED);
aMsg.replaceAll( sPlaceholder, OUString::valueOf( static_cast<sal_Int32>(nFilters) ) ); aMsg = aMsg.replaceAll( sPlaceholder, OUString::valueOf( static_cast<sal_Int32>(nFilters) ) );
aMsg.replaceAll( sPlaceholder, aURL.GetName() ); aMsg = aMsg.replaceAll( sPlaceholder, aURL.GetName() );
} }
else else
{ {
aMsg = RESIDSTR(STR_FILTER_HAS_BEEN_SAVED); aMsg = RESIDSTR(STR_FILTER_HAS_BEEN_SAVED);
aMsg.replaceAll( sPlaceholder, (*aFilters.begin())->maFilterName ); aMsg = aMsg.replaceAll( sPlaceholder, (*aFilters.begin())->maFilterName );
aMsg.replaceAll( sPlaceholder, aURL.GetName() ); aMsg = aMsg.replaceAll( sPlaceholder, aURL.GetName() );
} }
InfoBox aBox(this, aMsg ); InfoBox aBox(this, aMsg );
...@@ -986,18 +986,18 @@ void XMLFilterSettingsDialog::onOpen() ...@@ -986,18 +986,18 @@ void XMLFilterSettingsDialog::onOpen()
{ {
INetURLObject aURLObj( aURL ); INetURLObject aURLObj( aURL );
aMsg = RESIDSTR(STR_NO_FILTERS_FOUND); aMsg = RESIDSTR(STR_NO_FILTERS_FOUND);
aMsg.replaceAll( sPlaceholder, aURLObj.GetName() ); aMsg = aMsg.replaceAll( sPlaceholder, aURLObj.GetName() );
} }
else if( nFilters == 1 ) else if( nFilters == 1 )
{ {
aMsg = RESIDSTR(STR_FILTER_INSTALLED); aMsg = RESIDSTR(STR_FILTER_INSTALLED);
aMsg.replaceAll( sPlaceholder, aFilterName ); aMsg = aMsg.replaceAll( sPlaceholder, aFilterName );
} }
else else
{ {
aMsg = RESIDSTR(STR_FILTERS_INSTALLED); aMsg = RESIDSTR(STR_FILTERS_INSTALLED);
aMsg.replaceAll( sPlaceholder, OUString::valueOf( static_cast<sal_Int32>(nFilters) ) ); aMsg = aMsg.replaceAll( sPlaceholder, OUString::valueOf( static_cast<sal_Int32>(nFilters) ) );
} }
InfoBox aBox(this, aMsg ); InfoBox aBox(this, aMsg );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment