[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 8 commits - android/Bootstrap configure.ac external/nss sc/source sd/source
Henry Castro (via logerrit)
logerrit at kemper.freedesktop.org
Fri Jun 19 13:46:09 UTC 2020
android/Bootstrap/Makefile.shared | 6 +++---
configure.ac | 1 +
external/nss/nss-android.patch.1 | 12 ++++++++----
sc/source/ui/app/inputhdl.cxx | 22 ++++++++++++++--------
sc/source/ui/unoobj/docuno.cxx | 2 +-
sd/source/ui/view/drviews2.cxx | 3 ++-
6 files changed, 29 insertions(+), 17 deletions(-)
New commits:
commit 398782041dde160cf31a69cd015340ad425b3514
Author: Henry Castro <hcastro at collabora.com>
AuthorDate: Fri Jun 5 08:59:26 2020 -0400
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Jun 19 14:26:23 2020 +0100
android: fix the build output directory
When compiling in a different build output directory,
the "liblo-native-code.so" file is created in the source directory and
it fails compiling the "online" project
Change-Id: I4782a69796fb298e9c1a6c4370720b18587735e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95602
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Henry Castro <hcastro at collabora.com>
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index 3e38e14617cc..eb3812f1b9fb 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -14,8 +14,8 @@
# configurability on platforms like Android and iOS where apps based on LO
# code are very much self-contained pre-packaged thingies.
-SODEST=jniLibs/$(ANDROID_APP_ABI)
-OBJLOCAL=obj/local/$(ANDROID_APP_ABI)
+SODEST=$(BUILDDIR)/android/jniLibs/$(ANDROID_APP_ABI)
+OBJLOCAL=$(BUILDDIR)/android/obj/local/$(ANDROID_APP_ABI)
#
# Helpful rules ...
commit 6ab1c24b6c927cd00f482f50008b2048d3720fae
Author: Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Mon Dec 16 10:46:29 2019 +0100
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Jun 19 14:26:21 2020 +0100
android: Fix linking of liblo-native-code.so on x86_64
This is similar to commit c6dadf5035c8e1c31dbd3fccec167bd4a906bf54
("commit android: Fix linking of liblo-native-code.so on aarch64.").
Build previously failed with
Linking obj/local/x86_64/liblo-native-code.so
.../x86_64-linux-android/bin/ld.gold: error: cannot find -landroid_support
clang++: error: linker command failed with exit code 1 (use -v to see invocation)
make[2]: *** [../Bootstrap/Makefile.shared:62: obj/local/x86_64/liblo-native-code.so] Error 1
make[1]: *** [.../android/CustomTarget_lo_android.mk:18: .../workdir/CustomTarget/android/source/done] Error 2
make: *** [Makefile:282: build] Error 2
I quickly checked that the app actually runs on an x86_64 AVD
and is able to open and display documents after successfully
building with this commit in place.
Change-Id: I92b3759af6a86a6717c287d035b6a1add3a9af7a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85204
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95601
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Henry Castro <hcastro at collabora.com>
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index 00ad02285cf1..3e38e14617cc 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -59,7 +59,7 @@ WHOLELIBS = \
$(OBJLOCAL)/liblo-native-code.so : native-code.cxx $(ALL_STATIC_LIBS)
@echo "Linking $@"
mkdir -p $(OBJLOCAL)
- $(CXX) -fuse-ld=gold -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 -Wl,-soname,liblo-native-code.so -o $(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) -lc++_static -lc++abi $(if $(filter-out arm64-v8a,$(ANDROID_APP_ABI)),-landroid_support) $(if $(filter armeabi-v7a,$(ANDROID_APP_ABI)),-lunwind) $(addprefix -l,$(NSSLIBS)) -lGLESv2 -landroid -ljnigraphics -llog -lz
+ $(CXX) -fuse-ld=gold -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 -Wl,-soname,liblo-native-code.so -o $(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) -lc++_static -lc++abi $(if $(filter-out arm64-v8a x86_64,$(ANDROID_APP_ABI)),-landroid_support) $(if $(filter armeabi-v7a,$(ANDROID_APP_ABI)),-lunwind) $(addprefix -l,$(NSSLIBS)) -lGLESv2 -landroid -ljnigraphics -llog -lz
$(SODEST)/liblo-native-code.so : $(OBJLOCAL)/liblo-native-code.so
mkdir -p $(SODEST)
commit 2977df872f9ff29f69071195a929e95b873a1a78
Author: Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Tue Dec 3 14:49:59 2019 +0100
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Jun 19 14:26:18 2020 +0100
nss: Fix Android build for x86 and x86_64
... which previously failed with
cd freebl; make libs
error: unknown target CPU 'armv8-a'
and
cd freebl; make libs
error: unknown target CPU 'armv8-a+crypto'
respectively.
Change-Id: Ib8a6bfc615c4fb15a1e5dd3e55bba187ff34a891
Reviewed-on: https://gerrit.libreoffice.org/84369
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl at cib.de>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95600
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Henry Castro <hcastro at collabora.com>
diff --git a/external/nss/nss-android.patch.1 b/external/nss/nss-android.patch.1
index 560623080c73..368b7a23668b 100644
--- a/external/nss/nss-android.patch.1
+++ b/external/nss/nss-android.patch.1
@@ -73,15 +73,19 @@ diff -ur nss.org/nss/Makefile nss/nss/Makefile
diff -ur nss/nss/coreconf/arch.mk nss/nss/coreconf/arch.mk
--- nss/nss/coreconf/arch.mk 2019-11-01 10:29:44.933245745 +0100
+++ nss/nss/coreconf/arch.mk 2019-11-01 10:32:04.347181076 +0100
-@@ -234,7 +234,11 @@
+@@ -234,7 +234,15 @@
#
# this should be configurable from the user
#
- OS_TEST := arm
-+ ifeq ($(USE_64),1)
-+ OS_TEST := aarch64
++ ifneq (,$(filter x86 x86_64,$(ANDROID_APP_ABI)))
++ OS_TEST := $(ANDROID_APP_ABI)
+ else
-+ OS_TEST := arm
++ ifeq ($(USE_64),1)
++ OS_TEST := aarch64
++ else
++ OS_TEST := arm
++ endif
+ endif
OS_ARCH = Android
ifndef OS_TARGET_RELEASE
commit 0bfff7e927acc7ea6b41896b5b37ec8be257b73b
Author: Tor Lillqvist <tml at iki.fi>
AuthorDate: Fri May 29 16:18:24 2020 +0300
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Jun 19 14:26:16 2020 +0100
tdf#128502: Avoid potential crash in mobile app with multiple open documents
Change-Id: Ibb819818db40b2f086e5c1f2330a7f8f2fcc1727
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95148
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index a1256c17f0b2..a89b32bb92ed 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -539,7 +539,7 @@ int ScModelObj::getParts()
int ScModelObj::getPart()
{
ScViewData* pViewData = ScDocShell::GetViewData();
- return pViewData->GetViewShell()->getPart();
+ return pViewData ? pViewData->GetViewShell()->getPart() : 0;
}
OUString ScModelObj::getPartInfo( int nPart )
commit 1b0c28bf26e57e48dd2e82c25bbe5f696ae3f10c
Author: Henry Castro <hcastro at collabora.com>
AuthorDate: Wed Jun 3 20:18:58 2020 -0400
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Jun 19 14:26:14 2020 +0100
lok: symbolic link to the "include" directory when builddir != srcdir
When compiling the android variant build in a different build output directory
of the "online" project, it fails due to the missing "include" files.
Change-Id: If9056788b3d043e4ae8ad3f799885995c0ab0cf0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95603
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Henry Castro <hcastro at collabora.com>
diff --git a/configure.ac b/configure.ac
index 8184912b979c..aec7222c73bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12965,6 +12965,7 @@ CFLAGS=$my_original_CFLAGS
CXXFLAGS=$my_original_CXXFLAGS
CPPFLAGS=$my_original_CPPFLAGS
+AC_LINK_FILES([include], [include])
AC_CONFIG_FILES([config_host.mk
config_host_lang.mk
Makefile
commit 1f75f310f8ea998e2b0c244b9958e0a47ff2aef8
Author: Pranam Lashkari <plashkari628 at gmail.com>
AuthorDate: Thu Jun 18 23:14:59 2020 +0530
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Jun 19 14:26:12 2020 +0100
LOK: hyperlink were inserted as button instead of text object
Change-Id: I393e5cb34d90fc6def6c62be9216df1acd9b5f4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96624
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 5184253e4a1a..269eb8ac065e 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -38,6 +38,7 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/propertysequence.hxx>
#include <comphelper/scopeguard.hxx>
+#include <comphelper/lok.hxx>
#include <editeng/contouritem.hxx>
#include <editeng/editdata.hxx>
@@ -2282,7 +2283,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
{
OutlinerView* pOlView = mpDrawView->GetTextEditOutlinerView();
- if (pOlView)
+ if (pOlView || comphelper::LibreOfficeKit::isActive())
{
InsertURLField(pHLItem->GetURL(), pHLItem->GetName(),
pHLItem->GetTargetFrame());
commit f7591f993f204a7ad8efd73d4c2715b2ba6842f4
Author: Marco Cecchetti <marco.cecchetti at collabora.com>
AuthorDate: Sun Jun 7 21:39:59 2020 +0200
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Jun 19 14:26:09 2020 +0100
lok: formula bar: disable tunneled tooltips
Tooltips overlaps the entered text.
Change-Id: If003217fe1270a4a3ebc0ba9eee71cb8f6765760
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95792
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 8e4a16ce86ef..c7e42a83cd25 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1307,10 +1307,9 @@ namespace {
void ScInputHandler::ShowFuncList( const ::std::vector< OUString > & rFuncStrVec )
{
const SfxViewShell* pViewShell = SfxViewShell::Current();
- if (comphelper::LibreOfficeKit::isActive() &&
- pViewShell && pViewShell->isLOKMobilePhone())
+ if (comphelper::LibreOfficeKit::isActive())
{
- if (rFuncStrVec.size())
+ if (rFuncStrVec.size() && pViewShell && pViewShell->isLOKMobilePhone())
{
auto aPos = pFormulaData->begin();
sal_uInt32 nCurIndex = std::distance(aPos, miAutoPosFormula);
@@ -1364,6 +1363,7 @@ void ScInputHandler::ShowFuncList( const ::std::vector< OUString > & rFuncStrVec
OString s = aPayload.makeStringAndClear();
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CALC_FUNCTION_LIST, s.getStr());
}
+ // not tunnel tooltips in the lok case
return;
}
commit 7166ebaaaf65a43175a3868a764ddc0614c61c16
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Mar 19 13:54:18 2020 +0100
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Jun 19 14:26:07 2020 +0100
Fix sending reference marks for current selection
When selecting range on mobile in validation dialog
the message wasn't sent due to missing ViewShell
Change-Id: Iaab543368469cd363b54b1a89f6983b8c01877ce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94693
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 0c02f73966a3..8e4a16ce86ef 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -460,10 +460,16 @@ ReferenceMark ScInputHandler::GetReferenceMark( ScViewData& rViewData, ScDocShel
void ScInputHandler::UpdateLokReferenceMarks()
{
- if ( !comphelper::LibreOfficeKit::isActive() || !pActiveViewSh )
+ if ( !comphelper::LibreOfficeKit::isActive())
return;
- ScViewData& rViewData = pActiveViewSh->GetViewData();
+ ScTabViewShell* pShell = pActiveViewSh ? pActiveViewSh
+ : dynamic_cast<ScTabViewShell*>(SfxViewShell::Current());
+
+ if (!pShell)
+ return;
+
+ ScViewData& rViewData = pShell->GetViewData();
ScDocShell* pDocSh = rViewData.GetDocShell();
ScRangeFindList* pRangeFinder = GetRangeFindList();
@@ -516,18 +522,18 @@ void ScInputHandler::UpdateLokReferenceMarks()
nX1, nX2, nY1, nY2,
nTab, rData.nColor );
- ScInputHandler::SendReferenceMarks( pActiveViewSh, aReferenceMarks );
+ ScInputHandler::SendReferenceMarks( pShell, aReferenceMarks );
}
}
else if ( nCount )
{
- ScInputHandler::SendReferenceMarks( pActiveViewSh, aReferenceMarks );
+ ScInputHandler::SendReferenceMarks( pShell, aReferenceMarks );
}
else
{
// Clear
aReferenceMarks.clear();
- ScInputHandler::SendReferenceMarks( pActiveViewSh, aReferenceMarks );
+ ScInputHandler::SendReferenceMarks( pShell, aReferenceMarks );
}
}
More information about the Libreoffice-commits
mailing list