[Libreoffice-commits] core.git: 2 commits - sw/uiconfig vcl/source

[Caolán McNamara]

 sw/uiconfig/swriter/ui/insertbreak.ui |   29 +++++++++++++++++++++++++++--
 vcl/source/window/window.cxx          |    3 +++
 2 files changed, 30 insertions(+), 2 deletions(-)

New commits:
commit 1f5e95a607c124b6e29a392c42c8351051a65ba3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 13 16:43:52 2018 +0000

    move insert break extended tooltips out of help as a sample case
    
    Change-Id: I83f663e688a9e905624e0b580bb75793625e27ee

diff --git a/sw/uiconfig/swriter/ui/insertbreak.ui b/sw/uiconfig/swriter/ui/insertbreak.ui
index 2cd012930905..23dac4839f34 100644
--- a/sw/uiconfig/swriter/ui/insertbreak.ui
+++ b/sw/uiconfig/swriter/ui/insertbreak.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.20.2 -->
 <interface domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -104,6 +104,11 @@
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                         <property name="group">pagerb</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="linerb-atkobject">
+                            <property name="AtkObject::accessible-description" translatable="yes" context="insertbreak|linerb-atkobject">Ends the current line, and moves the text found to the right of the cursor to the next line, without creating a new paragraph.</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -120,6 +125,11 @@
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                         <property name="group">pagerb</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="columnrb-atkobject">
+                            <property name="AtkObject::accessible-description" translatable="yes" context="insertbreak|columnrb-atkobject">Inserts a manual column break (in a multiple column layout), and moves the text found to the right of the cursor to the beginning of the next column. A manual column break is indicated by a nonprinting border at the top of the new column.</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -136,6 +146,11 @@
                         <property name="xalign">0</property>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="pagerb-atkobject">
+                            <property name="AtkObject::accessible-description" translatable="yes" context="insertbreak|pagerb-atkobject">Inserts a manual page break, and moves the text found to the right of the cursor to the beginning of the next page. The inserted page break is indicated by a nonprinting border at the top of the new page.</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -167,6 +182,11 @@
                         <items>
                           <item translatable="yes" context="insertbreak|liststore1">[None]</item>
                         </items>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="stylelb-atkobject">
+                            <property name="AtkObject::accessible-description" translatable="yes" context="insertbreak|stylelb-atkobject">Select the page style for the page that follows the manual page break.</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -183,6 +203,11 @@
                         <property name="margin_top">6</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="pagenumcb-atkobject">
+                            <property name="AtkObject::accessible-description" translatable="yes" context="insertbreak|pagenumcb-atkobject">Assigns the page number that you specify to the page that follows the manual page break. This option is only available if you assign a different page style to the page that follows manual page break.</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -202,7 +227,7 @@
                         </accessibility>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="pagenumsb-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes" context="insertbreak|pagenumsb-atkobject">Change page number</property>
+                            <property name="AtkObject::accessible-description" translatable="yes" context="insertbreak|pagenumsb-atkobject">Enter the new page number for the page that follows the manual page break.</property>
                           </object>
                         </child>
                       </object>
commit ef428c448804defe899993d3a9a36411810c3ce6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 13 16:35:37 2018 +0000

    use a11y description if offline help doesn't have an entry
    
    Change-Id: I0090e10f6fa7b5e86be7ace8f1bd61f3f790fa11

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 25120bea663b..c93e194ab88c 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3139,6 +3139,9 @@ const OUString& Window::GetHelpText() const
         mpWindowImpl->mbHelpTextDynamic = false;
     }
 
+    //Fallback to Window::GetAccessibleDescription without reentry to GetHelpText()
+    if (mpWindowImpl->maHelpText.isEmpty() && mpWindowImpl->mpAccessibleInfos && mpWindowImpl->mpAccessibleInfos->pAccessibleDescription)
+        return *mpWindowImpl->mpAccessibleInfos->pAccessibleDescription;
     return mpWindowImpl->maHelpText;
 }