diff options
| author | Thorsten Behrens <thb@openoffice.org> | 2001-06-06 14:13:55 +0000 |
|---|---|---|
| committer | Thorsten Behrens <thb@openoffice.org> | 2001-06-06 14:13:55 +0000 |
| commit | 9798f4e2445c33f4f6aa0f676866927db953ceed (patch) | |
| tree | 30f47a4d483cc42a6b070065f3b728b064244314 /sd/source | |
| parent | 118e1a45050179695c321180bfd53e850f1ca6ae (diff) | |
#73900# Disabled page background dialog in the questionable cases
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/dlg/dlgpage.cxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/func/fupage.cxx | 11 |
2 files changed, 8 insertions, 9 deletions
diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx index d9d5ff1143de..9c1a13a3511c 100644 --- a/sd/source/ui/dlg/dlgpage.cxx +++ b/sd/source/ui/dlg/dlgpage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dlgpage.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:48:32 $ + * last change: $Author: thb $ $Date: 2001-06-06 15:13:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -124,7 +124,7 @@ SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* nGradientListState = CT_NONE; nHatchingListState = CT_NONE; - if( bAreaPage) // I have to add the page before I remove it ! + if(!bAreaPage) // I have to add the page before I remove it ! RemoveTabPage( RID_SVXPAGE_AREA ); } diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 910b2b3709b3..e6856a9e5f7a 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fupage.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: dl $ $Date: 2001-05-28 07:06:43 $ + * last change: $Author: thb $ $Date: 2001-06-06 15:13:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -335,10 +335,9 @@ FuPage::FuPage( SdViewShell* pViewSh, SdWindow* pWin, SdView* pView, aMergedAttr.Put(aNewAttr); - BOOL bAreaTabPage = ( ePageKind == PK_NOTES && - ( (SdDrawViewShell*) pViewSh )->GetEditMode() == EM_MASTERPAGE ) || - ( ePageKind == PK_HANDOUT ); - SdPageDlg* pDlg = new SdPageDlg( pDocSh, NULL, &aMergedAttr, bAreaTabPage ); + SdPageDlg* pDlg = new SdPageDlg( pDocSh, NULL, &aMergedAttr, + // shall we display background area tabpage? + (ePageKind == PK_STANDARD) ? TRUE : FALSE ); USHORT nResult = pDlg->Execute(); |