Merge branch 'master' into feature/killsdf

Conflicts:
	Repository.mk
	RepositoryFixes.mk
	connectivity/prj/build.lst
	extensions/prj/build.lst
	filter/prj/build.lst
	fpicker/prj/build.lst
	l10ntools/StaticLibrary_transex.mk
	saxon/build.xml
	shell/prj/build.lst
	solenv/gbuild/AllLangResTarget.mk
	solenv/gbuild/Configuration.mk
	solenv/gbuild/UI.mk
	ucb/source/ucp/webdav/webdavcontent.cxx

11 files changed, 110 insertions, 147 deletions

diff --git a/accessibility/Jar_accessibility.mk b/accessibility/Jar_accessibility.mk
deleted file mode 100644
index 0f7af1d4b26e..000000000000
--- a/accessibility/Jar_accessibility.mk
+++ /dev/null
@@ -1,90 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Jar_Jar,java_accessibility))
-
-$(eval $(call gb_Jar_use_jars,java_accessibility,\
-    jurt \
-    ridl \
-    unoil \
-))
-
-$(eval $(call gb_Jar_set_packageroot,java_accessibility,org))
-
-$(eval $(call gb_Jar_add_sourcefiles,java_accessibility,\
-    accessibility/bridge/org/openoffice/java/accessibility/AbstractButton \
-    accessibility/bridge/org/openoffice/java/accessibility/AccessibleActionImpl \
-    accessibility/bridge/org/openoffice/java/accessibility/AccessibleComponentImpl \
-    accessibility/bridge/org/openoffice/java/accessibility/AccessibleEditableTextImpl \
-    accessibility/bridge/org/openoffice/java/accessibility/AccessibleExtendedState \
-    accessibility/bridge/org/openoffice/java/accessibility/AccessibleHypertextImpl \
-    accessibility/bridge/org/openoffice/java/accessibility/AccessibleIconImpl \
-    accessibility/bridge/org/openoffice/java/accessibility/AccessibleKeyBinding \
-    accessibility/bridge/org/openoffice/java/accessibility/AccessibleObjectFactory \
-    accessibility/bridge/org/openoffice/java/accessibility/AccessibleRoleAdapter \
-    accessibility/bridge/org/openoffice/java/accessibility/AccessibleSelectionImpl \
-    accessibility/bridge/org/openoffice/java/accessibility/AccessibleStateAdapter \
-    accessibility/bridge/org/openoffice/java/accessibility/AccessibleTextImpl \
-    accessibility/bridge/org/openoffice/java/accessibility/AccessibleValueImpl \
-    accessibility/bridge/org/openoffice/java/accessibility/Alert \
-    accessibility/bridge/org/openoffice/java/accessibility/Application \
-    accessibility/bridge/org/openoffice/java/accessibility/Button \
-    accessibility/bridge/org/openoffice/java/accessibility/CheckBox \
-    accessibility/bridge/org/openoffice/java/accessibility/ComboBox \
-    accessibility/bridge/org/openoffice/java/accessibility/Component \
-    accessibility/bridge/org/openoffice/java/accessibility/Container \
-    accessibility/bridge/org/openoffice/java/accessibility/DescendantManager \
-    accessibility/bridge/org/openoffice/java/accessibility/Dialog \
-    accessibility/bridge/org/openoffice/java/accessibility/FocusTraversalPolicy \
-    accessibility/bridge/org/openoffice/java/accessibility/Frame \
-    accessibility/bridge/org/openoffice/java/accessibility/Icon \
-    accessibility/bridge/org/openoffice/java/accessibility/Label \
-    accessibility/bridge/org/openoffice/java/accessibility/List \
-    accessibility/bridge/org/openoffice/java/accessibility/Menu \
-    accessibility/bridge/org/openoffice/java/accessibility/MenuContainer \
-    accessibility/bridge/org/openoffice/java/accessibility/MenuItem \
-    accessibility/bridge/org/openoffice/java/accessibility/NativeFrame \
-    accessibility/bridge/org/openoffice/java/accessibility/Paragraph \
-    accessibility/bridge/org/openoffice/java/accessibility/RadioButton \
-    accessibility/bridge/org/openoffice/java/accessibility/ScrollBar \
-    accessibility/bridge/org/openoffice/java/accessibility/Separator \
-    accessibility/bridge/org/openoffice/java/accessibility/Table \
-    accessibility/bridge/org/openoffice/java/accessibility/TextComponent \
-    accessibility/bridge/org/openoffice/java/accessibility/ToggleButton \
-    accessibility/bridge/org/openoffice/java/accessibility/ToolTip \
-    accessibility/bridge/org/openoffice/java/accessibility/Tree \
-    accessibility/bridge/org/openoffice/java/accessibility/Window \
-    accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleEventLog \
-    accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleHypertextLog \
-    accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleTextLog \
-))
-
-$(eval $(call gb_Jar_add_generated_sourcefiles,java_accessibility,\
-    CustomTarget/accessibility/bridge/org/openoffice/java/accessibility/Build \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/accessibility/Jar_uno_accessbridge.mk b/accessibility/Jar_uno_accessbridge.mk
index 20be9f8b68b1..0486750633af 100644
--- a/accessibility/Jar_uno_accessbridge.mk
+++ b/accessibility/Jar_uno_accessbridge.mk
@@ -28,7 +28,6 @@
 $(eval $(call gb_Jar_Jar,java_uno_accessbridge))
 
 $(eval $(call gb_Jar_use_jars,java_uno_accessbridge,\
-    java_accessibility \
     jurt \
     ridl \
     unoil \
@@ -45,6 +44,55 @@ $(eval $(call gb_Jar_add_sourcefiles,java_uno_accessbridge,\
     accessibility/bridge/org/openoffice/accessibility/KeyHandler \
     accessibility/bridge/org/openoffice/accessibility/PopupWindow \
     accessibility/bridge/org/openoffice/accessibility/WindowsAccessBridgeAdapter \
+    accessibility/bridge/org/openoffice/java/accessibility/AbstractButton \
+    accessibility/bridge/org/openoffice/java/accessibility/AccessibleActionImpl \
+    accessibility/bridge/org/openoffice/java/accessibility/AccessibleComponentImpl \
+    accessibility/bridge/org/openoffice/java/accessibility/AccessibleEditableTextImpl \
+    accessibility/bridge/org/openoffice/java/accessibility/AccessibleExtendedState \
+    accessibility/bridge/org/openoffice/java/accessibility/AccessibleHypertextImpl \
+    accessibility/bridge/org/openoffice/java/accessibility/AccessibleIconImpl \
+    accessibility/bridge/org/openoffice/java/accessibility/AccessibleKeyBinding \
+    accessibility/bridge/org/openoffice/java/accessibility/AccessibleObjectFactory \
+    accessibility/bridge/org/openoffice/java/accessibility/AccessibleRoleAdapter \
+    accessibility/bridge/org/openoffice/java/accessibility/AccessibleSelectionImpl \
+    accessibility/bridge/org/openoffice/java/accessibility/AccessibleStateAdapter \
+    accessibility/bridge/org/openoffice/java/accessibility/AccessibleTextImpl \
+    accessibility/bridge/org/openoffice/java/accessibility/AccessibleValueImpl \
+    accessibility/bridge/org/openoffice/java/accessibility/Alert \
+    accessibility/bridge/org/openoffice/java/accessibility/Application \
+    accessibility/bridge/org/openoffice/java/accessibility/Button \
+    accessibility/bridge/org/openoffice/java/accessibility/CheckBox \
+    accessibility/bridge/org/openoffice/java/accessibility/ComboBox \
+    accessibility/bridge/org/openoffice/java/accessibility/Component \
+    accessibility/bridge/org/openoffice/java/accessibility/Container \
+    accessibility/bridge/org/openoffice/java/accessibility/DescendantManager \
+    accessibility/bridge/org/openoffice/java/accessibility/Dialog \
+    accessibility/bridge/org/openoffice/java/accessibility/FocusTraversalPolicy \
+    accessibility/bridge/org/openoffice/java/accessibility/Frame \
+    accessibility/bridge/org/openoffice/java/accessibility/Icon \
+    accessibility/bridge/org/openoffice/java/accessibility/Label \
+    accessibility/bridge/org/openoffice/java/accessibility/List \
+    accessibility/bridge/org/openoffice/java/accessibility/Menu \
+    accessibility/bridge/org/openoffice/java/accessibility/MenuContainer \
+    accessibility/bridge/org/openoffice/java/accessibility/MenuItem \
+    accessibility/bridge/org/openoffice/java/accessibility/NativeFrame \
+    accessibility/bridge/org/openoffice/java/accessibility/Paragraph \
+    accessibility/bridge/org/openoffice/java/accessibility/RadioButton \
+    accessibility/bridge/org/openoffice/java/accessibility/ScrollBar \
+    accessibility/bridge/org/openoffice/java/accessibility/Separator \
+    accessibility/bridge/org/openoffice/java/accessibility/Table \
+    accessibility/bridge/org/openoffice/java/accessibility/TextComponent \
+    accessibility/bridge/org/openoffice/java/accessibility/ToggleButton \
+    accessibility/bridge/org/openoffice/java/accessibility/ToolTip \
+    accessibility/bridge/org/openoffice/java/accessibility/Tree \
+    accessibility/bridge/org/openoffice/java/accessibility/Window \
+    accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleEventLog \
+    accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleHypertextLog \
+    accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleTextLog \
+))
+
+$(eval $(call gb_Jar_add_generated_sourcefiles,java_uno_accessbridge,\
+    CustomTarget/accessibility/bridge/org/openoffice/java/accessibility/Build \
 ))
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/accessibility/Module_accessibility.mk b/accessibility/Module_accessibility.mk
index 368973e54581..47751e88b396 100644
--- a/accessibility/Module_accessibility.mk
+++ b/accessibility/Module_accessibility.mk
@@ -37,7 +37,6 @@ ifeq ($(OS),WNT)
 $(eval $(call gb_Module_add_targets,accessibility,\
     CustomTarget_bridge \
     CustomTarget_bridge_inc \
-    Jar_accessibility \
     Jar_uno_accessbridge \
     Library_java_uno_accessbridge \
 ))
diff --git a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
index cb0fa441fc49..5b66b22106d3 100644
--- a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
+++ b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
@@ -68,12 +68,12 @@ jmethodID g_jmRevokeTopWindow = 0;
 // functions
 //------------------------------------------------------------------------
 
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *, void *)
+SAL_DLLPUBLIC_EXPORT jint JNICALL JNI_OnLoad(JavaVM *, void *)
 {
     return JNI_VERSION_1_2;
 }
 
-JNIEXPORT jbyteArray JNICALL
+SAL_DLLPUBLIC_EXPORT jbyteArray JNICALL
 Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_getProcessID(JNIEnv *pJNIEnv, jclass clazz)
 {
     // Initialize global class and method references
@@ -109,7 +109,7 @@ Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_getProcessID(JNIEnv
     return jbaProcessID;
 }
 
-JNIEXPORT jboolean JNICALL
+SAL_DLLPUBLIC_EXPORT jboolean JNICALL
 Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_createMapping(JNIEnv *, jclass, jlong pointer)
 {
     uno_Environment * pJava_environment = NULL;
@@ -165,7 +165,7 @@ Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_createMapping(JNIEn
     return JNI_TRUE;
 }
 
-JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *jvm, void *)
+SAL_DLLPUBLIC_EXPORT void JNICALL JNI_OnUnload(JavaVM *jvm, void *)
 {
     ::Application::RemoveEventListener(g_aEventListenerLink);
 
diff --git a/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx b/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx
index 6941c5a1af38..2027208305eb 100644
--- a/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx
+++ b/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx
@@ -47,7 +47,7 @@ namespace com { namespace sun { namespace star { namespace awt {
 } } } }
 
 class SvTreeListBox;
-class SvLBoxEntry;
+class SvTreeListEntry;
 
 //........................................................................
 namespace accessibility
@@ -119,7 +119,7 @@ namespace accessibility
             @param  _xParent
                 is our parent accessible object
         */
-        AccessibleListBoxEntry( SvTreeListBox& _rListBox, SvLBoxEntry* _pEntry,
+        AccessibleListBoxEntry( SvTreeListBox& _rListBox, SvTreeListEntry* _pEntry,
                                 const ::com::sun::star::uno::Reference<
                                     ::com::sun::star::accessibility::XAccessible >& _xParent );
 
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
index a1dd5ab94835..cd95a11ccd30 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
@@ -213,7 +213,7 @@ namespace accessibility
     {
         ENSURE_OR_RETURN_VOID( i_nPosition <= m_aChildren.size(), "AccessibleToolPanelTabBar_Impl::PanelInserted: illegal position (or invalid cache!)" );
         (void)i_pPanel;
-        m_aChildren.insert( m_aChildren.begin() + i_nPosition, NULL );
+        m_aChildren.insert( m_aChildren.begin() + i_nPosition, (Reference< XAccessible >)NULL );
         m_rAntiImpl.NotifyAccessibleEvent( AccessibleEventId::CHILD, Any(), makeAny( getAccessiblePanelItem( i_nPosition ) ) );
     }
 
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx
index 4a43b6c235fd..63dc7add5905 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -81,7 +81,7 @@ namespace accessibility
                 {
                     if ( getListBox() && getListBox()->HasFocus() )
                     {
-                        SvLBoxEntry* pEntry = static_cast< SvLBoxEntry* >( rVclWindowEvent.GetData() );
+                        SvTreeListEntry* pEntry = static_cast< SvTreeListEntry* >( rVclWindowEvent.GetData() );
                         if ( !pEntry )
                             pEntry = getListBox()->GetCurEntry();
 
@@ -105,7 +105,7 @@ namespace accessibility
                     NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
                     if ( getListBox() && getListBox()->HasFocus() )
                     {
-                        SvLBoxEntry* pEntry = static_cast< SvLBoxEntry* >( rVclWindowEvent.GetData() );
+                        SvTreeListEntry* pEntry = static_cast< SvTreeListEntry* >( rVclWindowEvent.GetData() );
                         if ( pEntry )
                         {
                             Reference< XAccessible > xChild = new AccessibleListBoxEntry( *getListBox(), pEntry, this );
@@ -120,7 +120,7 @@ namespace accessibility
                 case VCLEVENT_ITEM_EXPANDED :
                 case VCLEVENT_ITEM_COLLAPSED :
                 {
-                    SvLBoxEntry* pEntry = static_cast< SvLBoxEntry* >( rVclWindowEvent.GetData() );
+                    SvTreeListEntry* pEntry = static_cast< SvTreeListEntry* >( rVclWindowEvent.GetData() );
                     if ( pEntry )
                     {
                         AccessibleListBoxEntry* pAccListBoxEntry =
@@ -237,7 +237,7 @@ namespace accessibility
         ::comphelper::OExternalLockGuard aGuard( this );
 
         ensureAlive();
-        SvLBoxEntry* pEntry = getListBox()->GetEntry(i);
+        SvTreeListEntry* pEntry = getListBox()->GetEntry(i);
         if ( !pEntry )
             throw IndexOutOfBoundsException();
 
@@ -281,7 +281,7 @@ namespace accessibility
 
         ensureAlive();
 
-        SvLBoxEntry* pEntry = getListBox()->GetEntry( nChildIndex );
+        SvTreeListEntry* pEntry = getListBox()->GetEntry( nChildIndex );
         if ( !pEntry )
             throw IndexOutOfBoundsException();
 
@@ -294,7 +294,7 @@ namespace accessibility
 
         ensureAlive();
 
-        SvLBoxEntry* pEntry = getListBox()->GetEntry( nChildIndex );
+        SvTreeListEntry* pEntry = getListBox()->GetEntry( nChildIndex );
         if ( !pEntry )
             throw IndexOutOfBoundsException();
 
@@ -310,7 +310,7 @@ namespace accessibility
         sal_Int32 nCount = getListBox()->GetLevelChildCount( NULL );
         for ( sal_Int32 i = 0; i < nCount; ++i )
         {
-            SvLBoxEntry* pEntry = getListBox()->GetEntry( i );
+            SvTreeListEntry* pEntry = getListBox()->GetEntry( i );
             if ( getListBox()->IsSelected( pEntry ) )
                 getListBox()->Select( pEntry, sal_False );
         }
@@ -325,7 +325,7 @@ namespace accessibility
         sal_Int32 nCount = getListBox()->GetLevelChildCount( NULL );
         for ( sal_Int32 i = 0; i < nCount; ++i )
         {
-            SvLBoxEntry* pEntry = getListBox()->GetEntry( i );
+            SvTreeListEntry* pEntry = getListBox()->GetEntry( i );
             if ( !getListBox()->IsSelected( pEntry ) )
                 getListBox()->Select( pEntry, sal_True );
         }
@@ -341,7 +341,7 @@ namespace accessibility
         sal_Int32 nCount = getListBox()->GetLevelChildCount( NULL );
         for ( sal_Int32 i = 0; i < nCount; ++i )
         {
-            SvLBoxEntry* pEntry = getListBox()->GetEntry( i );
+            SvTreeListEntry* pEntry = getListBox()->GetEntry( i );
             if ( getListBox()->IsSelected( pEntry ) )
                 ++nSelCount;
         }
@@ -363,7 +363,7 @@ namespace accessibility
         sal_Int32 nCount = getListBox()->GetLevelChildCount( NULL );
         for ( sal_Int32 i = 0; i < nCount; ++i )
         {
-            SvLBoxEntry* pEntry = getListBox()->GetEntry( i );
+            SvTreeListEntry* pEntry = getListBox()->GetEntry( i );
             if ( getListBox()->IsSelected( pEntry ) )
                 ++nSelCount;
 
@@ -383,7 +383,7 @@ namespace accessibility
 
         ensureAlive();
 
-        SvLBoxEntry* pEntry = getListBox()->GetEntry( nSelectedChildIndex );
+        SvTreeListEntry* pEntry = getListBox()->GetEntry( nSelectedChildIndex );
         if ( !pEntry )
             throw IndexOutOfBoundsException();
 
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index 16ef81de82e8..e0b5bbb3cb22 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -65,7 +65,7 @@ namespace accessibility
     // Ctor() and Dtor()
     // -----------------------------------------------------------------------------
     AccessibleListBoxEntry::AccessibleListBoxEntry( SvTreeListBox& _rListBox,
-                                                    SvLBoxEntry* _pEntry,
+                                                    SvTreeListEntry* _pEntry,
                                                     const Reference< XAccessible >& _xParent ) :
 
         AccessibleListBoxEntry_BASE ( m_aMutex ),
@@ -92,11 +92,11 @@ namespace accessibility
     Rectangle AccessibleListBoxEntry::GetBoundingBox_Impl() const
     {
         Rectangle aRect;
-        SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
+        SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
         if ( pEntry )
         {
             aRect = getListBox()->GetBoundingRect( pEntry );
-            SvLBoxEntry* pParent = getListBox()->GetParent( pEntry );
+            SvTreeListEntry* pParent = getListBox()->GetParent( pEntry );
             if ( pParent )
             {
                 // position relative to parent entry
@@ -112,7 +112,7 @@ namespace accessibility
     Rectangle AccessibleListBoxEntry::GetBoundingBoxOnScreen_Impl() const
     {
         Rectangle aRect;
-        SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
+        SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
         if ( pEntry )
         {
             aRect = getListBox()->GetBoundingRect( pEntry );
@@ -173,7 +173,7 @@ namespace accessibility
     OUString AccessibleListBoxEntry::implGetText()
     {
         OUString sRet;
-        SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
+        SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
         if ( pEntry )
             sRet = getListBox()->SearchEntryText( pEntry );
         return sRet;
@@ -295,7 +295,7 @@ namespace accessibility
         ::osl::MutexGuard aGuard( m_aMutex );
 
         EnsureIsAlive();
-        SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
+        SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
         sal_Int32 nCount = 0;
         if ( pEntry )
             nCount = getListBox()->GetLevelChildCount( pEntry );
@@ -309,8 +309,8 @@ namespace accessibility
         ::osl::MutexGuard aGuard( m_aMutex );
         EnsureIsAlive();
 
-        SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
-        SvLBoxEntry* pEntry = pParent ? getListBox()->GetEntry( pParent, i ) : NULL;
+        SvTreeListEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
+        SvTreeListEntry* pEntry = pParent ? getListBox()->GetEntry( pParent, i ) : NULL;
         if ( !pEntry )
             throw IndexOutOfBoundsException();
 
@@ -338,7 +338,7 @@ namespace accessibility
                 aParentPath.pop_back();
 
                 // get the entry for this shortened access path
-                SvLBoxEntry* pParentEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
+                SvTreeListEntry* pParentEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
                 OSL_ENSURE( pParentEntry, "AccessibleListBoxEntry::implGetParentAccessible: could not obtain a parent entry!" );
 
                 if ( pParentEntry )
@@ -454,7 +454,7 @@ namespace accessibility
         ::osl::MutexGuard aGuard( m_aMutex );
 
         EnsureIsAlive();
-        SvLBoxEntry* pEntry = getListBox()->GetEntry( VCLPoint( _aPoint ) );
+        SvTreeListEntry* pEntry = getListBox()->GetEntry( VCLPoint( _aPoint ) );
         if ( !pEntry )
             throw RuntimeException();
 
@@ -539,7 +539,7 @@ namespace accessibility
             throw IndexOutOfBoundsException();
 
         awt::Rectangle aBounds( 0, 0, 0, 0 );
-        SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
+        SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
         if ( pEntry )
         {
             ::vcl::ControlLayoutData aLayoutData;
@@ -560,7 +560,7 @@ namespace accessibility
         EnsureIsAlive();
 
         sal_Int32 nIndex = -1;
-        SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
+        SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
         if ( pEntry )
         {
             ::vcl::ControlLayoutData aLayoutData;
@@ -644,7 +644,7 @@ namespace accessibility
         checkActionIndex_Impl( nIndex );
         EnsureIsAlive();
 
-        SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
+        SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
         if ( pEntry )
         {
             if ( getListBox()->IsExpanded( pEntry ) )
@@ -688,8 +688,8 @@ namespace accessibility
 
         EnsureIsAlive();
 
-        SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
-        SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, nChildIndex );
+        SvTreeListEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
+        SvTreeListEntry* pEntry = getListBox()->GetEntry( pParent, nChildIndex );
         if ( !pEntry )
             throw IndexOutOfBoundsException();
 
@@ -703,8 +703,8 @@ namespace accessibility
 
         EnsureIsAlive();
 
-        SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
-        SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, nChildIndex );
+        SvTreeListEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
+        SvTreeListEntry* pEntry = getListBox()->GetEntry( pParent, nChildIndex );
         if ( !pEntry )
             throw IndexOutOfBoundsException();
 
@@ -718,13 +718,13 @@ namespace accessibility
 
         EnsureIsAlive();
 
-        SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
+        SvTreeListEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
         if ( !pParent )
             throw RuntimeException();
         sal_Int32 nCount = getListBox()->GetLevelChildCount( pParent );
         for ( sal_Int32 i = 0; i < nCount; ++i )
         {
-            SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, i );
+            SvTreeListEntry* pEntry = getListBox()->GetEntry( pParent, i );
             if ( getListBox()->IsSelected( pEntry ) )
                 getListBox()->Select( pEntry, sal_False );
         }
@@ -737,13 +737,13 @@ namespace accessibility
 
         EnsureIsAlive();
 
-        SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
+        SvTreeListEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
         if ( !pParent )
             throw RuntimeException();
         sal_Int32 nCount = getListBox()->GetLevelChildCount( pParent );
         for ( sal_Int32 i = 0; i < nCount; ++i )
         {
-            SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, i );
+            SvTreeListEntry* pEntry = getListBox()->GetEntry( pParent, i );
             if ( !getListBox()->IsSelected( pEntry ) )
                 getListBox()->Select( pEntry, sal_True );
         }
@@ -758,13 +758,13 @@ namespace accessibility
 
         sal_Int32 i, nSelCount = 0, nCount = 0;
 
-        SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
+        SvTreeListEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
         if ( !pParent )
             throw RuntimeException();
         nCount = getListBox()->GetLevelChildCount( pParent );
         for ( i = 0; i < nCount; ++i )
         {
-            SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, i );
+            SvTreeListEntry* pEntry = getListBox()->GetEntry( pParent, i );
             if ( getListBox()->IsSelected( pEntry ) )
                 ++nSelCount;
         }
@@ -785,13 +785,13 @@ namespace accessibility
         Reference< XAccessible > xChild;
         sal_Int32 i, nSelCount = 0, nCount = 0;
 
-        SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
+        SvTreeListEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
         if ( !pParent )
             throw RuntimeException();
         nCount = getListBox()->GetLevelChildCount( pParent );
         for ( i = 0; i < nCount; ++i )
         {
-            SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, i );
+            SvTreeListEntry* pEntry = getListBox()->GetEntry( pParent, i );
             if ( getListBox()->IsSelected( pEntry ) )
                 ++nSelCount;
 
@@ -812,8 +812,8 @@ namespace accessibility
 
         EnsureIsAlive();
 
-        SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
-        SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, nSelectedChildIndex );
+        SvTreeListEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
+        SvTreeListEntry* pEntry = getListBox()->GetEntry( pParent, nSelectedChildIndex );
         if ( !pEntry )
             throw IndexOutOfBoundsException();
 
diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx
index 1ddaff3ec234..a33c9f1ea774 100644
--- a/accessibility/source/extended/accessibletablistboxtable.cxx
+++ b/accessibility/source/extended/accessibletablistboxtable.cxx
@@ -96,7 +96,7 @@ namespace accessibility
                     commitEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
                     if ( m_pTabListBox && m_pTabListBox->HasFocus() )
                     {
-                        SvLBoxEntry* pEntry = static_cast< SvLBoxEntry* >( rVclWindowEvent.GetData() );
+                        SvTreeListEntry* pEntry = static_cast< SvTreeListEntry* >( rVclWindowEvent.GetData() );
                         if ( pEntry )
                         {
                             sal_Int32 nRow = m_pTabListBox->GetEntryPos( pEntry );
@@ -136,7 +136,7 @@ namespace accessibility
                 {
                     if ( m_pTabListBox && m_pTabListBox->HasFocus() )
                     {
-                        SvLBoxEntry* pEntry = static_cast< SvLBoxEntry* >( rVclWindowEvent.GetData() );
+                        SvTreeListEntry* pEntry = static_cast< SvTreeListEntry* >( rVclWindowEvent.GetData() );
                         if ( pEntry )
                         {
                             sal_Int32 nRow = m_pTabListBox->GetEntryPos( pEntry );
@@ -161,7 +161,7 @@ namespace accessibility
                     {
                         commitEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
                         TabListBoxEventData* pData = static_cast< TabListBoxEventData* >( rVclWindowEvent.GetData() );
-                        SvLBoxEntry* pEntry = pData != NULL ? pData->m_pEntry : NULL;
+                        SvTreeListEntry* pEntry = pData != NULL ? pData->m_pEntry : NULL;
                         if ( pEntry )
                         {
                             sal_Int32 nRow = m_pTabListBox->GetEntryPos( pEntry );
@@ -244,7 +244,7 @@ namespace accessibility
         if ( m_pTabListBox )
         {
             sal_Int32 nRow = 0;
-            SvLBoxEntry* pEntry = m_pTabListBox->FirstSelected();
+            SvTreeListEntry* pEntry = m_pTabListBox->FirstSelected();
             while ( pEntry )
             {
                 ++nRow;
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 9f48b1a1ae2c..f25c46cf64f3 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include <accessibility/extended/textwindowaccessibility.hxx>
 #include "comphelper/accessibleeventnotifier.hxx"
 #include "unotools/accessiblerelationsethelper.hxx"
@@ -2124,12 +2123,19 @@ void Document::handleSelectionChangeNotification()
 
 void Document::notifySelectionChange( sal_Int32 nFirst, sal_Int32 nLast )
 {
-    if ( nFirst < nLast )
+    nFirst = std::max( nFirst, sal_Int32( 0 ) );
+    nLast = std::min( nLast, sal_Int32( m_xParagraphs->size() ) );
+    Paragraphs::iterator iFirst(m_xParagraphs->begin() + nFirst);
+    Paragraphs::iterator iLast(m_xParagraphs->begin() + nLast);
+    if ( iFirst < m_aVisibleBegin )
+        iFirst = m_aVisibleBegin;
+    if ( iLast > m_aVisibleEnd )
+        iLast = m_aVisibleEnd;
+    if ( iFirst < iLast )
     {
-        Paragraphs::iterator aEnd( ::std::min( m_xParagraphs->begin() + nLast, m_aVisibleEnd ) );
-        for ( Paragraphs::iterator aIt = ::std::max( m_xParagraphs->begin() + nFirst, m_aVisibleBegin ); aIt < aEnd; ++aIt )
+        for ( Paragraphs::iterator i = iFirst; i != iLast; i++ )
         {
-            ::rtl::Reference< ParagraphImpl > xParagraph( getParagraph( aIt ) );
+            ::rtl::Reference< ParagraphImpl > xParagraph( getParagraph( i ) );
             if ( xParagraph.is() )
             {
                 xParagraph->notifyEvent(
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx
index 60b8414c0c6f..20e4c862a895 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -143,7 +143,7 @@ OUString VCLXAccessibleEdit::implGetText()
 
         if ( getAccessibleRole() == AccessibleRole::PASSWORD_TEXT )
         {
-            xub_Unicode cEchoChar = pEdit->GetEchoChar();
+            sal_Unicode cEchoChar = pEdit->GetEchoChar();
             if ( !cEchoChar )
                 cEchoChar = '*';
             OUStringBuffer sTmp;