diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 15:04:10 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 15:04:10 +0000 |
commit | 31bd3953baa2b31dca5ee0fd895f459c210d5506 (patch) | |
tree | 624d31e348db8b572f721aea86756de96af04a7c /sc/source/ui/miscdlgs/textdlgs.cxx | |
parent | 59f17f5580300fc6b55ae7d220bf86f8a927e4c7 (diff) |
INTEGRATION: CWS dialogdiet01 (1.4.400); FILE MERGED
2004/02/27 06:01:02 mwu 1.4.400.1: dialogdiet01 2004_02_27
Diffstat (limited to 'sc/source/ui/miscdlgs/textdlgs.cxx')
-rw-r--r-- | sc/source/ui/miscdlgs/textdlgs.cxx | 53 |
1 files changed, 32 insertions, 21 deletions
diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx index b22894f309e3..782ee37ca37d 100644 --- a/sc/source/ui/miscdlgs/textdlgs.cxx +++ b/sc/source/ui/miscdlgs/textdlgs.cxx @@ -2,9 +2,9 @@ * * $RCSfile: textdlgs.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: nn $ $Date: 2001-05-02 15:33:49 $ + * last change: $Author: hr $ $Date: 2004-05-10 16:04:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,19 +73,19 @@ #define ITEMID_FONTLIST SID_ATTR_CHAR_FONTLIST #define ITEMID_TABSTOP 0 -#include <svx/chardlg.hxx> +//CHINA001 #include <svx/chardlg.hxx> #include <svx/flstitem.hxx> -#include <svx/paragrph.hxx> -#include <svx/tabstpge.hxx> +//CHINA001 #include <svx/paragrph.hxx> +//CHINA001 #include <svx/tabstpge.hxx> #include <sfx2/objsh.hxx> #include <svtools/cjkoptions.hxx> #include "textdlgs.hxx" #include "scresid.hxx" #include "sc.hrc" - - - +#include <svx/svxids.hrc> //add CHINA001 +#include <svtools/intitem.hxx> //add CHINA001 +#include <svx/flagsdef.hxx> //CHINA001 // ----------------------------------------------------------------------- ScCharDlg::ScCharDlg( Window* pParent, const SfxItemSet* pAttr, @@ -96,15 +96,16 @@ ScCharDlg::ScCharDlg( Window* pParent, const SfxItemSet* pAttr, { FreeResource(); - AddTabPage( RID_SVXPAGE_CHAR_NAME, SvxCharNamePage::Create, 0); - AddTabPage( RID_SVXPAGE_CHAR_EFFECTS, SvxCharEffectsPage::Create, 0); - AddTabPage( RID_SVXPAGE_CHAR_POSITION, SvxCharPositionPage::Create, 0); + AddTabPage( RID_SVXPAGE_CHAR_NAME ); //CHINA001 AddTabPage( RID_SVXPAGE_CHAR_NAME, SvxCharNamePage::Create, 0); + AddTabPage( RID_SVXPAGE_CHAR_EFFECTS ); //CHINA001 AddTabPage( RID_SVXPAGE_CHAR_EFFECTS, SvxCharEffectsPage::Create, 0); + AddTabPage( RID_SVXPAGE_CHAR_POSITION ); //CHINA001 AddTabPage( RID_SVXPAGE_CHAR_POSITION, SvxCharPositionPage::Create, 0); } // ----------------------------------------------------------------------- void __EXPORT ScCharDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) { + SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); //CHINA001 switch( nId ) { case RID_SVXPAGE_CHAR_NAME: @@ -112,13 +113,17 @@ void __EXPORT ScCharDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) SvxFontListItem aItem(*( (const SvxFontListItem*) ( rDocShell.GetItem( SID_ATTR_CHAR_FONTLIST) ) ) ); - ( (SvxCharNamePage&) rPage ).SetFontList( aItem ); + //CHINA001 ( (SvxCharNamePage&) rPage ).SetFontList( aItem ); + aSet.Put (SvxFontListItem( aItem.GetFontList(), SID_ATTR_CHAR_FONTLIST)); + rPage.PageCreated(aSet); } break; case RID_SVXPAGE_CHAR_EFFECTS: - ( (SvxCharEffectsPage&) rPage ).DisableControls( - DISABLE_CASEMAP); + //CHINA001 ( (SvxCharEffectsPage&) rPage ).DisableControls( + //CHINA001 DISABLE_CASEMAP); + aSet.Put (SfxUInt16Item(SID_DISABLE_CTL,DISABLE_CASEMAP)); //CHINA001 + rPage.PageCreated(aSet); break; default: @@ -136,14 +141,14 @@ ScParagraphDlg::ScParagraphDlg( Window* pParent, const SfxItemSet* pAttr ) : SvtCJKOptions aCJKOptions; - AddTabPage( RID_SVXPAGE_STD_PARAGRAPH, SvxStdParagraphTabPage::Create, 0); - AddTabPage( RID_SVXPAGE_ALIGN_PARAGRAPH, SvxParaAlignTabPage::Create, 0); + AddTabPage( RID_SVXPAGE_STD_PARAGRAPH );//CHINA001 AddTabPage( RID_SVXPAGE_STD_PARAGRAPH, SvxStdParagraphTabPage::Create, 0); + AddTabPage( RID_SVXPAGE_ALIGN_PARAGRAPH );//CHINA001 AddTabPage( RID_SVXPAGE_ALIGN_PARAGRAPH, SvxParaAlignTabPage::Create, 0); //AddTabPage( RID_SVXPAGE_EXT_PARAGRAPH, SvxExtParagraphTabPage::Create, 0); if ( aCJKOptions.IsAsianTypographyEnabled() ) - AddTabPage( RID_SVXPAGE_PARA_ASIAN, SvxAsianTabPage::Create,0); + AddTabPage( RID_SVXPAGE_PARA_ASIAN);//CHINA001 AddTabPage( RID_SVXPAGE_PARA_ASIAN, SvxAsianTabPage::Create,0); else RemoveTabPage( RID_SVXPAGE_PARA_ASIAN ); - AddTabPage( RID_SVXPAGE_TABULATOR, SvxTabulatorTabPage::Create, 0); + AddTabPage( RID_SVXPAGE_TABULATOR );//CHINA001 AddTabPage( RID_SVXPAGE_TABULATOR, SvxTabulatorTabPage::Create, 0); } // ----------------------------------------------------------------------- @@ -153,9 +158,15 @@ void __EXPORT ScParagraphDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) switch( nId ) { case RID_SVXPAGE_TABULATOR: - ( (SvxTabulatorTabPage&) rPage ). - DisableControls( TABTYPE_ALL &~TABTYPE_LEFT | - TABFILL_ALL &~TABFILL_NONE ); + { + //CHINA001 ( (SvxTabulatorTabPage&) rPage ). + //CHINA001 DisableControls( TABTYPE_ALL &~TABTYPE_LEFT | + //CHINA001 TABFILL_ALL &~TABFILL_NONE ); + SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));//add CHINA001 + aSet.Put(SfxUInt16Item(SID_SVXTABULATORTABPAGE_CONTROLFLAGS,TABTYPE_ALL &~TABTYPE_LEFT | + TABFILL_ALL &~TABFILL_NONE )); + rPage.PageCreated(aSet);//add CHINA001 + } break; } } |