[Libreoffice-commits] .: filter/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Dec 14 01:14:25 PST 2012
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit d13ff131bf8da692dd1d88c18e97999b8cb5b639
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Dec 14 11:12:40 2012 +0200
Use replaceAll() correctly
Change-Id: Ic109d8c4777c4e927d665a5dc5dd76061763ba11
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 29c5d55..90c788a 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -798,7 +798,7 @@ void XMLFilterSettingsDialog::onDelete()
OUString aPlaceHolder( "%s" );
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 );
if( aWarnBox.Execute() == RET_YES )
@@ -922,14 +922,14 @@ void XMLFilterSettingsDialog::onSave()
if( nFilters > 0 )
{
aMsg = RESIDSTR(STR_FILTERS_HAVE_BEEN_SAVED);
- aMsg.replaceAll( sPlaceholder, OUString::valueOf( static_cast<sal_Int32>(nFilters) ) );
- aMsg.replaceAll( sPlaceholder, aURL.GetName() );
+ aMsg = aMsg.replaceAll( sPlaceholder, OUString::valueOf( static_cast<sal_Int32>(nFilters) ) );
+ aMsg = aMsg.replaceAll( sPlaceholder, aURL.GetName() );
}
else
{
aMsg = RESIDSTR(STR_FILTER_HAS_BEEN_SAVED);
- aMsg.replaceAll( sPlaceholder, (*aFilters.begin())->maFilterName );
- aMsg.replaceAll( sPlaceholder, aURL.GetName() );
+ aMsg = aMsg.replaceAll( sPlaceholder, (*aFilters.begin())->maFilterName );
+ aMsg = aMsg.replaceAll( sPlaceholder, aURL.GetName() );
}
InfoBox aBox(this, aMsg );
@@ -986,18 +986,18 @@ void XMLFilterSettingsDialog::onOpen()
{
INetURLObject aURLObj( aURL );
aMsg = RESIDSTR(STR_NO_FILTERS_FOUND);
- aMsg.replaceAll( sPlaceholder, aURLObj.GetName() );
+ aMsg = aMsg.replaceAll( sPlaceholder, aURLObj.GetName() );
}
else if( nFilters == 1 )
{
aMsg = RESIDSTR(STR_FILTER_INSTALLED);
- aMsg.replaceAll( sPlaceholder, aFilterName );
+ aMsg = aMsg.replaceAll( sPlaceholder, aFilterName );
}
else
{
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 );
More information about the Libreoffice-commits
mailing list