diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-07-13 14:01:24 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-07-13 14:01:24 +0000 |
| commit | 0595f5be3af786993e57f7b280d31bd6c1e28d49 (patch) | |
| tree | 65f47d49fe62e1d14842be187a4c1ebc4a752c36 /sd/source/ui/view/sdview2.cxx | |
| parent | 1a80fdedba5e09ce4fdeb04ffc24aee8165afc6c (diff) | |
INTEGRATION: CWS impress2 (1.37.48); FILE MERGED
2004/06/11 07:18:10 af 1.37.48.1: #i22705# Using GetActiveWindow() instead of pWindow or GetWindow().
Diffstat (limited to 'sd/source/ui/view/sdview2.cxx')
| -rw-r--r-- | sd/source/ui/view/sdview2.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 49e5d9c5b2f1..e1f957b92b92 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sdview2.cxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.39 $ * - * last change: $Author: rt $ $Date: 2004-07-12 15:22:21 $ + * last change: $Author: rt $ $Date: 2004-07-13 15:01:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -998,7 +998,7 @@ BOOL View::GetExchangeList( List*& rpExchangeList, List* pBookmarkList, USHORT n if( nType == 0 || nType == 2 ) bNameOK = pDocSh->CheckPageName ( - pViewSh->GetWindow(), *pNewName); + pViewSh->GetActiveWindow(), *pNewName); if( bNameOK && ( nType == 1 || nType == 2 ) ) { @@ -1009,7 +1009,7 @@ BOOL View::GetExchangeList( List*& rpExchangeList, List* pBookmarkList, USHORT n //CHINA001 SvxNameDialog* pDlg = new SvxNameDialog( pViewSh->GetWindow(), *pNewName, aDesc ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 - AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( pViewSh->GetWindow(), *pNewName, aDesc, ResId(RID_SVXDLG_NAME) ); + AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( pViewSh->GetActiveWindow(), *pNewName, aDesc, ResId(RID_SVXDLG_NAME) ); DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 pDlg->SetEditHelpId( HID_SD_NAMEDIALOG_OBJECT ); |