summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-09-07 10:54:22 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-09-08 11:27:18 +0200
commit1af5f6e8d1bdec9bd2f14d0f5f8fad9c0fdead2b (patch)
tree84773114c08ca86424af4f8a17ec69d295908e01 /svx/source
parentbb2258f7e4bcf078810cf1e40fdec2f17576c3b2 (diff)
set parent for file dialog helper
Change-Id: I3994ee48dcb5b2732cb27cb9ccb54926abf0828a Reviewed-on: https://gerrit.libreoffice.org/42048 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/source')
-rw-r--r--svx/source/core/graphichelper.cxx8
-rw-r--r--svx/source/dialog/imapdlg.cxx6
-rw-r--r--svx/source/form/datanavi.cxx3
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanelBase.cxx2
4 files changed, 11 insertions, 8 deletions
diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx
index e5f09eda0622..cc1e725c0eb9 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -179,12 +179,12 @@ bool lcl_ExecuteFilterDialog( const Sequence< PropertyValue >& rPropsForDialog,
}
} // anonymous ns
-OUString GraphicHelper::ExportGraphic( const Graphic& rGraphic, const OUString& rGraphicName )
+OUString GraphicHelper::ExportGraphic(const vcl::Window* pParent, const Graphic& rGraphic, const OUString& rGraphicName)
{
SvtPathOptions aPathOpt;
OUString sGraphicsPath( aPathOpt.GetGraphicPath() );
- FileDialogHelper aDialogHelper( TemplateDescription::FILESAVE_AUTOEXTENSION );
+ FileDialogHelper aDialogHelper(TemplateDescription::FILESAVE_AUTOEXTENSION, FileDialogFlags::NONE, pParent);
Reference < XFilePicker3 > xFilePicker = aDialogHelper.GetFilePicker();
INetURLObject aPath;
@@ -336,7 +336,7 @@ OUString GraphicHelper::ExportGraphic( const Graphic& rGraphic, const OUString&
return OUString();
}
-void GraphicHelper::SaveShapeAsGraphic( const Reference< drawing::XShape >& xShape )
+void GraphicHelper::SaveShapeAsGraphic(const vcl::Window* pParent, const Reference< drawing::XShape >& xShape)
{
try
{
@@ -346,7 +346,7 @@ void GraphicHelper::SaveShapeAsGraphic( const Reference< drawing::XShape >& xSha
SvtPathOptions aPathOpt;
OUString sGraphicPath( aPathOpt.GetGraphicPath() );
- FileDialogHelper aDialogHelper( TemplateDescription::FILESAVE_AUTOEXTENSION );
+ FileDialogHelper aDialogHelper(TemplateDescription::FILESAVE_AUTOEXTENSION, FileDialogFlags::NONE, pParent);
Reference < XFilePicker3 > xFilePicker = aDialogHelper.GetFilePicker();
aDialogHelper.SetTitle( SvxResId(RID_SVXSTR_SAVEAS_IMAGE) );
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index ecc61ecaf7b8..65a25fc87fe6 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -448,7 +448,8 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx, void )
void SvxIMapDlg::DoOpen()
{
::sfx2::FileDialogHelper aDlg(
- css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE );
+ css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
+ FileDialogFlags::NONE, this);
ImageMap aLoadIMap;
const OUString aFilter( IMAP_ALL_FILTER );
@@ -487,7 +488,8 @@ void SvxIMapDlg::DoOpen()
bool SvxIMapDlg::DoSave()
{
::sfx2::FileDialogHelper aDlg(
- css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE );
+ css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE,
+ FileDialogFlags::NONE, this);
const OUString aBinFilter( IMAP_BINARY_FILTER );
const OUString aCERNFilter( IMAP_CERN_FILTER );
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index da2303afc156..ee6c7b12ed83 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -3376,7 +3376,8 @@ namespace svxform
IMPL_LINK_NOARG(AddInstanceDialog, FilePickerHdl, Button*, void)
{
::sfx2::FileDialogHelper aDlg(
- css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE );
+ css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
+ FileDialogFlags::NONE, this);
INetURLObject aFile( SvtPathOptions().GetWorkPath() );
aDlg.AddFilter( m_sAllFilterName, FILEDIALOG_FILTER_ALL );
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 806866c24c13..eb2980a0b195 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -198,7 +198,7 @@ void AreaPropertyPanelBase::SetTransparency(sal_uInt16 nVal)
IMPL_LINK_NOARG(AreaPropertyPanelBase, ClickImportBitmapHdl, Button*, void)
{
- SvxOpenGraphicDialog aDlg( "Import" );
+ SvxOpenGraphicDialog aDlg("Import", this);
aDlg.EnableLink(false);
if( aDlg.Execute() == ERRCODE_NONE )
{