summaryrefslogtreecommitdiff
path: root/svx/source/svdraw
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/svdraw')
-rw-r--r--svx/source/svdraw/svddrgv.cxx13
-rw-r--r--svx/source/svdraw/svdedtv1.cxx4
-rw-r--r--svx/source/svdraw/svdedxv.cxx8
-rw-r--r--svx/source/svdraw/svdfmtf.cxx15
-rw-r--r--svx/source/svdraw/svdglev.cxx8
-rw-r--r--svx/source/svdraw/svdmark.cxx20
-rw-r--r--svx/source/svdraw/svdopath.cxx4
-rw-r--r--svx/source/svdraw/svdotext.cxx6
-rw-r--r--svx/source/svdraw/svdpntv.cxx2
-rw-r--r--svx/source/svdraw/svdpoev.cxx6
-rw-r--r--svx/source/svdraw/svdview.cxx4
11 files changed, 39 insertions, 51 deletions
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index da555ea0ab9d..9b1a15e31d72 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -639,14 +639,13 @@ sal_Bool SdrDragView::ImpBegInsObjPoint(sal_Bool bIdxZwang, sal_uInt32 nIdx, con
pInsPointUndo = dynamic_cast< SdrUndoGeoObj* >( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pMarkedObj) );
DBG_ASSERT( pInsPointUndo, "svx::SdrDragView::BegInsObjPoint(), could not create correct undo object!" );
- XubString aStr(ImpGetResStr(STR_DragInsertPoint));
+ OUString aStr(ImpGetResStr(STR_DragInsertPoint));
OUString aName(pMarkedObj->TakeObjNameSingul());
- xub_StrLen nPos(aStr.SearchAscii("%1"));
+ sal_Int32 nPos(aStr.indexOf("%1"));
- if(STRING_NOTFOUND != nPos)
+ if(-1 != nPos)
{
- aStr.Erase(nPos, 2);
- aStr.Insert(aName, nPos);
+ aStr = aStr.replaceAt(nPos, 2, aName);
}
aInsPointUndoStr = aStr;
@@ -749,10 +748,10 @@ sal_Bool SdrDragView::BegInsGluePoint(const Point& rPnt)
UnmarkAllGluePoints();
pInsPointUndo= dynamic_cast< SdrUndoGeoObj* >( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj) );
DBG_ASSERT( pInsPointUndo, "svx::SdrDragView::BegInsObjPoint(), could not create correct undo object!" );
- XubString aStr(ImpGetResStr(STR_DragInsertGluePoint));
+ OUString aStr(ImpGetResStr(STR_DragInsertGluePoint));
OUString aName(pObj->TakeObjNameSingul());
- aStr.SearchAndReplaceAscii("%1", aName);
+ aStr = aStr.replaceFirst("%1", aName);
aInsPointUndoStr=aStr;
SdrGluePointList* pGPL=pObj->ForceGluePointList();
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 7f0c5f1213c7..edd1eec4be36 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -184,9 +184,9 @@ void SdrEditView::MoveMarkedObj(const Size& rSiz, bool bCopy)
if( bUndo )
{
- XubString aStr(ImpGetResStr(STR_EditMove));
+ OUString aStr(ImpGetResStr(STR_EditMove));
if (bCopy)
- aStr+=ImpGetResStr(STR_EditWithCopy);
+ aStr += ImpGetResStr(STR_EditWithCopy);
// meeds its own UndoGroup because of its parameters
BegUndo(aStr,GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_MOVE);
}
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 21a7ba22f7de..81a80dec068f 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1369,17 +1369,13 @@ sal_Bool SdrObjEditView::ImpIsTextEditAllSelected() const
ESelection aESel(pTextEditOutlinerView->GetSelection());
if (aESel.nStartPara==0 && aESel.nStartPos==0 && aESel.nEndPara==(nParaAnz-1))
{
- XubString aStr(pTextEditOutliner->GetText(pLastPara));
-
- if(aStr.Len() == aESel.nEndPos)
+ if( pTextEditOutliner->GetText(pLastPara).getLength() == aESel.nEndPos )
bRet = sal_True;
}
// in case the selection was done backwards
if (!bRet && aESel.nEndPara==0 && aESel.nEndPos==0 && aESel.nStartPara==(nParaAnz-1))
{
- XubString aStr(pTextEditOutliner->GetText(pLastPara));
-
- if(aStr.Len() == aESel.nStartPos)
+ if(pTextEditOutliner->GetText(pLastPara).getLength() == aESel.nStartPos)
bRet = sal_True;
}
}
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 72d6d57e0613..386caf7ece55 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -1062,25 +1062,22 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const OUString& rSt
void ImpSdrGDIMetaFileImport::DoAction(MetaTextAction& rAct)
{
- XubString aStr(rAct.GetText());
- aStr.Erase(0,rAct.GetIndex());
- aStr.Erase(rAct.GetLen());
+ OUString aStr(rAct.GetText());
+ aStr = aStr.copy(rAct.GetIndex(), rAct.GetLen());
ImportText( rAct.GetPoint(), aStr, rAct );
}
void ImpSdrGDIMetaFileImport::DoAction(MetaTextArrayAction& rAct)
{
- XubString aStr(rAct.GetText());
- aStr.Erase(0,rAct.GetIndex());
- aStr.Erase(rAct.GetLen());
+ OUString aStr(rAct.GetText());
+ aStr = aStr.copy(rAct.GetIndex(), rAct.GetLen());
ImportText( rAct.GetPoint(), aStr, rAct );
}
void ImpSdrGDIMetaFileImport::DoAction(MetaStretchTextAction& rAct)
{
- XubString aStr(rAct.GetText());
- aStr.Erase(0,rAct.GetIndex());
- aStr.Erase(rAct.GetLen());
+ OUString aStr(rAct.GetText());
+ aStr = aStr.copy(rAct.GetIndex(), rAct.GetLen());
ImportText( rAct.GetPoint(), aStr, rAct );
}
diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx
index 359b413b3c96..83db1668d397 100644
--- a/svx/source/svdraw/svdglev.cxx
+++ b/svx/source/svdraw/svdglev.cxx
@@ -362,8 +362,8 @@ static void ImpMove(Point& rPt, const void* p1, const void* /*p2*/, const void*
void SdrGlueEditView::MoveMarkedGluePoints(const Size& rSiz, bool bCopy)
{
ForceUndirtyMrkPnt();
- XubString aStr(ImpGetResStr(STR_EditMove));
- if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
+ OUString aStr(ImpGetResStr(STR_EditMove));
+ if (bCopy) aStr += ImpGetResStr(STR_EditWithCopy);
BegUndo(aStr,GetDescriptionOfMarkedGluePoints(),SDRREPFUNC_OBJ_MOVE);
if (bCopy) ImpCopyMarkedGluePoints();
ImpTransformMarkedGluePoints(ImpMove,&rSiz);
@@ -381,7 +381,7 @@ static void ImpResize(Point& rPt, const void* p1, const void* p2, const void* p3
void SdrGlueEditView::ResizeMarkedGluePoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy)
{
ForceUndirtyMrkPnt();
- XubString aStr(ImpGetResStr(STR_EditResize));
+ OUString aStr(ImpGetResStr(STR_EditResize));
if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
BegUndo(aStr,GetDescriptionOfMarkedGluePoints(),SDRREPFUNC_OBJ_RESIZE);
if (bCopy) ImpCopyMarkedGluePoints();
@@ -400,7 +400,7 @@ static void ImpRotate(Point& rPt, const void* p1, const void* /*p2*/, const void
void SdrGlueEditView::RotateMarkedGluePoints(const Point& rRef, long nWink, bool bCopy)
{
ForceUndirtyMrkPnt();
- XubString aStr(ImpGetResStr(STR_EditRotate));
+ OUString aStr(ImpGetResStr(STR_EditRotate));
if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
BegUndo(aStr,GetDescriptionOfMarkedGluePoints(),SDRREPFUNC_OBJ_ROTATE);
if (bCopy) ImpCopyMarkedGluePoints();
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index 1c7bf49b50a8..13f8c74fcd03 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -559,7 +559,7 @@ const OUString& SdrMarkList::GetMarkDescription() const
if(!mbNameOk)
{
SdrMark* pMark = GetMark(0);
- XubString aNam;
+ OUString aNam;
if(!nAnz)
{
@@ -583,7 +583,7 @@ const OUString& SdrMarkList::GetMarkDescription() const
{
SdrMark* pMark2 = GetMark(i);
OUString aStr1(pMark2->GetMarkedSdrObj()->TakeObjNamePlural());
- bEq = aNam.Equals(aStr1);
+ bEq = aNam == aStr1;
}
if(!bEq)
@@ -592,8 +592,7 @@ const OUString& SdrMarkList::GetMarkDescription() const
}
}
- aNam.Insert(sal_Unicode(' '), 0);
- aNam.Insert(OUString::number( nAnz ), 0);
+ aNam = OUString::number( nAnz ) + " " + aNam;
}
const_cast<SdrMarkList*>(this)->maMarkName = aNam;
@@ -656,7 +655,7 @@ const OUString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const
else if(!rNameOk)
{
const SdrMark* pMark = GetMark(n1stMarkNum);
- XubString aNam;
+ OUString aNam;
if(1L == nMarkPtObjAnz)
{
@@ -682,7 +681,7 @@ const OUString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const
if(pPts && !pPts->empty() && pMark2->GetMarkedSdrObj())
{
OUString aStr1(pMark2->GetMarkedSdrObj()->TakeObjNamePlural());
- bEq = aNam.Equals(aStr1);
+ bEq = aNam == aStr1;
}
}
@@ -691,11 +690,10 @@ const OUString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const
aNam = ImpGetResStr(STR_ObjNamePlural);
}
- aNam.Insert(sal_Unicode(' '), 0);
- aNam.Insert(OUString::number( nMarkPtObjAnz ), 0);
+ aNam = OUString::number( nMarkPtObjAnz ) + " " + aNam;
}
- XubString aStr1;
+ OUString aStr1;
if(1L == nMarkPtAnz)
{
@@ -704,10 +702,10 @@ const OUString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const
else
{
aStr1 = (ImpGetResStr(bGlue ? STR_ViewMarkedGluePoints : STR_ViewMarkedPoints));
- aStr1.SearchAndReplaceAscii("%2", OUString::number( nMarkPtAnz ));
+ aStr1 = aStr1.replaceFirst("%2", OUString::number( nMarkPtAnz ));
}
- aStr1.SearchAndReplaceAscii("%1", aNam);
+ aStr1 = aStr1.replaceFirst("%1", aNam);
rName = aStr1;
rNameOk = sal_True;
}
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 33f0888501ea..a9a6fe5e9568 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -1000,10 +1000,10 @@ OUString ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag
aStr = aTmp;
// delete %O
- XubString aStr2(ImpGetResStr(STR_EditDelete));
+ OUString aStr2(ImpGetResStr(STR_EditDelete));
// UNICODE: delete point of ...
- aStr2.SearchAndReplaceAscii("%1", aStr);
+ aStr2 = aStr2.replaceFirst("%1", aStr);
return aStr2;
}
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index a9f8cdc0bfc6..1615b04c2e21 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -472,9 +472,7 @@ bool SdrTextObj::HasTextImpl( SdrOutliner* pOutliner )
if(nParaAnz==1)
{
// if it is only one paragraph, check if that paragraph is empty
- XubString aStr(pOutliner->GetText(p1stPara));
-
- if(!aStr.Len())
+ if( pOutliner->GetText(p1stPara).isEmpty() )
nParaAnz = 0;
}
@@ -970,7 +968,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
OUString SdrTextObj::TakeObjNameSingul() const
{
- XubString aStr;
+ OUString aStr;
switch(eTextKind)
{
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index f854be1ce471..e4264681a49f 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -1026,7 +1026,7 @@ void SdrPaintView::MergeNotPersistDefaultAttr(SfxItemSet& rAttr, sal_Bool /*bOnl
{
// bOnlyHardAttr has no effect here at all.
bool bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool();
- const XubString& aNam=bMeasure?aMeasureLayer:aAktLayer;
+ const OUString& aNam = bMeasure ? aMeasureLayer : aAktLayer;
rAttr.Put(SdrLayerNameItem(aNam));
SdrLayerID nLayer=pMod->GetLayerAdmin().GetLayerID(aNam,sal_True);
if (nLayer!=SDRLAYER_NOTFOUND) {
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index e6324da53653..8ff5f021bdfd 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -664,7 +664,7 @@ void SdrPolyEditView::MoveMarkedPoints(const Size& rSiz, bool bCopy)
{
bCopy=sal_False; // TODO: not yet implemented
ForceUndirtyMrkPnt();
- XubString aStr(ImpGetResStr(STR_EditMove));
+ OUString aStr(ImpGetResStr(STR_EditMove));
if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
BegUndo(aStr,GetDescriptionOfMarkedPoints(),SDRREPFUNC_OBJ_MOVE);
ImpTransformMarkedPoints(ImpMove,&rSiz);
@@ -685,7 +685,7 @@ void SdrPolyEditView::ResizeMarkedPoints(const Point& rRef, const Fraction& xFac
{
bCopy=sal_False; // TODO: not yet implemented
ForceUndirtyMrkPnt();
- XubString aStr(ImpGetResStr(STR_EditResize));
+ OUString aStr(ImpGetResStr(STR_EditResize));
if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
BegUndo(aStr,GetDescriptionOfMarkedPoints(),SDRREPFUNC_OBJ_RESIZE);
ImpTransformMarkedPoints(ImpResize,&rRef,&xFact,&yFact);
@@ -706,7 +706,7 @@ void SdrPolyEditView::RotateMarkedPoints(const Point& rRef, long nWink, bool bCo
{
bCopy=sal_False; // TODO: not yet implemented
ForceUndirtyMrkPnt();
- XubString aStr(ImpGetResStr(STR_EditResize));
+ OUString aStr(ImpGetResStr(STR_EditResize));
if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
BegUndo(aStr,GetDescriptionOfMarkedPoints(),SDRREPFUNC_OBJ_ROTATE);
double nSin=sin(nWink*nPi180);
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index af0b4abf314e..68d258e72f7f 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1166,7 +1166,7 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
OUString SdrView::GetStatusText()
{
OUString aStr;
- XubString aName;
+ OUString aName;
aStr += STR_NOTHING;
@@ -1280,7 +1280,7 @@ OUString SdrView::GetStatusText()
aStr = "";
}
}
- else if(aName.Len())
+ else if(!aName.isEmpty())
{
aStr = aStr.replaceFirst("%1", aName);
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-19 16:04:39 +0000