summaryrefslogtreecommitdiff
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
commit7bd13d9c9d86999bca94e1151c9ac0bdbf05fe13 (patch)
treed4b056db8f00416e7a6f64327f3855963a8fa752
parentef6bcef09cc079f68dbb90a69dbc76ab35ee371d (diff)
cjk-character-units-imp.diff: add a new unit 'character unit'
-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 26eccfc0bb3e..34f142176760 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 );