diff options
author | Oliver-Rainer Wittmann <orw@apache.org> | 2013-05-17 11:35:46 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-22 11:34:41 +0100 |
commit | 6bd7bfc156c6fda69b629cb31d28a7b0ed2298da (patch) | |
tree | 1b5cb34811c6b5451e462527062f7dabc7c95526 /sw | |
parent | 851ecc635c25aecb623a54c8b22583ce3e6adb26 (diff) |
Resolves: #i122310# page property panel, page size control
display page size as Width x Height
(cherry picked from commit b83fb522809c9b54427f60200164f878ae7f4658)
Conflicts:
sw/source/ui/sidebar/PageSizeControl.cxx
Change-Id: I150eb045366ee1a712f2a7fc992d5ac76b7e19d7
(cherry picked from commit 2d00e944315ddbf25b1e566082ecbf576ea0dab6)
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/ui/sidebar/PageSizeControl.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/ui/sidebar/PageSizeControl.cxx b/sw/source/ui/sidebar/PageSizeControl.cxx index 1f6cfd8487ce..ca77f913c1dc 100644 --- a/sw/source/ui/sidebar/PageSizeControl.cxx +++ b/sw/source/ui/sidebar/PageSizeControl.cxx @@ -111,9 +111,9 @@ PageSizeControl::PageSizeControl( maWidthHeightField.IsUseThousandSep(), maWidthHeightField.IsShowTrailingZeros() ); - ItemText2 = HeightStr; + ItemText2 = WidthStr; ItemText2 += OUString(" x "); - ItemText2 += WidthStr; + ItemText2 += HeightStr; ItemText2 += OUString(" "); ItemText2 += aMetricStr; |