diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-11-08 15:56:01 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-11-08 17:26:46 +0100 |
| commit | 3b16dfd80f632beffdc75fbde0e5d3248c5d4b1a (patch) | |
| tree | ddc05852de872b96eae5e518ce3eca7fdc73b714 /framework/source/dispatch | |
| parent | 76762b4c9899787a32d71bf5ed7695e22eccbc4c (diff) | |
Combine LoadEnv's initializeLoading and startLoading
...as they are only ever called directly one after the other. Rename the
original initializeLoading to startLoading, and rename the original startLoading
to private start (called at the end of the original initializeLoading).
Change-Id: I5271387450324cc26743195329c4f401cf3aa0f9
Reviewed-on: https://gerrit.libreoffice.org/82308
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'framework/source/dispatch')
| -rw-r--r-- | framework/source/dispatch/loaddispatcher.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/framework/source/dispatch/loaddispatcher.cxx b/framework/source/dispatch/loaddispatcher.cxx index 07ee5adf9798..eb6f5e1ae32a 100644 --- a/framework/source/dispatch/loaddispatcher.cxx +++ b/framework/source/dispatch/loaddispatcher.cxx @@ -102,8 +102,7 @@ css::uno::Any LoadDispatcher::impl_dispatch( const css::util::URL& rURL, css::uno::Reference< css::lang::XComponent > xComponent; try { - m_aLoader.initializeLoading( rURL.Complete, lArguments, xBaseFrame, m_sTarget, m_nSearchFlags, LoadEnvFeatures::AllowContentHandler | LoadEnvFeatures::WorkWithUI); - m_aLoader.startLoading(); + m_aLoader.startLoading( rURL.Complete, lArguments, xBaseFrame, m_sTarget, m_nSearchFlags, LoadEnvFeatures::AllowContentHandler | LoadEnvFeatures::WorkWithUI); m_aLoader.waitWhileLoading(); // wait for ever! xComponent = m_aLoader.getTargetComponent(); |