summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorAmelia Wang <amwang@novell.com>2010-09-13 14:37:50 +0200
committerCédric Bosdonnat <cedricbosdo@openoffice.org>2010-09-13 16:01:52 +0200
commit38d7e2c79e4207d8138a1740e077bf0e83c80856 (patch)
tree59ac2bca190b3dc0637e54c733463bd3b2646cf8 /cui
parentecd9e9d1a068915607ed0b4cc97e573839c9fe47 (diff)
cjk-character-units-imp.diff: add a new unit 'character unit'
Diffstat (limited to 'cui')
-rw-r--r--cui/source/tabpages/paragrph.cxx9
1 files changed, 9 insertions, 0 deletions
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index d500078e8..aa70c22dc 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -38,6 +38,7 @@
#define _SVX_PARAGRPH_CXX 0
#include <svl/languageoptions.hxx>
+#include <svl/cjkoptions.hxx>
#include <editeng/pgrditem.hxx>
#include <cuires.hrc>
#include "paragrph.hrc"
@@ -438,11 +439,19 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet )
// Metrik einstellen
FieldUnit eFUnit = GetModuleFieldUnit( rSet );
+
+ BOOL bApplyCharUnit = GetApplyCharUnit( rSet );
+
+ if ( bApplyCharUnit )
+ eFUnit = FUNIT_CHAR;
SetFieldUnit( aLeftIndent, eFUnit );
SetFieldUnit( aRightIndent, eFUnit );
SetFieldUnit( aFLineIndent, eFUnit );
+ if ( bApplyCharUnit )
+ eFUnit = FUNIT_LINE;
SetFieldUnit( aTopDist, eFUnit );
SetFieldUnit( aBottomDist, eFUnit );
+ eFUnit = FUNIT_POINT;
SetFieldUnit( aLineDistAtMetricBox, eFUnit );
USHORT _nWhich = GetWhich( SID_ATTR_LRSPACE );