summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/svx/svdobj.hxx2
-rw-r--r--svx/source/svdraw/svdobj.cxx28
-rw-r--r--svx/source/svdraw/svdocapt.cxx2
-rw-r--r--svx/source/svdraw/svdocirc.cxx22
-rw-r--r--svx/source/svdraw/svdoedge.cxx2
-rw-r--r--svx/source/svdraw/svdopath.cxx12
-rw-r--r--svx/source/svdraw/svdorect.cxx12
-rw-r--r--svx/source/svdraw/svdotxdr.cxx2
8 files changed, 41 insertions, 41 deletions
diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx
index 30b8385d717a..03494441f379 100644
--- a/svx/inc/svx/svdobj.hxx
+++ b/svx/inc/svx/svdobj.hxx
@@ -478,7 +478,7 @@ protected:
Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const;
// Fuer GetDragComment
- void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, sal_uInt16 nVal=0) const;
+ void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, rtl::OUString& rStr, sal_uInt16 nVal=0) const;
void ImpForcePlusData();
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index f5dd2b70b303..5ce27e6487bf 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1096,31 +1096,23 @@ void SdrObject::TakeObjNamePlural(XubString& rName) const
rName=ImpGetResStr(STR_ObjNamePluralNONE);
}
-void SdrObject::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, sal_uInt16 nVal) const
+void SdrObject::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, rtl::OUString& rStr, sal_uInt16 nVal) const
{
rStr = ImpGetResStr(nStrCacheID);
-
- sal_Char aSearchText1[] = "%1";
- sal_Char aSearchText2[] = "%2";
- xub_StrLen nPos = rStr.SearchAscii(aSearchText1);
-
- if(nPos != STRING_NOTFOUND)
+ sal_Int32 nPos = rStr.indexOf(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%1")));
+ if (nPos >= 0)
{
- rStr.Erase(nPos, 2);
-
+ // Replace '%1' with the object name.
XubString aObjName;
-
TakeObjNameSingul(aObjName);
- rStr.Insert(aObjName, nPos);
+ rStr = rStr.replaceAt(nPos, 2, aObjName);
}
- nPos = rStr.SearchAscii(aSearchText2);
-
- if(nPos != STRING_NOTFOUND)
- {
- rStr.Erase(nPos, 2);
- rStr.Insert(UniString::CreateFromInt32(nVal), nPos);
- }
+ nPos = rStr.indexOf(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%2")));
+ if (nPos >= 0)
+ // Replace '%2' with the passed value.
+ rStr = rStr.replaceAt(
+ nPos, 2, rtl::OUString::valueOf(static_cast<sal_Int32>(nVal)));
}
void SdrObject::ImpForcePlusData()
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index cf261d8136ff..54ee2a16ced2 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -403,7 +403,7 @@ String SdrCaptionObj::getSpecialDragComment(const SdrDragStat& rDrag) const
}
else
{
- XubString aStr;
+ rtl::OUString aStr;
if(!pHdl)
{
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index cafb87d44fd3..083426c427eb 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -570,8 +570,9 @@ String SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const
if(bCreateComment)
{
- XubString aStr;
+ rtl::OUString aStr;
ImpTakeDescriptionStr(STR_ViewCreateObj, aStr);
+ rtl::OUStringBuffer aBuf(aStr);
const sal_uInt32 nPntAnz(rDrag.GetPointAnz());
if(OBJ_CIRC != meCircleKind && nPntAnz > 2)
@@ -579,7 +580,7 @@ String SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const
ImpCircUser* pU = (ImpCircUser*)rDrag.GetUser();
sal_Int32 nWink;
- aStr.AppendAscii(" (");
+ aBuf.appendAscii(" (");
if(3 == nPntAnz)
{
@@ -590,11 +591,11 @@ String SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const
nWink = pU->nEnd;
}
- aStr += GetWinkStr(nWink,sal_False);
- aStr += sal_Unicode(')');
+ aBuf.append(GetWinkStr(nWink,false));
+ aBuf.append(sal_Unicode(')'));
}
- return aStr;
+ return aBuf.makeStringAndClear();
}
else
{
@@ -602,15 +603,16 @@ String SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const
if(bWink)
{
- XubString aStr;
const sal_Int32 nWink(1 == rDrag.GetHdl()->GetPointNum() ? nStartWink : nEndWink);
+ rtl::OUString aStr;
ImpTakeDescriptionStr(STR_DragCircAngle, aStr);
- aStr.AppendAscii(" (");
- aStr += GetWinkStr(nWink,sal_False);
- aStr += sal_Unicode(')');
+ rtl::OUStringBuffer aBuf(aStr);
+ aBuf.appendAscii(" (");
+ aBuf.append(GetWinkStr(nWink,false));
+ aBuf.append(sal_Unicode(')'));
- return aStr;
+ return aBuf.makeStringAndClear();
}
else
{
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index b56b1d56c7fa..4312ae4c1136 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -1939,7 +1939,7 @@ String SdrEdgeObj::getSpecialDragComment(const SdrDragStat& rDrag) const
}
else
{
- XubString aStr;
+ rtl::OUString aStr;
ImpTakeDescriptionStr(STR_DragEdgeTail, aStr);
return aStr;
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 867eab9bea98..d816b55da0af 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -942,7 +942,9 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
ImpPathCreateUser* pU = (ImpPathCreateUser*)rDrag.GetUser();
const SdrObjKind eKindMerk(meObjectKind);
mrSdrPathObject.meKind = pU->eAktKind;
- mrSdrPathObject.ImpTakeDescriptionStr(STR_ViewCreateObj, aStr);
+ rtl::OUString aTmp;
+ mrSdrPathObject.ImpTakeDescriptionStr(STR_ViewCreateObj, aTmp);
+ aStr = aTmp;
mrSdrPathObject.meKind = eKindMerk;
Point aPrev(rDrag.GetPrev());
@@ -992,7 +994,9 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
{
// #i103058# fallback when no model and/or Handle, both needed
// for else-path
- mrSdrPathObject.ImpTakeDescriptionStr(STR_DragPathObj, aStr);
+ rtl::OUString aTmp;
+ mrSdrPathObject.ImpTakeDescriptionStr(STR_DragPathObj, aTmp);
+ aStr = aTmp;
}
else
{
@@ -1015,7 +1019,9 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
if(!pDragData->IsMultiPointDrag() && pDragData->bEliminate)
{
// point of ...
- mrSdrPathObject.ImpTakeDescriptionStr(STR_ViewMarkedPoint, aStr);
+ rtl::OUString aTmp;
+ mrSdrPathObject.ImpTakeDescriptionStr(STR_ViewMarkedPoint, aTmp);
+ aStr = aTmp;
// delete %O
XubString aStr2(ImpGetResStr(STR_EditDelete));
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index d684ae31328f..fa1b1299dec3 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -448,14 +448,14 @@ String SdrRectObj::getSpecialDragComment(const SdrDragStat& rDrag) const
if(nRad < 0)
nRad = 0;
- XubString aStr;
-
+ rtl::OUString aStr;
ImpTakeDescriptionStr(STR_DragRectEckRad, aStr);
- aStr.AppendAscii(" (");
- aStr += GetMetrStr(nRad);
- aStr += sal_Unicode(')');
+ rtl::OUStringBuffer aBuf(aStr);
+ aBuf.appendAscii(" (");
+ aBuf.append(GetMetrStr(nRad));
+ aBuf.append(sal_Unicode(')'));
- return aStr;
+ return aBuf.makeStringAndClear();
}
else
{
diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx
index d6bbb3ebebe2..972c1f56ee43 100644
--- a/svx/source/svdraw/svdotxdr.cxx
+++ b/svx/source/svdraw/svdotxdr.cxx
@@ -182,7 +182,7 @@ bool SdrTextObj::applySpecialDrag(SdrDragStat& rDrag)
String SdrTextObj::getSpecialDragComment(const SdrDragStat& /*rDrag*/) const
{
- XubString aStr;
+ rtl::OUString aStr;
ImpTakeDescriptionStr(STR_DragRectResize,aStr);
return aStr;
}
generated by cgit (git 2.34.1) at 2025-02-23 12:32:13 +0000