INTEGRATION: CWS impress49 (1.70.80); FILE MERGED
2005/06/10 15:51:50 cl 1.70.80.2: #i41546# reworked after effects 2005/05/20 11:38:53 cl 1.70.80.1: #120379# check for disposed page when creating a xshape
This commit is contained in:
parent
05eb9e07db
commit
dc8ea63335
1 changed files with 9 additions and 2 deletions
|
@ -4,9 +4,9 @@
|
|||
*
|
||||
* $RCSfile: unopage.cxx,v $
|
||||
*
|
||||
* $Revision: 1.72 $
|
||||
* $Revision: 1.73 $
|
||||
*
|
||||
* last change: $Author: rt $ $Date: 2005-09-09 06:52:49 $
|
||||
* last change: $Author: hr $ $Date: 2005-09-23 10:47:09 $
|
||||
*
|
||||
* The Contents of this file are made available subject to
|
||||
* the terms of GNU Lesser General Public License Version 2.1.
|
||||
|
@ -2110,6 +2110,13 @@ void SAL_CALL SdDrawPage::setName( const OUString& rName )
|
|||
if( nPageNumber == ( ( GetPage()->GetPageNum() - 1 ) >> 1 ) + 1 )
|
||||
aName = OUString();
|
||||
}
|
||||
else
|
||||
{
|
||||
String aDefaultPageName( SdResId(STR_PAGE) );
|
||||
aDefaultPageName += sal_Unicode( ' ' );
|
||||
if( aName.compareTo( aDefaultPageName, aDefaultPageName.Len() ) == 0 )
|
||||
aName = OUString();
|
||||
}
|
||||
|
||||
GetPage()->SetName( aName );
|
||||
|
||||
|
|
Loading…
Reference in a new issue