summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/svtools/strings.hrc4
-rw-r--r--sc/inc/strings.hrc6
-rw-r--r--sc/source/ui/dbgui/tpsort.cxx1
-rw-r--r--sc/source/ui/dbgui/tpsubt.cxx2
-rw-r--r--sc/source/ui/optdlg/tpview.cxx2
-rw-r--r--sc/uiconfig/scalc/ui/sortoptionspage.ui1
-rw-r--r--sc/uiconfig/scalc/ui/subtotaloptionspage.ui10
-rw-r--r--sc/uiconfig/scalc/ui/tpviewpage.ui5
-rw-r--r--sfx2/inc/dinfdlg.hrc4
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx2
-rw-r--r--sfx2/uiconfig/ui/documentinfopage.ui5
-rw-r--r--svtools/source/dialogs/prnsetup.cxx1
-rw-r--r--svtools/uiconfig/ui/printersetupdialog.ui5
-rw-r--r--sw/inc/strings.hrc4
-rw-r--r--sw/source/ui/frmdlg/cption.cxx1
-rw-r--r--sw/uiconfig/swriter/ui/insertcaption.ui5
16 files changed, 27 insertions, 31 deletions
diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc
index 80d8d2e7fa5c..ccac89d6809a 100644
--- a/include/svtools/strings.hrc
+++ b/include/svtools/strings.hrc
@@ -271,6 +271,10 @@
#define STR_WARNING_INVALIDJAVASETTINGS_TITLE NC_("STR_WARNING_INVALIDJAVASETTINGS_TITLE", "Select JRE")
#define STR_ERROR_JVMCREATIONFAILED_TITLE NC_("STR_ERROR_JVMCREATIONFAILED_TITLE", "JRE is Defective")
+// acccessibility descriptions that use %PRODUCTNAME, we set these explicitly because querying a11y descs
+// in order to change %PRODUCTNAME at runtime is expensive, so limit doing that as much as possible.
+#define STR_A11Y_DESC_OPTIONS NC_("printersetupdialog|extended_tip|options", "Opens the Printer Options dialog where you can override the global printer options set on the Tools - Options - %PRODUCTNAME Writer/Web - Print panel for the current document.")
+
#define STR_DESCRIPTION_SOURCEFILE NC_("STR_DESCRIPTION_SOURCEFILE", "Source code")
#define STR_DESCRIPTION_BOOKMARKFILE NC_("STR_DESCRIPTION_BOOKMARKFILE", "Bookmark file")
#define STR_DESCRIPTION_GRAPHIC_DOC NC_("STR_DESCRIPTION_GRAPHIC_DOC", "Graphics")
diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index 8f94d9a94104..90c1a91e5f8d 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -382,4 +382,10 @@
#define STR_BORDER_DOUBLE_3 NC_("STR_BORDER_DOUBLE_3", "Medium/Hairline (%s pt)")
#define STR_BORDER_DOUBLE_4 NC_("STR_BORDER_DOUBLE_4", "Medium/Medium (%s pt)")
+// acccessibility descriptions that use %PRODUCTNAME, we set these explicitly because querying a11y descs
+// in order to change %PRODUCTNAME at runtime is expensive, so limit doing that as much as possible.
+#define STR_A11Y_DESC_SORTUSER NC_("sortoptionspage|extended_tip|sortuserlb", "Select the custom sort order that you want to apply. To define a custom sort order, choose Tools - Options - %PRODUCTNAME Calc - Sort Lists.")
+#define STR_A11Y_DESC_USERDEF NC_("subtotaloptionspage|extended_tip|lbuserdef", "Uses a custom sorting order that you defined in the Options dialog box at %PRODUCTNAME Calc - Sort Lists.")
+#define STR_A11Y_DESC_ANNOT NC_("extended_tip|annot", "Specifies that a small rectangle in the top right corner of the cell indicates that a comment exists. The comment will be shown only when you enable tips under %PRODUCTNAME - General in the Options dialog box.")
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 9fa00704d148..3455f11006cf 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -511,6 +511,7 @@ ScTabPageSortOptions::ScTabPageSortOptions(weld::Container* pPage, weld::DialogC
, m_xBtnIncImages(m_xBuilder->weld_check_button("includeimages"))
{
m_xLbSortUser->set_size_request(m_xLbSortUser->get_approximate_digit_width() * 50, -1);
+ m_xLbSortUser->set_accessible_description(ScResId(STR_A11Y_DESC_SORTUSER));
Init();
SetExchangeSupport();
}
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index aa5f38862701..01431c8156c6 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -454,6 +454,8 @@ ScTpSubTotalOptions::ScTpSubTotalOptions(weld::Container* pPage, weld::DialogCon
, m_xBtnUserDef(m_xBuilder->weld_check_button("btnuserdef"))
, m_xLbUserDef(m_xBuilder->weld_combo_box("lbuserdef"))
{
+ m_xLbUserDef->set_accessible_description(ScResId(STR_A11Y_DESC_USERDEF));
+ m_xBtnUserDef->set_accessible_description(ScResId(STR_A11Y_DESC_USERDEF));
Init();
}
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 4809061b4005..d7cd46303a26 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -25,6 +25,7 @@
#include <scresid.hxx>
#include <docsh.hxx>
#include <sc.hrc>
+#include <strings.hrc>
#include <units.hrc>
#include <appoptio.hxx>
#include <scmod.hxx>
@@ -71,6 +72,7 @@ ScTpContentOptions::ScTpContentOptions(weld::Container* pPage, weld::DialogContr
m_xFormulaCB->connect_toggled(aCBHdl);
m_xNilCB->connect_toggled(aCBHdl);
m_xAnnotCB->connect_toggled(aCBHdl);
+ m_xAnnotCB->set_accessible_description(ScResId(STR_A11Y_DESC_ANNOT));
m_xValueCB->connect_toggled(aCBHdl);
m_xAnchorCB->connect_toggled(aCBHdl);
m_xClipMarkCB->connect_toggled(aCBHdl);
diff --git a/sc/uiconfig/scalc/ui/sortoptionspage.ui b/sc/uiconfig/scalc/ui/sortoptionspage.ui
index 0ad1ba655dc7..9f3f427f780a 100644
--- a/sc/uiconfig/scalc/ui/sortoptionspage.ui
+++ b/sc/uiconfig/scalc/ui/sortoptionspage.ui
@@ -207,7 +207,6 @@
<child internal-child="accessible">
<object class="AtkObject" id="sortuserlb-atkobject">
<property name="AtkObject::accessible-name" translatable="yes" context="sortoptionspage|sortuserlb-atkobject">Custom sort order</property>
- <property name="AtkObject::accessible-description" translatable="yes" context="sortoptionspage|extended_tip|sortuserlb">Select the custom sort order that you want to apply. To define a custom sort order, choose Tools - Options - Calc - Sort Lists.</property>
</object>
</child>
</object>
diff --git a/sc/uiconfig/scalc/ui/subtotaloptionspage.ui b/sc/uiconfig/scalc/ui/subtotaloptionspage.ui
index f7620b8f4ae5..d81fb987be61 100644
--- a/sc/uiconfig/scalc/ui/subtotaloptionspage.ui
+++ b/sc/uiconfig/scalc/ui/subtotaloptionspage.ui
@@ -196,11 +196,6 @@
<accessibility>
<relation type="label-for" target="lbuserdef"/>
</accessibility>
- <child internal-child="accessible">
- <object class="AtkObject" id="btnuserdef-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="subtotaloptionspage|extended_tip|btnuserdef">Uses a custom sorting order that you defined in the Options dialog box at Calc - Sort Lists.</property>
- </object>
- </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -215,11 +210,6 @@
<accessibility>
<relation type="labelled-by" target="btnuserdef"/>
</accessibility>
- <child internal-child="accessible">
- <object class="AtkObject" id="lbuserdef-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="subtotaloptionspage|extended_tip|lbuserdef">Uses a custom sorting order that you defined in the Options dialog box at Calc - Sort Lists.</property>
- </object>
- </child>
</object>
<packing>
<property name="left_attach">0</property>
diff --git a/sc/uiconfig/scalc/ui/tpviewpage.ui b/sc/uiconfig/scalc/ui/tpviewpage.ui
index 032f94da3188..18acb5e2fadb 100644
--- a/sc/uiconfig/scalc/ui/tpviewpage.ui
+++ b/sc/uiconfig/scalc/ui/tpviewpage.ui
@@ -72,11 +72,6 @@
<property name="receives-default">False</property>
<property name="use-underline">True</property>
<property name="draw-indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="annot-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|annot">Specifies that a small rectangle in the top right corner of the cell indicates that a comment exists. The comment will be shown only when you enable tips under General in the Options dialog box.</property>
- </object>
- </child>
</object>
<packing>
<property name="left-attach">0</property>
diff --git a/sfx2/inc/dinfdlg.hrc b/sfx2/inc/dinfdlg.hrc
index 153fedb1ff92..121bb80c3f8a 100644
--- a/sfx2/inc/dinfdlg.hrc
+++ b/sfx2/inc/dinfdlg.hrc
@@ -78,6 +78,10 @@ const std::pair<TranslateId, CustomProperties> SFX_LB_PROPERTY_STRINGARRAY[] =
{ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Yes or no") , Custom_Type_Boolean }
};
+// acccessibility descriptions that use %PRODUCTNAME, we set these explicitly because querying a11y descs
+// in order to change %PRODUCTNAME at runtime is expensive, so limit doing that as much as possible.
+#define STR_A11Y_DESC_USERDATA NC_("documentinfopage|extended_tip|userdatacb", "Saves the user's full name with the file. You can edit the name by choosing Tools - Options - %PRODUCTNAME - User Data.")
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 21d2c333f203..ddc272907306 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -695,6 +695,8 @@ SfxDocumentPage::SfxDocumentPage(weld::Container* pPage, weld::DialogController*
, m_xImagePreferredDpiCheckButton(m_xBuilder->weld_check_button("image-preferred-dpi-checkbutton"))
, m_xImagePreferredDpiComboBox(m_xBuilder->weld_combo_box("image-preferred-dpi-combobox"))
{
+ m_xUseUserDataCB->set_accessible_description(SfxResId(STR_A11Y_DESC_USERDATA));
+
m_aUnknownSize = m_xShowSizeFT->get_label();
m_xShowSizeFT->set_label(OUString());
diff --git a/sfx2/uiconfig/ui/documentinfopage.ui b/sfx2/uiconfig/ui/documentinfopage.ui
index f8be86a62b5e..a8d59288ca98 100644
--- a/sfx2/uiconfig/ui/documentinfopage.ui
+++ b/sfx2/uiconfig/ui/documentinfopage.ui
@@ -186,11 +186,6 @@
<property name="no-show-all">True</property>
<property name="use-underline">True</property>
<property name="draw-indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="userdatacb-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="documentinfopage|extended_tip|userdatacb">Saves the user's full name with the file. You can edit the name by choosing Tools - Options - User Data.</property>
- </object>
- </child>
</object>
<packing>
<property name="left-attach">1</property>
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index 5f41e355e3a8..60dba4348ec3 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -250,6 +250,7 @@ PrinterSetupDialog::~PrinterSetupDialog()
void PrinterSetupDialog::SetOptionsHdl(const Link<weld::Button&, void>& rLink)
{
m_xBtnOptions->connect_clicked(rLink);
+ m_xBtnOptions->set_accessible_description(SvtResId(STR_A11Y_DESC_OPTIONS));
m_xBtnOptions->set_visible(rLink.IsSet());
}
diff --git a/svtools/uiconfig/ui/printersetupdialog.ui b/svtools/uiconfig/ui/printersetupdialog.ui
index ef107138655a..84332795aeef 100644
--- a/svtools/uiconfig/ui/printersetupdialog.ui
+++ b/svtools/uiconfig/ui/printersetupdialog.ui
@@ -41,11 +41,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="options-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="printersetupdialog|extended_tip|options">Opens the Printer Options dialog where you can override the global printer options set on the Tools - Options - Writer/Web - Print panel for the current document.</property>
- </object>
- </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 5a2ff72b0b3b..ab0b0b77d62c 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -1433,6 +1433,10 @@
#define STR_DROPDOWN_CONTENT_CONTROL_PLACEHOLDER NC_("STR_DROPDOWN_CONTENT_CONTROL_PLACEHOLDER", "Choose an item")
#define STR_DATE_CONTENT_CONTROL_PLACEHOLDER NC_("STR_DATE_CONTENT_CONTROL_PLACEHOLDER", "Choose a date")
+// acccessibility descriptions that use %PRODUCTNAME, we set these explicitly because querying a11y descs
+// in order to change %PRODUCTNAME at runtime is expensive, so limit doing that as much as possible.
+#define STR_A11Y_DESC_AUTO NC_("insertcaption|extended_tip|auto", "Opens the Caption dialog. It has the same information as the dialog you get by menu %PRODUCTNAME Writer - AutoCaption in the Options dialog box.")
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 867e16fa56dc..a14b4ab99278 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -139,6 +139,7 @@ SwCaptionDialog::SwCaptionDialog(weld::Window *pParent, SwView &rV)
m_xFormatBox->connect_changed(LINK(this, SwCaptionDialog, SelectListBoxHdl));
m_xOptionButton->connect_clicked(LINK(this, SwCaptionDialog, OptionHdl));
m_xAutoCaptionButton->connect_clicked(LINK(this, SwCaptionDialog, CaptionHdl));
+ m_xAutoCaptionButton->set_accessible_description(SwResId(STR_A11Y_DESC_AUTO));
m_xCategoryBox->append_text(m_sNone);
size_t nCount = pMgr->GetFieldTypeCount();
diff --git a/sw/uiconfig/swriter/ui/insertcaption.ui b/sw/uiconfig/swriter/ui/insertcaption.ui
index e827d7bd426f..ec4500b525c9 100644
--- a/sw/uiconfig/swriter/ui/insertcaption.ui
+++ b/sw/uiconfig/swriter/ui/insertcaption.ui
@@ -25,11 +25,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="auto-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="insertcaption|extended_tip|auto">Opens the Caption dialog. It has the same information as the dialog you get by menu Writer - AutoCaption in the Options dialog box.</property>
- </object>
- </child>
</object>
<packing>
<property name="expand">False</property>
generated by cgit (git 2.34.1) at 2025-02-26 17:19:59 +0000