summaryrefslogtreecommitdiff
path: root/svx/source/gallery2/galbrws1.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/gallery2/galbrws1.cxx')
-rw-r--r--svx/source/gallery2/galbrws1.cxx15
1 files changed, 7 insertions, 8 deletions
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index ff3a01ae6d..dc775caf2b 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -37,13 +37,12 @@
#include <ucbhelper/content.hxx>
#include <sfx2/app.hxx>
#include "helpid.hrc"
-#include "gallery1.hxx"
+#include "svx/gallery1.hxx"
#include "galtheme.hxx"
-#include "galmisc.hxx"
-#include "galdlg.hxx"
+#include "svx/galmisc.hxx"
#include "galbrws1.hxx"
#include <com/sun/star/util/DateTime.hpp>
-
+#include "gallery.hrc"
#include <algorithm>
#include <svx/svxdlg.hxx> //CHINA001
@@ -316,7 +315,7 @@ void GalleryBrowser1::ImplGalleryThemeProperties( const String & rThemeName, boo
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Got no AbstractDialogFactory!");
- VclAbstractDialog2* pThemeProps = pFact->CreateGalleryThemePropertiesDialog( NULL, mpExchangeData, mpThemePropsDlgItemSet, RID_SVXTABDLG_GALLERYTHEME );
+ VclAbstractDialog2* pThemeProps = pFact->CreateGalleryThemePropertiesDialog( NULL, mpExchangeData, mpThemePropsDlgItemSet );
DBG_ASSERT(pThemeProps, "Got no GalleryThemePropertiesDialog!");
if ( bCreateNew )
@@ -415,7 +414,7 @@ void GalleryBrowser1::ImplExecute( USHORT nId )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- VclAbstractRefreshableDialog* aActualizeProgress = pFact->CreateActualizeProgressDialog( this, pTheme, RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS );
+ VclAbstractRefreshableDialog* aActualizeProgress = pFact->CreateActualizeProgressDialog( this, pTheme );
DBG_ASSERT(aActualizeProgress, "Dialogdiet fail!");//CHINA001
aActualizeProgress->Update(); //CHINA001 aActualizeProgress.Update();
@@ -440,7 +439,7 @@ void GalleryBrowser1::ImplExecute( USHORT nId )
//CHINA001 TitleDialog aDlg( this, aOldName );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
- AbstractTitleDialog* aDlg = pFact->CreateTitleDialog( this, aOldName, RID_SVXDLG_GALLERY_TITLE );
+ AbstractTitleDialog* aDlg = pFact->CreateTitleDialog( this, aOldName );
DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001
if( aDlg->Execute() == RET_OK ) //CHINA001 if( aDlg.Execute() == RET_OK )
@@ -477,7 +476,7 @@ void GalleryBrowser1::ImplExecute( USHORT nId )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- AbstractGalleryIdDialog* aDlg = pFact->CreateGalleryIdDialog( this, pTheme, RID_SVXDLG_GALLERY_THEMEID );
+ AbstractGalleryIdDialog* aDlg = pFact->CreateGalleryIdDialog( this, pTheme );
DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001
if( aDlg->Execute() == RET_OK ) //CHINA001 if( aDlg.Execute() == RET_OK )