diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 17:27:34 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 17:27:34 +0000 |
commit | ba998121e763b1e8860ea15b0ca816c0ef171fba (patch) | |
tree | 851096b76d82f58790b8d1427e542e45e1ccef35 /sfx2 | |
parent | 31d5d3b6571ac524e90edbd19b6b949b10cccfc7 (diff) |
INTEGRATION: CWS inplaceobjects (1.64.10); FILE MERGED
2006/10/04 11:48:02 mba 1.64.10.1: #i66239#: support for SID_FILLFRAME; document should know the frame it is loaded to. Use its window as a dialog parent
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/doc/objcont.cxx | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 124d2440c7f9..c212ced0f92b 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -4,9 +4,9 @@ * * $RCSfile: objcont.cxx,v $ * - * $Revision: 1.65 $ + * $Revision: 1.66 $ * - * last change: $Author: obo $ $Date: 2006-10-12 15:55:24 $ + * last change: $Author: vg $ $Date: 2006-11-01 18:27:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1515,21 +1515,6 @@ SfxObjectShellRef MakeObjectShellForOrganizer_Impl( const String& aTargetURL, BO return xDoc; } -/* -SfxToolBoxConfig* SfxObjectShell::GetToolBoxConfig_Impl() -{ - //TODO/LATER: new API after recync to docking1 cws??? - if ( !pImp->pTbxConfig ) - { - pImp->pTbxConfig = new SfxToolBoxConfig( -//REMOVE GetConfigManager() ? pImp->pCfgMgr : SFX_APP()->GetConfigManager_Impl() ); - SFX_APP()->GetConfigManager_Impl() ); - } - - return pImp->pTbxConfig; -} */ - - sal_Bool SfxObjectShell::IsHelpDocument() const { const SfxFilter* pFilter = GetMedium()->GetFilter(); |