[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 6 commits - bridges/source sd/uiconfig sfx2/source sw/source vcl/uiconfig
Muhammet Kara (via logerrit)
logerrit at kemper.freedesktop.org
Mon May 18 17:43:15 UTC 2020
bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx | 7 -
bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx | 117 +++++++++++++-----
bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx | 1
bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx | 4
sd/uiconfig/simpress/ui/tabledesignpanel.ui | 1
sfx2/source/sidebar/DeckLayouter.cxx | 8 -
sw/source/uibase/dochdl/swdtflvr.cxx | 3
vcl/uiconfig/theme_definitions/ios/definition.xml | 7 -
8 files changed, 107 insertions(+), 41 deletions(-)
New commits:
commit 2b6397882c3d3e22b6a80154008b509a9541b42d
Author: Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Tue Dec 10 18:59:36 2019 +0300
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon May 18 19:15:43 2020 +0200
Sidebar: Don't expand table design styles vertically
Otherwise, they become veeery high in Online.
Change-Id: I2572eb6ac94ad5e46aa596095cd718aef63eed6c
Reviewed-on: https://gerrit.libreoffice.org/84868
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>
diff --git a/sd/uiconfig/simpress/ui/tabledesignpanel.ui b/sd/uiconfig/simpress/ui/tabledesignpanel.ui
index 2e215515dd7c..28833b46e9ea 100644
--- a/sd/uiconfig/simpress/ui/tabledesignpanel.ui
+++ b/sd/uiconfig/simpress/ui/tabledesignpanel.ui
@@ -113,7 +113,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="vexpand">True</property>
</object>
<packing>
<property name="left_attach">0</property>
commit 28c19dafdeec7e367569febfaeb63bc3cb10af52
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sun Dec 8 11:26:27 2019 -0500
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon May 18 19:15:43 2020 +0200
sidebar: no scrollbar in LOK
Scrolling in LOK is done in the client. We render
the sidebar as long as the original height is
(the minimum that will fit all panels) and scroll
in the client. For that, we keep the scrollbar
disabled when layouting the Deck.
Reviewed-on: https://gerrit.libreoffice.org/84720
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
(cherry picked from commit 09ddec08eaa0af1ca6a5f8a376abae9e62fe2607)
Change-Id: If0d813b04af679768f80ee88fc976bce9cde46d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85785
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx
index 652268567753..bc1bf6e93986 100644
--- a/sfx2/source/sidebar/DeckLayouter.cxx
+++ b/sfx2/source/sidebar/DeckLayouter.cxx
@@ -23,6 +23,7 @@
#include <sfx2/sidebar/PanelTitleBar.hxx>
#include <sfx2/sidebar/Deck.hxx>
#include <sfx2/sidebar/SidebarController.hxx>
+#include <comphelper/lok.hxx>
#include <comphelper/processfactory.hxx>
#include <vcl/window.hxx>
@@ -179,8 +180,8 @@ tools::Rectangle LayoutPanels (
nTotalPreferredHeight += rItem.maLayoutSize.Preferred;
}
- if (nTotalMinimumHeight > nAvailableHeight
- && ! bShowVerticalScrollBar)
+ if (nTotalMinimumHeight > nAvailableHeight && !bShowVerticalScrollBar
+ && !comphelper::LibreOfficeKit::isActive())
{
// Not enough space, even when all panels are shrunk to their
// minimum height.
@@ -524,7 +525,8 @@ void DistributeHeights (
// There are no panels with unrestricted height.
return;
}
- const sal_Int32 nAdditionalHeightPerPanel (nRemainingHeightToDistribute / nNoMaximumCount);
+
+ const sal_Int32 nAdditionalHeightPerPanel(nRemainingHeightToDistribute / nNoMaximumCount);
// Handle rounding error.
sal_Int32 nAdditionalHeightForFirstPanel (nRemainingHeightToDistribute
- nNoMaximumCount*nAdditionalHeightPerPanel);
commit 4fc6d01047d71128617ac3e359a1fcad379a9280
Author: Dennis Francis <dennis.francis at collabora.com>
AuthorDate: Fri Feb 7 12:08:21 2020 +0530
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon May 18 19:15:43 2020 +0200
Classify shape(s) selections as 'complex'...
in isComplex() of XTransferable2 implementation SwTransferable.
This method is used by online via doc_getSelectionType() to determine the
type of selection. In writer this method used to classify shape objects as
non-complex which translates to 'text' in online, so if a shape is selected
in online, the js code there would treat it as text. This is problematic
when you want to send the correct align uno commands based on selection type.
So returning true in isComplex() for writer would correctly treat the shape
selections as 'complex' in online Writer.
Change-Id: I09fcd9e4fab48aa0d7e7d04c88bae9e1281a1b0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88158
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
Tested-by: Jan Holesovsky <kendy at collabora.com>
(cherry picked from commit c7178a12e6e57e3d85cecd09e9c0373ececbb33f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88495
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index f6e5990b1b3d..26567bca7743 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -463,6 +463,9 @@ sal_Bool SAL_CALL SwTransferable::isComplex()
}
}
+ if (m_pWrtShell->GetSelectionType() == SelectionType::DrawObject)
+ return true; // Complex
+
// Simple
return false;
}
commit 7926510d29e518c82768b4498b43af331dd9dbe8
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Dec 18 15:42:41 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon May 18 18:46:30 2020 +0200
Silence -Werror,-Wuninitialized
...as seen with "Android (5220042 based on r346389c) clang version 8.0.7
(https://android.googlesource.com/toolchain/clang
b55f2d4ebfd35bf643d27dbca1bb228957008617)
(https://android.googlesource.com/toolchain/llvm
3c393fe7a7e13b0fba4ac75a01aa683d7a5b11cd) (based on LLVM 8.0.7svn)", warning
about functionIndex, vtableOffset, and indirectRet being used "uninitialized"
(but which is as intended, carrying over the values those registers have upon
entry to the function)
Change-Id: I443fe2e8bf7c25a5bd2bfd99c245d430be65f445
Reviewed-on: https://gerrit.libreoffice.org/85400
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
index d11a11b0c965..f9396321cb14 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
@@ -313,6 +313,7 @@ struct aarch64_va_list {
};
#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wuninitialized"
#pragma GCC diagnostic ignored "-Wvolatile-register-var"
extern "C" void vtableSlotCall(
unsigned long gpr0, unsigned long gpr1, unsigned long gpr2,
commit d0847765097c13a3ecd6755f715af2a2a519af18
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Dec 17 23:33:28 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon May 18 18:46:08 2020 +0200
tdf#128671: Rely on unwind.h, declare what's missing from cxxabi.h
...for gcc3_linux_aarch64, similar to what
128deeae81a6f802bfb79b8f0fa8c4b10729f7db "cxxabi.h is not specific to GCC" et al
did for gcc3_linux_x86-64
Change-Id: Iee9980842c0e5f6f49642407339a67e865f8be9c
Reviewed-on: https://gerrit.libreoffice.org/85344
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
index 938011a09a2e..892bf6e81963 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
@@ -24,7 +24,6 @@
#include <cstring>
#include <typeinfo>
-#include <cxxabi.h>
#include <dlfcn.h>
#include <com/sun/star/uno/RuntimeException.hpp>
@@ -135,8 +134,8 @@ std::type_info * getRtti(typelib_TypeDescription const & type) {
}
extern "C" void _GLIBCXX_CDTOR_CALLABI deleteException(void * exception) {
- abi_aarch64::__cxa_exception * header =
- static_cast<abi_aarch64::__cxa_exception *>(exception) - 1;
+ __cxxabiv1::__cxa_exception * header =
+ static_cast<__cxxabiv1::__cxa_exception *>(exception) - 1;
OUString unoName(toUnoName(header->exceptionType->name()));
typelib_TypeDescription * td = 0;
typelib_typedescription_getByName(&td, unoName.pData);
@@ -224,7 +223,7 @@ StructKind getStructKind(typelib_CompoundTypeDescription const * type) {
namespace abi_aarch64 {
void mapException(
- __cxa_exception * exception, std::type_info const * type, uno_Any * any, uno_Mapping * mapping)
+ __cxxabiv1::__cxa_exception * exception, std::type_info const * type, uno_Any * any, uno_Mapping * mapping)
{
assert(exception != 0);
assert(type != nullptr);
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx
index 50c5f1f21a37..e3dc9b5872a7 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx
@@ -22,55 +22,114 @@
#include <sal/config.h>
+#include <cstddef>
#include <exception>
#include <typeinfo>
+#include <cxxabi.h>
+#ifndef _GLIBCXX_CDTOR_CALLABI // new in GCC 4.7 cxxabi.h
+#define _GLIBCXX_CDTOR_CALLABI
+#endif
+#include <unwind.h>
+
+#include <config_cxxabi.h>
#include <typelib/typedescription.h>
#include <uno/any2.h>
#include <uno/mapping.h>
-namespace abi_aarch64 {
-
-// Following declarations from libstdc++-v3/libsupc++/unwind-cxx.h and
-// lib/gcc/*-*-*/*/include/unwind.h:
-
-struct _Unwind_Exception
-{
- unsigned exception_class __attribute__((__mode__(__DI__)));
- void * exception_cleanup;
- unsigned private_1 __attribute__((__mode__(__word__)));
- unsigned private_2 __attribute__((__mode__(__word__)));
-} __attribute__((__aligned__));
+#if !HAVE_CXXABI_H_CLASS_TYPE_INFO
+// <https://mentorembedded.github.io/cxx-abi/abi.html>,
+// libstdc++-v3/libsupc++/cxxabi.h:
+namespace __cxxabiv1 {
+class __class_type_info: public std::type_info {
+public:
+ explicit __class_type_info(char const * n): type_info(n) {}
+ ~__class_type_info() override;
+};
+}
+#endif
-struct __cxa_exception
-{
- std::type_info *exceptionType;
- void (*exceptionDestructor)(void *);
+#if !HAVE_CXXABI_H_SI_CLASS_TYPE_INFO
+// <https://mentorembedded.github.io/cxx-abi/abi.html>,
+// libstdc++-v3/libsupc++/cxxabi.h:
+namespace __cxxabiv1 {
+class __si_class_type_info: public __class_type_info {
+public:
+ __class_type_info const * __base_type;
+ explicit __si_class_type_info(
+ char const * n, __class_type_info const *base):
+ __class_type_info(n), __base_type(base) {}
+ ~__si_class_type_info() override;
+};
+}
+#endif
+#if !HAVE_CXXABI_H_CXA_EXCEPTION
+// <https://mentorembedded.github.io/cxx-abi/abi-eh.html>,
+// libcxxabi/src/cxa_exception.hpp:
+namespace __cxxabiv1 {
+struct __cxa_exception {
+#if defined _LIBCPPABI_VERSION // detect libc++abi
+#if defined __LP64__ || LIBCXXABI_ARM_EHABI
+ std::size_t referenceCount;
+#endif
+#endif
+ std::type_info * exceptionType;
+ void (* exceptionDestructor)(void *);
void (*unexpectedHandler)(); // std::unexpected_handler dropped from C++17
std::terminate_handler terminateHandler;
-
- __cxa_exception *nextException;
-
+ __cxa_exception * nextException;
int handlerCount;
-
int handlerSwitchValue;
- const unsigned char *actionRecord;
- const unsigned char *languageSpecificData;
- void *catchTemp;
- void *adjustedPtr;
-
+ char const * actionRecord;
+ char const * languageSpecificData;
+ void * catchTemp;
+ void * adjustedPtr;
_Unwind_Exception unwindHeader;
};
+}
+#endif
-struct __cxa_eh_globals
-{
- __cxa_exception *caughtExceptions;
+#if !HAVE_CXXABI_H_CXA_EH_GLOBALS
+// <https://mentorembedded.github.io/cxx-abi/abi-eh.html>:
+namespace __cxxabiv1 {
+struct __cxa_eh_globals {
+ __cxa_exception * caughtExceptions;
unsigned int uncaughtExceptions;
};
+}
+#endif
+
+#if !HAVE_CXXABI_H_CXA_GET_GLOBALS
+namespace __cxxabiv1 {
+extern "C" __cxa_eh_globals * __cxa_get_globals() throw();
+}
+#endif
+
+#if !HAVE_CXXABI_H_CXA_CURRENT_EXCEPTION_TYPE
+namespace __cxxabiv1 {
+extern "C" std::type_info *__cxa_current_exception_type() throw();
+}
+#endif
+
+#if !HAVE_CXXABI_H_CXA_ALLOCATE_EXCEPTION
+namespace __cxxabiv1 {
+extern "C" void * __cxa_allocate_exception(std::size_t thrown_size) throw();
+}
+#endif
+
+#if !HAVE_CXXABI_H_CXA_THROW
+namespace __cxxabiv1 {
+extern "C" void __cxa_throw(
+ void * thrown_exception, void * tinfo, void (* dest)(void *))
+ __attribute__((noreturn));
+}
+#endif
+
+namespace abi_aarch64 {
void mapException(
- __cxa_exception * exception, std::type_info const * type, uno_Any * any, uno_Mapping * mapping);
+ __cxxabiv1::__cxa_exception * exception, std::type_info const * type, uno_Any * any, uno_Mapping * mapping);
void raiseException(uno_Any * any, uno_Mapping * mapping);
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx
index f03d848521cc..0847dfc76db5 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx
@@ -24,8 +24,6 @@
#include <exception>
#include <typeinfo>
-#include <cxxabi.h>
-
#include <bridge.hxx>
#include <types.hxx>
#include <unointerfaceproxy.hxx>
@@ -190,7 +188,7 @@ void call(
}
} catch (css::uno::Exception &) {
abi_aarch64::mapException(
- reinterpret_cast<abi_aarch64::__cxa_eh_globals *>(
+ reinterpret_cast<__cxxabiv1::__cxa_eh_globals *>(
__cxxabiv1::__cxa_get_globals())->caughtExceptions,
__cxxabiv1::__cxa_current_exception_type(), *exception,
proxy->getBridge()->getCpp2Uno());
commit 6a8b6ceefb98106d9ea9e88c6c846b76be05ea89
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Thu Dec 12 21:41:39 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon May 18 18:27:28 2020 +0200
iOS theme: set spinbox orientation to "decrease-edit-increase"
iOS theme was designed to have spinbox orientation set to
"decrease-edit-increase", but this was not explicitly set in the
theme definition as it was also the default. The defualt was
changed recently to "stacked" and it broke the iOS theme.
Change-Id: If43fa46c04415dda1efe0855c4901b5aede7eb32
diff --git a/vcl/uiconfig/theme_definitions/ios/definition.xml b/vcl/uiconfig/theme_definitions/ios/definition.xml
index 8725e14ee1f2..958c85600e15 100644
--- a/vcl/uiconfig/theme_definitions/ios/definition.xml
+++ b/vcl/uiconfig/theme_definitions/ios/definition.xml
@@ -95,6 +95,11 @@
selected="true|false|any"
button-value="true|false|any"
extra="{various}"
+
+ control specific:
+ <spinbox> attributes:
+ - orientation: stacked (default), edit-decrease-increase, decrease-edit-increase
+
-->
<pushbutton>
@@ -242,7 +247,7 @@
</listbox>
<spinbox>
- <part value="Entire">
+ <part value="Entire" orientation="decrease-edit-increase">
<state>
<rect stroke="#ffffff" fill="#ffffff" stroke-width="0" />
</state>
More information about the Libreoffice-commits
mailing list