[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/unx

[Julien Nabet]

 vcl/unx/gtk/a11y/atkutil.cxx   |    2 ++
 vcl/unx/gtk/a11y/atkwindow.cxx |    2 ++
 2 files changed, 4 insertions(+)

New commits:
commit da966e07c6fb26f54e3538ccaf0a13f857ed2993
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Wed Oct 9 23:11:28 2013 +0200

    Use SAL_WNODEPRECATED_DECLARATIONS_PUSH/POP part2
    
    Change-Id: Id3691ab81af466dd21cc86592c5ac0c2c7a1c8f7
    Reviewed-on: https://gerrit.libreoffice.org/6244
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 2f8757e961d6156d529c2ab9131747071236f085)
    Reviewed-on: https://gerrit.libreoffice.org/7362
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index e1cb134..adeda2b 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -86,7 +86,9 @@ atk_wrapper_focus_idle_handler (gpointer data)
 #ifdef ENABLE_TRACING
             fprintf(stderr, "notifying focus event for %p\n", atk_obj);
 #endif
+            SAL_WNODEPRECATED_DECLARATIONS_PUSH
             atk_focus_tracker_notify(atk_obj);
+            SAL_WNODEPRECATED_DECLARATIONS_POP
             // #i93269#
             // emit text_caret_moved event for <XAccessibleText> object,
             // if cursor is inside the <XAccessibleText> object.
diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx
index fd396c8..0bddf07 100644
--- a/vcl/unx/gtk/a11y/atkwindow.cxx
+++ b/vcl/unx/gtk/a11y/atkwindow.cxx
@@ -122,7 +122,9 @@ static gint
 ooo_window_wrapper_clear_focus(gpointer)
 {
     SolarMutexGuard aGuard;
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     atk_focus_tracker_notify( NULL );
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     return FALSE;
 }