[Libreoffice-commits] .: 3 commits - sd/source

[Caolán McNamara]

 sd/source/ui/inc/AccessibleSlideSorterObject.hxx |   12 ++++++++----
 sd/source/ui/inc/AccessibleSlideSorterView.hxx   |   14 ++++++++++----
 sd/source/ui/inc/AccessibleTreeNode.hxx          |   14 ++++++++++----
 sd/source/ui/inc/optsitem.hxx                    |   10 +++++-----
 4 files changed, 33 insertions(+), 17 deletions(-)

New commits:
commit 220be0b4e9e6fa2a8d972697b18e787248e3fd59
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 28 14:04:53 2011 +0100

    add in pre/post win to build

diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
index e2b6f68..4d78769 100644
--- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
+++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
@@ -49,7 +49,7 @@ class SlideSorter;
 namespace accessibility {
 
 
-typedef ::cppu::WeakComponentImplHelper5< 
+typedef ::cppu::PartialWeakComponentImplHelper5<
     ::com::sun::star::accessibility::XAccessible,
     ::com::sun::star::accessibility::XAccessibleEventBroadcaster,
     ::com::sun::star::accessibility::XAccessibleContext,
@@ -95,7 +95,14 @@ 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 =======================================================
 
@@ -118,9 +125,6 @@ public:
             ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener )
         throw (::com::sun::star::uno::RuntimeException);
 
-    using cppu::WeakComponentImplHelperBase::addEventListener;
-    using cppu::WeakComponentImplHelperBase::removeEventListener;
-    
     //=====  XAccessibleContext  ==============================================
 
     virtual sal_Int32 SAL_CALL
commit f74f9da7f04da63eefc2515509ffcbeb4f729228
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 28 13:46:00 2011 +0100

    use PartialWeakComponentImplHelperX for overloaded-virtual

diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx
index 2bab637..9dcc7cd 100644
--- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx
+++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx
@@ -55,7 +55,7 @@ namespace accessibility {
 
 class AccessibleSlideSorterObject;
 
-typedef ::cppu::WeakComponentImplHelper6< 
+typedef ::cppu::PartialWeakComponentImplHelper6<
     ::com::sun::star::accessibility::XAccessible,
     ::com::sun::star::accessibility::XAccessibleEventBroadcaster,
     ::com::sun::star::accessibility::XAccessibleContext,
@@ -100,6 +100,15 @@ public:
     */
     AccessibleSlideSorterObject* GetAccessibleChildImplementation (sal_Int32 nIndex);
     
+    //===== 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<
@@ -121,9 +130,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.
commit b469f603f9ffb619067a9dede0a53cecbd917c72
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 28 13:37:47 2011 +0100

    use PartialWeakComponentImplHelperX for overloaded-virtual

diff --git a/sd/source/ui/inc/AccessibleTreeNode.hxx b/sd/source/ui/inc/AccessibleTreeNode.hxx
index 870e063..70e7157 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 fa807f2..4301b5d 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