Resync to trunk, windows non-pro build aoo/aw080

24 files changed, 31 insertions, 34 deletions

diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleTextImpl.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleTextImpl.java
index 226fed223be2..979ee54b6a1d 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleTextImpl.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleTextImpl.java
@@ -637,7 +637,7 @@ public class AccessibleTextImpl implements javax.accessibility.AccessibleText {
         }
     }
 
-    /** Returns the number of characters (valid indicies) */
+    /** Returns the number of characters (valid indices) */
     public int getCharCount() {
         try {
             return unoObject.getCharacterCount();
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Component.java b/accessibility/bridge/org/openoffice/java/accessibility/Component.java
index 2fda8772ce4e..4255399270ad 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Component.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Component.java
@@ -199,7 +199,7 @@ public abstract class Component extends java.awt.Component {
     }
 
     /**
-    * Update the proxy objects appropriatly on property change events
+    * Update the proxy objects appropriately on property change events
     */
     protected class AccessibleUNOComponentListener implements XAccessibleEventListener {
 
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Container.java b/accessibility/bridge/org/openoffice/java/accessibility/Container.java
index 019e88ca50c9..97ca3288917d 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Container.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Container.java
@@ -196,7 +196,7 @@ public class Container extends java.awt.Container implements javax.accessibility
     }
 
     /**
-    * Update the proxy objects appropriatly on property change events
+    * Update the proxy objects appropriately on property change events
     */
     protected class AccessibleContainerListener implements XAccessibleEventListener {
 
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/DescendantManager.java b/accessibility/bridge/org/openoffice/java/accessibility/DescendantManager.java
index 794cb4709ba5..6282da7a5fdd 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/DescendantManager.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/DescendantManager.java
@@ -46,7 +46,7 @@ public abstract class DescendantManager extends Component {
     }
 
     /**
-    * Update the proxy objects appropriatly on property change events
+    * Update the proxy objects appropriately on property change events
     */
     protected class AccessibleDescendantManagerListener
         extends AccessibleUNOComponentListener {
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Dialog.java b/accessibility/bridge/org/openoffice/java/accessibility/Dialog.java
index 2de886a1521f..82f8bbf319b4 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Dialog.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Dialog.java
@@ -190,7 +190,7 @@ public class Dialog extends java.awt.Dialog implements javax.accessibility.Acces
     }
 
     /**
-    * Update the proxy objects appropriatly on property change events
+    * Update the proxy objects appropriately on property change events
     */
     protected class AccessibleDialogListener implements XAccessibleEventListener {
 
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Frame.java b/accessibility/bridge/org/openoffice/java/accessibility/Frame.java
index 8196d6fc421e..82b5407ca341 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Frame.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Frame.java
@@ -161,7 +161,7 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi
     }
 
     /**
-    * Update the proxy objects appropriatly on property change events
+    * Update the proxy objects appropriately on property change events
     */
     protected class AccessibleFrameListener implements XAccessibleEventListener {
 
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/List.java b/accessibility/bridge/org/openoffice/java/accessibility/List.java
index 9e217dbf0360..9709337713e3 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/List.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/List.java
@@ -104,7 +104,7 @@ public class List extends DescendantManager implements javax.accessibility.Acces
     }
 
     /**
-    * Update the proxy objects appropriatly on property change events
+    * Update the proxy objects appropriately on property change events
     */
     protected class AccessibleListListener extends AccessibleDescendantManagerListener {
 
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Menu.java b/accessibility/bridge/org/openoffice/java/accessibility/Menu.java
index 3ee9cdd57929..c3f6bb4c3cf3 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Menu.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Menu.java
@@ -141,7 +141,7 @@ public class Menu extends AbstractButton
     }
 
     /**
-    * Update the proxy objects appropriatly on property change events
+    * Update the proxy objects appropriately on property change events
     */
     protected class AccessibleMenuListener
         extends AccessibleUNOComponentListener {
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Table.java b/accessibility/bridge/org/openoffice/java/accessibility/Table.java
index c90b9a3ae699..c9ff11ca02ee 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Table.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Table.java
@@ -93,7 +93,7 @@ public class Table extends DescendantManager implements javax.accessibility.Acce
     }
 
     /**
-    * Update the proxy objects appropriatly on property change events
+    * Update the proxy objects appropriately on property change events
     */
     protected class AccessibleTableListener extends AccessibleDescendantManagerListener {
 
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Tree.java b/accessibility/bridge/org/openoffice/java/accessibility/Tree.java
index c124cad75d57..144e10105ce6 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Tree.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Tree.java
@@ -88,7 +88,7 @@ public class Tree extends DescendantManager implements javax.accessibility.Acces
     }
 
     /**
-    * Update the proxy objects appropriatly on property change events
+    * Update the proxy objects appropriately on property change events
     */
     protected class AccessibleTreeListener extends AccessibleDescendantManagerListener {
 
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Window.java b/accessibility/bridge/org/openoffice/java/accessibility/Window.java
index 1ff53dc74d1a..3ad9fc6ae41e 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Window.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Window.java
@@ -166,7 +166,7 @@ public class Window extends java.awt.Window implements javax.accessibility.Acces
     }
 
     /**
-    * Update the proxy objects appropriatly on property change events
+    * Update the proxy objects appropriately on property change events
     */
     protected class AccessibleWindowListener implements XAccessibleEventListener {
 
diff --git a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
index 951afcae857f..e294b0baf338 100644
--- a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
+++ b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
@@ -95,17 +95,17 @@ Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_getProcessID(JNIEnv
     g_jcWindowsAccessBridgeAdapter =
         static_cast< jclass > (pJNIEnv->NewGlobalRef(clazz));
     if (NULL == g_jcWindowsAccessBridgeAdapter) {
-        return 0; /* jni error occured */
+        return 0; /* jni error occurred */
     }
     g_jmRegisterTopWindow =
         pJNIEnv->GetStaticMethodID(clazz, "registerTopWindow", "(ILcom/sun/star/accessibility/XAccessible;)V");
     if (0 == g_jmRegisterTopWindow) {
-        return 0; /* jni error occured */
+        return 0; /* jni error occurred */
     }
     g_jmRevokeTopWindow =
         pJNIEnv->GetStaticMethodID(clazz, "revokeTopWindow", "(ILcom/sun/star/accessibility/XAccessible;)V");
     if (0 == g_jmRevokeTopWindow) {
-        return 0; /* jni error occured */
+        return 0; /* jni error occurred */
     }
 
     // Use the special protocol of XJavaVM.getJavaVM:  If the passed in
@@ -285,7 +285,7 @@ void handleWindowEvent(Window * pWindow, bool bShow)
                         (bShow) ? g_jmRegisterTopWindow : g_jmRevokeTopWindow,
                         (jint) GetHWND(pWindow), joXAccessible );
 
-                    // Clear any exception that might have been occured.
+                    // Clear any exception that might have been occurred.
                     if (pJNIEnv->ExceptionCheck()) {
                         pJNIEnv->ExceptionClear();
                     }
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
index ef1d8abbd045..a5b96082daf7 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
@@ -65,7 +65,7 @@ namespace accessibility {
 
 // ============================================================================
 
-/** Aquire the solar mutex. */
+/** Acquire the solar mutex. */
 class BBSolarGuard : public ::vos::OGuard
 {
 public:
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
index 02af9ef0b7ae..fef4e2f39c50 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
@@ -60,7 +60,7 @@ namespace accessibility {
 
 // ============================================================================
 
-/** Aquire the solar mutex. */
+/** Acquire the solar mutex. */
 class TCSolarGuard : public ::vos::OGuard
 {
 public:
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
index bd9b016476e3..e62122451703 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
@@ -112,7 +112,7 @@ public:
     virtual sal_Bool SAL_CALL doAccessibleAction (sal_Int32 nIndex)
         throw (::com::sun::star::lang::IndexOutOfBoundsException,
             ::com::sun::star::uno::RuntimeException);
-    /** The returned string is assoicated with resource
+    /** The returned string is associated with resource
         <const>RID_STR_ACC_ACTION_TOGGLEPOPUP</const>.
     */
     virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription (sal_Int32 nIndex)
@@ -175,7 +175,7 @@ protected:
     /** This flag specifies whether an object has a list as child regardless
         of whether that child being currently instantiated or not.  This
         flag is always true in the current implementation because the list
-        child is just another wrapper arround this object and thus has the
+        child is just another wrapper around this object and thus has the
         same life time.
     */
     bool m_bHasListChild;
diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx
index bd64c074dc29..f31d544112a2 100644
--- a/accessibility/source/extended/accessibleiconchoicectrl.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx
@@ -368,7 +368,7 @@ namespace accessibility
             }
         }
 
-        // if only one entry is selected and its index is choosen to deselect -> no selection anymore
+        // if only one entry is selected and its index is chosen to deselect -> no selection anymore
         if ( 1 == nSelCount && bFound )
             pCtrl->SetNoSelection();
     }
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index d756bcf8aeab..d88f5d1d3b1c 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -63,7 +63,7 @@ namespace accessibility
     //........................................................................
     // class ALBSolarGuard ---------------------------------------------------------
 
-    /** Aquire the solar mutex. */
+    /** Acquire the solar mutex. */
     class ALBSolarGuard : public ::vos::OGuard
     {
     public:
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index eff014063e16..2a998575f474 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -67,7 +67,7 @@ namespace accessibility
     //........................................................................
     // class ALBSolarGuard ---------------------------------------------------------
 
-    /** Aquire the solar mutex. */
+    /** Acquire the solar mutex. */
     class ALBSolarGuard : public ::vos::OGuard
     {
     public:
diff --git a/accessibility/source/extended/accessibletablistbox.cxx b/accessibility/source/extended/accessibletablistbox.cxx
index 5a090bb0f488..975902a64091 100644
--- a/accessibility/source/extended/accessibletablistbox.cxx
+++ b/accessibility/source/extended/accessibletablistbox.cxx
@@ -38,7 +38,7 @@ namespace accessibility
 
     // class TLBSolarGuard ---------------------------------------------------------
 
-    /** Aquire the solar mutex. */
+    /** Acquire the solar mutex. */
     class TLBSolarGuard : public ::vos::OGuard
     {
     public:
diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx
index 60cf7ef7a9f9..c55c50f0ecc8 100644
--- a/accessibility/source/extended/accessibletablistboxtable.cxx
+++ b/accessibility/source/extended/accessibletablistboxtable.cxx
@@ -42,7 +42,7 @@ namespace accessibility
 
     // class TLBSolarGuard ---------------------------------------------------------
 
-    /** Aquire the solar mutex. */
+    /** Acquire the solar mutex. */
     class TLBSolarGuard : public ::vos::OGuard
     {
     public:
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 262a7ff2f554..493f11f8090d 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -1160,7 +1160,7 @@ Document::retrieveCharacterAttributes(
     for( i = 0; i < nLength; i++ )
         pIndices[i] = i;
     std::sort( &pIndices[0], &pIndices[nLength], IndexCompare(pPairs) );
-    // create sorted sequences accoring to index array
+    // create sorted sequences according to index array
     ::css::uno::Sequence< ::css::beans::PropertyValue > aNewValues( nLength );
     ::css::beans::PropertyValue* pNewValues = aNewValues.getArray();
     for( i = 0; i < nLength; i++ )
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx
index 00d8bc818eae..f09e1eb3d764 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -182,7 +182,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
         case VCLEVENT_COMBOBOX_SELECT:
         {
                  VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
-                 if (pList != NULL)
+                 if (pList != NULL && m_xText.is())
                  {
                         Reference<XAccessibleText> xText (m_xText->getAccessibleContext(), UNO_QUERY);
                         if ( xText.is() )
@@ -416,7 +416,7 @@ sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleActionCount (void)
 
     // There is one action for drop down boxes (toggle popup) and none for
     // the other boxes.
-    return m_bIsDropDownBox ? 0 : 1;
+    return m_bIsDropDownBox ? 1 : 0;
 }
 
 sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction (sal_Int32 nIndex)
@@ -463,11 +463,8 @@ sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction (sal_Int32 nIndex)
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
     if (nIndex<0 || nIndex>=getAccessibleActionCount())
         throw ::com::sun::star::lang::IndexOutOfBoundsException();
-    //Solution:When combo_box,it should not has action information.
-    //return TK_RES_STRING( RID_STR_ACC_ACTION_TOGGLEPOPUP);
-    if (m_aBoxType == LISTBOX)
-        return ::rtl::OUString();
-    return m_bIsDropDownBox?::rtl::OUString():TK_RES_STRING( RID_STR_ACC_ACTION_TOGGLEPOPUP);
+
+    return m_bIsDropDownBox ? TK_RES_STRING( RID_STR_ACC_ACTION_TOGGLEPOPUP) : ::rtl::OUString();
 }
 
 Reference< XAccessibleKeyBinding > VCLXAccessibleBox::getAccessibleActionKeyBinding( sal_Int32 nIndex )
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/canvas/Canvas.java b/accessibility/workben/org/openoffice/accessibility/awb/canvas/Canvas.java
index 21403a3e9cc9..ddaff69c7416 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/canvas/Canvas.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/canvas/Canvas.java
@@ -130,7 +130,7 @@ public class Canvas
                 0,
                 aScreenSize.getWidth(),
                 aScreenSize.getHeight());
-            // Fill the screen rectangle and draw a frame arround it to increase its visibility.
+            // Fill the screen rectangle and draw a frame around it to increase its visibility.
             g2.setColor (new Color (250,240,230));
             g2.fill (aScreen);
             g2.setColor (Color.BLACK);
diff --git a/accessibility/workben/org/openoffice/accessibility/misc/OfficeConnection.java b/accessibility/workben/org/openoffice/accessibility/misc/OfficeConnection.java
index 9ccb8af352d1..349a63883375 100644
--- a/accessibility/workben/org/openoffice/accessibility/misc/OfficeConnection.java
+++ b/accessibility/workben/org/openoffice/accessibility/misc/OfficeConnection.java
@@ -179,7 +179,7 @@ public class OfficeConnection
     String msPipeName;
 
     /** A value of true just indicates that it has been tried to establish a connection,
-        not that that has been successfull.
+        not that that has been successful.
     */
     private boolean mbInitialized = false;