[Libreoffice-commits] core.git: cui/source cui/uiconfig

[Julien Nabet]

 cui/source/tabpages/tpcolor.cxx |    2 +-
 cui/uiconfig/ui/colorpage.ui    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 38fed70782ae6ac6b0282897c7abc6fa33a6de9e
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Fri Jan 24 20:56:37 2014 +0100

    Replace "cymk" by "cmyk"
    
    See http://en.wikipedia.org/wiki/CMYK_color_model
    
    Change-Id: Ie0264694f7daf6c5de1c7c056e16e10bda2b24ac

diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 2942c83..b904eaa 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -335,7 +335,7 @@ SvxColorTabPage::SvxColorTabPage(Window* pParent, const SfxItemSet& rInAttrs)
     get(m_pR, "R");
     get(m_pG, "G");
     get(m_pB, "B");
-    get(m_pCYMK, "cymk");
+    get(m_pCYMK, "cmyk");
     get(m_pC, "C");
     get(m_pY, "Y");
     get(m_pM, "M");
diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui
index 7cf9ef6..89508bc 100644
--- a/cui/uiconfig/ui/colorpage.ui
+++ b/cui/uiconfig/ui/colorpage.ui
@@ -341,7 +341,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkGrid" id="cymk">
+                      <object class="GtkGrid" id="cmyk">
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
                         <property name="halign">end</property>