solenv/bin/native-code.py | 1 +
sw/source/uibase/app/swdll.cxx | 2 +-
sw/source/uibase/uiview/view.cxx | 2 --
3 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 9798df00fa1de75653a512ea30639948eb0b487f
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Thu Jan 29 15:48:34 2015 +0100
solenv: add missing component to make accelerators work on Android
One could argue that they are not needed on Android, but even backspace
is an accelerator, so they are needed.
Change-Id: I786d3da59e222b48d75e7d84ca2ef1eb51094532
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 00ec07b..dda7581 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -80,6 +80,7 @@ core_constructor_list = [
"com_sun_star_comp_framework_UIElementFactoryManager_get_implementation",
"com_sun_star_comp_framework_URLTransformer_get_implementation",
"com_sun_star_comp_framework_WindowStateConfiguration_get_implementation",
+
"com_sun_star_comp_framework_ModuleAcceleratorConfiguration_get_implementation",
"org_apache_openoffice_comp_framework_ContextChangeEventMultiplexer_get_implementation",
# i18npool/util/i18npool.component
"com_sun_star_i18n_BreakIterator_get_implementation",
commit d55192f90701c584dcaf2220fe568da46616486d
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Thu Jan 29 15:13:53 2015 +0100
SwView: SelectShell() is needed on Android, too
Otherwise GetShellAndSlot_Impl() in
SfxDispatchController_Impl::dispatch() will fail, as there is no
SwTextShell on SfxDispatcher's shell stack, and that means nobody will
invoke SwBaseShell::ExecDelete() when an SwBackspace command is to be
handled.
Change-Id: I62e3aff265784e8c73659d3e3c5f646d927338b0
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index f6a8512..5d63310 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -226,7 +226,6 @@ IMPL_LINK_NOARG(SwView, FormControlActivated)
void SwView::SelectShell()
{
-#if HAVE_FEATURE_DESKTOP
// Attention: Maintain the SelectShell for the WebView additionally
if(m_bInDtor)
@@ -455,7 +454,6 @@ void SwView::SelectShell()
m_pWrtShell->UpdateTable();
GetViewImpl()->GetUNOObject_Impl()->NotifySelChanged();
-#endif
}
// Interaction: AttrChangedNotify() and TimeoutHdl.
commit 3dd671b7928e49d8bd092cc04c18c9322e5faad7
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Thu Jan 29 15:09:14 2015 +0100
SwDLL: RegisterInterfaces() is needed on Android, too
Otherwise SfxSlotPool::GetUnoSlot() will have no interfaces and we ask
what should be the UNO command for a backspace key in Writer, we won't
find the needed SwBackspace command, so no action will be posted to the
main loop.
Change-Id: I62062fbc0e86db83e2b0ddac184bfd6d35d073b2
diff --git a/sw/source/uibase/app/swdll.cxx b/sw/source/uibase/app/swdll.cxx
index 1e598ef..8f0c4e2 100644
--- a/sw/source/uibase/app/swdll.cxx
+++ b/sw/source/uibase/app/swdll.cxx
@@ -130,10 +130,10 @@ SwDLL::SwDLL()
// register your view-factories here
RegisterFactories();
-#if HAVE_FEATURE_DESKTOP
// register your shell-interfaces here
RegisterInterfaces();
+#if HAVE_FEATURE_DESKTOP
// register your controllers here
RegisterControls();
#endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
