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 /sd/source/ui/annotations/annotationmanagerimpl.hxx | |
| parent | Disable HTML export "hspace" and "vspace" check on OSX (diff) | |
| download | core-827c46e7d75000cb03b0ce21759f9d0825f0c096.tar.gz core-827c46e7d75000cb03b0ce21759f9d0825f0c096.zip | |
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 'sd/source/ui/annotations/annotationmanagerimpl.hxx')
| -rw-r--r-- | sd/source/ui/annotations/annotationmanagerimpl.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index f81c76112fcd..61f6705072fe 100644 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -78,7 +78,7 @@ public: void DeleteAnnotationsByAuthor( const OUString& sAuthor ); void DeleteAllAnnotations(); - void ExecuteAnnotationContextMenu( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, ::Window* pParent, const Rectangle& rContextRect, bool bButtonMenu = false ); + void ExecuteAnnotationContextMenu( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, vcl::Window* pParent, const Rectangle& rContextRect, bool bButtonMenu = false ); Color GetColorDark(sal_uInt16 aAuthorIndex); Color GetColorLight(sal_uInt16 aAuthorIndex); |