mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OUString: constify and avoid temporaries

Browse Source 
Change-Id: I20f049ba275225b6429b630dbff07d0eba5522a3
This commit is contained in:
Matteo Casalin
2014-05-23 23:36:07 +02:00
parent a2724474fb
commit 554d7bf0d1
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sw/source/core/unocore/unosett.cxx
View File

@@ -453,12 +453,12 @@ uno::Any SwXFootnoteProperties::getPropertyValue(const OUString& rPropertyName)
{ {
case WID_PREFIX: case WID_PREFIX:
{ {
aRet <<= OUString(rFtnInfo.GetPrefix()); aRet <<= rFtnInfo.GetPrefix();
} }
break; break;
case WID_SUFFIX: case WID_SUFFIX:
{ {
aRet <<= OUString(rFtnInfo.GetSuffix()); aRet <<= rFtnInfo.GetSuffix();
} }
break; break;
case WID_NUMBERING_TYPE : case WID_NUMBERING_TYPE :
@@ -544,10 +544,10 @@ uno::Any SwXFootnoteProperties::getPropertyValue(const OUString& rPropertyName)
} }
break; break;
case WID_END_NOTICE : case WID_END_NOTICE :
aRet <<= OUString(rFtnInfo.aQuoVadis); aRet <<= rFtnInfo.aQuoVadis;
break; break;
case WID_BEGIN_NOTICE : case WID_BEGIN_NOTICE :
aRet <<= OUString(rFtnInfo.aErgoSum); aRet <<= rFtnInfo.aErgoSum;
break; break;
} }
} }
@@ -1575,7 +1575,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
static PropValData* lcl_FindProperty(const char* cName, PropValDataArr& rPropertyValues) static PropValData* lcl_FindProperty(const char* cName, PropValDataArr& rPropertyValues)
{ {
OUString sCmp = OUString::createFromAscii(cName); const OUString sCmp = OUString::createFromAscii(cName);
for(size_t i = 0; i < rPropertyValues.size(); ++i) for(size_t i = 0; i < rPropertyValues.size(); ++i)
{ {
PropValData* pTemp = rPropertyValues[i]; PropValData* pTemp = rPropertyValues[i];
@@ -1959,7 +1959,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
{ {
aFmt.SetBulletChar(aChar.toChar()); aFmt.SetBulletChar(aChar.toChar());
} }
else if(aChar.getLength() == 0) else if(aChar.isEmpty())
{ {
// If w:lvlText's value is null - set bullet char to zero // If w:lvlText's value is null - set bullet char to zero
aFmt.SetBulletChar(sal_Unicode(0x0)); aFmt.SetBulletChar(sal_Unicode(0x0));
@@ -2224,7 +2224,7 @@ Any SwXNumberingRules::getPropertyValue( const OUString& rPropertyName )
aRet.setValue(&bVal, ::getBooleanCppuType()); aRet.setValue(&bVal, ::getBooleanCppuType());
} }
else if(rPropertyName == UNO_NAME_NAME) else if(rPropertyName == UNO_NAME_NAME)
aRet <<= OUString(pRule->GetName()); aRet <<= pRule->GetName();
else if(rPropertyName == UNO_NAME_IS_ABSOLUTE_MARGINS) else if(rPropertyName == UNO_NAME_IS_ABSOLUTE_MARGINS)
{ {
sal_Bool bVal = pRule->IsAbsSpaces(); sal_Bool bVal = pRule->IsAbsSpaces();
@@ -2272,15 +2272,16 @@ void SwXNumberingRules::removeVetoableChangeListener(
OUString SwXNumberingRules::getName() throw( RuntimeException, std::exception ) OUString SwXNumberingRules::getName() throw( RuntimeException, std::exception )
{ {
OUString aString;
if(pNumRule) if(pNumRule)
{ {
OUString aString;
SwStyleNameMapper::FillProgName(pNumRule->GetName(), aString, nsSwGetPoolIdFromName::GET_POOLID_NUMRULE, true ); SwStyleNameMapper::FillProgName(pNumRule->GetName(), aString, nsSwGetPoolIdFromName::GET_POOLID_NUMRULE, true );
return aString; return aString;
} }
// consider chapter numbering <SwXNumberingRules> // consider chapter numbering <SwXNumberingRules>
if ( pDocShell ) if ( pDocShell )
{ {
OUString aString;
SwStyleNameMapper::FillProgName( pDocShell->GetDoc()->GetOutlineNumRule()->GetName(), SwStyleNameMapper::FillProgName( pDocShell->GetDoc()->GetOutlineNumRule()->GetName(),
aString, nsSwGetPoolIdFromName::GET_POOLID_NUMRULE, true ); aString, nsSwGetPoolIdFromName::GET_POOLID_NUMRULE, true );
return aString; return aString;