diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
| commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
| tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /sw/inc/accmap.hxx | |
| parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (diff) | |
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.
Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'sw/inc/accmap.hxx')
| -rw-r--r-- | sw/inc/accmap.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx index 6e349b439c41..29dab399a691 100644 --- a/sw/inc/accmap.hxx +++ b/sw/inc/accmap.hxx @@ -55,7 +55,7 @@ class SwRect; class MapMode; class SwAccPreviewData; struct PreviewPage; -class Window; +namespace vcl { class Window; } // real states for events #define ACC_STATE_EDITABLE 0x01 @@ -193,12 +193,12 @@ public: // Dispose frame and its children if bRecursive is set void Dispose( const SwFrm* pFrm, const SdrObject* pObj, - Window* pWindow, + vcl::Window* pWindow, bool bRecursive = false ); void InvalidatePosOrSize( const SwFrm* pFrm, const SdrObject* pObj, - Window* pWindow, + vcl::Window* pWindow, const SwRect& rOldFrm ); void InvalidateContent( const SwFrm *pFrm ); @@ -245,7 +245,7 @@ public: void InvalidateTextSelectionOfAllParas(); sal_Int32 GetChildIndex( const SwFrm& rParentFrm, - Window& rChild ) const; + vcl::Window& rChild ) const; // update preview data (and fire events if necessary) void UpdatePreview( const std::vector<PreviewPage*>& _rPreviewPages, |