diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-09-01 20:26:27 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-01 20:39:19 +0100 |
commit | 6c5c0302f3624ec7c3b862c98d5514f29328bbe9 (patch) | |
tree | 9879fbad47b5957c279128f290c24da4f6832218 /include | |
parent | 277b339371727134851da1b695d9d8d30889a961 (diff) |
XubString->OUString
Change-Id: I8bf16712cee985c1eeeea9e42479f22de2a43597
Diffstat (limited to 'include')
-rw-r--r-- | include/svx/svdedtv.hxx | 6 | ||||
-rw-r--r-- | include/svx/svdpagv.hxx | 8 | ||||
-rw-r--r-- | include/svx/svdpntv.hxx | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx index 0b0305cbd4f4..fead690fb4cc 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 2a485be7a8fc..d4de159c0796 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 2e9bc2534adb..69bc1fff0199 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; |