diff options
| author | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2011-05-23 12:51:49 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-06-08 06:39:30 +0200 |
| commit | f1575d39d539f261d40d81aca48820f8fb495ff8 (patch) | |
| tree | 6325270c6c975bb2b23ada1d475350779ea20260 | |
| parent | 5586202428a483004bf38bcd477ab62a3d0ca945 (diff) | |
fdo#32684: Really don't handle the CJK unit by default
Signed-off-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | sw/source/ui/config/usrpref.cxx | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx index 7c1eec9e89..20627df243 100644 --- a/sw/source/ui/config/usrpref.cxx +++ b/sw/source/ui/config/usrpref.cxx @@ -32,7 +32,6 @@ #include <tools/stream.hxx> #include <unotools/syslocale.hxx> -#include <svl/cjkoptions.hxx> #include "swtypes.hxx" #include "hintids.hxx" @@ -74,17 +73,8 @@ SwMasterUsrPref::SwMasterUsrPref(sal_Bool bWeb) : bApplyCharUnit(sal_False) { MeasurementSystem eSystem = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum(); - SvtCJKOptions aCJKOptions; eUserMetric = MEASURE_METRIC == eSystem ? FUNIT_CM : FUNIT_INCH; - sal_Bool bCJKEnabled = aCJKOptions.IsAsianTypographyEnabled(); - bApplyCharUnit = bCJKEnabled; - eHScrollMetric = bApplyCharUnit ? FUNIT_CHAR : eUserMetric; - eVScrollMetric = bApplyCharUnit ? FUNIT_LINE : eUserMetric; - - bIsHScrollMetricSet = bApplyCharUnit; - bIsVScrollMetricSet = bApplyCharUnit; - aContentConfig.Load(); aLayoutConfig.Load(); aGridConfig.Load(); |