android/Bootstrap/Makefile.shared | 3 +-- sd/source/ui/view/drviewse.cxx | 4 ++++ svx/sdi/svx.sdi | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-)
New commits: commit 1c5fe8a13fb95ecbfed732c0ae627e1e5ca8f00d Author: Stephan Bergmann <[email protected]> AuthorDate: Tue Dec 11 14:03:31 2018 +0100 Commit: Jan Holesovsky <[email protected]> CommitDate: Wed Oct 9 10:35:27 2019 +0200 Move NSSLIBS to a more sensible place on the linker command line 511ae02c6457e69cb6daab871acd9c3e7d64e2e3 "Android: Enable HAVE_FEATURE_NSS and package the NSS libraries with apk" had added them to WHOLELIBS probably just because that already had the $(addprefix -l,...), even though --whole-archive doesn't make any sense for shared libraries. Better place them later on the linker command line (after all our own archives and compiler support libraries), so that switching armeabi-v7a to libc++/libc++abi/libunwind (coming soon) will be able to override erroneously picking _Unwind_* symbols from NSSLIBS's nspr4 instead of libunwind. Change-Id: Ie0c0b7a55da3eabe1bb427232d698b2a4af63e78 Reviewed-on: https://gerrit.libreoffice.org/64964 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/80264 Reviewed-by: Jan Holesovsky <[email protected]> Tested-by: Jan Holesovsky <[email protected]> diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index e0678ba8c779..2e1c8c163bd2 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -52,7 +52,6 @@ WHOLELIBS = \ -Wl,--whole-archive \ $(addprefix -l,$(strip \ juh \ - $(NSSLIBS) \ )) \ -Wl,--no-whole-archive @@ -60,7 +59,7 @@ WHOLELIBS = \ $(OBJLOCAL)/liblo-native-code.so : native-code.cxx $(ALL_STATIC_LIBS) @echo "Linking $@" mkdir -p $(OBJLOCAL) - $(CXX) -Wl,--build-id=sha1 -Wl,--gc-sections -Wl,--version-script=../Bootstrap/version.map -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) $(if $(filter armeabi-v7a,$(ANDROID_APP_ABI)),-lgnustl_static,-lc++_static -lc++abi -landroid_support) -lGLESv2 -landroid -ljnigraphics -llog -lz + $(CXX) -Wl,--build-id=sha1 -Wl,--gc-sections -Wl,--version-script=../Bootstrap/version.map -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) $(if $(filter armeabi-v7a,$(ANDROID_APP_ABI)),-lgnustl_static,-lc++_static -lc++abi -landroid_support) $(addprefix -l,$(NSSLIBS)) -lGLESv2 -landroid -ljnigraphics -llog -lz $(SODEST)/liblo-native-code.so : $(OBJLOCAL)/liblo-native-code.so mkdir -p $(SODEST) commit 79657a39b47a515e35555c5174fa16db67a507d7 Author: Jan Holesovsky <[email protected]> AuthorDate: Thu May 23 15:23:25 2019 +0200 Commit: Jan Holesovsky <[email protected]> CommitDate: Wed Oct 9 10:35:08 2019 +0200 Add a parameter to insert a text box directly. This is useful for the Online, where we want to insert the text box directly into the document so that it is visible right away. Change-Id: I09ab2efba758aac077fa37ddfd20b1486b35b3ef Reviewed-on: https://gerrit.libreoffice.org/72912 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/80262 Tested-by: Jan Holesovsky <[email protected]> diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 233e627208fe..df63acc9e107 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -255,6 +255,10 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) ImpAddPrintableCharactersToTextEdit(rReq, GetView()); rReq.Done(); + + const SfxItemSet* pArgs = rReq.GetArgs(); + if (pArgs && pArgs->HasItem(FN_PARAM_1)) + bCreateDirectly = static_cast<const SfxBoolItem&>(pArgs->Get(FN_PARAM_1)).GetValue(); } break; diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index 984198ea64d2..628f48232bb2 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -8281,7 +8281,7 @@ SfxBoolItem TestMode SID_DIALOG_TESTMODE SfxBoolItem Text SID_ATTR_CHAR - +(SfxBoolItem CreateDirectly FN_PARAM_1) [ AutoUpdate = TRUE, FastCall = FALSE, _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
