Related: tdf#146971 remove %PRODUCTNAME from accessible-description

Change-Id: I83ff18c8b5e95fa172de950eb351cbfd855c9d5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128919
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

4 files changed, 8 insertions, 3 deletions

diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 2fefb02ff125..fb99335c5265 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -77,6 +77,8 @@ SfxModelessDialogController::SfxModelessDialogController(SfxBindings* pBindinx,
     const OString& rID)
     : SfxDialogController(pParent, rUIXMLDescription, rID)
 {
+    fprintf(stderr, "SfxModelessDialogController ctor %p\n", this);
+
     Init(pBindinx, pCW);
 }
 
@@ -133,6 +135,8 @@ void SfxModelessDialogController::Deactivate()
 
 SfxModelessDialogController::~SfxModelessDialogController()
 {
+    fprintf(stderr, "SfxModelessDialogController dtor %p\n", this);
+
     if (!m_xImpl->pMgr)
         return;
     auto xFrame = m_xImpl->pMgr->GetFrame();
@@ -213,6 +217,7 @@ SfxDialogController::SfxDialogController(weld::Widget* pParent, const OUString&
 
 void SfxDialogController::Close()
 {
+    fprintf(stderr, "really closing\n");
     // tdf3146571 ignore focus changes after we've closed
     m_xDialog->connect_container_focus_changed(Link<weld::Container&, void>());
 }
diff --git a/sfx2/uiconfig/ui/documentinfopage.ui b/sfx2/uiconfig/ui/documentinfopage.ui
index 3ea5798caa45..de1120caa698 100644
--- a/sfx2/uiconfig/ui/documentinfopage.ui
+++ b/sfx2/uiconfig/ui/documentinfopage.ui
@@ -188,7 +188,7 @@
         <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 - %PRODUCTNAME - User Data.</property>
+            <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>
diff --git a/sfx2/uiconfig/ui/linkeditdialog.ui b/sfx2/uiconfig/ui/linkeditdialog.ui
index 8d74dd0f1455..0fbe755ffc6d 100644
--- a/sfx2/uiconfig/ui/linkeditdialog.ui
+++ b/sfx2/uiconfig/ui/linkeditdialog.ui
@@ -145,7 +145,7 @@
                     <property name="activates_default">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="app-atkobject">
-                        <property name="AtkObject::accessible-description" translatable="yes" context="linkeditdialog|extended_tip|app">Lists the application that last saved the source file. %PRODUCTNAME applications have the server name soffice.</property>
+                        <property name="AtkObject::accessible-description" translatable="yes" context="linkeditdialog|extended_tip|app">Lists the application that last saved the source file. The office suite applications have the server name soffice.</property>
                       </object>
                     </child>
                   </object>
diff --git a/sfx2/uiconfig/ui/versionsofdialog.ui b/sfx2/uiconfig/ui/versionsofdialog.ui
index c6439232415e..c217cbf59138 100644
--- a/sfx2/uiconfig/ui/versionsofdialog.ui
+++ b/sfx2/uiconfig/ui/versionsofdialog.ui
@@ -207,7 +207,7 @@
                         <property name="draw_indicator">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="always-atkobject">
-                            <property name="AtkObject::accessible-description" translatable="yes" context="versionsofdialog|extended_tip|always">If you have made changes to your document, %PRODUCTNAME automatically saves a new version when you close the document.</property>
+                            <property name="AtkObject::accessible-description" translatable="yes" context="versionsofdialog|extended_tip|always">If you have made changes to your document then a new version is automatically saved when you close the document.</property>
                           </object>
                         </child>
                       </object>