Anonymous avatar Anonymous committed 7147fcc Merge

merged OOO330 m2

Comments (0)

Files changed (1247)

 a5fb3c4091cbac8324a98bf080c08ef626b32258 DEV300_m82
 23debe0bf2cd63dd34c412ccb0de5e4dcfe62e58 DEV300_m83
 85e7cfbbb08a63f906a1e6b83423c151680ccc19 DEV300_m84
+a57ff7adc11c8c7c35824b12fc5bc204b724ea9c OOO330_m0
+a61542f65727f9e64991c85056c22f890fd8934b OOO330_m1
+c85a59971620bc9e04ad689600ee9846f0f9dc18 OOO330_m2

accessibility/source/extended/textwindowaccessibility.cxx

                 determineVisibleRange();
                 notifyVisibleRangeChanges(aOldVisibleBegin, aOldVisibleEnd,
                                           m_xParagraphs->end());
-                Paragraphs::iterator aIt(m_xParagraphs->begin() + n);
-                ::rtl::Reference< ParagraphImpl > xParagraph(getParagraph(aIt));
-                if (xParagraph.is())
-                    xParagraph->textChanged();
+
+                if (n < m_xParagraphs->size())
+                {
+                    Paragraphs::iterator aIt(m_xParagraphs->begin() + n);
+                    ::rtl::Reference< ParagraphImpl > xParagraph(getParagraph(aIt));
+                    if (xParagraph.is())
+                        xParagraph->textChanged();
+                }
                 break;
             }
         default:

accessibility/source/standard/vclxaccessiblelistboxlist.cxx

-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_accessibility.hxx"
-#include <accessibility/standard/vclxaccessiblelistboxlist.hxx>
-#include <accessibility/standard/vclxaccessiblelistitem.hxx>
-#include <accessibility/helper/listboxhelper.hxx>
-
-#include <algorithm>
-
-#include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#include <tools/debug.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/unohelp.hxx>
-
-#include <toolkit/awt/vclxwindow.hxx>
-#include <toolkit/helper/convert.hxx>
-
-#include <comphelper/sequence.hxx>
-#include <cppuhelper/typeprovider.hxx>
-#include <unotools/accessiblestatesethelper.hxx>
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::accessibility;
-
-
-namespace
-{
-	void checkSelection_Impl( sal_Int32 _nIndex, const ListBox& _rListBox, sal_Bool bSelected )
-        throw (::com::sun::star::lang::IndexOutOfBoundsException)
-	{
-		sal_Int32 nCount = bSelected ? (sal_Int32)_rListBox.GetSelectEntryCount()
-									 : (sal_Int32)_rListBox.GetEntryCount();
-		if ( _nIndex < 0 || _nIndex >= nCount )
-			throw ::com::sun::star::lang::IndexOutOfBoundsException();
-	}
-}
-
-
-VCLXAccessibleListBoxList::VCLXAccessibleListBoxList (VCLXWindow* pVCLWindow,
-    BoxType aBoxType,const Reference< XAccessible >& _xParent)
-    : VCLXAccessibleList (pVCLWindow, aBoxType, _xParent)
-{
-}
-
-
-
-
-VCLXAccessibleListBoxList::~VCLXAccessibleListBoxList (void)
-{
-}
-
-
-
-
-void VCLXAccessibleListBoxList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent)
-{
-	switch ( rVclWindowEvent.GetId() )
-	{
-		case VCLEVENT_LISTBOX_SCROLLED:
-			UpdateEntryRange_Impl();
-			break;
-
-		case VCLEVENT_LISTBOX_SELECT:
-			if ( !m_bDisableProcessEvent )
-				UpdateSelection_Impl();
-			break;
-
-		default:
-			VCLXAccessibleList::ProcessWindowEvent (rVclWindowEvent);
-	}
-}
-
-IMPLEMENT_FORWARD_XINTERFACE2(VCLXAccessibleListBoxList, VCLXAccessibleList, VCLXAccessibleListBoxList_BASE)
-IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleListBoxList, VCLXAccessibleList, VCLXAccessibleListBoxList_BASE)
-
-
-
-//=====  XServiceInfo  ========================================================
-
-::rtl::OUString VCLXAccessibleListBoxList::getImplementationName (void)
-    throw (RuntimeException)
-{
-	return ::rtl::OUString::createFromAscii("com.sun.star.comp.toolkit.AccessibleListBoxList");
-}
-
-
-
-
-Sequence< ::rtl::OUString > VCLXAccessibleListBoxList::getSupportedServiceNames (void)
-    throw (RuntimeException)
-{
-	Sequence< ::rtl::OUString > aNames = VCLXAccessibleList::getSupportedServiceNames();
-	sal_Int32 nLength = aNames.getLength();
-	aNames.realloc( nLength + 1 );
-	aNames[nLength] = ::rtl::OUString::createFromAscii(
-        "com.sun.star.accessibility.AccessibleListBoxList");
-	return aNames;
-}
-// -----------------------------------------------------------------------------
-
-void VCLXAccessibleListBoxList::UpdateSelection_Impl()
-{
-	uno::Any aOldValue, aNewValue;
-
-	{
-		vos::OGuard aSolarGuard( Application::GetSolarMutex() );
-		::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-	    Reference< XAccessible > xNewAcc;
-
-	    ListBox* pListBox = static_cast< ListBox* >( GetWindow() );
-	    if ( pListBox )
-		{
-			USHORT nPos = 0;
-			ListItems::iterator aEnd = m_aAccessibleChildren.end();
-	        for ( ListItems::iterator aIter = m_aAccessibleChildren.begin();
-				  aIter != aEnd; ++aIter,++nPos)
-			{
-				if ( aIter->is() )
-				{
-					VCLXAccessibleListItem* pItem = static_cast< VCLXAccessibleListItem* >( aIter->get() );
-					// Retrieve the item's index from the list entry.
-					BOOL bNowSelected = pListBox->IsEntryPosSelected (nPos);
-
-					if ( bNowSelected && !pItem->IsSelected() )
-					{
-						xNewAcc = *aIter;
-						aNewValue <<= xNewAcc;
-						m_nLastSelectedPos = nPos;
-					}
-
-					pItem->SetSelected( bNowSelected );
-				}
-				else
-				{ // it could happen that a child was not created before
-					checkEntrySelected(pListBox,nPos,aNewValue,xNewAcc);
-				}
-			}
-
-			USHORT nCount = pListBox->GetEntryCount();
-			if ( nPos < nCount ) // here we have to check the if any other listbox entry is selected
-			{
-				for (; nPos < nCount && !checkEntrySelected(pListBox,nPos,aNewValue,xNewAcc) ;++nPos )
-					;
-			}
-		}
-
-		if ( xNewAcc.is() && pListBox->HasFocus() )
-		{