diff options
| author | Noel Grandin <noel@peralex.com> | 2013-08-30 14:32:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-05 08:54:16 +0200 |
| commit | 10f96c28ba736029aee431307f70f07e5c0269dc (patch) | |
| tree | f3c4a269f609d42f2cc22781fbaac164fa3b8b50 /include | |
| parent | f4b76b7b160467a4d67689e1fe24d481df714ce5 (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 'include')
| -rw-r--r-- | include/svx/svdcrtv.hxx | 6 | ||||
| -rw-r--r-- | include/svx/svdpntv.hxx | 16 |
2 files changed, 10 insertions, 12 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 ..) |