[Libreoffice-commits] core.git: 3 commits - vcl/unx

[Caolán McNamara]

 vcl/unx/gtk/a11y/atklistener.cxx |   57 +++++++++++++++++++++++----------------
 vcl/unx/gtk/a11y/atkutil.cxx     |   10 ++++--
 2 files changed, 40 insertions(+), 27 deletions(-)

New commits:
commit 0defd98b5995a27117023c289d628a6efbc5d2cc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue May 17 12:35:04 2016 +0100

    The other Invalidate is a OSL_TRACE, so silence here likewise
    
    Change-Id: Ib7e7d53e8feb378229a71985bb6108ce9b58cb29

diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index 9b5bbd0..d722936 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -199,8 +199,9 @@ void DocumentFocusListener::notifyEvent( const accessibility::AccessibleEventObj
 
                 if( accessibility::AccessibleStateType::FOCUSED == nState )
                     atk_wrapper_focus_tracker_notify_when_idle( getAccessible(aEvent) );
+
+                break;
             }
-            break;
 
             case accessibility::AccessibleEventId::CHILD:
             {
@@ -210,12 +211,13 @@ void DocumentFocusListener::notifyEvent( const accessibility::AccessibleEventObj
 
                 if( (aEvent.NewValue >>= xChild) && xChild.is() )
                     attachRecursive(xChild);
+
+                break;
             }
-            break;
 
             case accessibility::AccessibleEventId::INVALIDATE_ALL_CHILDREN:
-            g_warning( "Invalidate all children called\n" );
-            break;
+                OSL_TRACE( "Invalidate all children called\n" );
+                break;
 
             default:
                 break;
commit 47bf48a035f768689b92a977caffbd312f6a2a5d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue May 17 12:32:41 2016 +0100

    shut up about the PAGE_CHANGED event from slide pane slide switching
    
    Change-Id: I8ebe1b3db894cd3a2e9834ec73949cc6504366b9

diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx
index d4eb9ed..053138e 100644
--- a/vcl/unx/gtk/a11y/atklistener.cxx
+++ b/vcl/unx/gtk/a11y/atklistener.cxx
@@ -558,6 +558,17 @@ void AtkListener::notifyEvent( const accessibility::AccessibleEventObject& aEven
             break;
         }
 
+        case accessibility::AccessibleEventId::PAGE_CHANGED:
+        {
+            /* // If we implemented AtkDocument then I imagine this is what this
+               // handler should look like
+               sal_Int32 nPos=0;
+               aEvent.NewValue >>= nPos;
+               g_signal_emit_by_name( G_OBJECT( atk_obj ), "page_changed", nPos );
+            */
+            break;
+        }
+
         default:
             g_warning( "Unknown event notification %d", aEvent.EventId );
             break;
commit 0e609b5d9576c612ca98a820374daf94fdf485fd
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue May 17 12:21:01 2016 +0100

    fix indent
    
    Change-Id: I5be34b446166e221d02c55ad5eb7b25182f20891

diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx
index d94970e..d4eb9ed 100644
--- a/vcl/unx/gtk/a11y/atklistener.cxx
+++ b/vcl/unx/gtk/a11y/atklistener.cxx
@@ -293,8 +293,8 @@ void AtkListener::notifyEvent( const accessibility::AccessibleEventObject& aEven
 
             if( aEvent.NewValue >>= xChild )
                 handleChildAdded(xParent, xChild);
-        }
             break;
+        }
 
         case accessibility::AccessibleEventId::INVALIDATE_ALL_CHILDREN:
         {
@@ -304,8 +304,8 @@ void AtkListener::notifyEvent( const accessibility::AccessibleEventObject& aEven
             g_return_if_fail( xParent.is() );
 
             handleInvalidateChildren(xParent);
-        }
             break;
+        }
 
         case accessibility::AccessibleEventId::NAME_CHANGED:
         {
@@ -315,8 +315,8 @@ void AtkListener::notifyEvent( const accessibility::AccessibleEventObject& aEven
                 atk_object_set_name(atk_obj,
                     OUStringToOString(aName, RTL_TEXTENCODING_UTF8).getStr());
             }
-        }
             break;
+        }
 
         case accessibility::AccessibleEventId::DESCRIPTION_CHANGED:
         {
@@ -326,8 +326,8 @@ void AtkListener::notifyEvent( const accessibility::AccessibleEventObject& aEven
                 atk_object_set_description(atk_obj,
                     OUStringToOString(aDescription, RTL_TEXTENCODING_UTF8).getStr());
             }
-        }
             break;
+        }
 
         case accessibility::AccessibleEventId::STATE_CHANGED:
         {
@@ -495,24 +495,24 @@ void AtkListener::notifyEvent( const accessibility::AccessibleEventObject& aEven
             };
             switch( aChange.Type )
             {
-            case accessibility::AccessibleTableModelChangeType::INSERT:
-            case accessibility::AccessibleTableModelChangeType::DELETE:
-                if( nRowsChanged > 0 )
-                    g_signal_emit_by_name( G_OBJECT( atk_obj ),
-                                           aSignalNames[aChange.Type].row,
-                                           aChange.FirstRow, nRowsChanged );
-                if( nColumnsChanged > 0 )
-                    g_signal_emit_by_name( G_OBJECT( atk_obj ),
-                                           aSignalNames[aChange.Type].col,
-                                           aChange.FirstColumn, nColumnsChanged );
-                break;
-
-            case accessibility::AccessibleTableModelChangeType::UPDATE:
-                // This is not really a model change, is it ?
-                break;
-            default:
-                g_warning( "TESTME: unusual table model change %d\n", aChange.Type );
-                break;
+                case accessibility::AccessibleTableModelChangeType::INSERT:
+                case accessibility::AccessibleTableModelChangeType::DELETE:
+                    if( nRowsChanged > 0 )
+                        g_signal_emit_by_name( G_OBJECT( atk_obj ),
+                                               aSignalNames[aChange.Type].row,
+                                               aChange.FirstRow, nRowsChanged );
+                    if( nColumnsChanged > 0 )
+                        g_signal_emit_by_name( G_OBJECT( atk_obj ),
+                                               aSignalNames[aChange.Type].col,
+                                               aChange.FirstColumn, nColumnsChanged );
+                    break;
+
+                case accessibility::AccessibleTableModelChangeType::UPDATE:
+                    // This is not really a model change, is it ?
+                    break;
+                default:
+                    g_warning( "TESTME: unusual table model change %d\n", aChange.Type );
+                    break;
             }
             g_signal_emit_by_name( G_OBJECT( atk_obj ), "model-changed" );
             break;
@@ -558,7 +558,7 @@ void AtkListener::notifyEvent( const accessibility::AccessibleEventObject& aEven
             break;
         }
 
-    default:
+        default:
             g_warning( "Unknown event notification %d", aEvent.EventId );
             break;
     }