[ooo-build-commit] Branch 'ooo/OOO320' - 2 commits - sd/source

[Jan Holesovsky]

 sd/source/core/sdpage.cxx                                 |    2 +-
 sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx |    8 +-------
 sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx |   11 +----------
 sd/source/ui/inc/AccessibleDocumentViewBase.hxx           |    4 +++-
 sd/source/ui/inc/AccessibleDrawDocumentView.hxx           |    4 ++--
 5 files changed, 8 insertions(+), 21 deletions(-)

New commits:
commit e11d6f6eecdc028417ad5dd9e15b3ecaabfec769
Author: Oliver Bolte <obo at openoffice.org>
Date:   Wed Nov 11 14:21:16 2009 +0000

    CWS-TOOLING: integrate CWS ooo32gsl03
    2009-11-04 20:19:30 +0100 hdu  r277364 : #i105769# final cleanup of the trapezoid converter for OOO320
    2009-11-04 18:54:50 +0100 hdu  r277363 : #i105769# force intersection point to be bit-identical on each involved segment
    2009-11-03 08:04:26 +0100 hdu  r277308 : #i105769# remove elimination of horizontal segments out of intersection solver again
    2009-11-02 19:06:32 +0100 hdu  r277304 : #i105769# adjust my intersection-solver for the needs of the trapezoid converter
    2009-11-02 11:03:31 +0100 hdu  r277291 : #i105769# start integrating my intersection-solver
    2009-10-28 17:04:53 +0100 cl  r277246 : #i106369# only hide placeholder on master page not all text shapes
    2009-10-28 17:00:22 +0100 aw  r277245 : #i106183# added fix as described tin task
    2009-10-27 18:08:07 +0100 pl  r277229 : #i106351# avoid early exits when changing state
    2009-10-27 16:25:59 +0100 aw  r277217 : #i103454# need to set all PaperSizes (three) at the Outliner to get the right layout
    2009-10-27 13:29:43 +0100 pl  r277201 : #i106261# do not confuse stop with start
    2009-10-27 12:48:36 +0100 pl  r277199 : #i106261# avoid duplicate initialization

diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 75bb8df..3459c5f 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -2883,7 +2883,7 @@ bool SdPage::checkVisibility(
                     }
                 }
             } // check for placeholders on master
-            else if( pCheckPage->IsMasterPage() && ( pVisualizedPage != pCheckPage ) ) 
+            else if( (eKind != PRESOBJ_NONE) && pCheckPage->IsMasterPage() && ( pVisualizedPage != pCheckPage ) ) 
             {
                 // presentation objects on master slide are always invisible if slide is shown.
                 return false;
commit dafbbc3971c4b8be0f98a67beed0e98a4b329eb2
Author: Oliver Bolte <obo at openoffice.org>
Date:   Wed Nov 11 12:32:18 2009 +0000

    CWS-TOOLING: integrate CWS impressaccessibility6
    2009-10-16 17:00:36 +0200 af  r276986 : #i105958# Fixed throw part of declaration of getAccessibleChild().

diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 387241b..b7810a6 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -39,17 +39,11 @@
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/document/XEventBroadcaster.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#ifndef _COM_SUN_STAR_ACCESSIBLE_ACCESSIBLEEVENTID_HPP_
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#endif
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#ifndef	_COM_SUN_STAR_LANG_XMULSTISERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
 #include <rtl/ustring.h>
-#ifndef _SFXFRAME_HXX
 #include<sfx2/viewfrm.hxx>
-#endif
 
 #include <svx/AccessibleShape.hxx>
 
@@ -279,7 +273,7 @@ sal_Int32 SAL_CALL
 
 Reference<XAccessible> SAL_CALL
     AccessibleDocumentViewBase::getAccessibleChild (sal_Int32 nIndex)
-    throw (uno::RuntimeException)
+    throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
 {
     ThrowIfDisposed ();
 
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 13e7dfd..3f1d526 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -40,20 +40,11 @@
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/document/XEventBroadcaster.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#ifndef _COM_SUN_STAR_ACCESSIBLE_ACCESSIBLEEVENTID_HPP_
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#endif
-#ifndef _COM_SUN_STAR_ACCESSIBLE_ACCESSIBLESTATETYPE_HPP_
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#endif
-#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#ifndef	_COM_SUN_STAR_LANG_XMULSTISERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
 #include <rtl/ustring.h>
-#ifndef _SFXFRAME_HXX
 #include<sfx2/viewfrm.hxx>
-#endif
 
 #include <svx/AccessibleShape.hxx>
 
@@ -243,7 +234,7 @@ sal_Int32 SAL_CALL
 
 uno::Reference<XAccessible> SAL_CALL
     AccessibleDrawDocumentView::getAccessibleChild (sal_Int32 nIndex)
-    throw (::com::sun::star::uno::RuntimeException)
+    throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
 {
     ThrowIfDisposed ();
 
diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
index db7f030..8c28dec 100644
--- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
+++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
@@ -42,6 +42,7 @@
 #include <com/sun/star/awt/XFocusListener.hpp>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <tools/link.hxx>
 
 namespace sd {
@@ -159,7 +160,8 @@ public:
     virtual ::com::sun::star::uno::Reference<
         ::com::sun::star::accessibility::XAccessible> SAL_CALL
         getAccessibleChild (sal_Int32 nIndex)
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::uno::RuntimeException,
+            ::com::sun::star::lang::IndexOutOfBoundsException);
 
 
     //=====  XAccessibleComponent  ============================================
diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
index c6404c2..bba70ad 100644
--- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
+++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx
@@ -33,7 +33,6 @@
 
 #include "AccessibleDocumentViewBase.hxx"
 
-
 namespace accessibility {
 
 
@@ -78,7 +77,8 @@ public:
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
         getAccessibleChild (sal_Int32 nIndex)
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::uno::RuntimeException,
+            ::com::sun::star::lang::IndexOutOfBoundsException);
 
 
     //=====  lang::XEventListener  ============================================