cui/source/inc/cuitabarea.hxx | 2 +- cui/source/tabpages/tpcolor.cxx | 6 +++--- filter/source/graphicfilter/icgm/cgmtypes.hxx | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit 61cb4a8e956f7471ae654955bc5aa77a67852d34 Author: Thomas Arnhold <[email protected]> Date: Sat Jan 25 09:54:45 2014 +0100 some more CMYK -> CYMK diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 2b8ed32..47d6bb4 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -661,7 +661,7 @@ private: NumericField* m_pG; NumericField* m_pB; - VclContainer* m_pCYMK; + VclContainer* m_pCMYK; MetricField* m_pC; MetricField* m_pY; MetricField* m_pM; diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index b904eaa..b5edc2d 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, "cmyk"); + get(m_pCMYK, "cmyk"); get(m_pC, "C"); get(m_pY, "Y"); get(m_pM, "M"); @@ -981,7 +981,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectColorModelHdl_Impl) case CM_RGB: { m_pRGB->Show(); - m_pCYMK->Hide(); + m_pCMYK->Hide(); m_pR->SetValue( ColorToPercent_Impl( aCurrentColor.GetRed() ) ); m_pG->SetValue( ColorToPercent_Impl( aCurrentColor.GetGreen() ) ); @@ -992,7 +992,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectColorModelHdl_Impl) case CM_CMYK: { - m_pCYMK->Show(); + m_pCMYK->Show(); m_pRGB->Hide(); m_pC->SetValue( ColorToPercent_Impl( aCurrentColor.GetRed() ) ); diff --git a/filter/source/graphicfilter/icgm/cgmtypes.hxx b/filter/source/graphicfilter/icgm/cgmtypes.hxx index b5e678a..07e121d 100644 --- a/filter/source/graphicfilter/icgm/cgmtypes.hxx +++ b/filter/source/graphicfilter/icgm/cgmtypes.hxx @@ -102,7 +102,7 @@ enum DeviceViewPortMapV { DVPMV_BOTTOM = 0, DVPMV_CENTER = 1, DVPMV_TOP = 2 }; enum ClipIndicator { CI_OFF = 0, CI_ON = 1 }; enum ColorSelectionMode { CSM_INDEXED = 0, CSM_DIRECT = 1 }; -enum ColorModel { CM_RGB = 0, CM_CYMK = 1 }; +enum ColorModel { CM_RGB = 0, CM_CMYK = 1 }; enum CharacterCodingA { CCA_BASIC_7 = 0, CCA_BASIC_8 = 1, CCA_EXT_7 = 2, CCA_EXT_8 = 3 }; enum CharSetType { CST_CBYTE_94 = 0, CST_CBYTE_96 = 1, CST_MULT94 = 2, CST_MULT96 = 3, CST_CCOMPLETE = 4 }; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
