sw33a11y01: merge with DEV300_m72, resolution of merge conflicts, adjustments due to changes on master

1 files changed, 55 insertions, 4 deletions

diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index d88f5150b0c5..10f75309708d 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: atkwrapper.cxx,v $
- * $Revision: 1.11.52.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -517,6 +514,60 @@ wrapper_ref_relation_set( AtkObject *atk_obj )
 
 /*****************************************************************************/
 
+#if 0
+struct {
+    sal_Int16       value;
+    const sal_Char* name;
+} aStateTypeTable[] = {
+    { accessibility::AccessibleStateType::INVALID, "INVALID" },
+    { accessibility::AccessibleStateType::ACTIVE, "ACTIVE" },
+    { accessibility::AccessibleStateType::ARMED, "ARMED" },
+    { accessibility::AccessibleStateType::BUSY, "BUSY" },
+    { accessibility::AccessibleStateType::CHECKED, "CHECKED" },
+    { accessibility::AccessibleStateType::DEFUNC, "DEFUNC" },
+    { accessibility::AccessibleStateType::EDITABLE, "EDITABLE" },
+    { accessibility::AccessibleStateType::ENABLED, "ENABLED" },
+    { accessibility::AccessibleStateType::EXPANDABLE, "EXPANDABLE" },
+    { accessibility::AccessibleStateType::EXPANDED, "EXPANDED" },
+    { accessibility::AccessibleStateType::FOCUSABLE, "FOCUSABLE" },
+    { accessibility::AccessibleStateType::FOCUSED, "FOCUSED" },
+    { accessibility::AccessibleStateType::HORIZONTAL, "HORIZONTAL" },
+    { accessibility::AccessibleStateType::ICONIFIED, "ICONIFIED" },
+    { accessibility::AccessibleStateType::INDETERMINATE, "INDETERMINATE" },
+    { accessibility::AccessibleStateType::MANAGES_DESCENDANTS, "MANAGES_DESCENDANTS" },
+    { accessibility::AccessibleStateType::MODAL, "MODAL" },
+    { accessibility::AccessibleStateType::MULTI_LINE, "MULTI_LINE" },
+    { accessibility::AccessibleStateType::MULTI_SELECTABLE, "MULTI_SELECTABLE" },
+    { accessibility::AccessibleStateType::OPAQUE, "OPAQUE" },
+    { accessibility::AccessibleStateType::PRESSED, "PRESSED" },
+    { accessibility::AccessibleStateType::RESIZABLE, "RESIZABLE" },
+    { accessibility::AccessibleStateType::SELECTABLE, "SELECTABLE" },
+    { accessibility::AccessibleStateType::SELECTED, "SELECTED" },
+    { accessibility::AccessibleStateType::SENSITIVE, "SENSITIVE" },
+    { accessibility::AccessibleStateType::SHOWING, "SHOWING" },
+    { accessibility::AccessibleStateType::SINGLE_LINE, "SINGLE_LINE" },
+    { accessibility::AccessibleStateType::STALE, "STALE" },
+    { accessibility::AccessibleStateType::TRANSIENT, "TRANSIENT" },
+    { accessibility::AccessibleStateType::VERTICAL, "VERTICAL" },
+    { accessibility::AccessibleStateType::VISIBLE, "VISIBLE" }
+};
+
+static void printStates(const uno::Sequence<sal_Int16>& rStates)
+{
+    sal_Int32 n = rStates.getLength();
+    size_t nTypes = sizeof(aStateTypeTable)/sizeof(aStateTypeTable[0]);
+    for (sal_Int32 i = 0; i < n; ++i)
+    {
+        for (size_t j = 0; j < nTypes; ++j)
+        {
+            if (aStateTypeTable[j].value == rStates[i])
+                printf("%s ", aStateTypeTable[j].name);
+        }
+    }
+    printf("\n");
+}
+#endif
+
 static AtkStateSet *
 wrapper_ref_state_set( AtkObject *atk_obj )
 {