diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-09-20 12:38:14 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-09-20 12:38:14 +0000 |
| commit | 10941413bd342fea2bf64c90c8cf6c029c034c77 (patch) | |
| tree | 249364bde198c959a56823b5c616ff99863b0b81 /sd/source/ui/view/viewshe3.cxx | |
| parent | b2113f7db57e5b1ea85386820f8f9d75e1e1f4df (diff) | |
INTEGRATION: CWS impress21ea (1.36.56); FILE MERGED
2004/08/24 10:46:34 af 1.36.56.1: #i31967# Do not show dialog when creating new page in Draw.
Diffstat (limited to 'sd/source/ui/view/viewshe3.cxx')
| -rw-r--r-- | sd/source/ui/view/viewshe3.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 1794a3181f34..de6882638f97 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewshe3.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: rt $ $Date: 2004-07-15 08:58:37 $ + * last change: $Author: rt $ $Date: 2004-09-20 13:38:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,6 +63,7 @@ #include "ViewShell.hxx" #include "GraphicViewShell.hxx" +#include "GraphicViewShellBase.hxx" #ifndef _COM_SUN_STAR_LANG_LOCALE_HPP_ #include <com/sun/star/lang/Locale.hpp> @@ -1557,7 +1558,9 @@ void ViewShell::CreateOrDuplicatePage ( SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();//CHINA001 DBG_ASSERT(pFact, "SdAbstractDialogFactory fail!");//CHINA001 - if (nSId == SID_INSERTPAGE && !this->ISA(GraphicViewShell)) + // Do not show the dialog for the Draw application. + if (nSId == SID_INSERTPAGE + && !GetViewShellBase().ISA(GraphicViewShellBase)) { //add by CHINA001 //CHINA001 pDlg = new SdNewFoilDlg(GetActiveWindow(), aAttrSet, ePageKind, GetDocSh(), FALSE); pDlg = pFact->CreateSdNewFoilDlg(ResId( DLG_NEW_FOIL ), GetActiveWindow(), aAttrSet, ePageKind, GetDocSh(), FALSE ); |