diff options
| -rwxr-xr-x | sd/source/ui/inc/AccessibleTreeNode.hxx | 14 | ||||
| -rw-r--r-- | sd/source/ui/inc/optsitem.hxx | 10 |
2 files changed, 15 insertions, 9 deletions
diff --git a/sd/source/ui/inc/AccessibleTreeNode.hxx b/sd/source/ui/inc/AccessibleTreeNode.hxx index cf27a99c9a98..8651a90cec22 100755 --- a/sd/source/ui/inc/AccessibleTreeNode.hxx +++ b/sd/source/ui/inc/AccessibleTreeNode.hxx @@ -62,7 +62,7 @@ namespace accessibility { class AccessibleSlideSorterObject; -typedef ::cppu::WeakComponentImplHelper5< +typedef ::cppu::PartialWeakComponentImplHelper5< ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleEventBroadcaster, ::com::sun::star::accessibility::XAccessibleContext, @@ -104,6 +104,15 @@ public: virtual void SAL_CALL disposing (void); + //===== XComponent ======================================================= + + virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException) + { WeakComponentImplHelperBase::dispose(); } + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException) + { WeakComponentImplHelperBase::addEventListener(xListener); } + virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException) + { WeakComponentImplHelperBase::removeEventListener(xListener); } + //===== XAccessible ======================================================= virtual ::com::sun::star::uno::Reference< @@ -126,9 +135,6 @@ public: ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener ) throw (::com::sun::star::uno::RuntimeException); - using cppu::WeakComponentImplHelperBase::addEventListener; - using cppu::WeakComponentImplHelperBase::removeEventListener; - //===== XAccessibleContext ============================================== /// Return the number of currently visible children. diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index ef3f531bea57..42ecc2bd118b 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -146,11 +146,11 @@ class SD_DLLPUBLIC SdOptionsLayout : public SdOptionsGeneric { private: - sal_Bool bRuler : 1; // Layout/Display/Ruler - sal_Bool bMoveOutline : 1; // Layout/Display/Contur - sal_Bool bDragStripes : 1; // Layout/Display/Guide - sal_Bool bHandlesBezier : 1; // Layout/Display/Bezier - sal_Bool bHelplines : 1; // Layout/Display/Helpline + sal_Bool bRuler; // Layout/Display/Ruler + sal_Bool bMoveOutline; // Layout/Display/Contur + sal_Bool bDragStripes; // Layout/Display/Guide + sal_Bool bHandlesBezier; // Layout/Display/Bezier + sal_Bool bHelplines; // Layout/Display/Helpline sal_uInt16 nMetric; // Layout/Other/MeasureUnit sal_uInt16 nDefTab; // Layout/Other/TabStop |