summaryrefslogtreecommitdiff
path: root/sd/source/ui/view/tabcontr.cxx
diff options
context:
space:
mode:
authorThorsten Behrens <thb@openoffice.org>2001-10-02 14:45:11 +0000
committerThorsten Behrens <thb@openoffice.org>2001-10-02 14:45:11 +0000
commit75837ab2ba03037f56fcb5879ab4dedd1cb66f30 (patch)
tree32ac52e2db6dc5d3cf3adb730a38c7cc60d1c832 /sd/source/ui/view/tabcontr.cxx
parent86a7c723948e25321c85283f8b7afffd379cff62 (diff)
#91146# Check name also for master pages
Diffstat (limited to 'sd/source/ui/view/tabcontr.cxx')
-rw-r--r--sd/source/ui/view/tabcontr.cxx21
1 files changed, 7 insertions, 14 deletions
diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx
index 4a47e347cdbb..9ba41fd17c39 100644
--- a/sd/source/ui/view/tabcontr.cxx
+++ b/sd/source/ui/view/tabcontr.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: tabcontr.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: aw $ $Date: 2001-07-30 14:13:00 $
+ * last change: $Author: thb $ $Date: 2001-10-02 15:45:11 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -361,22 +361,15 @@ long SdTabControl::AllowRenaming()
if( aCompareName != aNewName )
{
- if (pDrViewSh->GetEditMode() == EM_PAGE)
+ // Seite umbenennen
+ if( pDrViewSh->GetDocSh()->CheckPageName( this, aNewName ) )
{
- // Seite umbenennen
- if( pDrViewSh->GetDocSh()->CheckPageName( this, aNewName ) )
- {
- SetEditText( aNewName );
- EndRenaming();
- }
- else
- {
- bOK = FALSE;
- }
+ SetEditText( aNewName );
+ EndRenaming();
}
else
{
- // MasterPage umbenennen
+ bOK = FALSE;
}
}
return( bOK );