summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-08-30 14:32:42 +0200
committerNoel Grandin <noel@peralex.com>2013-09-05 08:54:16 +0200
commit10f96c28ba736029aee431307f70f07e5c0269dc (patch)
treef3c4a269f609d42f2cc22781fbaac164fa3b8b50 /svx/source
parentf4b76b7b160467a4d67689e1fe24d481df714ce5 (diff)
convert include/svdpntv.hxx from String to OUString
And remove SdrCreateView::SetActiveLayer and SdrCreateView::GetActiveLayer, since they are already declared in the SdrPaintView superclass. Change-Id: I1bc87229628bd4490e7c9497c97ac5d38ae595fa
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/svdraw/svdcrtv.cxx2
-rw-r--r--svx/source/svdraw/svdpntv.cxx8
2 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 10bcaed1aac4..9e6ff2332ef6 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -407,7 +407,7 @@ sal_Bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, c
{ // otherwise no side registered!
String aLay(aAktLayer);
- if(nInvent == SdrInventor && nIdent == OBJ_MEASURE && aMeasureLayer.Len())
+ if(nInvent == SdrInventor && nIdent == OBJ_MEASURE && !aMeasureLayer.isEmpty())
{
aLay = aMeasureLayer;
}
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 7356a502149a..b7a42daa5196 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -529,7 +529,7 @@ bool SdrPaintView::IsLayerVisible(const OUString& rName) const
return false;
}
-void SdrPaintView::SetLayerLocked(const XubString& rName, sal_Bool bLock)
+void SdrPaintView::SetLayerLocked(const OUString& rName, sal_Bool bLock)
{
if(mpPageView)
{
@@ -537,7 +537,7 @@ void SdrPaintView::SetLayerLocked(const XubString& rName, sal_Bool bLock)
}
}
-bool SdrPaintView::IsLayerLocked(const XubString& rName) const
+bool SdrPaintView::IsLayerLocked(const OUString& rName) const
{
if(mpPageView)
{
@@ -547,7 +547,7 @@ bool SdrPaintView::IsLayerLocked(const XubString& rName) const
return false;
}
-void SdrPaintView::SetLayerPrintable(const XubString& rName, sal_Bool bPrn)
+void SdrPaintView::SetLayerPrintable(const OUString& rName, sal_Bool bPrn)
{
if(mpPageView)
{
@@ -555,7 +555,7 @@ void SdrPaintView::SetLayerPrintable(const XubString& rName, sal_Bool bPrn)
}
}
-bool SdrPaintView::IsLayerPrintable(const XubString& rName) const
+bool SdrPaintView::IsLayerPrintable(const OUString& rName) const
{
if(mpPageView)
{