[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - cui/source

[Caolán McNamara (via logerrit)]

 cui/source/tabpages/tpcolor.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 2a137f1c2ae882a0f4a75773ecfb1b5d042c683c
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Dec 3 14:09:33 2021 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Dec 3 18:02:28 2021 +0100

    some translations are searched for in the wrong .mo
    
    since...
    
    commit c895a6d8298a349784cd0aafff4bf518ac8d0a7d
    Date:   Fri May 15 10:51:10 2020 +0200
    
        Resolves tdf#132799 - Deleting of colors unclear
    
        Tooltips added for disabled states
    
    those ones are in cui.mo (CuiResId) not svx (SvxResId)
    
    Change-Id: I595bd5aadd8ead18291ff818405bec594c8d32db
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126319
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 5669f73adc76..9639ed1ac342 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -129,7 +129,7 @@ SvxColorTabPage::SvxColorTabPage(weld::Container* pPage, 
weld::DialogController*
     // disable modify buttons
     // Color palettes can't be modified
     m_xBtnDelete->set_sensitive(false);
-    m_xBtnDelete->set_tooltip_text( SvxResId(RID_SVXSTR_DELETEUSERCOLOR1) );
+    m_xBtnDelete->set_tooltip_text( CuiResId(RID_SVXSTR_DELETEUSERCOLOR1) );
 
     m_xMoreColors->set_from_icon_name("cmd/sc_additionsdialog.png");
     m_xMoreColors->connect_clicked(LINK(this, SvxColorTabPage, 
OnMoreColorsClick));
@@ -375,7 +375,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl, 
weld::Button&, void)
         m_xValSetColorList->InsertItem( nId + 1 , aCurrentColor, aName );
         m_xValSetColorList->SelectItem( nId + 1 );
         m_xBtnDelete->set_sensitive(false);
-        m_xBtnDelete->set_tooltip_text( SvxResId(RID_SVXSTR_DELETEUSERCOLOR2) 
);
+        m_xBtnDelete->set_tooltip_text( CuiResId(RID_SVXSTR_DELETEUSERCOLOR2) 
);
         ImpColorCountChanged();
     }
 
@@ -436,7 +436,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl, 
weld::Button&, void)
     else
     {
         m_xBtnDelete->set_sensitive(false);
-        m_xBtnDelete->set_tooltip_text( SvxResId(RID_SVXSTR_DELETEUSERCOLOR2) 
);
+        m_xBtnDelete->set_tooltip_text( CuiResId(RID_SVXSTR_DELETEUSERCOLOR2) 
);
     }
 }
 
@@ -472,7 +472,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectPaletteLBHdl, 
weld::ComboBox&, void)
     if (nPos != 0)
     {
         m_xBtnDelete->set_sensitive(false);
-        m_xBtnDelete->set_tooltip_text( SvxResId(RID_SVXSTR_DELETEUSERCOLOR1) 
);
+        m_xBtnDelete->set_tooltip_text( CuiResId(RID_SVXSTR_DELETEUSERCOLOR1) 
);
     }
 
     m_xValSetColorList->Resize();
@@ -502,14 +502,14 @@ IMPL_LINK(SvxColorTabPage, SelectValSetHdl_Impl, 
ValueSet*, pValSet, void)
         else
         {
             m_xBtnDelete->set_sensitive(false);
-            m_xBtnDelete->set_tooltip_text( 
SvxResId(RID_SVXSTR_DELETEUSERCOLOR1) );
+            m_xBtnDelete->set_tooltip_text( 
CuiResId(RID_SVXSTR_DELETEUSERCOLOR1) );
         }
     }
     if (pValSet == m_xValSetRecentList.get())
     {
         m_xValSetColorList->SetNoSelection();
         m_xBtnDelete->set_sensitive(false);
-        m_xBtnDelete->set_tooltip_text( SvxResId(RID_SVXSTR_DELETEUSERCOLOR2) 
);
+        m_xBtnDelete->set_tooltip_text( CuiResId(RID_SVXSTR_DELETEUSERCOLOR2) 
);
     }
 }