summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/dragmt3d.hxx2
-rw-r--r--svx/source/engine3d/dragmt3d.cxx2
-rw-r--r--svx/source/svdraw/svddrgm1.hxx16
-rw-r--r--svx/source/svdraw/svddrgmt.cxx92
-rw-r--r--svx/source/svdraw/svdedtv1.cxx22
-rw-r--r--svx/source/svdraw/svdedxv.cxx4
-rw-r--r--svx/source/svdraw/svdmrkv.cxx21
-rw-r--r--svx/source/svdraw/svdview.cxx26
8 files changed, 91 insertions, 94 deletions
diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx
index cb38376cef62..2189ca34f135 100644
--- a/svx/inc/dragmt3d.hxx
+++ b/svx/inc/dragmt3d.hxx
@@ -79,7 +79,7 @@ public:
E3dDragConstraint eConstr = E3DDRAG_CONSTR_XYZ,
sal_Bool bFull = sal_False);
- virtual void TakeSdrDragComment(String& rStr) const;
+ virtual void TakeSdrDragComment(OUString& rStr) const;
virtual bool BeginSdrDrag();
virtual void MoveSdrDrag(const Point& rPnt);
virtual void CancelSdrDrag();
diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx
index 4e0bf86df28e..e12fcebed0b4 100644
--- a/svx/source/engine3d/dragmt3d.cxx
+++ b/svx/source/engine3d/dragmt3d.cxx
@@ -120,7 +120,7 @@ E3dDragMethod::E3dDragMethod (
}
}
-void E3dDragMethod::TakeSdrDragComment(XubString& /*rStr*/) const
+void E3dDragMethod::TakeSdrDragComment(OUString& /*rStr*/) const
{
}
diff --git a/svx/source/svdraw/svddrgm1.hxx b/svx/source/svdraw/svddrgm1.hxx
index 344dadac7c6e..00920ce5d434 100644
--- a/svx/source/svdraw/svddrgm1.hxx
+++ b/svx/source/svdraw/svddrgm1.hxx
@@ -43,7 +43,7 @@ public:
TYPEINFO();
SdrDragMovHdl(SdrDragView& rNewView);
- virtual void TakeSdrDragComment(String& rStr) const;
+ virtual void TakeSdrDragComment(OUString& rStr) const;
virtual bool BeginSdrDrag();
virtual void MoveSdrDrag(const Point& rPnt);
virtual bool EndSdrDrag(bool bCopy);
@@ -67,7 +67,7 @@ public:
TYPEINFO();
SdrDragRotate(SdrDragView& rNewView);
- virtual void TakeSdrDragComment(String& rStr) const;
+ virtual void TakeSdrDragComment(OUString& rStr) const;
virtual bool BeginSdrDrag();
virtual void MoveSdrDrag(const Point& rPnt);
virtual bool EndSdrDrag(bool bCopy);
@@ -96,7 +96,7 @@ public:
TYPEINFO();
SdrDragShear(SdrDragView& rNewView,bool bSlant1);
- virtual void TakeSdrDragComment(String& rStr) const;
+ virtual void TakeSdrDragComment(OUString& rStr) const;
virtual bool BeginSdrDrag();
virtual void MoveSdrDrag(const Point& rPnt);
virtual bool EndSdrDrag(bool bCopy);
@@ -123,7 +123,7 @@ public:
TYPEINFO();
SdrDragMirror(SdrDragView& rNewView);
- virtual void TakeSdrDragComment(String& rStr) const;
+ virtual void TakeSdrDragComment(OUString& rStr) const;
virtual bool BeginSdrDrag();
virtual void MoveSdrDrag(const Point& rPnt);
virtual bool EndSdrDrag(bool bCopy);
@@ -151,7 +151,7 @@ public:
bool IsGradient() const { return bIsGradient; }
- virtual void TakeSdrDragComment(String& rStr) const;
+ virtual void TakeSdrDragComment(OUString& rStr) const;
virtual bool BeginSdrDrag();
virtual void MoveSdrDrag(const Point& rPnt);
virtual bool EndSdrDrag(bool bCopy);
@@ -201,7 +201,7 @@ public:
TYPEINFO();
SdrDragCrook(SdrDragView& rNewView);
- virtual void TakeSdrDragComment(String& rStr) const;
+ virtual void TakeSdrDragComment(OUString& rStr) const;
virtual bool BeginSdrDrag();
virtual void MoveSdrDrag(const Point& rPnt);
virtual bool EndSdrDrag(bool bCopy);
@@ -235,7 +235,7 @@ public:
TYPEINFO();
SdrDragDistort(SdrDragView& rNewView);
- virtual void TakeSdrDragComment(String& rStr) const;
+ virtual void TakeSdrDragComment(OUString& rStr) const;
virtual bool BeginSdrDrag();
virtual void MoveSdrDrag(const Point& rPnt);
virtual bool EndSdrDrag(bool bCopy);
@@ -254,7 +254,7 @@ public:
TYPEINFO();
SdrDragCrop(SdrDragView& rNewView);
- virtual void TakeSdrDragComment(String& rStr) const;
+ virtual void TakeSdrDragComment(OUString& rStr) const;
virtual bool EndSdrDrag(bool bCopy);
virtual Pointer GetSdrDragPointer() const;
};
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 2255d58ad9a8..f58ad2b0d98e 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -559,7 +559,7 @@ void SdrDragMethod::createSdrDragEntries_GlueDrag()
}
}
-void SdrDragMethod::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, sal_uInt16 nVal) const
+void SdrDragMethod::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal) const
{
sal_uInt16 nOpt=0;
if (IsDraggingPoints()) {
@@ -976,7 +976,7 @@ void SdrDragMovHdl::createSdrDragEntries()
// but creates nothing
}
-void SdrDragMovHdl::TakeSdrDragComment(XubString& rStr) const
+void SdrDragMovHdl::TakeSdrDragComment(OUString& rStr) const
{
rStr=ImpGetResStr(STR_DragMethMovHdl);
if (getSdrDragView().IsDragWithCopy()) rStr+=ImpGetResStr(STR_EditWithCopy);
@@ -1254,7 +1254,7 @@ void SdrDragObjOwn::createSdrDragEntries()
}
}
-void SdrDragObjOwn::TakeSdrDragComment(XubString& rStr) const
+void SdrDragObjOwn::TakeSdrDragComment(OUString& rStr) const
{
// #i103058# get info string from the clone preferred, the original will
// not be changed. For security, use original as fallback
@@ -1518,18 +1518,18 @@ SdrDragMove::SdrDragMove(SdrDragView& rNewView)
setMoveOnly(true);
}
-void SdrDragMove::TakeSdrDragComment(XubString& rStr) const
+void SdrDragMove::TakeSdrDragComment(OUString& rStr) const
{
OUString aStr;
ImpTakeDescriptionStr(STR_DragMethMove, rStr);
- rStr.AppendAscii(" (x=");
+ rStr += " (x=";
getSdrDragView().GetModel()->TakeMetricStr(DragStat().GetDX(), aStr);
- rStr.Append(aStr);
- rStr.AppendAscii(" y=");
+ rStr += aStr;
+ rStr += " y=";
getSdrDragView().GetModel()->TakeMetricStr(DragStat().GetDY(), aStr);
- rStr.Append(aStr);
- rStr += sal_Unicode(')');
+ rStr += aStr;
+ rStr += ")";
if(getSdrDragView().IsDragWithCopy())
{
@@ -1776,7 +1776,7 @@ SdrDragResize::SdrDragResize(SdrDragView& rNewView)
{
}
-void SdrDragResize::TakeSdrDragComment(XubString& rStr) const
+void SdrDragResize::TakeSdrDragComment(OUString& rStr) const
{
ImpTakeDescriptionStr(STR_DragMethResize, rStr);
bool bEqual(aXFact == aYFact);
@@ -1800,12 +1800,12 @@ void SdrDragResize::TakeSdrDragComment(XubString& rStr) const
{
XubString aStr;
- rStr.AppendAscii(" (");
+ rStr += " (";
if(bX)
{
if(!bEqual)
- rStr.AppendAscii("x=");
+ rStr += "x=";
getSdrDragView().GetModel()->TakePercentStr(aXFact, aStr);
rStr += aStr;
@@ -1814,14 +1814,14 @@ void SdrDragResize::TakeSdrDragComment(XubString& rStr) const
if(bY && !bEqual)
{
if(bX)
- rStr += sal_Unicode(' ');
+ rStr += " ";
- rStr.AppendAscii("y=");
+ rStr += "y=";
getSdrDragView().GetModel()->TakePercentStr(aYFact, aStr);
rStr += aStr;
}
- rStr += sal_Unicode(')');
+ rStr += ")";
}
if(getSdrDragView().IsDragWithCopy())
@@ -2121,10 +2121,10 @@ SdrDragRotate::SdrDragRotate(SdrDragView& rNewView)
{
}
-void SdrDragRotate::TakeSdrDragComment(XubString& rStr) const
+void SdrDragRotate::TakeSdrDragComment(OUString& rStr) const
{
ImpTakeDescriptionStr(STR_DragMethRotate, rStr);
- rStr.AppendAscii(" (");
+ rStr += " (";
sal_Int32 nTmpWink(NormAngle360(nWink));
if(bRight && nWink)
@@ -2134,8 +2134,8 @@ void SdrDragRotate::TakeSdrDragComment(XubString& rStr) const
OUString aStr;
getSdrDragView().GetModel()->TakeWinkStr(nTmpWink, aStr);
- rStr.Append(aStr);
- rStr += sal_Unicode(')');
+ rStr += aStr;
+ rStr += ")";
if(getSdrDragView().IsDragWithCopy())
rStr += ImpGetResStr(STR_EditWithCopy);
@@ -2257,10 +2257,10 @@ SdrDragShear::SdrDragShear(SdrDragView& rNewView, bool bSlant1)
{
}
-void SdrDragShear::TakeSdrDragComment(XubString& rStr) const
+void SdrDragShear::TakeSdrDragComment(OUString& rStr) const
{
ImpTakeDescriptionStr(STR_DragMethShear, rStr);
- rStr.AppendAscii(" (");
+ rStr += " (";
sal_Int32 nTmpWink(nWink);
@@ -2271,8 +2271,8 @@ void SdrDragShear::TakeSdrDragComment(XubString& rStr) const
OUString aStr;
getSdrDragView().GetModel()->TakeWinkStr(nTmpWink, aStr);
- rStr.Append(aStr);
- rStr += sal_Unicode(')');
+ rStr += aStr;
+ rStr += ")";
if(getSdrDragView().IsDragWithCopy())
rStr += ImpGetResStr(STR_EditWithCopy);
@@ -2478,11 +2478,11 @@ bool SdrDragShear::EndSdrDrag(bool bCopy)
{
if (nWink!=0 && bResize)
{
- XubString aStr;
+ OUString aStr;
ImpTakeDescriptionStr(STR_EditShear,aStr);
if (bCopy)
- aStr+=ImpGetResStr(STR_EditWithCopy);
+ aStr += ImpGetResStr(STR_EditWithCopy);
getSdrDragView().BegUndo(aStr);
}
@@ -2552,7 +2552,7 @@ bool SdrDragMirror::ImpCheckSide(const Point& rPnt) const
return nWink1<18000;
}
-void SdrDragMirror::TakeSdrDragComment(XubString& rStr) const
+void SdrDragMirror::TakeSdrDragComment(OUString& rStr) const
{
if (aDif.X()==0)
ImpTakeDescriptionStr(STR_DragMethMirrorHori,rStr);
@@ -2665,7 +2665,7 @@ SdrDragGradient::SdrDragGradient(SdrDragView& rNewView, bool bGrad)
{
}
-void SdrDragGradient::TakeSdrDragComment(XubString& rStr) const
+void SdrDragGradient::TakeSdrDragComment(OUString& rStr) const
{
if(IsGradient())
ImpTakeDescriptionStr(STR_DragMethGradient, rStr);
@@ -2842,13 +2842,13 @@ SdrDragCrook::SdrDragCrook(SdrDragView& rNewView)
{
}
-void SdrDragCrook::TakeSdrDragComment(XubString& rStr) const
+void SdrDragCrook::TakeSdrDragComment(OUString& rStr) const
{
ImpTakeDescriptionStr(!bContortion ? STR_DragMethCrook : STR_DragMethCrookContortion, rStr);
if(bValid)
{
- rStr.AppendAscii(" (");
+ rStr += " (";
sal_Int32 nVal(nWink);
@@ -2858,8 +2858,8 @@ void SdrDragCrook::TakeSdrDragComment(XubString& rStr) const
nVal = std::abs(nVal);
OUString aStr;
getSdrDragView().GetModel()->TakeWinkStr(nVal, aStr);
- rStr.Append(aStr);
- rStr += sal_Unicode(')');
+ rStr += aStr;
+ rStr += ")";
}
if(getSdrDragView().IsDragWithCopy())
@@ -3421,11 +3421,11 @@ bool SdrDragCrook::EndSdrDrag(bool bCopy)
{
if (bResize && bUndo)
{
- XubString aStr;
+ OUString aStr;
ImpTakeDescriptionStr(!bContortion?STR_EditCrook:STR_EditCrookContortion,aStr);
if (bCopy)
- aStr+=ImpGetResStr(STR_EditWithCopy);
+ aStr += ImpGetResStr(STR_EditWithCopy);
getSdrDragView().BegUndo(aStr);
}
@@ -3503,19 +3503,19 @@ SdrDragDistort::SdrDragDistort(SdrDragView& rNewView)
{
}
-void SdrDragDistort::TakeSdrDragComment(XubString& rStr) const
+void SdrDragDistort::TakeSdrDragComment(OUString& rStr) const
{
ImpTakeDescriptionStr(STR_DragMethDistort, rStr);
OUString aStr;
- rStr.AppendAscii(" (x=");
+ rStr += " (x=";
getSdrDragView().GetModel()->TakeMetricStr(DragStat().GetDX(), aStr);
- rStr.Append(aStr);
- rStr.AppendAscii(" y=");
+ rStr += aStr;
+ rStr += " y=";
getSdrDragView().GetModel()->TakeMetricStr(DragStat().GetDY(), aStr);
- rStr.Append(aStr);
- rStr += sal_Unicode(')');
+ rStr += aStr;
+ rStr += ")";
if(getSdrDragView().IsDragWithCopy())
rStr += ImpGetResStr(STR_EditWithCopy);
@@ -3658,19 +3658,19 @@ SdrDragCrop::SdrDragCrop(SdrDragView& rNewView)
setSolidDraggingActive(false);
}
-void SdrDragCrop::TakeSdrDragComment(XubString& rStr) const
+void SdrDragCrop::TakeSdrDragComment(OUString& rStr) const
{
ImpTakeDescriptionStr(STR_DragMethCrop, rStr);
OUString aStr;
- rStr.AppendAscii(" (x=");
+ rStr += " (x=";
getSdrDragView().GetModel()->TakeMetricStr(DragStat().GetDX(), aStr);
- rStr.Append(aStr);
- rStr.AppendAscii(" y=");
+ rStr += aStr;
+ rStr += " y=";
getSdrDragView().GetModel()->TakeMetricStr(DragStat().GetDY(), aStr);
- rStr.Append(aStr);
- rStr += sal_Unicode(')');
+ rStr += aStr;
+ rStr += ")";
if(getSdrDragView().IsDragWithCopy())
rStr += ImpGetResStr(STR_EditWithCopy);
@@ -3711,7 +3711,7 @@ bool SdrDragCrop::EndSdrDrag(bool bCopy)
if( bUndo )
{
- String aUndoStr;
+ OUString aUndoStr;
ImpTakeDescriptionStr(STR_DragMethCrop, aUndoStr);
getSdrDragView().BegUndo( aUndoStr );
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 6468c9121133..f62eb7ddba3b 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -84,7 +84,7 @@ void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, sal_Bool bCopy)
long y1=rRect.Top();
long w1=rRect.Right()-x1;
long h1=rRect.Bottom()-y1;
- XubString aStr;
+ OUString aStr;
ImpTakeDescriptionStr(STR_EditPosSize,aStr);
if (bCopy)
aStr+=ImpGetResStr(STR_EditWithCopy);
@@ -217,7 +217,7 @@ void SdrEditView::ResizeMarkedObj(const Point& rRef, const Fraction& xFact, cons
const bool bUndo = IsUndoEnabled();
if( bUndo )
{
- XubString aStr;
+ OUString aStr;
ImpTakeDescriptionStr(STR_EditResize,aStr);
if (bCopy)
aStr+=ImpGetResStr(STR_EditWithCopy);
@@ -254,7 +254,7 @@ void SdrEditView::ResizeMultMarkedObj(const Point& rRef,
const bool bUndo = IsUndoEnabled();
if( bUndo )
{
- XubString aStr;
+ OUString aStr;
ImpTakeDescriptionStr(STR_EditResize,aStr);
if (bCopy)
aStr+=ImpGetResStr(STR_EditWithCopy);
@@ -322,7 +322,7 @@ void SdrEditView::RotateMarkedObj(const Point& rRef, long nWink, bool bCopy)
const bool bUndo = IsUndoEnabled();
if( bUndo )
{
- XubString aStr;
+ OUString aStr;
ImpTakeDescriptionStr(STR_EditRotate,aStr);
if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
BegUndo(aStr);
@@ -380,7 +380,7 @@ void SdrEditView::MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool b
if( bUndo )
{
- XubString aStr;
+ OUString aStr;
Point aDif(rRef2-rRef1);
if (aDif.X()==0) ImpTakeDescriptionStr(STR_EditMirrorHori,aStr);
else if (aDif.Y()==0) ImpTakeDescriptionStr(STR_EditMirrorVert,aStr);
@@ -476,7 +476,7 @@ void SdrEditView::ShearMarkedObj(const Point& rRef, long nWink, bool bVShear, bo
if( bUndo )
{
- XubString aStr;
+ OUString aStr;
ImpTakeDescriptionStr(STR_EditShear,aStr);
if (bCopy)
aStr+=ImpGetResStr(STR_EditWithCopy);
@@ -593,7 +593,7 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM
if( bUndo )
{
- XubString aStr;
+ OUString aStr;
ImpTakeDescriptionStr(bNoContortion?STR_EditCrook:STR_EditCrookContortion,aStr);
if (bCopy)
aStr+=ImpGetResStr(STR_EditWithCopy);
@@ -667,7 +667,7 @@ void SdrEditView::DistortMarkedObj(const Rectangle& rRef, const XPolygon& rDisto
if( bUndo )
{
- XubString aStr;
+ OUString aStr;
ImpTakeDescriptionStr(STR_EditDistort,aStr);
if (bCopy)
aStr+=ImpGetResStr(STR_EditWithCopy);
@@ -1027,7 +1027,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, sal_Bool bReplaceAll)
const bool bUndo = IsUndoEnabled();
if( bUndo )
{
- XubString aStr;
+ OUString aStr;
ImpTakeDescriptionStr(STR_EditSetAttributes,aStr);
BegUndo(aStr);
}
@@ -1207,7 +1207,7 @@ void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, sal_Bool bDo
if( bUndo )
{
- XubString aStr;
+ OUString aStr;
if (pStyleSheet!=NULL)
ImpTakeDescriptionStr(STR_EditSetStylesheet,aStr);
else
@@ -1764,7 +1764,7 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, sal_B
const bool bUndo = IsUndoEnabled();
if( bUndo )
{
- XubString aStr(GetDescriptionOfMarkedObjects());
+ OUString aStr(GetDescriptionOfMarkedObjects());
if (eHor==SDRHALIGN_NONE)
{
switch (eVert)
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 97c7e9129d3a..95da6a413444 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1539,7 +1539,7 @@ sal_Bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplace
if( bUndo )
{
- String aStr;
+ OUString aStr;
ImpTakeDescriptionStr(STR_EditSetAttributes,aStr);
BegUndo(aStr);
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*mxTextEditObj.get()));
@@ -1588,7 +1588,7 @@ sal_Bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplace
{
if( IsUndoEnabled() )
{
- String aStr;
+ OUString aStr;
ImpTakeDescriptionStr(STR_EditSetAttributes,aStr);
BegUndo(aStr);
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*mxTextEditObj.get()));
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 896b19a6fcd5..07e35491db4c 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -1994,35 +1994,32 @@ const Rectangle& SdrMarkView::GetMarkedObjRect() const
////////////////////////////////////////////////////////////////////////////////////////////////////
-void SdrMarkView::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, sal_uInt16 nVal, sal_uInt16 nOpt) const
+void SdrMarkView::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal, sal_uInt16 nOpt) const
{
rStr = ImpGetResStr(nStrCacheID);
- xub_StrLen nPos = rStr.SearchAscii("%1");
+ sal_Int32 nPos = rStr.indexOf("%1");
- if(nPos != STRING_NOTFOUND)
+ if(nPos != -1)
{
- rStr.Erase(nPos, 2);
-
if(nOpt == IMPSDR_POINTSDESCRIPTION)
{
- rStr.Insert(GetDescriptionOfMarkedPoints(), nPos);
+ rStr = rStr.replaceAt(nPos, 2, GetDescriptionOfMarkedPoints());
}
else if(nOpt == IMPSDR_GLUEPOINTSDESCRIPTION)
{
- rStr.Insert(GetDescriptionOfMarkedGluePoints(), nPos);
+ rStr = rStr.replaceAt(nPos, 2, GetDescriptionOfMarkedGluePoints());
}
else
{
- rStr.Insert(GetDescriptionOfMarkedObjects(), nPos);
+ rStr = rStr.replaceAt(nPos, 2, GetDescriptionOfMarkedObjects());
}
}
- nPos = rStr.SearchAscii("%2");
+ nPos = rStr.indexOf("%2");
- if(nPos != STRING_NOTFOUND)
+ if(nPos != -1)
{
- rStr.Erase(nPos, 2);
- rStr.Insert(OUString::number( nVal ), nPos);
+ rStr = rStr.replaceAt(nPos, 2, OUString::number( nVal ));
}
}
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 4fef391324a3..af0b4abf314e 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1165,16 +1165,16 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
#define STR_NOTHING "nothing"
OUString SdrView::GetStatusText()
{
- XubString aStr;
+ OUString aStr;
XubString aName;
- aStr.AppendAscii(STR_NOTHING);
+ aStr += STR_NOTHING;
if (pAktCreate!=NULL)
{
aStr=pAktCreate->getSpecialDragComment(aDragStat);
- if(!aStr.Len())
+ if(aStr.isEmpty())
{
aName = pAktCreate->TakeObjNameSingul();
aStr = ImpGetResStr(STR_ViewCreateObj);
@@ -1253,17 +1253,17 @@ OUString SdrView::GetStatusText()
if (nLen==0) bBrk=true; // to be sure
}
- aStr.SearchAndReplaceAscii("%1", OUString::number(nPar + 1));
- aStr.SearchAndReplaceAscii("%2", OUString::number(nLin + 1));
- aStr.SearchAndReplaceAscii("%3", OUString::number(nCol + 1));
+ aStr = aStr.replaceFirst("%1", OUString::number(nPar + 1));
+ aStr = aStr.replaceFirst("%2", OUString::number(nLin + 1));
+ aStr = aStr.replaceFirst("%3", OUString::number(nCol + 1));
#ifdef DBG_UTIL
- aStr += OUString( ", Level " );
+ aStr += ", Level " ;
aStr += OUString::number( pTextEditOutliner->GetDepth( aSel.nEndPara ) );
#endif
}
- if(aStr.EqualsAscii(STR_NOTHING))
+ if(aStr == STR_NOTHING)
{
if (AreObjectsMarked()) {
ImpTakeDescriptionStr(STR_ViewMarked,aStr);
@@ -1277,19 +1277,19 @@ OUString SdrView::GetStatusText()
}
}
} else {
- aStr.Erase();
+ aStr = "";
}
}
else if(aName.Len())
{
- aStr.SearchAndReplaceAscii("%1", aName);
+ aStr = aStr.replaceFirst("%1", aName);
}
- if(aStr.Len())
+ if(!aStr.isEmpty())
{
// capitalize first letter
- OUString aTmpStr(aStr.Copy(0, 1));
- aStr.Replace(0, 1, aTmpStr.toAsciiUpperCase());
+ OUString aTmpStr(aStr.copy(0, 1));
+ aStr = aStr.replaceAt(0, 1, aTmpStr.toAsciiUpperCase());
}
return aStr;
}
generated by cgit (git 2.34.1) at 2025-02-12 16:43:27 +0000