diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-03 18:13:05 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-03 18:13:05 +0000 |
| commit | 79f17545ba4aa005753d84d250f62edf10665f65 (patch) | |
| tree | 9e19b1274b42df5583e3840678d6dfb607cf1b9a /svx | |
| parent | 93272f2ac95fecff04b8a5cde80f3da48dc56ae8 (diff) | |
INTEGRATION: CWS dialogdiet (1.39.320); FILE MERGED
2004/01/13 03:12:18 mwu 1.39.320.1: DialogDiet 2004_01_13
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/gallery2/galbrws2.cxx | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 29971d6c5f1e..a32440fbbd82 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: galbrws2.cxx,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: rt $ $Date: 2003-04-08 15:25:37 $ + * last change: $Author: hr $ $Date: 2004-02-03 19:13:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,6 +82,9 @@ #include "galdlg.hxx" #include "galbrws2.hxx" +#include "svxdlg.hxx" //CHINA001 +//CHINA001 #include "dialogs.hrc" //CHINA001 + // ----------- // - Defines - // ----------- @@ -1024,23 +1027,29 @@ void GalleryBrowser2::ImplExecute( USHORT nId ) if( pObj ) { const String aOldTitle( GetItemText( *mpCurTheme, *pObj, GALLERY_ITEM_TITLE ) ); - TitleDialog aDlg( this, aOldTitle ); - - if( aDlg.Execute() == RET_OK ) + //CHINA001 TitleDialog aDlg( this, aOldTitle ); + SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); + if(pFact) { - String aNewTitle( aDlg.GetTitle() ); - - if( ( !aNewTitle.Len() && pObj->GetTitle().Len() ) || ( aNewTitle != aOldTitle ) ) + AbstractTitleDialog* aDlg = pFact->CreateTitleDialog( this, aOldTitle, ResId(RID_SVXDLG_GALLERY_TITLE) ); + DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001 + if( aDlg->Execute() == RET_OK )//CHINA001 if( aDlg.Execute() == RET_OK ) { - if( !aNewTitle.Len() ) - aNewTitle = String( RTL_CONSTASCII_USTRINGPARAM( "__<empty>__" ) ); + String aNewTitle( aDlg->GetTitle() );//CHINA001 String aNewTitle( aDlg.GetTitle() ); + + if( ( !aNewTitle.Len() && pObj->GetTitle().Len() ) || ( aNewTitle != aOldTitle ) ) + { + if( !aNewTitle.Len() ) + aNewTitle = String( RTL_CONSTASCII_USTRINGPARAM( "__<empty>__" ) ); - pObj->SetTitle( aNewTitle ); - mpCurTheme->InsertObject( *pObj ); + pObj->SetTitle( aNewTitle ); + mpCurTheme->InsertObject( *pObj ); + } } - } - mpCurTheme->ReleaseObject( pObj ); + mpCurTheme->ReleaseObject( pObj ); + delete aDlg; //add CHINA001 + } } } break; |