summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2016-02-26 11:38:52 +0900
committerDavid Tardon <dtardon@redhat.com>2016-02-26 08:53:35 +0000
commita6c26ef0c77c716d222bacb4f402af4638ba62c2 (patch)
tree88271522457a1c407db0ceed47424d6f0e47a2cb
parent42c5c699d131d34bdb3dba2545438337c9c1bb09 (diff)
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 <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
-rw-r--r--cui/source/tabpages/chardlg.cxx2
-rw-r--r--cui/uiconfig/ui/positionpage.ui4
2 files changed, 3 insertions, 3 deletions
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 38527176a933..d2e7fabda54e 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 ebd1b243b4f3..22776edb2c96 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>