diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-06-07 15:42:52 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-06-13 09:57:02 +0200 |
| commit | 415dfaed9fe782e02e393ff6b0e79026f3ce0449 (patch) | |
| tree | b136d84477bbd6112803e336eccd59424a2c6310 /sfx2 | |
| parent | 276f08d2753b294340fe6b65163aff93715b8016 (diff) | |
weld OrganizeDialog
Change-Id: I976edb0b49c8439d1723be4544b10a5375b8e1d3
Reviewed-on: https://gerrit.libreoffice.org/73900
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/app.cxx | 10 | ||||
| -rw-r--r-- | sfx2/source/appl/appserv.cxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 2e84fb18876b..75ea2ff5e820 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -414,14 +414,14 @@ void SfxApplication::Invalidate( sal_uInt16 nId ) #ifndef DISABLE_DYNLOADING typedef long (*basicide_handle_basic_error)(void const *); -typedef void (*basicide_macro_organizer)(sal_Int16); +typedef void (*basicide_macro_organizer)(void const *, sal_Int16); extern "C" { static void thisModule() {} } #else extern "C" long basicide_handle_basic_error(void*); -extern "C" void basicide_macro_organizer(sal_Int16); +extern "C" void basicide_macro_organizer(void*, sal_Int16); #endif @@ -520,7 +520,7 @@ SfxApplication::ChooseScript(weld::Window *pParent) return aScriptURL; } -void SfxApplication::MacroOrganizer( sal_Int16 nTabId ) +void SfxApplication::MacroOrganizer(weld::Window* pParent, sal_Int16 nTabId) { #if !HAVE_FEATURE_SCRIPTING (void) nTabId; @@ -541,11 +541,11 @@ void SfxApplication::MacroOrganizer( sal_Int16 nTabId ) return; // call basicide_macro_organizer in basctl - pSymbol( nTabId ); + pSymbol(pParent, nTabId); #else - basicide_macro_organizer( nTabId ); + basicide_macro_organizer(pParent, nTabId); #endif diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index a7707b791867..1535f0c4a2da 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -1520,7 +1520,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) nTabId = static_cast<const SfxUInt16Item*>(pItem)->GetValue(); } - SfxApplication::MacroOrganizer( nTabId ); + SfxApplication::MacroOrganizer(rReq.GetFrameWeld(), nTabId); rReq.Done(); } break; |