diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-14 11:06:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-15 07:15:42 +0100 |
| commit | bd79b7154dec6ad6bcc3aa5d875d22d01270e39f (patch) | |
| tree | 0387c3bb7d3117ead80bab5a3733ee6a262ddd0b /editeng | |
| parent | 0f0f585e7822888ffc60bb0172cdd92e80e8a991 (diff) | |
sal_uIntPtr->VclPtr<OutputDevice> in XParaPortionList
who knows we had to hide a pointer behind an integer type, but it's been
this way since forever
Change-Id: I9738e1137752cc8226877e2cf0291967b45dbf0e
Reviewed-on: https://gerrit.libreoffice.org/46480
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/editobj.cxx | 2 | ||||
| -rw-r--r-- | editeng/source/editeng/editobj2.hxx | 4 | ||||
| -rw-r--r-- | editeng/source/editeng/impedit4.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 8d210ceea975..59f1c17fcd0a 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -98,7 +98,7 @@ XParaPortionList::XParaPortionList( OutputDevice* pRefDev, sal_uLong nPW, sal_uInt16 _nStretchX, sal_uInt16 _nStretchY) : aRefMapMode(pRefDev->GetMapMode()), nStretchX(_nStretchX), nStretchY(_nStretchY) { - nRefDevPtr = reinterpret_cast<sal_uIntPtr>(pRefDev); + nRefDevPtr = pRefDev; nPaperWidth = nPW; eRefDevType = pRefDev->GetOutDevType(); } diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx index f8645a5e93c4..44fc5ac82c47 100644 --- a/editeng/source/editeng/editobj2.hxx +++ b/editeng/source/editeng/editobj2.hxx @@ -96,7 +96,7 @@ class XParaPortionList typedef std::vector<std::unique_ptr<XParaPortion> > ListType; ListType maList; - sal_uIntPtr nRefDevPtr; + VclPtr<OutputDevice> nRefDevPtr; OutDevType eRefDevType; MapMode aRefMapMode; sal_uInt16 nStretchX; @@ -109,7 +109,7 @@ public: void push_back(XParaPortion* p); const XParaPortion& operator[](size_t i) const; - sal_uIntPtr GetRefDevPtr() const { return nRefDevPtr; } + OutputDevice* GetRefDevPtr() const { return nRefDevPtr; } sal_uLong GetPaperWidth() const { return nPaperWidth; } OutDevType GetRefDevType() const { return eRefDevType; } const MapMode& GetRefMapMode() const { return aRefMapMode; } diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 14b9bd3aab6b..684cb969b04b 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -1186,7 +1186,7 @@ EditSelection ImpEditEngine::InsertTextObject( const EditTextObject& rTextObject && ( pPortionInfo->GetStretchX() == nStretchX ) && ( pPortionInfo->GetStretchY() == nStretchY ) ) { - if ( ( pPortionInfo->GetRefDevPtr() == reinterpret_cast<sal_uIntPtr>(GetRefDevice()) ) || + if ( ( pPortionInfo->GetRefDevPtr() == GetRefDevice() ) || ( ( pPortionInfo->GetRefDevType() == OUTDEV_VIRDEV ) && ( GetRefDevice()->GetOutDevType() == OUTDEV_VIRDEV ) ) ) bUsePortionInfo = true; |