Skip to content

C
core
Kaydet (Commit) 0798c42c authored tarafından Jens-Heiner Rechtien's avatar Jens-Heiner Rechtien
Dosyalara gözat
Seçenekler

INTEGRATION: CWS os38 (1.17.4); FILE MERGED 

2004/10/08 14:14:50 os 1.17.4.2: RESYNC: (1.17-1.18); FILE MERGED
2004/09/22 12:41:15 os 1.17.4.1: #i29255# order of options dialog groups according to spec
üst 3403ac10
Hide whitespace changes
Inline Side-by-side
Showing with 142 additions and 181 deletions
svx/source/dialog/treeopt.cxx
Dosyayı görüntüle @ 0798c42c
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: treeopt.cxx,v $ * $RCSfile: treeopt.cxx,v $
* *
* $Revision: 1.19 $ * $Revision: 1.20 $
* *
* last change: $Author: pjunck $ $Date: 2004-11-03 10:36:35 $ * last change: $Author: hr $ $Date: 2004-11-09 16:40:25 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -1449,222 +1449,183 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ...@@ -1449,222 +1449,183 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet
void OfaTreeOptionsDialog::Initialize() void OfaTreeOptionsDialog::Initialize()
{ {
USHORT nSlot = SID_OPTIONS_TREEDIALOG;
OfaPageResource aDlgResource; OfaPageResource aDlgResource;
sal_uInt16 nGroup = 0; sal_uInt16 nGroup = 0;
SfxApplication* pApp = SFX_APP(); SfxApplication* pApp = SFX_APP();
if(nSlot != SID_OPTPAGE_PROXY) BOOL isSSOEnabled = EnableSSO();
{
BOOL isSSOEnabled = EnableSSO();
ResStringArray& rGeneralArray = aDlgResource.GetGeneralArray();
nGroup = AddGroup(rGeneralArray.GetString(0), 0, 0, SID_GENERAL_OPTIONS );
sal_uInt16 nEnd = nSlot == SID_OPTIONS_TREEDIALOG ? rGeneralArray.Count() : 2;
sal_uInt16 i; ResStringArray& rGeneralArray = aDlgResource.GetGeneralArray();
for(i = 1; i < nEnd; i++) nGroup = AddGroup(rGeneralArray.GetString(0), 0, 0, SID_GENERAL_OPTIONS );
{ sal_uInt16 nEnd = rGeneralArray.Count();
sal_uInt16 nPageId = (sal_uInt16)rGeneralArray.GetValue(i);
if ( nPageId != RID_SVXPAGE_SSO || isSSOEnabled )
AddTabPage( nPageId, rGeneralArray.GetString(i), nGroup );
}
//load/save sal_uInt16 i;
ResStringArray& rFilterArray = aDlgResource.GetFilterArray(); for(i = 1; i < nEnd; i++)
nGroup = AddGroup( rFilterArray.GetString(0), 0, 0, SID_FILTER_DLG ); {
for(i = 1; i < rFilterArray.Count(); ++i ) sal_uInt16 nPageId = (sal_uInt16)rGeneralArray.GetValue(i);
AddTabPage( (sal_uInt16)rFilterArray.GetValue(i), if ( nPageId != RID_SVXPAGE_SSO || isSSOEnabled )
rFilterArray.GetString(i), nGroup ); AddTabPage( nPageId, rGeneralArray.GetString(i), nGroup );
// new spec: always show chart pages in general options
ResStringArray& rChartArray = aDlgResource.GetChartArray();
nGroup = AddGroup( rChartArray.GetString(0), 0, 0, SID_SCH_EDITOPTIONS );
for(USHORT i1 = 1; i1 < rChartArray.Count(); i1++)
AddTabPage( (sal_uInt16)rChartArray.GetValue(i1), rChartArray.GetString(i1), nGroup);
} }
SvtLanguageOptions aLanguageOptions; //load/save
ResStringArray& rFilterArray = aDlgResource.GetFilterArray();
nGroup = AddGroup( rFilterArray.GetString(0), 0, 0, SID_FILTER_DLG );
for(i = 1; i < rFilterArray.Count(); ++i )
AddTabPage( (sal_uInt16)rFilterArray.GetValue(i),
rFilterArray.GetString(i), nGroup );
if ( nSlot == SID_OPTIONS_TREEDIALOG ) // language options
SvtLanguageOptions aLanguageOptions;
ResStringArray& rLangArray = aDlgResource.GetLangArray();
nGroup = AddGroup( rLangArray.GetString(0), 0, 0, SID_LANGUAGE_OPTIONS );
for ( USHORT i = 1; i < rLangArray.Count(); ++i )
{ {
// language options sal_uInt16 nValue = (sal_uInt16)rLangArray.GetValue(i);
ResStringArray& rLangArray = aDlgResource.GetLangArray(); if ( ( RID_SVXPAGE_JSEARCH_OPTIONS != nValue || aLanguageOptions.IsJapaneseFindEnabled() ) &&
nGroup = AddGroup( rLangArray.GetString(0), 0, 0, SID_LANGUAGE_OPTIONS ); ( RID_SVXPAGE_ASIAN_LAYOUT != nValue || aLanguageOptions.IsAsianTypographyEnabled() ) &&
for ( USHORT i = 1; i < rLangArray.Count(); ++i ) ( RID_SVXPAGE_OPTIONS_CTL != nValue || aLanguageOptions.IsCTLFontEnabled() ) )
{ AddTabPage( nValue, rLangArray.GetString(i), nGroup );
sal_uInt16 nValue = (sal_uInt16)rLangArray.GetValue(i);
if ( ( RID_SVXPAGE_JSEARCH_OPTIONS != nValue || aLanguageOptions.IsJapaneseFindEnabled() ) &&
( RID_SVXPAGE_ASIAN_LAYOUT != nValue || aLanguageOptions.IsAsianTypographyEnabled() ) &&
( RID_SVXPAGE_OPTIONS_CTL != nValue || aLanguageOptions.IsCTLFontEnabled() ) )
AddTabPage( nValue, rLangArray.GetString(i), nGroup );
}
}
if ( nSlot != SID_OPTPAGE_USERDATA )
{
// Internet
// f"ur SID_OPTPAGE_PROXY wird der komplett INet-Dlg angezeigt
ResStringArray& rInetArray = aDlgResource.GetInetArray();
nGroup = AddGroup(rInetArray.GetString(0), 0, 0, SID_INET_DLG );
//falls doch nur dir Proxy-Page gewuenscht wird, dann diese Zeile
// sal_uInt16 nEnd = nSlot == SID_OPTPAGE_PROXY ? 2 : rInetArray.Count();
sal_uInt16 nEnd = rInetArray.Count();
for ( sal_uInt16 i = 1; i < nEnd; i++ )
{
#if defined WNT
// Disable E-mail tab-page on Windows
if ( i == 3 )
continue;
#endif
sal_uInt16 nPageId = (sal_uInt16)rInetArray.GetValue(i);
AddTabPage( nPageId, rInetArray.GetString(i), nGroup );
}
if ( nSlot == SID_OPTPAGE_PROXY )
ActivatePage( RID_SVXPAGE_INET_PROXY );
} }
if ( nSlot == SID_OPTIONS_TREEDIALOG )
sal_Bool bHasAnyFilter = sal_False;
SvtModuleOptions aModuleOpt;
if ( aModuleOpt.IsWriter() )
{ {
sal_Bool bHasAnyFilter = sal_False; // Textdokument
SvtModuleOptions aModuleOpt; bHasAnyFilter = sal_True;
if ( aModuleOpt.IsWriter() ) ResStringArray& rTextArray = aDlgResource.GetTextArray();
SfxModule *pSwMod = (*(SfxModule**) GetAppData(SHL_WRITER));
if ( pSwMod && pSwMod->IsActive() )
{ {
// Textdokument nGroup = AddGroup(rTextArray.GetString(0), pSwMod, pSwMod, SID_SW_EDITOPTIONS );
bHasAnyFilter = sal_True; USHORT i;
ResStringArray& rTextArray = aDlgResource.GetTextArray(); for(i = 1; i < rTextArray.Count(); i++)
SfxModule *pSwMod = (*(SfxModule**) GetAppData(SHL_WRITER));
if ( pSwMod && pSwMod->IsActive() )
{ {
nGroup = AddGroup(rTextArray.GetString(0), pSwMod, pSwMod, SID_SW_EDITOPTIONS ); sal_uInt16 nValue = (sal_uInt16)rTextArray.GetValue(i);
USHORT i; if((RID_SW_TP_STD_FONT_CJK != nValue || aLanguageOptions.IsCJKFontEnabled())&&
for(i = 1; i < rTextArray.Count(); i++) (RID_SW_TP_STD_FONT_CTL != nValue || aLanguageOptions.IsCTLFontEnabled()))
{ AddTabPage( nValue, rTextArray.GetString(i), nGroup);
sal_uInt16 nValue = (sal_uInt16)rTextArray.GetValue(i);
if((RID_SW_TP_STD_FONT_CJK != nValue || aLanguageOptions.IsCJKFontEnabled())&&
(RID_SW_TP_STD_FONT_CTL != nValue || aLanguageOptions.IsCTLFontEnabled()))
AddTabPage( nValue, rTextArray.GetString(i), nGroup);
}
#ifndef PRODUCT
AddTabPage( RID_SW_TP_OPTTEST_PAGE, String::CreateFromAscii("Interner Test"), nGroup);
#endif
// HTML-Dokument
ResStringArray& rHTMLArray = aDlgResource.GetHTMLArray();
nGroup = AddGroup(rHTMLArray.GetString(0), pSwMod, pSwMod, SID_SW_ONLINEOPTIONS );
for(i = 1; i < rHTMLArray.Count(); i++)
AddTabPage( (sal_uInt16)rHTMLArray.GetValue(i), rHTMLArray.GetString(i), nGroup);
#ifndef PRODUCT
AddTabPage( RID_SW_TP_OPTTEST_PAGE, String::CreateFromAscii("Interner Test"), nGroup);
#endif
} }
#ifndef PRODUCT
AddTabPage( RID_SW_TP_OPTTEST_PAGE, String::CreateFromAscii("Interner Test"), nGroup);
#endif
// HTML-Dokument
ResStringArray& rHTMLArray = aDlgResource.GetHTMLArray();
nGroup = AddGroup(rHTMLArray.GetString(0), pSwMod, pSwMod, SID_SW_ONLINEOPTIONS );
for(i = 1; i < rHTMLArray.Count(); i++)
AddTabPage( (sal_uInt16)rHTMLArray.GetValue(i), rHTMLArray.GetString(i), nGroup);
#ifndef PRODUCT
AddTabPage( RID_SW_TP_OPTTEST_PAGE, String::CreateFromAscii("Interner Test"), nGroup);
#endif
} }
}
if ( aModuleOpt.IsCalc() ) if ( aModuleOpt.IsCalc() )
{
// StarCalc-Dialog
bHasAnyFilter = sal_True;
SfxModule* pScMod = ( *( SfxModule** ) GetAppData( SHL_CALC ) );
if ( pScMod && pScMod->IsActive() )
{ {
// StarCalc-Dialog ResStringArray& rCalcArray = aDlgResource.GetCalcArray();
bHasAnyFilter = sal_True; nGroup = AddGroup( rCalcArray.GetString( 0 ), pScMod, pScMod, SID_SC_EDITOPTIONS );
SfxModule* pScMod = ( *( SfxModule** ) GetAppData( SHL_CALC ) ); const sal_Bool bCTL = aLanguageOptions.IsCTLFontEnabled();
if ( pScMod && pScMod->IsActive() ) sal_uInt16 nId;
const USHORT nCount = rCalcArray.Count();
for( USHORT i = 1 ; i < nCount ; ++i )
{ {
ResStringArray& rCalcArray = aDlgResource.GetCalcArray(); nId = ( sal_uInt16 ) rCalcArray.GetValue( i );
nGroup = AddGroup( rCalcArray.GetString( 0 ), pScMod, pScMod, SID_SC_EDITOPTIONS ); // if( bCTL || nId != RID_OFA_TP_INTERNATIONAL )
const sal_Bool bCTL = aLanguageOptions.IsCTLFontEnabled(); // #103755# if an international tabpage is need one day, this should be used again... ;-)
sal_uInt16 nId; if( nId != RID_OFA_TP_INTERNATIONAL )
const USHORT nCount = rCalcArray.Count(); AddTabPage( nId, rCalcArray.GetString( i ), nGroup );
for( USHORT i = 1 ; i < nCount ; ++i )
{
nId = ( sal_uInt16 ) rCalcArray.GetValue( i );
// if( bCTL || nId != RID_OFA_TP_INTERNATIONAL )
// #103755# if an international tabpage is need one day, this should be used again... ;-)
if( nId != RID_OFA_TP_INTERNATIONAL )
AddTabPage( nId, rCalcArray.GetString( i ), nGroup );
}
} }
} }
}
if ( aModuleOpt.IsImpress() ) if ( aModuleOpt.IsImpress() )
{
//Praesentation
bHasAnyFilter = sal_True;
SfxModule* pSdMod = ( *( SfxModule** ) GetAppData( SHL_DRAW ) );
if ( pSdMod && pSdMod->IsActive() )
{ {
//Praesentation ResStringArray& rImpressArray = aDlgResource.GetImpressArray();
bHasAnyFilter = sal_True; nGroup = AddGroup( rImpressArray.GetString( 0 ), pSdMod, pSdMod, SID_SD_EDITOPTIONS );
SfxModule* pSdMod = ( *( SfxModule** ) GetAppData( SHL_DRAW ) ); const sal_Bool bCTL = aLanguageOptions.IsCTLFontEnabled();
if ( pSdMod && pSdMod->IsActive() ) sal_uInt16 nId;
const USHORT nCount = rImpressArray.Count();
for( USHORT i = 1 ; i < nCount ; ++i )
{ {
ResStringArray& rImpressArray = aDlgResource.GetImpressArray(); nId = ( sal_uInt16 ) rImpressArray.GetValue( i );
nGroup = AddGroup( rImpressArray.GetString( 0 ), pSdMod, pSdMod, SID_SD_EDITOPTIONS ); if( bCTL || nId != RID_OFA_TP_INTERNATIONAL_IMPR )
const sal_Bool bCTL = aLanguageOptions.IsCTLFontEnabled(); AddTabPage( nId, rImpressArray.GetString( i ), nGroup );
sal_uInt16 nId;
const USHORT nCount = rImpressArray.Count();
for( USHORT i = 1 ; i < nCount ; ++i )
{
nId = ( sal_uInt16 ) rImpressArray.GetValue( i );
if( bCTL || nId != RID_OFA_TP_INTERNATIONAL_IMPR )
AddTabPage( nId, rImpressArray.GetString( i ), nGroup );
}
} }
} }
}
if ( aModuleOpt.IsDraw() ) if ( aModuleOpt.IsDraw() )
{
//Zeichnung
SfxModule* pSdMod = ( *( SfxModule** ) GetAppData( SHL_DRAW ) );
if ( pSdMod && pSdMod->IsActive() )
{ {
//Zeichnung ResStringArray& rDrawArray = aDlgResource.GetDrawArray();
SfxModule* pSdMod = ( *( SfxModule** ) GetAppData( SHL_DRAW ) ); nGroup = AddGroup( rDrawArray.GetString( 0 ), pSdMod, pSdMod, SID_SD_GRAPHIC_OPTIONS );
if ( pSdMod && pSdMod->IsActive() ) const sal_Bool bCTL = aLanguageOptions.IsCTLFontEnabled();
sal_uInt16 nId;
const USHORT nCount = rDrawArray.Count();
for( USHORT i = 1 ; i < nCount ; ++i )
{ {
ResStringArray& rDrawArray = aDlgResource.GetDrawArray(); nId = ( sal_uInt16 ) rDrawArray.GetValue( i );
nGroup = AddGroup( rDrawArray.GetString( 0 ), pSdMod, pSdMod, SID_SD_GRAPHIC_OPTIONS ); if( bCTL || nId != RID_OFA_TP_INTERNATIONAL_SD )
const sal_Bool bCTL = aLanguageOptions.IsCTLFontEnabled(); AddTabPage( nId, rDrawArray.GetString( i ), nGroup );
sal_uInt16 nId;
const USHORT nCount = rDrawArray.Count();
for( USHORT i = 1 ; i < nCount ; ++i )
{
nId = ( sal_uInt16 ) rDrawArray.GetValue( i );
if( bCTL || nId != RID_OFA_TP_INTERNATIONAL_SD )
AddTabPage( nId, rDrawArray.GetString( i ), nGroup );
}
} }
} }
}
if ( aModuleOpt.IsMath() ) if ( aModuleOpt.IsMath() )
{ {
// StarMath-Dialog // StarMath-Dialog
SfxModule *pSmMod = (*(SfxModule**) GetAppData(SHL_SM)); SfxModule *pSmMod = (*(SfxModule**) GetAppData(SHL_SM));
if ( pSmMod && pSmMod->IsActive() ) if ( pSmMod && pSmMod->IsActive() )
{
ResStringArray& rStarMathArray = aDlgResource.GetStarMathArray();
nGroup = AddGroup(rStarMathArray.GetString(0), pSmMod, pSmMod, SID_SM_EDITOPTIONS );
for(USHORT i = 1; i < rStarMathArray.Count(); i++)
AddTabPage( (sal_uInt16)rStarMathArray.GetValue(i), rStarMathArray.GetString(i), nGroup);
}
}
/*
if ( aModuleOpt.IsChart() )
{ {
//Diagramm ResStringArray& rStarMathArray = aDlgResource.GetStarMathArray();
SfxModule *pSchMod = (*(SfxModule**) GetAppData(SHL_SCH)); nGroup = AddGroup(rStarMathArray.GetString(0), pSmMod, pSmMod, SID_SM_EDITOPTIONS );
if ( pSchMod && pSchMod->IsActive() ) for(USHORT i = 1; i < rStarMathArray.Count(); i++)
{ AddTabPage( (sal_uInt16)rStarMathArray.GetValue(i), rStarMathArray.GetString(i), nGroup);
ResStringArray& rChartArray = aDlgResource.GetChartArray();
nGroup = AddGroup(rChartArray.GetString(0), pSchMod, pSchMod, SID_SCH_EDITOPTIONS );
for(USHORT i = 1; i < rChartArray.Count(); i++)
AddTabPage( (sal_uInt16)rChartArray.GetValue(i), rChartArray.GetString(i), nGroup);
}
} }
*/
if (sal_True)
{ // Data access (always installed)
ResStringArray& rDSArray = aDlgResource.GetDatasourcesArray();
nGroup = AddGroup(rDSArray.GetString(0), 0, NULL, SID_SB_STARBASEOPTIONS );
for(USHORT i = 1; i < rDSArray.Count(); i++)
AddTabPage( (sal_uInt16)rDSArray.GetValue(i), rDSArray.GetString(i), nGroup);
}
ResizeTreeLB();
ActivateLastSelection();
} }
else // Data access (always installed)
ResizeTreeLB(); ResStringArray& rDSArray = aDlgResource.GetDatasourcesArray();
nGroup = AddGroup(rDSArray.GetString(0), 0, NULL, SID_SB_STARBASEOPTIONS );
for(USHORT i = 1; i < rDSArray.Count(); i++)
AddTabPage( (sal_uInt16)rDSArray.GetValue(i), rDSArray.GetString(i), nGroup);
// new spec: always show chart pages in general options
ResStringArray& rChartArray = aDlgResource.GetChartArray();
nGroup = AddGroup( rChartArray.GetString(0), 0, 0, SID_SCH_EDITOPTIONS );
for(USHORT i1 = 1; i1 < rChartArray.Count(); i1++)
AddTabPage( (sal_uInt16)rChartArray.GetValue(i1), rChartArray.GetString(i1), nGroup);
// Internet
ResStringArray& rInetArray = aDlgResource.GetInetArray();
nGroup = AddGroup(rInetArray.GetString(0), 0, 0, SID_INET_DLG );
for ( sal_uInt16 i = 1; i < rInetArray.Count(); i++ )
{
sal_uInt16 nPageId = (sal_uInt16)rInetArray.GetValue(i);
#if defined WNT
// Disable E-mail tab-page on Windows
if ( nPageId == RID_SVXPAGE_INET_MAIL )
continue;
#endif
AddTabPage( nPageId, rInetArray.GetString(i), nGroup );
}
if ( nSlot == SID_OPTPAGE_USERDATA ) ResizeTreeLB();
ActivatePage( RID_SFXPAGE_GENERAL ); ActivateLastSelection();
} }
namespace namespace
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment