[Libreoffice-commits] core.git: include/svx svx/source

[Caolán McNamara]

 include/svx/svdedtv.hxx       |    6 +++---
 include/svx/svdpagv.hxx       |    8 ++++----
 include/svx/svdpntv.hxx       |    4 ++--
 svx/source/svdraw/svdedtv.cxx |    4 ++--
 svx/source/svdraw/svdpagv.cxx |   12 ++++++------
 svx/source/svdraw/svdpntv.cxx |    6 +++---
 6 files changed, 20 insertions(+), 20 deletions(-)

New commits:
commit 6c5c0302f3624ec7c3b862c98d5514f29328bbe9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Sep 1 20:26:27 2013 +0100

    XubString->OUString
    
    Change-Id: I8bf16712cee985c1eeeea9e42479f22de2a43597

diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index 0b0305c..fead690 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -189,11 +189,11 @@ public:
     void AddUndoActions( std::vector< SdrUndoAction* >& );
 
     // Layerverwaltung. Mit Undo.
-    SdrLayer* InsertNewLayer(const String& rName, sal_uInt16 nPos=0xFFFF);
+    SdrLayer* InsertNewLayer(const OUString& rName, sal_uInt16 nPos=0xFFFF);
     // Loeschen eines Layer inkl. aller darauf befindlichen Objekte
-    void      DeleteLayer(const String& rName);
+    void      DeleteLayer(const OUString& rName);
     // Verschieben eines Layer (Layerreihenfolge aendern)
-    void      MoveLayer(const String& rName, sal_uInt16 nNewPos);
+    void      MoveLayer(const OUString& rName, sal_uInt16 nNewPos);
 
     // Markierte Objekte die ausserhalb ihrer Page liegen
     // werden ggf. einer anderen Page zugewiesen
diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx
index 2a485be..d4de159 100644
--- a/include/svx/svdpagv.hxx
+++ b/include/svx/svdpagv.hxx
@@ -119,8 +119,8 @@ private:
 
     void ImpInvalidateHelpLineArea(sal_uInt16 nNum) const;
 
-    void SetLayer(const String& rName, SetOfByte& rBS, sal_Bool bJa);
-    sal_Bool IsLayer(const String& rName, const SetOfByte& rBS) const;
+    void SetLayer(const OUString& rName, SetOfByte& rBS, bool bJa);
+    bool IsLayer(const OUString& rName, const SetOfByte& rBS) const;
 
     // Nachsehen, ob AktGroup noch Inserted ist.
     void CheckAktGroup();
@@ -195,8 +195,8 @@ public:
     Rectangle& MarkBound() { return aMarkBound; }
     Rectangle& MarkSnap() { return aMarkSnap; }
 
-    void SetLayerVisible(const String& rName, sal_Bool bShow = sal_True) { SetLayer(rName, aLayerVisi, bShow); if(!bShow) AdjHdl(); InvalidateAllWin(); }
-    sal_Bool IsLayerVisible(const String& rName) const { return IsLayer(rName, aLayerVisi); }
+    void SetLayerVisible(const OUString& rName, bool bShow = true) { SetLayer(rName, aLayerVisi, bShow); if(!bShow) AdjHdl(); InvalidateAllWin(); }
+    bool IsLayerVisible(const OUString& rName) const { return IsLayer(rName, aLayerVisi); }
 
     void SetLayerLocked(const String& rName, sal_Bool bLock = sal_True) { SetLayer(rName, aLayerLock, bLock); if(bLock) AdjHdl(); }
     sal_Bool IsLayerLocked(const String& rName) const { return IsLayer(rName,aLayerLock); }
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 2e9bc25..69bc1ff 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -353,8 +353,8 @@ public:
     virtual void AddWindowToPaintView(OutputDevice* pNewWin);
     virtual void DeleteWindowFromPaintView(OutputDevice* pOldWin);
 
-    void SetLayerVisible(const String& rName, sal_Bool bShow=sal_True);
-    bool IsLayerVisible(const String& rName) const;
+    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;
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index 0194e05..d8ea1f4 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -102,7 +102,7 @@ SdrEditView::~SdrEditView()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-SdrLayer* SdrEditView::InsertNewLayer(const XubString& rName, sal_uInt16 nPos)
+SdrLayer* SdrEditView::InsertNewLayer(const OUString& rName, sal_uInt16 nPos)
 {
     SdrLayerAdmin& rLA=pMod->GetLayerAdmin();
     sal_uInt16 nMax=rLA.GetLayerCount();
@@ -196,7 +196,7 @@ void SdrEditView::ImpDelLayerDelObjs(SdrObjList* pOL, SdrLayerID nDelID)
     }
 }
 
-void SdrEditView::DeleteLayer(const XubString& rName)
+void SdrEditView::DeleteLayer(const OUString& rName)
 {
     SdrLayerAdmin& rLA = pMod->GetLayerAdmin();
     SdrLayer* pLayer = rLA.GetLayer(rName, sal_True);
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index cd13358..310897d 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -612,7 +612,7 @@ void SdrPageView::AdjHdl()
     GetView().AdjustMarkHdl();
 }
 
-void SdrPageView::SetLayer(const XubString& rName, SetOfByte& rBS, sal_Bool bJa)
+void SdrPageView::SetLayer(const OUString& rName, SetOfByte& rBS, bool bJa)
 {
     if(!GetPage())
         return;
@@ -623,16 +623,16 @@ void SdrPageView::SetLayer(const XubString& rName, SetOfByte& rBS, sal_Bool bJa)
         rBS.Set(nID, bJa);
 }
 
-sal_Bool SdrPageView::IsLayer(const XubString& rName, const SetOfByte& rBS) const
+bool SdrPageView::IsLayer(const OUString& rName, const SetOfByte& rBS) const
 {
     if(!GetPage())
-        return sal_False;
+        return false;
 
-    sal_Bool bRet(sal_False);
+    bool bRet(false);
 
-    if(rName.Len())
+    if (!rName.isEmpty())
     {
-        SdrLayerID nId = GetPage()->GetLayerAdmin().GetLayerID(rName, sal_True);
+        SdrLayerID nId = GetPage()->GetLayerAdmin().GetLayerID(rName, true);
 
         if(SDRLAYER_NOTFOUND != nId)
         {
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 3b7aeb9..7356a50 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -509,17 +509,17 @@ void SdrPaintView::DeleteWindowFromPaintView(OutputDevice* pOldWin)
 #endif
 }
 
-void SdrPaintView::SetLayerVisible(const XubString& rName, sal_Bool bShow)
+void SdrPaintView::SetLayerVisible(const OUString& rName, bool bShow)
 {
     if(mpPageView)
     {
-        mpPageView->SetLayerVisible(rName,bShow);
+        mpPageView->SetLayerVisible(rName, bShow);
     }
 
     InvalidateAllWin();
 }
 
-bool SdrPaintView::IsLayerVisible(const XubString& rName) const
+bool SdrPaintView::IsLayerVisible(const OUString& rName) const
 {
     if(mpPageView)
     {