diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-02-24 13:13:15 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-02-24 13:13:15 +0000 |
| commit | 8a4bdb07fc74ac810903568bbe1f5e08b7f255ca (patch) | |
| tree | 2c6a3c421a029b00f9ed5d2808af1a4634496728 /svx/source | |
| parent | ca34526d1d346d3063a10509d6c9292ff5fb6b03 (diff) | |
INTEGRATION: CWS sch06 (1.24.46); FILE MERGED
2005/02/16 11:13:22 bm 1.24.46.1: #i42417# set pShell at the chart's group info after the sch dll is loaded
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/dialog/treeopt.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/svx/source/dialog/treeopt.cxx b/svx/source/dialog/treeopt.cxx index 6bd580527e9c..d0225997582c 100644 --- a/svx/source/dialog/treeopt.cxx +++ b/svx/source/dialog/treeopt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: treeopt.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: rt $ $Date: 2005-02-02 16:44:55 $ + * last change: $Author: vg $ $Date: 2005-02-24 14:13:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -929,6 +929,8 @@ IMPL_LINK( OfaTreeOptionsDialog, SelectHdl_Impl, Timer*, EMPTYARG ) pPageInfo->pPage = pSchMod->CreateTabPage( pPageInfo->nPageId, this, *pGroupInfo->pInItemSet ); if( !pGroupInfo->pOutItemSet ) pGroupInfo->pOutItemSet = new SfxItemSet(*pGroupInfo->pInItemSet->GetPool(), pGroupInfo->pInItemSet->GetRanges()); + if( !pGroupInfo->pShell ) + pGroupInfo->pShell = pSchMod; } } else if(RID_SVXPAGE_COLOR != pPageInfo->nPageId) @@ -1390,11 +1392,17 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet case SID_INET_DLG : case SID_FILTER_DLG: SFX_APP()->SetOptions( rSet ); + break; case SID_SB_STARBASEOPTIONS: ::offapp::ConnectionPoolConfig::SetOptions( rSet ); ::svx::DbRegisteredNamesConfig::SetOptions(rSet); break; + + default: + { + DBG_ERROR( "Unhandled option in ApplyItemSet" ); + } break; } |