strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

n#735533: Donot set duplicate master slide names.

Browse source
This commit is contained in:
Muthu Subramanian 2012-02-01 18:01:17 +05:30
parent ab8f1757ce
commit fd33c0b1cf
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sd/source/ui/unoidl/unopage.cxx
View file

@ -3015,7 +3015,7 @@ void SdMasterPage::getBackground( Any& rValue ) throw()
}
// XNamed
void SAL_CALL SdMasterPage::setName( const OUString& aName )
void SAL_CALL SdMasterPage::setName( const OUString& rName )
throw(uno::RuntimeException)
{
::SolarMutexGuard aGuard;
@ -3024,11 +3024,18 @@ void SAL_CALL SdMasterPage::setName( const OUString& aName )
if(SvxFmDrawPage::mpPage && GetPage()->GetPageKind() != PK_NOTES)
{
String aNewName( aName );
SdDrawDocument* pDoc = GetModel()->GetDoc();
sal_Bool bOutDummy;
String aNewName( rName );
// Slide Name has to be unique
if( pDoc && pDoc->GetPageByName( aNewName, bOutDummy ) != SDRPAGE_NOTFOUND )
return; // throw Exception ?
GetPage()->SetName( aNewName );
if(GetModel()->GetDoc())
GetModel()->GetDoc()->RenameLayoutTemplate(GetPage()->GetLayoutName(), aNewName);
if( pDoc )
pDoc->RenameLayoutTemplate( GetPage()->GetLayoutName(), aNewName );
// fake a mode change to repaint the page tab bar
::sd::DrawDocShell* pDocSh = GetModel()->GetDocShell();