diff options
| author | Amelia Wang <amwang@novell.com> | 2010-09-13 14:43:46 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2010-09-13 15:41:47 +0200 |
| commit | c9326d9df33ec9d25ea72511511d4294857743b3 (patch) | |
| tree | b224f8f390ee30b72a0527febdd864fa8d1a6922 /sw/source/ui/app | |
| parent | afcc1620eda45972f850af06495f556ee5e42977 (diff) | |
cjk-character-units-fix.diff: add a new unit 'character unit'
i#356101
Diffstat (limited to 'sw/source/ui/app')
| -rw-r--r-- | sw/source/ui/app/appopt.cxx | 1 | ||||
| -rw-r--r-- | sw/source/ui/app/swmodul1.cxx | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx index 0bc088f06a98..00a96d152b53 100644 --- a/sw/source/ui/app/appopt.cxx +++ b/sw/source/ui/app/appopt.cxx @@ -230,6 +230,7 @@ SfxItemSet* SwModule::CreateItemSet( USHORT nId ) pAppView->GetVLinealMetric(eUnit); pRet->Put(SfxUInt16Item( FN_VSCROLL_METRIC, static_cast< UINT16 >(eUnit) )); pRet->Put(SfxUInt16Item( SID_ATTR_METRIC, static_cast< UINT16 >(pPref->GetMetric()) )); + pRet->Put(SfxBoolItem(SID_ATTR_APPLYCHARUNIT, pPref->IsApplyCharUnit())); if(bTextDialog) { if(pAppView) diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx index e4b152257141..f27c89478a8a 100644 --- a/sw/source/ui/app/swmodul1.cxx +++ b/sw/source/ui/app/swmodul1.cxx @@ -348,8 +348,10 @@ void SwModule::ApplyUserCharUnit(BOOL bApplyChar, BOOL bWeb) } else { - eHScrollMetric = FUNIT_CM; - eVScrollMetric = FUNIT_CM; + if ( eHScrollMetric == FUNIT_CHAR ) + eHScrollMetric == FUNIT_CM; + if ( eVScrollMetric == FUNIT_LINE ) + eVScrollMetric == FUNIT_CM; } SwView* pTmpView = SwModule::GetFirstView(); // fuer alle MDI-Fenster das Lineal umschalten |