diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-05-14 12:52:37 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-05-14 18:25:19 +0200 |
commit | 7b8556729629ceaf633f60c86f0114e4427d2b4a (patch) | |
tree | f8182d12df8dabf7c819c2cf0be1bfdfb87a85a5 /svx | |
parent | a9a0601e2af539ab8feed76279181339393ae633 (diff) |
weld GalleryIdDialog
Change-Id: I214afef7668eaf5082683f1c77b08aa0c5107619
Reviewed-on: https://gerrit.libreoffice.org/54317
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/gallery2/galbrws1.cxx | 2 | ||||
-rw-r--r-- | svx/source/gallery2/gallery1.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 89b9af36a852..93d60ae548aa 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -403,7 +403,7 @@ void GalleryBrowser1::ImplExecute(const OString &rIdent) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - ScopedVclPtr<AbstractGalleryIdDialog> aDlg(pFact->CreateGalleryIdDialog( this, pTheme )); + ScopedVclPtr<AbstractGalleryIdDialog> aDlg(pFact->CreateGalleryIdDialog(GetFrameWeld(), pTheme)); DBG_ASSERT(aDlg, "Dialog creation failed!"); if( aDlg->Execute() == RET_OK ) diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 2284d35479fa..622974c2349d 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -187,13 +187,13 @@ GalleryThemeEntry::GalleryThemeEntry( bool bCreateUniqueURL, aName = rName; } -void GalleryTheme::InsertAllThemes( ListBox& rListBox ) +void GalleryTheme::InsertAllThemes(weld::ComboBoxText& rListBox) { for (size_t i = 0; i < SAL_N_ELEMENTS(aUnlocalized); ++i) - rListBox.InsertEntry(OUString::createFromAscii(aUnlocalized[i].second)); + rListBox.append_text(OUString::createFromAscii(aUnlocalized[i].second)); for (size_t i = 0; i < SAL_N_ELEMENTS(aLocalized); ++i) - rListBox.InsertEntry(SvxResId(aLocalized[i].second)); + rListBox.append_text(SvxResId(aLocalized[i].second)); } INetURLObject GalleryThemeEntry::ImplGetURLIgnoreCase( const INetURLObject& rURL ) |