diff options
| author | Adrien Ollier <adr.ollier@hotmail.fr> | 2019-04-24 04:18:09 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-05-07 08:28:43 +0200 |
| commit | 0e791f4e59f0288081375d26d281a5aef41b628d (patch) | |
| tree | 95e6caecaaa60d937b00e67552b570a07a18960e /editeng | |
| parent | WidgetDefinition: add "action" state for the PushButton (diff) | |
| download | core-0e791f4e59f0288081375d26d281a5aef41b628d.tar.gz core-0e791f4e59f0288081375d26d281a5aef41b628d.zip | |
tdf#74702 partial cleanup of OutDevType
XParaPortionList::RefDevIsVirtual() does not depend on eRefDevType
Change-Id: I22182bbe26502552125d24aa1a8c33ffb5a38971
Signed-off-by: Adrien Ollier <adr.ollier@hotmail.fr>
Reviewed-on: https://gerrit.libreoffice.org/71649
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/editobj.cxx | 3 | ||||
| -rw-r--r-- | editeng/source/editeng/editobj2.hxx | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index c33d17d62ee8..dd4b710f3ef4 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -91,8 +91,7 @@ void XEditAttribute::SetItem(const SfxPoolItem& rNew) XParaPortionList::XParaPortionList( OutputDevice* pRefDev, sal_uLong nPW, sal_uInt16 _nStretchX, sal_uInt16 _nStretchY) - : nRefDevPtr(pRefDev) - , eRefDevType(pRefDev->GetOutDevType()) + : pRefDevPtr(pRefDev) , aRefMapMode(pRefDev->GetMapMode()) , nStretchX(_nStretchX) , nStretchY(_nStretchY) diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx index 24c399db53a1..c833e4b57d99 100644 --- a/editeng/source/editeng/editobj2.hxx +++ b/editeng/source/editeng/editobj2.hxx @@ -96,8 +96,7 @@ class XParaPortionList typedef std::vector<std::unique_ptr<XParaPortion> > ListType; ListType maList; - VclPtr<OutputDevice> nRefDevPtr; - OutDevType eRefDevType; + VclPtr<OutputDevice> pRefDevPtr; MapMode aRefMapMode; sal_uInt16 nStretchX; sal_uInt16 nStretchY; @@ -109,10 +108,9 @@ public: void push_back(XParaPortion* p); const XParaPortion& operator[](size_t i) const; - OutputDevice* GetRefDevPtr() const { return nRefDevPtr; } + OutputDevice* GetRefDevPtr() const { return pRefDevPtr; } sal_uLong GetPaperWidth() const { return nPaperWidth; } - bool RefDevIsVirtual() const - { return (eRefDevType == OUTDEV_VIRDEV) || (eRefDevType == OUTDEV_PDF); } + bool RefDevIsVirtual() const {return pRefDevPtr->IsVirtual();} const MapMode& GetRefMapMode() const { return aRefMapMode; } sal_uInt16 GetStretchX() const { return nStretchX; } sal_uInt16 GetStretchY() const { return nStretchY; } |