diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 14:51:21 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 14:51:21 +0000 |
| commit | 8a6211b13c6cf7435c93914ac0b18bd6086868cc (patch) | |
| tree | 62bf5abdf53b874ba27cc910ddd2660ab2eb70b1 /sfx2 | |
| parent | 38f78d69ee94c951d78676ef0f176457b333ff2a (diff) | |
INTEGRATION: CWS fwk20 (1.20.88); FILE MERGED
2005/08/31 08:53:47 cd 1.20.88.1: #i53949# Added support for SFX_CHILDWIN_FORCEDOCK to hide non-floatable child windows in the OLE server mode
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/childwin.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 8796d02536aa..ac33426e32b3 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -4,9 +4,9 @@ * * $RCSfile: childwin.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: rt $ $Date: 2005-09-07 17:37:19 $ + * last change: $Author: hr $ $Date: 2005-09-23 15:51:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -252,12 +252,10 @@ SfxChildWindow* SfxChildWindow::CreateChildWindow( sal_uInt16 nId, { if ( pBindings ) pBindings->ENTERREGISTRATIONS(); - rFactInfo.nFlags |= rInfo.nFlags & SFX_CHILDWIN_FORCEDOCK; SfxChildWinInfo aInfo = rFactInfo; Application::SetSystemWindowMode( SYSTEMWINDOW_MODE_NOAUTOMODE ); pChild = pFact->pCtor( pParent, nId, pBindings, &aInfo ); Application::SetSystemWindowMode( nOldMode ); - rFactInfo.nFlags &= ~(rInfo.nFlags & SFX_CHILDWIN_FORCEDOCK ); if ( pBindings ) pBindings->LEAVEREGISTRATIONS(); } @@ -284,12 +282,10 @@ SfxChildWindow* SfxChildWindow::CreateChildWindow( sal_uInt16 nId, { if ( pBindings ) pBindings->ENTERREGISTRATIONS(); - rFactInfo.nFlags |= rInfo.nFlags & SFX_CHILDWIN_FORCEDOCK; SfxChildWinInfo aInfo = rFactInfo; Application::SetSystemWindowMode( SYSTEMWINDOW_MODE_NOAUTOMODE ); pChild = pFact->pCtor( pParent, nId, pBindings, &aInfo ); Application::SetSystemWindowMode( nOldMode ); - rFactInfo.nFlags &= ~(rInfo.nFlags & SFX_CHILDWIN_FORCEDOCK ); if ( pBindings ) pBindings->LEAVEREGISTRATIONS(); } |