cui/source/tabpages/chardlg.cxx | 2 +- cui/uiconfig/ui/positionpage.ui | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit a6c26ef0c77c716d222bacb4f402af4638ba62c2 Author: Takeshi Abe <t...@fixedpoint.jp> Date: Fri Feb 26 11:38:52 2016 +0900 cui: Fix a wrong label "Rotation" in Character > Position menu ... by replacing it with "Scaling". To find the label in Calc's Character > Position menu: 1. select text in a cell and open context menu 2. choose "Character..." in the context menu 3. choose "Position" tab (then the label appears as 2nd headline) This looks a regression from 6a0951a9bc564d8e214472bd84aec2971b9e9d64. Change-Id: I183f89e6891eea53f6e345472d7d413f0f801e91 Reviewed-on: https://gerrit.libreoffice.org/22709 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: David Tardon <dtar...@redhat.com> Tested-by: David Tardon <dtar...@redhat.com> diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 3852717..d2e7fab 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -2629,7 +2629,7 @@ SvxCharPositionPage::SvxCharPositionPage( vcl::Window* pParent, const SfxItemSet get(m_pFontSizeFT, "relativefontsize"); get(m_pFontSizeMF, "fontsizesb"); get(m_pRotationContainer, "rotationcontainer"); - get(m_pScalingFT, "rotate"); + get(m_pScalingFT, "scale"); get(m_pScalingAndRotationFT, "rotateandscale"); get(m_p0degRB, "0deg"); get(m_p90degRB, "90deg"); diff --git a/cui/uiconfig/ui/positionpage.ui b/cui/uiconfig/ui/positionpage.ui index ebd1b24..22776ed 100644 --- a/cui/uiconfig/ui/positionpage.ui +++ b/cui/uiconfig/ui/positionpage.ui @@ -394,11 +394,11 @@ </packing> </child> <child> - <object class="GtkLabel" id="rotate"> + <object class="GtkLabel" id="scale"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Rotation</property> + <property name="label" translatable="yes">Scaling</property> <attributes> <attribute name="weight" value="bold"/> </attributes> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits