INTEGRATION: CWS iha06 (1.25.38); FILE MERGED

2005/01/11 14:27:11 iha 1.25.38.1: #i39635# remove delete page warning

1 files changed, 12 insertions, 29 deletions

diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 988c5173ac03..493b91431e1a 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: drviews4.cxx,v $
  *
- *  $Revision: 1.25 $
+ *  $Revision: 1.26 $
  *
- *  last change: $Author: rt $ $Date: 2004-11-26 20:31:21 $
+ *  last change: $Author: rt $ $Date: 2005-01-31 14:55:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -175,39 +175,22 @@ void DrawViewShell::DeleteActualPage()
 {
     USHORT          nPage = aTabControl.GetCurPageId() - 1;
     SdPage*         pPage = GetDoc()->GetSdPage(nPage,PK_STANDARD);
-    String          aString(SdResId(STR_ASK_DELETE_PAGE));
-    String          aPageName(pPage->GetName());
 
-    // dynamische Seitentitel beachten
-    if (aPageName.Len() == 0)
-    {
-        aPageName += String(SdResId(STR_PAGE));
-        aPageName += String::CreateFromInt32( (sal_Int32)nPage + 1 );           // an der UI beginnen Seiten bei 1
-    }
-
-    // Platzhalter ersetzen
-    USHORT nPos = aString.Search(sal_Unicode('$'));
-    aString.Erase(nPos, 1);
-    aString.Insert(aPageName, nPos);
+    USHORT nPageCount = GetDoc()->GetPageCount();
+    DBG_ASSERT(nPageCount > 1, "aber das ist die letzte!");
 
-    if (QueryBox(GetActiveWindow(), WB_YES_NO, aString).Execute() == RET_YES)
-    {
-        USHORT nPageCount = GetDoc()->GetPageCount();
-        DBG_ASSERT(nPageCount > 1, "aber das ist die letzte!");
+    pDrView->EndTextEdit();
 
-        pDrView->EndTextEdit();
+    pDrView->BegUndo();
 
-        pDrView->BegUndo();
+    pDrView->AddUndo(new SdrUndoDelPage(*pPage));
+    GetDoc()->RemovePage(pPage->GetPageNum());
 
-        pDrView->AddUndo(new SdrUndoDelPage(*pPage));
-        GetDoc()->RemovePage(pPage->GetPageNum());
+    pPage = GetDoc()->GetSdPage(nPage, PK_NOTES);
+    pDrView->AddUndo(new SdrUndoDelPage(*pPage));
+    GetDoc()->RemovePage(pPage->GetPageNum());
 
-        pPage = GetDoc()->GetSdPage(nPage, PK_NOTES);
-        pDrView->AddUndo(new SdrUndoDelPage(*pPage));
-        GetDoc()->RemovePage(pPage->GetPageNum());
-
-        pDrView->EndUndo();
-    }
+    pDrView->EndUndo();
 }
 
 /*************************************************************************