summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chart2/source/controller/main/DragMethod_Base.cxx2
-rw-r--r--include/svx/svdview.hxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationCreateDialog.cxx4
-rw-r--r--svx/source/svdraw/svddrgmt.cxx27
-rw-r--r--svx/source/svdraw/svdmrkv.cxx7
-rw-r--r--svx/source/svdraw/svdundo.cxx5
-rw-r--r--svx/source/svdraw/svdview.cxx3
7 files changed, 16 insertions, 34 deletions
diff --git a/chart2/source/controller/main/DragMethod_Base.cxx b/chart2/source/controller/main/DragMethod_Base.cxx
index e7768078ba3d..6da22f590ab7 100644
--- a/chart2/source/controller/main/DragMethod_Base.cxx
+++ b/chart2/source/controller/main/DragMethod_Base.cxx
@@ -66,7 +66,7 @@ OUString DragMethod_Base::getUndoDescription() const
}
void DragMethod_Base::TakeSdrDragComment(OUString& rStr) const
{
- rStr = String( getUndoDescription() );
+ rStr = getUndoDescription();
}
Pointer DragMethod_Base::GetSdrDragPointer() const
{
diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx
index bf0dee6ba2df..187e26bb0f4b 100644
--- a/include/svx/svdview.hxx
+++ b/include/svx/svdview.hxx
@@ -298,7 +298,7 @@ public:
// Sonstiges:
// ~~~~~~~~~~
// Pointer GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nTol=0) const;
-// String GetStatusText();
+// OUString GetStatusText();
//
///////////////////////////////////////////////////////////////////////////////////////////////// */
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index 95454ad4b95b..257d7fe67cc8 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -76,7 +76,7 @@ public:
virtual void MouseButtonUp( const MouseEvent& rMEvt );
- sal_uInt16 InsertCategory( const XubString& rStr, sal_uInt16 nPos = LISTBOX_APPEND );
+ sal_uInt16 InsertCategory( const OUString& rStr, sal_uInt16 nPos = LISTBOX_APPEND );
void SetDoubleClickLink( const Link& rDoubleClickHdl ) { maDoubleClickHdl = rDoubleClickHdl; }
@@ -104,7 +104,7 @@ CategoryListBox::~CategoryListBox()
{
}
-sal_uInt16 CategoryListBox::InsertCategory( const XubString& rStr, sal_uInt16 nPos /* = LISTBOX_APPEND */ )
+sal_uInt16 CategoryListBox::InsertCategory( const OUString& rStr, sal_uInt16 nPos /* = LISTBOX_APPEND */ )
{
sal_uInt16 n = ListBox::InsertEntry( rStr, nPos );
if( n != LISTBOX_ENTRY_NOTFOUND )
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 3b143eef2b3b..a2c4e79abd86 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -1525,11 +1525,9 @@ void SdrDragMove::TakeSdrDragComment(OUString& rStr) const
ImpTakeDescriptionStr(STR_DragMethMove, rStr);
rStr += " (x=";
getSdrDragView().GetModel()->TakeMetricStr(DragStat().GetDX(), aStr);
- rStr += aStr;
- rStr += " y=";
+ rStr += aStr + " y=";
getSdrDragView().GetModel()->TakeMetricStr(DragStat().GetDY(), aStr);
- rStr += aStr;
- rStr += ")";
+ rStr += aStr + ")";
if(getSdrDragView().IsDragWithCopy())
{
@@ -2134,8 +2132,7 @@ void SdrDragRotate::TakeSdrDragComment(OUString& rStr) const
OUString aStr;
getSdrDragView().GetModel()->TakeWinkStr(nTmpWink, aStr);
- rStr += aStr;
- rStr += ")";
+ rStr += aStr + ")";
if(getSdrDragView().IsDragWithCopy())
rStr += ImpGetResStr(STR_EditWithCopy);
@@ -2271,8 +2268,7 @@ void SdrDragShear::TakeSdrDragComment(OUString& rStr) const
OUString aStr;
getSdrDragView().GetModel()->TakeWinkStr(nTmpWink, aStr);
- rStr += aStr;
- rStr += ")";
+ rStr += aStr + ")";
if(getSdrDragView().IsDragWithCopy())
rStr += ImpGetResStr(STR_EditWithCopy);
@@ -2858,8 +2854,7 @@ void SdrDragCrook::TakeSdrDragComment(OUString& rStr) const
nVal = std::abs(nVal);
OUString aStr;
getSdrDragView().GetModel()->TakeWinkStr(nVal, aStr);
- rStr += aStr;
- rStr += ")";
+ rStr += aStr + ")";
}
if(getSdrDragView().IsDragWithCopy())
@@ -3511,11 +3506,9 @@ void SdrDragDistort::TakeSdrDragComment(OUString& rStr) const
rStr += " (x=";
getSdrDragView().GetModel()->TakeMetricStr(DragStat().GetDX(), aStr);
- rStr += aStr;
- rStr += " y=";
+ rStr += aStr + " y=";
getSdrDragView().GetModel()->TakeMetricStr(DragStat().GetDY(), aStr);
- rStr += aStr;
- rStr += ")";
+ rStr += aStr + ")";
if(getSdrDragView().IsDragWithCopy())
rStr += ImpGetResStr(STR_EditWithCopy);
@@ -3666,11 +3659,9 @@ void SdrDragCrop::TakeSdrDragComment(OUString& rStr) const
rStr += " (x=";
getSdrDragView().GetModel()->TakeMetricStr(DragStat().GetDX(), aStr);
- rStr += aStr;
- rStr += " y=";
+ rStr += aStr + " y=";
getSdrDragView().GetModel()->TakeMetricStr(DragStat().GetDY(), aStr);
- rStr += aStr;
- rStr += ")";
+ rStr += aStr + ")";
if(getSdrDragView().IsDragWithCopy())
rStr += ImpGetResStr(STR_EditWithCopy);
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 07e35491db4c..91f85baf3c83 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -2015,12 +2015,7 @@ void SdrMarkView::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr,
}
}
- nPos = rStr.indexOf("%2");
-
- if(nPos != -1)
- {
- rStr = rStr.replaceAt(nPos, 2, OUString::number( nVal ));
- }
+ rStr = rStr.replaceFirst("%2", OUString::number( nVal ));
}
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index df7b1e6ad6f8..fcdf5f09546d 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -1315,10 +1315,7 @@ OUString SdrUndoObjStrAttr::GetComment() const
{
case OBJ_NAME:
ImpTakeDescriptionStr( STR_UndoObjName, aStr );
- aStr += " ";
- aStr += "\'";
- aStr += msNewStr;
- aStr += "\'";
+ aStr += " '" + msNewStr + "'";
break;
case OBJ_TITLE:
ImpTakeDescriptionStr( STR_UndoObjTitle, aStr );
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 68d258e72f7f..45505090e8b9 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1288,8 +1288,7 @@ OUString SdrView::GetStatusText()
if(!aStr.isEmpty())
{
// capitalize first letter
- OUString aTmpStr(aStr.copy(0, 1));
- aStr = aStr.replaceAt(0, 1, aTmpStr.toAsciiUpperCase());
+ aStr = aStr.replaceAt(0, 1, OUString(aStr[0]).toAsciiUpperCase());
}
return aStr;
}
generated by cgit (git 2.34.1) at 2024-08-15 07:33:24 +0000