summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-08-30 16:13:52 +0200
committerNoel Grandin <noel@peralex.com>2013-09-05 08:54:17 +0200
commitad5a56abf2d28cd5dc019a5081da41fef6253ed6 (patch)
treea57a72965190875d1472a3386d9eae16566f96ac /svx/source
parentbfd3c3069f1d89a125bce4e0fcebf3636fb5f8af (diff)
convert include/svx/svdovirt.hxx from String to OUString
Change-Id: I3af71e2eae19068c4eafd58d8be3a62506ea28f6
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/svdraw/svdobj.cxx4
-rw-r--r--svx/source/svdraw/svdocapt.cxx2
-rw-r--r--svx/source/svdraw/svdocirc.cxx2
-rw-r--r--svx/source/svdraw/svdoedge.cxx4
-rw-r--r--svx/source/svdraw/svdomeas.cxx5
-rw-r--r--svx/source/svdraw/svdopath.cxx4
-rw-r--r--svx/source/svdraw/svdorect.cxx4
-rw-r--r--svx/source/svdraw/svdotxdr.cxx2
-rw-r--r--svx/source/svdraw/svdovirt.cxx2
-rw-r--r--svx/source/table/svdotable.cxx2
10 files changed, 15 insertions, 16 deletions
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 9f9b45342e1a..0414d038aaa0 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1407,9 +1407,9 @@ bool SdrObject::applySpecialDrag(SdrDragStat& rDrag)
return true;
}
-String SdrObject::getSpecialDragComment(const SdrDragStat& /*rDrag*/) const
+OUString SdrObject::getSpecialDragComment(const SdrDragStat& /*rDrag*/) const
{
- return String();
+ return OUString();
}
basegfx::B2DPolyPolygon SdrObject::getSpecialDragPoly(const SdrDragStat& /*rDrag*/) const
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index 9bd598c677ff..b5de9891dd07 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -381,7 +381,7 @@ bool SdrCaptionObj::applySpecialDrag(SdrDragStat& rDrag)
}
}
-String SdrCaptionObj::getSpecialDragComment(const SdrDragStat& rDrag) const
+OUString SdrCaptionObj::getSpecialDragComment(const SdrDragStat& rDrag) const
{
const bool bCreateComment(rDrag.GetView() && this == rDrag.GetView()->GetCreateObj());
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 9ed310c5d5ce..e7b1dd8981e8 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -558,7 +558,7 @@ bool SdrCircObj::applySpecialDrag(SdrDragStat& rDrag)
}
}
-String SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const
+OUString SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const
{
const bool bCreateComment(rDrag.GetView() && this == rDrag.GetView()->GetCreateObj());
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index afb70f390a3b..ebeea351cf5b 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -1944,13 +1944,13 @@ bool SdrEdgeObj::applySpecialDrag(SdrDragStat& rDragStat)
return true;
}
-String SdrEdgeObj::getSpecialDragComment(const SdrDragStat& rDrag) const
+OUString SdrEdgeObj::getSpecialDragComment(const SdrDragStat& rDrag) const
{
const bool bCreateComment(rDrag.GetView() && this == rDrag.GetView()->GetCreateObj());
if(bCreateComment)
{
- return String();
+ return OUString();
}
else
{
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 90fa446be398..a1bce28da556 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -899,10 +899,9 @@ bool SdrMeasureObj::applySpecialDrag(SdrDragStat& rDrag)
return true;
}
-String SdrMeasureObj::getSpecialDragComment(const SdrDragStat& /*rDrag*/) const
+OUString SdrMeasureObj::getSpecialDragComment(const SdrDragStat& /*rDrag*/) const
{
- XubString aStr;
- return aStr;
+ return OUString();
}
void SdrMeasureObj::ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) const
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 21b395211699..6b1931fc9a3a 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -2171,9 +2171,9 @@ bool SdrPathObj::applySpecialDrag(SdrDragStat& rDrag)
return bRetval;
}
-String SdrPathObj::getSpecialDragComment(const SdrDragStat& rDrag) const
+OUString SdrPathObj::getSpecialDragComment(const SdrDragStat& rDrag) const
{
- String aRetval;
+ OUString aRetval;
if(mpDAC)
{
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 6fd3e0354391..1fb7b322fbe7 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -427,13 +427,13 @@ bool SdrRectObj::applySpecialDrag(SdrDragStat& rDrag)
}
}
-String SdrRectObj::getSpecialDragComment(const SdrDragStat& rDrag) const
+OUString SdrRectObj::getSpecialDragComment(const SdrDragStat& rDrag) const
{
const bool bCreateComment(rDrag.GetView() && this == rDrag.GetView()->GetCreateObj());
if(bCreateComment)
{
- return String();
+ return OUString();
}
else
{
diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx
index 27d033d34750..22a220825360 100644
--- a/svx/source/svdraw/svdotxdr.cxx
+++ b/svx/source/svdraw/svdotxdr.cxx
@@ -171,7 +171,7 @@ bool SdrTextObj::applySpecialDrag(SdrDragStat& rDrag)
return true;
}
-String SdrTextObj::getSpecialDragComment(const SdrDragStat& /*rDrag*/) const
+OUString SdrTextObj::getSpecialDragComment(const SdrDragStat& /*rDrag*/) const
{
OUString aStr;
ImpTakeDescriptionStr(STR_DragRectResize,aStr);
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
index 2a545777be9e..947755eb1921 100644
--- a/svx/source/svdraw/svdovirt.cxx
+++ b/svx/source/svdraw/svdovirt.cxx
@@ -323,7 +323,7 @@ basegfx::B2DPolyPolygon SdrVirtObj::getSpecialDragPoly(const SdrDragStat& rDrag)
// TODO: we don't handle offsets yet!
}
-String SdrVirtObj::getSpecialDragComment(const SdrDragStat& rDrag) const
+OUString SdrVirtObj::getSpecialDragComment(const SdrDragStat& rDrag) const
{
return rRefObj.getSpecialDragComment(rDrag);
}
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index a944f4e8dac5..994076e4f322 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -2348,7 +2348,7 @@ bool SdrTableObj::applySpecialDrag(SdrDragStat& rDrag)
return bRet;
}
-String SdrTableObj::getSpecialDragComment(const SdrDragStat& rDrag) const
+OUString SdrTableObj::getSpecialDragComment(const SdrDragStat& rDrag) const
{
return SdrTextObj::getSpecialDragComment( rDrag );
}