diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-03-19 11:48:17 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-03-19 11:48:17 +0000 |
| commit | 7ce070923f17fa5dd7d7590e625967eb5fdb0575 (patch) | |
| tree | 45eb25ca1800856d37a2d67dc7087b7895ba577e /sw/source/ui/app/appopt.cxx | |
| parent | 4eadf334e3b1348d2b922c76c0dc54d2ed5e65ca (diff) | |
INTEGRATION: CWS os28 (1.22.122); FILE MERGED
2004/02/27 14:05:01 os 1.22.122.2: RESYNC: (1.22-1.23); FILE MERGED
2004/01/21 14:54:54 os 1.22.122.1: #i17450# SwModule::ApplyItemSet(): apply changes to the SwMasterUsrPref of the correct module
Diffstat (limited to 'sw/source/ui/app/appopt.cxx')
| -rw-r--r-- | sw/source/ui/app/appopt.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx index 8c2787562cf9..98332116a4bc 100644 --- a/sw/source/ui/app/appopt.cxx +++ b/sw/source/ui/app/appopt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appopt.cxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: hr $ $Date: 2004-02-03 16:31:13 $ + * last change: $Author: obo $ $Date: 2004-03-19 12:48:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -403,6 +403,7 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet ) SwViewOption aViewOpt = *GetUsrPref(!bTextDialog); SwModuleOptions* pMCfg = GetModuleConfig(); + SwMasterUsrPref* pPref = bTextDialog ? pUsrPref : pWebUsrPref; const SfxPoolItem* pItem; SfxBindings *pBindings = pAppView ? &pAppView->GetViewFrame()->GetBindings() @@ -459,10 +460,9 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet ) if( SFX_ITEM_SET == rSet.GetItemState(FN_HSCROLL_METRIC, FALSE, &pItem ) ) { - SFX_APP()->SetOptions(rSet); const SfxUInt16Item* pMetricItem = (const SfxUInt16Item*)pItem; FieldUnit eUnit = (FieldUnit)pMetricItem->GetValue(); - pUsrPref->SetHScrollMetric(eUnit); + pPref->SetHScrollMetric(eUnit); if(pAppView) pAppView->ChangeTabMetric(eUnit); } @@ -470,10 +470,9 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet ) if( SFX_ITEM_SET == rSet.GetItemState(FN_VSCROLL_METRIC, FALSE, &pItem ) ) { - SFX_APP()->SetOptions(rSet); const SfxUInt16Item* pMetricItem = (const SfxUInt16Item*)pItem; FieldUnit eUnit = (FieldUnit)pMetricItem->GetValue(); - pUsrPref->SetVScrollMetric(eUnit); + pPref->SetVScrollMetric(eUnit); if(pAppView) pAppView->ChangeVLinealMetric(eUnit); } @@ -482,7 +481,7 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet ) FALSE, &pItem ) ) { USHORT nTabDist = ((const SfxUInt16Item*)pItem)->GetValue(); - pUsrPref->SetDefTab(nTabDist); + pPref->SetDefTab(nTabDist); if(pAppView) { SvxTabStopItem aDefTabs( 0, 0 ); |