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

[Caolán McNamara (via logerrit)]

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

New commits:
commit c0658e3e60daae59058734a13127fb6af38f2e21
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Dec 3 14:09:33 2021 +0000
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Sun Dec 5 18:05:47 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) which
    is more obvious now we only SVXSTR for strings in svx
    
    Change-Id: I595bd5aadd8ead18291ff818405bec594c8d32db
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126292
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 7be82dca2676..962439c51d70 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -126,7 +126,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) );
 
     // disable preset color values
     m_xRGBpreset->set_sensitive(false);
@@ -369,7 +369,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();
     }
 
@@ -428,7 +428,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) 
);
     }
 }
 
@@ -464,7 +464,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();
@@ -494,14 +494,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) 
);
     }
 }