Hi all,
That bug was badly fixed (by me) quite some times ago. Here is a correct
fix (why did I add that code at all ?). Could you review it and push it
in 3.4 and 3.4.0?
More cleanup is needed but it'll end up in master: some options aren't
used at all in that area.
Thanks,
--
Cédric Bosdonnat
LibreOffice hacker
http://documentfoundation.org
OOo Eclipse Integration developer
http://cedric.bosdonnat.free.fr
>From 4cb6d69c1fa64bd7411d2502d646a9df378ff171 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cedric.bosdonnat....@free.fr>
Date: Mon, 23 May 2011 12:51:49 +0200
Subject: [PATCH] fdo#32684: Really don't handle the CJK unit by default
---
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 7c1eec9..20627df 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();
--
1.7.3.4
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
