diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-12 20:06:58 +0100 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-12 20:06:58 +0100 |
commit | c61cd1a5a26de1d1f62389988b00229c04e36693 (patch) | |
tree | 9d6de00f4d149cba080fe88f1eff71a67786b5f0 /sd/source/ui/annotations/annotationmanagerimpl.hxx | |
parent | Removed header reference that no longer exists. (diff) | |
parent | masterfix DEV300: #i10000# usage of L10N build_type (diff) | |
download | core-c61cd1a5a26de1d1f62389988b00229c04e36693.tar.gz core-c61cd1a5a26de1d1f62389988b00229c04e36693.zip |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sd/source/ui/annotations/annotationmanagerimpl.hxx')
-rw-r--r-- | sd/source/ui/annotations/annotationmanagerimpl.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index 0a31dfa0d04e..e9e50e34946e 100644 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -79,7 +79,7 @@ public: void SelectNextAnnotation(bool bForeward); - void SelectAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, bool bEdit = FALSE ); + void SelectAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, bool bEdit = sal_False ); void GetSelectedAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation ); void InsertAnnotation(); @@ -133,7 +133,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > mxSelectedAnnotation; bool mbShowAnnotations; - ULONG mnUpdateTagsEvent; + sal_uLong mnUpdateTagsEvent; Font maFont; }; |