diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-04 10:22:34 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-04 16:03:21 +0200 |
| commit | 3ff4800fe400de916c97f587322104af06cc0879 (patch) | |
| tree | 0e7b2d29b6998445da0cec98bd924e5178a4ef60 /sw | |
| parent | 265e1305e4f9bf8a4897069a020c9c65e8047f58 (diff) | |
weld SvInsertOleDlg
and
weld SfxInsertFloatingFrameDialog
and smuggle in the parent widget for the Gtk File dialog via
an XWindow interface
Change-Id: I971b3a0ffe661c9268115fd5d00bf8eee80e77b3
Reviewed-on: https://gerrit.libreoffice.org/52373
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 'sw')
| -rw-r--r-- | sw/source/uibase/wrtsh/wrtsh1.cxx | 6 | ||||
| -rw-r--r-- | sw/uiconfig/swriter/ui/autoformattable.ui | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 59962673e9ef..12a2c158da63 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -375,8 +375,10 @@ void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName OString aCmd(".uno:"); aCmd += pSlot->GetUnoName(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - ScopedVclPtr<SfxAbstractInsertObjectDialog> pDlg( pFact->CreateInsertObjectDialog( GetWin(), OUString::fromUtf8( aCmd ), xStor, &aServerList )); - if ( pDlg ) + vcl::Window* pWin = GetWin(); + ScopedVclPtr<SfxAbstractInsertObjectDialog> pDlg(pFact->CreateInsertObjectDialog(pWin ? pWin->GetFrameWeld() : nullptr, + OUString::fromUtf8( aCmd ), xStor, &aServerList)); + if (pDlg) { pDlg->Execute(); bDoVerb = pDlg->IsCreateNew(); diff --git a/sw/uiconfig/swriter/ui/autoformattable.ui b/sw/uiconfig/swriter/ui/autoformattable.ui index 1d9a6eb4f8be..84539082ac5c 100644 --- a/sw/uiconfig/swriter/ui/autoformattable.ui +++ b/sw/uiconfig/swriter/ui/autoformattable.ui @@ -6,6 +6,8 @@ <columns> <!-- column-name text --> <column type="gchararray"/> + <!-- column-name id --> + <column type="gchararray"/> </columns> </object> <object class="GtkDialog" id="AutoFormatTableDialog"> |