diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 15:04:54 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 15:04:54 +0000 |
| commit | f5e24a5c2bd3eb075a46535f080a716fb9001754 (patch) | |
| tree | 2baaef45af9472d59eaba48628c4cbc136507caa /sw/source/ui/fmtui | |
| parent | 7d95caa72205634ac58963841829d9ce0b6910ff (diff) | |
INTEGRATION: CWS os30 (1.18.8); FILE MERGED
2004/05/26 09:34:05 os 1.18.8.1: #i29517# putting the same item type twice doesn't work
Diffstat (limited to 'sw/source/ui/fmtui')
| -rw-r--r-- | sw/source/ui/fmtui/tmpdlg.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index b73646890b6e..91dd5c7a278c 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tmpdlg.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: hr $ $Date: 2004-05-10 16:26:39 $ + * last change: $Author: rt $ $Date: 2004-06-17 16:04:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -664,18 +664,18 @@ void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) break; case TP_BACKGROUND: + { + sal_Int32 nFlagType = 0; if( SFX_STYLE_FAMILY_PARA == nType ) - aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, SVX_SHOW_PARACTL)); - //CHINA001 ((SvxBackgroundTabPage&)rPage).ShowParaControl(); + nFlagType |= SVX_SHOW_PARACTL; if( SFX_STYLE_FAMILY_CHAR != nType ) - aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, SVX_SHOW_SELECTOR)); - //CHINA001 ((SvxBackgroundTabPage&)rPage).ShowSelector(); + nFlagType |= SVX_SHOW_SELECTOR; if( SFX_STYLE_FAMILY_FRAME == nType ) - aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, SVX_ENABLE_TRANSPARENCY)); - //CHINA001 ((SvxBackgroundTabPage&)rPage).EnableTransparency(TRUE, TRUE); + nFlagType |= SVX_ENABLE_TRANSPARENCY; + aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlagType)); rPage.PageCreated(aSet); - break; - + } + break; case TP_CONDCOLL: ((SwCondCollPage&)rPage).SetCollection( ((SwDocStyleSheet&)GetStyleSheet()).GetCollection(), bNewStyle ); |