[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sw/source

[David Tardon]

 sw/source/ui/config/usrpref.cxx |   10 ----------
 1 file changed, 10 deletions(-)

New commits:
commit f1575d39d539f261d40d81aca48820f8fb495ff8
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date:   Mon May 23 12:51:49 2011 +0200

    fdo#32684: Really don't handle the CJK unit by default
    
    Signed-off-by: David Tardon <dtardon at redhat.com>

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();