From 10f96c28ba736029aee431307f70f07e5c0269dc Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Fri, 30 Aug 2013 14:32:42 +0200
Subject: 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
---
 include/svx/svdcrtv.hxx       |  6 ++----
 include/svx/svdpntv.hxx       | 16 ++++++++--------
 svx/source/svdraw/svdcrtv.cxx |  2 +-
 svx/source/svdraw/svdpntv.cxx |  8 ++++----
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx
index 3df995480451..9f14c12cdc78 100644
--- a/include/svx/svdcrtv.hxx
+++ b/include/svx/svdcrtv.hxx
@@ -84,10 +84,8 @@ public:
 
     virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin);
 
-    void SetActiveLayer(const String& rName) { aAktLayer=rName; }
-    const String& GetActiveLayer() const { return aAktLayer; }
-    void SetMeasureLayer(const String& rName) { aMeasureLayer=rName; }
-    const String& GetMeasureLayer() const { return aMeasureLayer; }
+    void SetMeasureLayer(const OUString& rName) { aMeasureLayer=rName; }
+    const OUString& GetMeasureLayer() const { return aMeasureLayer; }
 
     // If the MeasureLayer is not set (empty string), then use the active layer for measuring.
     void SetEditMode(SdrViewEditMode eMode) { SdrDragView::SetEditMode(eMode); CheckEdgeMode(); }
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 69bc1fff0199..f6a68f56c897 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -139,8 +139,8 @@ protected:
     OutputDevice*               pDragWin;
     SfxStyleSheet*              pDefaultStyleSheet;
 
-    String                      aAktLayer;     // Aktueller Zeichenlayer
-    String                      aMeasureLayer; // Aktueller Layer fuer Bemassung
+    OUString                    aAktLayer;     // Aktueller Zeichenlayer
+    OUString                    aMeasureLayer; // Aktueller Layer fuer Bemassung
 
 //  Container                   aPagV;         // Liste von SdrPageViews
 
@@ -356,11 +356,11 @@ public:
     void SetLayerVisible(const OUString& rName, bool bShow=true);
     bool IsLayerVisible(const OUString& rName) const;
 
-    void SetLayerLocked(const String& rName, sal_Bool bLock=sal_True);
-    bool IsLayerLocked(const String& rName) const;
+    void SetLayerLocked(const OUString& rName, sal_Bool bLock=sal_True);
+    bool IsLayerLocked(const OUString& rName) const;
 
-    void SetLayerPrintable(const String& rName, sal_Bool bPrn=sal_True);
-    bool IsLayerPrintable(const String& rName) const;
+    void SetLayerPrintable(const OUString& rName, sal_Bool bPrn=sal_True);
+    bool IsLayerPrintable(const OUString& rName) const;
 
     // PrePaint call forwarded from app windows
     void PrePaint();
@@ -444,8 +444,8 @@ public:
     virtual void InvalidateOneWin(Window& rWin);
     virtual void InvalidateOneWin(Window& rWin, const Rectangle& rRect);
 
-    void SetActiveLayer(const String& rName) { aAktLayer=rName; }
-    const String&  GetActiveLayer() const { return aAktLayer; }
+    void SetActiveLayer(const OUString& rName) { aAktLayer=rName; }
+    const OUString&  GetActiveLayer() const { return aAktLayer; }
 
     // Verlassen einer betretenen Objektgruppe aller sichtbaren Seiten.
     // (wie MsDos chdir ..)
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)
     {
-- 
cgit