summaryrefslogtreecommitdiff
path: root/sd/source
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source')
-rw-r--r--sd/source/core/anminfo.cxx3
-rw-r--r--sd/source/core/drawdoc2.cxx3
-rw-r--r--sd/source/core/drawdoc3.cxx4
-rw-r--r--sd/source/core/drawdoc4.cxx3
-rw-r--r--sd/source/core/sdpage.cxx46
-rw-r--r--sd/source/core/stlpool.cxx8
-rw-r--r--sd/source/core/stlsheet.cxx3
-rw-r--r--sd/source/filter/eppt/epptso.cxx20
-rw-r--r--sd/source/filter/html/htmlex.cxx3
-rw-r--r--sd/source/filter/ppt/pptin.cxx13
-rw-r--r--sd/source/filter/xml/sdxmlwrp.cxx5
-rw-r--r--sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx3
-rw-r--r--sd/source/ui/animations/CustomAnimationList.cxx3
-rw-r--r--sd/source/ui/func/fucopy.cxx4
-rw-r--r--sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx3
-rw-r--r--sd/source/ui/unoidl/UnoDocumentSettings.cxx3
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx18
17 files changed, 56 insertions, 89 deletions
diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx
index f2159cd0307a..d54a318d67d4 100644
--- a/sd/source/core/anminfo.cxx
+++ b/sd/source/core/anminfo.cxx
@@ -96,8 +96,7 @@ void SdAnimationInfo::SetBookmark( const OUString& rBookmark )
{
if( meClickAction == css::presentation::ClickAction_BOOKMARK )
{
- OUString sURL("#");
- sURL += rBookmark;
+ OUString sURL = "#" + rBookmark;
SvxFieldItem aURLItem( SvxURLField( sURL, sURL ), EE_FEATURE_FIELD );
mrObject.SetMergedItem( aURLItem );
}
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index d50e9ad56457..c4a776605a30 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -328,8 +328,7 @@ void SdDrawDocument::UpdatePageRelativeURLs(SdPage const * pPage, sal_uInt16 nPo
if (!aURL.isEmpty() && (aURL[0] == 35))
{
- OUString aHashSlide("#");
- aHashSlide += SdResId(STR_PAGE);
+ OUString aHashSlide = "#" + SdResId(STR_PAGE);
if (aURL.startsWith(aHashSlide))
{
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index d206a03a1c4a..626a7dfd79d0 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -1480,9 +1480,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
{
aTargetNewLayoutName = createNewMasterPageLayoutName(*this);
- OUString aTemp(aTargetNewLayoutName);
- aTemp += SD_LT_SEPARATOR;
- aTemp += STR_LAYOUT_OUTLINE;
+ OUString aTemp = aTargetNewLayoutName + SD_LT_SEPARATOR STR_LAYOUT_OUTLINE;
pMaster->SetName(aTargetNewLayoutName);
pMaster->SetLayoutName(aTemp);
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 76f94d3e5845..9edf91062a16 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -1137,8 +1137,7 @@ void SdDrawDocument::RenameLayoutTemplate(const OUString& rOldLayoutName, const
// Now set the layout name of the drawing and the notes page, as well as
// their master pages.
- OUString aPageLayoutName(rNewName);
- aPageLayoutName += aSep + STR_LAYOUT_OUTLINE;
+ OUString aPageLayoutName = rNewName + aSep + STR_LAYOUT_OUTLINE;
// Inform all text objects on pages that use the renamed layout and set the
// new name.
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 667fb7ed57d7..098bd4b821ae 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -691,8 +691,8 @@ SdStyleSheet* SdPage::getPresentationStyle( sal_uInt32 nHelpId ) const
aStyleName += OUString::createFromAscii(pNameId);
if (bOutline)
{
- aStyleName += " ";
- aStyleName += OUString::number( sal_Int32( nHelpId - HID_PSEUDOSHEET_OUTLINE ));
+ aStyleName += " " +
+ OUString::number( sal_Int32( nHelpId - HID_PSEUDOSHEET_OUTLINE ));
}
SfxStyleSheetBasePool* pStShPool = getSdrModelFromSdrPage().GetStyleSheetPool();
@@ -2400,29 +2400,23 @@ void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eO
{
pOutl->Init( OutlinerMode::OutlineObject );
- aString += "\t";
- aString += rString;
+ aString += "\t" + rString;
if (mbMaster)
{
pOutl->SetStyleSheet( 0, GetStyleSheetForPresObj(eObjKind) );
- aString += "\n\t\t";
- aString += SdResId(STR_PRESOBJ_MPOUTLLAYER2);
-
- aString += "\n\t\t\t";
- aString += SdResId(STR_PRESOBJ_MPOUTLLAYER3);
-
- aString += "\n\t\t\t\t";
- aString += SdResId(STR_PRESOBJ_MPOUTLLAYER4);
-
- aString += "\n\t\t\t\t\t";
- aString += SdResId(STR_PRESOBJ_MPOUTLLAYER5);
-
- aString += "\n\t\t\t\t\t\t";
- aString += SdResId(STR_PRESOBJ_MPOUTLLAYER6);
-
- aString += "\n\t\t\t\t\t\t\t";
- aString += SdResId(STR_PRESOBJ_MPOUTLLAYER7);
+ aString += "\n\t\t" +
+ SdResId(STR_PRESOBJ_MPOUTLLAYER2) +
+ "\n\t\t\t" +
+ SdResId(STR_PRESOBJ_MPOUTLLAYER3) +
+ "\n\t\t\t\t" +
+ SdResId(STR_PRESOBJ_MPOUTLLAYER4) +
+ "\n\t\t\t\t\t" +
+ SdResId(STR_PRESOBJ_MPOUTLLAYER5) +
+ "\n\t\t\t\t\t\t" +
+ SdResId(STR_PRESOBJ_MPOUTLLAYER6) +
+ "\n\t\t\t\t\t\t\t" +
+ SdResId(STR_PRESOBJ_MPOUTLLAYER7);
}
}
@@ -2526,8 +2520,7 @@ const OUString& SdPage::GetName() const
// default name for handout pages
sal_uInt16 nNum = (GetPageNum() + 1) / 2;
- aCreatedPageName = SdResId(STR_PAGE);
- aCreatedPageName += " ";
+ aCreatedPageName = SdResId(STR_PAGE) + " ";
if( getSdrModelFromSdrPage().GetPageNumType() == css::style::NumberingType::NUMBER_NONE )
{
// if the document has number none as a formatting
@@ -2555,14 +2548,11 @@ const OUString& SdPage::GetName() const
if (mePageKind == PageKind::Notes)
{
- aCreatedPageName += " ";
- aCreatedPageName += SdResId(STR_NOTES);
+ aCreatedPageName += " " + SdResId(STR_NOTES);
}
else if (mePageKind == PageKind::Handout && mbMaster)
{
- aCreatedPageName += " (";
- aCreatedPageName += SdResId(STR_HANDOUT);
- aCreatedPageName += ")";
+ aCreatedPageName += " (" + SdResId(STR_HANDOUT) + ")";
}
const_cast< SdPage* >(this)->maCreatedPageName = aCreatedPageName;
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 1004b8e6f988..4562a27df981 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -135,9 +135,7 @@ SfxStyleSheetBase* SdStyleSheetPool::Create(const OUString& rName, SfxStyleFamil
SfxStyleSheetBase* SdStyleSheetPool::GetTitleSheet(const OUString& rLayoutName)
{
- OUString aName(rLayoutName);
- aName += SD_LT_SEPARATOR;
- aName += STR_LAYOUT_TITLE;
+ OUString aName = rLayoutName + SD_LT_SEPARATOR STR_LAYOUT_TITLE;
SfxStyleSheetBase* pResult = Find(aName, SfxStyleFamily::Page);
return pResult;
}
@@ -151,9 +149,7 @@ SfxStyleSheetBase* SdStyleSheetPool::GetTitleSheet(const OUString& rLayoutName)
void SdStyleSheetPool::CreateOutlineSheetList (const OUString& rLayoutName, std::vector<SfxStyleSheetBase*> &rOutlineStyles)
{
- OUString aName(rLayoutName);
- aName += SD_LT_SEPARATOR;
- aName += STR_LAYOUT_OUTLINE;
+ OUString aName = rLayoutName + SD_LT_SEPARATOR STR_LAYOUT_OUTLINE;
for (sal_Int32 nSheet = 1; nSheet < 10; nSheet++)
{
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 95b8facb6389..99fdd72c6940 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -464,8 +464,7 @@ SdStyleSheet* SdStyleSheet::GetPseudoStyleSheet() const
if (nPos != -1)
{
OUString aNumStr(aStyleName.copy(aOutlineStr.getLength()));
- aStyleName = SdResId(STR_PSEUDOSHEET_OUTLINE);
- aStyleName += aNumStr;
+ aStyleName = SdResId(STR_PSEUDOSHEET_OUTLINE) + aNumStr;
}
}
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index ff614afe9999..e03db4c9ddd3 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -1119,11 +1119,11 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
if ( pIter != maSlideNameList.end() )
{
nPageIndex = pIter - maSlideNameList.begin();
- aPageUrl = OUString::number(256 + nPageIndex);
- aPageUrl += ",";
- aPageUrl += OUString::number(nPageIndex + 1);
- aPageUrl += ",Slide ";
- aPageUrl += OUString::number(nPageIndex + 1);
+ aPageUrl = OUString::number(256 + nPageIndex) +
+ "," +
+ OUString::number(nPageIndex + 1) +
+ ",Slide " +
+ OUString::number(nPageIndex + 1);
}
}
sal_uInt32 nHyperId(0);
@@ -1440,11 +1440,11 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, css::presentation::ClickAct
nAction = 4;
nHyperLinkType = 7;
- OUString aHyperString = OUString::number(256 + nIndex);
- aHyperString += ",";
- aHyperString += OUString::number(nIndex + 1);
- aHyperString += ",Slide ";
- aHyperString += OUString::number(nIndex + 1);
+ OUString aHyperString = OUString::number(256 + nIndex) +
+ "," +
+ OUString::number(nIndex + 1) +
+ ",Slide " +
+ OUString::number(nIndex + 1);
nHyperLinkID = ImplInsertBookmarkURL( aHyperString, 1 | ( nIndex << 8 ) | ( 1U << 31 ), aBookmark, "", "", aHyperString );
}
nIndex++;
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 622278de70c2..ac9db8f6ed66 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -3029,8 +3029,7 @@ bool HtmlExport::checkFileExists( Reference< css::ucb::XSimpleFileAccess3 > cons
{
try
{
- OUString url( maExportPath );
- url += aFileName;
+ OUString url = maExportPath + aFileName;
return xFileAccess->exists( url );
}
catch( css::uno::Exception& )
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 6a1e57ed40ce..606bb18a8025 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -619,16 +619,15 @@ bool ImplSdPPTImport::Import()
{
if ( ePgKind == PageKind::Standard )
{ // standard page: create new presentation layout
- aLayoutName = SdResId( STR_LAYOUT_DEFAULT_TITLE_NAME );
- aLayoutName += OUString::number( static_cast<sal_Int32>( ( nMasterNum + 1 ) / 2 - 1 ) );
+ aLayoutName = SdResId( STR_LAYOUT_DEFAULT_TITLE_NAME ) +
+ OUString::number( static_cast<sal_Int32>( ( nMasterNum + 1 ) / 2 - 1 ) );
static_cast<SdStyleSheetPool*>( mpDoc->GetStyleSheetPool() )->CreateLayoutStyleSheets( aLayoutName );
}
else // note page: use presentation layout of standard page
aLayoutName = static_cast<SdPage*>( mpDoc->GetMasterPage( nMasterNum - 1 ) )->GetName();
}
pPage->SetName( aLayoutName );
- aLayoutName += SD_LT_SEPARATOR;
- aLayoutName += STR_LAYOUT_OUTLINE;
+ aLayoutName += SD_LT_SEPARATOR STR_LAYOUT_OUTLINE;
pPage->SetLayoutName( aLayoutName );
// set stylesheets
@@ -663,8 +662,7 @@ bool ImplSdPPTImport::Import()
for ( nLevel = 0; nLevel < 9; nLevel++ )
{
OUString aName( pPage->GetLayoutName() );
- aName += " ";
- aName += OUString::number( nLevel + 1 );
+ aName += " " + OUString::number( nLevel + 1 );
SfxStyleSheet* pOutlineSheet = static_cast<SfxStyleSheet*>( mpDoc->GetStyleSheetPool()->Find( aName, SfxStyleFamily::Page ) );
DBG_ASSERT( pOutlineSheet, "Template for outline object not found" );
if ( pOutlineSheet )
@@ -2231,8 +2229,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
for ( sal_uInt16 nLevel = 9; nLevel; nLevel-- )
{
OUString aName( pPage->GetLayoutName() );
- aName += " ";
- aName += OUString::number( nLevel );
+ aName += " " + OUString::number( nLevel );
pSheet = static_cast<SfxStyleSheet*>(mpDoc->GetStyleSheetPool()->Find( aName, SfxStyleFamily::Page ));
if ( pSheet )
pText->StartListening( *pSheet );
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index e11578a4c7fb..f23eabd0f6c8 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -253,9 +253,8 @@ ErrCode ReadThroughComponent(
SAL_WARN( "sd.filter", "SAX parse exception caught while importing: " << exceptionToString(ex));
- OUString sErr( OUString::number( r.LineNumber ));
- sErr += ",";
- sErr += OUString::number( r.ColumnNumber );
+ OUString sErr = OUString::number( r.LineNumber ) +
+ "," + OUString::number( r.ColumnNumber );
if (!rStreamName.isEmpty())
{
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index fe808039929e..c3004e7c1d61 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -691,8 +691,7 @@ uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes()
if (!layerAltText.isEmpty())
{
sName = " ";
- sDisplay = sDisplay + sName;
- sDisplay += layerAltText;
+ sDisplay = sDisplay + sName + layerAltText;
}
}
}
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 275575e64cf9..83def14415df 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -915,8 +915,7 @@ void CustomAnimationList::update()
{
SvTreeListEntry* pLBoxEntry = new CustomAnimationListEntry;
pLBoxEntry->AddItem(std::make_unique<SvLBoxContextBmp>(Image(), Image(), false));
- OUString aDescription = SdResId(STR_CUSTOMANIMATION_TRIGGER);
- aDescription += ": ";
+ OUString aDescription = SdResId(STR_CUSTOMANIMATION_TRIGGER) + ": ";
aDescription += getShapeDescription( xShape, false );
pLBoxEntry->AddItem(std::make_unique<CustomAnimationTriggerEntryItem>(aDescription));
Insert( pLBoxEntry );
diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx
index 32b682e01db0..ea9d0f139b46 100644
--- a/sd/source/ui/func/fucopy.cxx
+++ b/sd/source/ui/func/fucopy.cxx
@@ -166,8 +166,8 @@ void FuCopy::DoExecute( SfxRequest& rReq )
if( nNumber > 1 )
{
- OUString aStr( SdResId( STR_OBJECTS ) );
- aStr += " " + SdResId( STR_UNDO_COPYOBJECTS );
+ OUString aStr = SdResId( STR_OBJECTS ) +
+ " " + SdResId( STR_UNDO_COPYOBJECTS );
pProgress.reset(new SfxProgress( mpDocSh, aStr, nNumber ));
mpDocSh->SetWaitCursor( true );
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
index 9065a27e76cd..c6f0b02b07a4 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
@@ -200,8 +200,7 @@ void RecentlyUsedMasterPages::SavePersistentValues()
for (const auto& rDescriptor : mvMasterPages)
{
// Create new child.
- OUString sKey ("index_");
- sKey += OUString::number(nIndex);
+ OUString sKey = "index_" + OUString::number(nIndex);
Reference<container::XNameReplace> xChild(
xChildFactory->createInstance(), UNO_QUERY);
if (xChild.is())
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index 77970bb24df1..666122868a57 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -366,8 +366,7 @@ uno::Sequence<beans::PropertyValue>
OUString aResult;
if( pList->SaveTo( xSubStorage, aName.makeStringAndClear(), &aResult ) )
{
- OUString aRealPath( "Settings/" );
- aRealPath += aResult;
+ OUString aRealPath = "Settings/" + aResult;
aRet[i].Value <<= aRealPath;
}
}
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index eeda330cc569..c7f8113a0513 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -1563,8 +1563,7 @@ static void ImplPDFExportComments( const uno::Reference< drawing::XDrawPage >& x
vcl::PDFNote aNote;
OUString sTitle( xAnnotation->getAuthor() );
- sTitle += ", ";
- sTitle += aStr;
+ sTitle += ", " + aStr;
aNote.Title = sTitle;
aNote.Contents = xText->getString();
rPDFExtOutDevData.CreateNote( ::tools::Rectangle( Point( static_cast< long >( aRealPoint2D.X * 100 ),
@@ -2271,15 +2270,14 @@ OUString SdXImpressDocument::getPartInfo(int nPart)
if (!pViewSh)
return OUString();
- OUString aPartInfo;
const bool bIsVisible = pViewSh->IsVisible(nPart);
const bool bIsSelected = pViewSh->IsSelected(nPart);
- aPartInfo += "{ \"visible\": \"";
- aPartInfo += OUString::number(static_cast<unsigned int>(bIsVisible));
- aPartInfo += "\", \"selected\": \"";
- aPartInfo += OUString::number(static_cast<unsigned int>(bIsSelected));
- aPartInfo += "\" }";
+ OUString aPartInfo = "{ \"visible\": \"" +
+ OUString::number(static_cast<unsigned int>(bIsVisible)) +
+ "\", \"selected\": \"" +
+ OUString::number(static_cast<unsigned int>(bIsSelected)) +
+ "\" }";
return aPartInfo;
}
@@ -3121,9 +3119,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn
bUnique = std::find(aPageNames.begin(), aPageNames.end(), aPrefix) == aPageNames.end();
}
- OUString aLayoutName( aPrefix );
- aLayoutName += SD_LT_SEPARATOR;
- aLayoutName += STR_LAYOUT_OUTLINE;
+ OUString aLayoutName = aPrefix + SD_LT_SEPARATOR STR_LAYOUT_OUTLINE;
// create styles
static_cast<SdStyleSheetPool*>(pDoc->GetStyleSheetPool())->CreateLayoutStyleSheets( aPrefix );
generated by cgit (git 2.34.1) at 2024-08-03 23:54:39 +0000