summaryrefslogtreecommitdiff
path: root/fpicker
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-09 12:22:17 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-09 12:22:17 +0100
commit9d3cb71115cfb34adde975f66f394303982f85be (patch)
treeadf872556cd90007038c9cf22f7a0aac630395f1 /fpicker
parent53352be12cb6a191934b8107559ea47171868718 (diff)
Prevent += called on temporary O[U]String instances
...found regression e31205f3ec1f941ab5a188bfde6329edf2acc55b "EditUndoRemoveChars::GetStr must return a reference" and dubious code 0e23f7b0839df68d277186b4df54ba391ac3406a "Lets assume this doesn't want to update m_pForcedPrefix->GetText() anyway" in addition to the apparent sillies directly fixed in this commit. Introduces HAVE_CXX11_REF_QUALIFIER. Change-Id: I564e98254fd53c1dd9b34193d7057c59721ee24c
Diffstat (limited to 'fpicker')
-rw-r--r--fpicker/source/office/commonpicker.cxx16
1 files changed, 7 insertions, 9 deletions
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index 9546ab79e772..1e84b11d17e9 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -450,21 +450,19 @@ namespace svt
else
{
OSL_FAIL(
- ( OString( "OCommonPicker::initialize: unknown argument type at position " )
- += OString::number( pArguments - _rArguments.getConstArray() )
- ).getStr()
- );
+ OString(
+ "OCommonPicker::initialize: unknown argument type at position "
+ + OString::number(pArguments - _rArguments.getConstArray())).getStr());
continue;
}
bool bKnownSetting =
implHandleInitializationArgument( sSettingName, aSettingValue );
DBG_ASSERT( bKnownSetting,
- ( OString( "OCommonPicker::initialize: unknown argument \"" )
- += OString( sSettingName.getStr(), sSettingName.getLength(), osl_getThreadTextEncoding() )
- += OString( "\"!" )
- ).getStr()
- );
+ OString(
+ "OCommonPicker::initialize: unknown argument \""
+ + OString(sSettingName.getStr(), sSettingName.getLength(), osl_getThreadTextEncoding())
+ + "\"!").getStr() );
}
}