[Libreoffice-commits] core.git: ucb/source
ucb/source/core/ucbprops.cxx | 18 ++
ucb/source/core/ucbprops.hxx | 11 +++
2 files changed, 5 insertions(+), 24 deletions(-)
New commits:
commit 0de191e1d201d691c2196cf1aef412a98affb66f
Author: Stephan Bergmann
AuthorDate: Tue Aug 11 06:52:25 2020 +0200
Commit: Stephan Bergmann
CommitDate: Tue Aug 11 08:32:16 2020 +0200
Heap use-after-free
...as seen during UITest_writer_tests2:
> ==2548829==ERROR: AddressSanitizer: heap-use-after-free on address
0x60b0002be9d0 at pc 0x7f42be5ddc7f bp 0x7ffe2d26b090 sp 0x7ffe2d26b088
> READ of size 1 at 0x60b0002be9d0 thread T0
> #0 in cppu::WeakComponentImplHelperBase::release() at
cppuhelper/source/implbase.cxx:84:9
> #1 in
cppu::PartialWeakComponentImplHelper::release() at
include/cppuhelper/compbase.hxx:86:36
> #2 in rtl::Reference::~Reference() at
include/rtl/ref.hxx:113:22
> #3 in __run_exit_handlers at
/usr/src/debug/glibc-2.31-48-g64246fccaf/stdlib/exit.c:108:8
> #4 in exit at
/usr/src/debug/glibc-2.31-48-g64246fccaf/stdlib/exit.c:139:3
> #5 in __libc_start_main at
/usr/src/debug/glibc-2.31-48-g64246fccaf/csu/../csu/libc-start.c:342:3
> 0x60b0002be9d0 is located 64 bytes inside of 112-byte region
[0x60b0002be990,0x60b0002bea00)
> freed by thread T0 here:
> #0 in free at
/home/sbergman/github.com/llvm/llvm-project/compiler-rt/lib/asan/asan_malloc_linux.cpp:123:3
> #1 in rtl_freeMemory at sal/rtl/alloc_global.cxx:51:5
> #2 in cppu::WeakComponentImplHelperBase::operator delete(void*) at
include/cppuhelper/compbase_ex.hxx:66:11
> #3 in UcbPropertiesManager::~UcbPropertiesManager() at
ucb/source/core/ucbprops.cxx:197:1
> #4 in cppu::OWeakObject::release() at cppuhelper/source/weak.cxx:233:9
> #5 in cppu::WeakComponentImplHelperBase::release() at
cppuhelper/source/implbase.cxx:86:18
> #6 in
cppu::PartialWeakComponentImplHelper::release() at
include/cppuhelper/compbase.hxx:86:36
> #7 in rtl::Reference::clear() at
include/rtl/ref.hxx:180:19
> #8 in UcbPropertiesManager::dispose() at
ucb/source/core/ucbprops.cxx:205:16
> #9 in cppu::WeakComponentImplHelperBase::release() at
cppuhelper/source/implbase.cxx:79:13
> #10 in
cppu::PartialWeakComponentImplHelper::release() at
include/cppuhelper/compbase.hxx:86:36
> #11 in rtl::Reference::~Reference() at
include/rtl/ref.hxx:113:22
> #12 in __run_exit_handlers at
/usr/src/debug/glibc-2.31-48-g64246fccaf/stdlib/exit.c:108:8
The elaborate g_Instance disposal scheme had been introduced with
3d44c6a49b20415616dab7a2de2820da5efab309 "ucb/core: create instances with
uno
constructors", but it is unclear to me for what reason.
Change-Id: I768bc3a8674e0e81cf89adae58e4a67d14509985
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100456
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx
index 19a42e653883..fe64bfad6cfe 100644
--- a/ucb/source/core/ucbprops.cxx
+++ b/ucb/source/core/ucbprops.cxx
@@ -45,12 +45,8 @@ using namespace com::sun::star::uno;
#define ATTR_DEFAULT ( PropertyAttribute::BOUND | PropertyAttribute::MAYBEVOID
| PropertyAttribute::MAYBEDEFAULT )
-static osl::Mutex g_InstanceGuard;
-static rtl::Reference g_Instance;
-
UcbPropertiesManager::UcbPropertiesManager()
-: UcbPropertiesManager_Base(m_aMutex),
- m_pProps({
+: m_pProps({
{ "Account", -1, cppu::UnoType::get(), ATTR_DEFAULT },
{ "AutoUpdateInterval", -1, cppu::UnoType::get(), ATTR_DEFAULT
},
{ "ConfirmEmpty", -1, cppu::UnoType::get(), ATTR_DEFAULT },
@@ -197,14 +193,6 @@ UcbPropertiesManager::~UcbPropertiesManager()
{
}
-// XComponent
-void SAL_CALL UcbPropertiesManager::dispose()
-{
-UcbPropertiesManager_Base::dispose();
-osl::MutexGuard aGuard(g_InstanceGuard);
-g_Instance.clear();
-}
-
// XServiceInfo methods.
OUString SAL_CALL UcbPropertiesManager::getImplementationName()
@@ -228,9 +216,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
ucb_UcbPropertiesManager_get_implementation(
css::uno::XComponentContext* , css::uno::Sequence const&)
{
-osl::MutexGuard aGuard(g_InstanceGuard);
-if (!g_Instance)
-g_Instance.set(new UcbPropertiesManager());
+static rtl::Reference g_Instance(new
UcbPropertiesManager());
g_Instance->acquire();
return static_cast(g_Instance.get());
}
diff --git a/ucb/source/core/ucbprops.hxx b/ucb/source/core/ucbprops.hxx
index 6ef4e5a5bfcb..89e31a389e9f 100644
--- a/ucb/source/core/ucbprops.hxx
+++ b/ucb/source/core/ucbprops.hxx
@@ -24,15 +24,13 @@
#include
#include
#include
-#include
-#include
+#include
-
-using UcbPropertiesManager_Base = cppu::WeakComponentImplHelper <
+using UcbPropertiesManager_Base = cppu::WeakImplHelper <
css::lang::XServiceInfo,
css::beans::XP
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src
loleaflet/src/core/Socket.js |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6b05c81ffed4496586705c8c825d93b45d0f2257
Author: Szymon Kłos
AuthorDate: Tue Aug 4 09:27:00 2020 +0200
Commit: Aron Budea
CommitDate: Tue Aug 11 05:43:15 2020 +0200
Don't show [object Window] in about dialog
Change-Id: I4ba1ab2fa443a46dd205411da558980ddee44865
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100043
Tested-by: Jenkins CollaboraOffice
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
(cherry picked from commit d6bfb8867495f34010620b68a8d298e96cb51d56)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100359
Reviewed-by: Aron Budea
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 41b173209..a5f8ee5ed 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -283,7 +283,7 @@ L.Socket = L.Class.extend({
this.WSDServer =
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
var h = this.WSDServer.Hash;
if (parseInt(h,16).toString(16) ===
h.toLowerCase().replace(/^0+/, '')) {
- h = 'https://hub.libreoffice.org/git-online/' + h +
'\');">' + h + '';
+ h = 'https://hub.libreoffice.org/git-online/' +
h + '\'));">' + h + '';
$('#loolwsd-version').html(this.WSDServer.Version + ' (git hash: ' + h + ')');
}
else {
@@ -306,7 +306,7 @@ L.Socket = L.Class.extend({
var lokitVersionObj =
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
h = lokitVersionObj.BuildId.substring(0, 7);
if (parseInt(h,16).toString(16) ===
h.toLowerCase().replace(/^0+/, '')) {
- h = 'https://hub.libreoffice.org/git-core/' + h +
'\');">' + h + '';
+ h = 'https://hub.libreoffice.org/git-core/' + h
+ '\'));">' + h + '';
}
$('#lokit-version').html(lokitVersionObj.ProductName +
' ' +
lokitVersionObj.ProductVersion
+ lokitVersionObj.ProductExtension.replace('.10.','-') +
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - framework/source icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg icon-themes/colibre icon-theme
framework/source/uielement/popuptoolbarcontroller.cxx |2 icon-themes/breeze/cmd/lc_newhtmldoc.png |binary icon-themes/breeze/cmd/sc_newhtmldoc.png |binary icon-themes/breeze/cmd/sc_questionanswers.png |binary icon-themes/breeze/links.txt |4 + icon-themes/breeze/res/lx03245.png |binary icon-themes/breeze/res/lx03245_32.png |binary icon-themes/breeze/res/lx03246.png |binary icon-themes/breeze/res/lx03246_32.png |binary icon-themes/breeze/res/lx03247.png |binary icon-themes/breeze/res/lx03247_32.png |binary icon-themes/breeze/res/lx03248.png |binary icon-themes/breeze/res/lx03248_32.png |binary icon-themes/breeze/res/lx03249.png |binary icon-themes/breeze/res/lx03249_32.png |binary icon-themes/breeze/res/lx03250.png |binary icon-themes/breeze/res/lx03250_32.png |binary icon-themes/breeze/res/lx03251.png |binary icon-themes/breeze/res/lx03251_32.png |binary icon-themes/breeze/res/lx03255.png |binary icon-themes/breeze/res/lx03255_32.png |binary icon-themes/breeze_dark/cmd/lc_newhtmldoc.png |binary icon-themes/breeze_dark/cmd/sc_newhtmldoc.png |binary icon-themes/breeze_dark/cmd/sc_questionanswers.png |binary icon-themes/breeze_dark/links.txt |4 + icon-themes/breeze_dark/res/lx03245.png|binary icon-themes/breeze_dark/res/lx03245_32.png |binary icon-themes/breeze_dark/res/lx03246.png|binary icon-themes/breeze_dark/res/lx03246_32.png |binary icon-themes/breeze_dark/res/lx03247.png|binary icon-themes/breeze_dark/res/lx03247_32.png |binary icon-themes/breeze_dark/res/lx03248.png|binary icon-themes/breeze_dark/res/lx03248_32.png |binary icon-themes/breeze_dark/res/lx03249.png|binary icon-themes/breeze_dark/res/lx03249_32.png |binary icon-themes/breeze_dark/res/lx03250.png|binary icon-themes/breeze_dark/res/lx03250_32.png |binary icon-themes/breeze_dark/res/lx03251.png|binary icon-themes/breeze_dark/res/lx03251_32.png |binary icon-themes/breeze_dark/res/lx03255.png|binary icon-themes/breeze_dark/res/lx03255_32.png |binary icon-themes/breeze_dark_svg/cmd/lc_newhtmldoc.svg |1 icon-themes/breeze_dark_svg/cmd/sc_newhtmldoc.svg |1 icon-themes/breeze_dark_svg/cmd/sc_questionanswers.svg |2 icon-themes/breeze_dark_svg/res/lx03245.svg|2 icon-themes/breeze_dark_svg/res/lx03245_32.svg |1 icon-themes/breeze_dark_svg/res/lx03246.svg|2 icon-themes/breeze_dark_svg/res/lx03246_32.svg |1 icon-themes/breeze_dark_svg/res/lx03247.svg|2 icon-themes/breeze_dark_svg/res/lx03247_32.svg |1 icon-themes/breeze_dark_svg/res/lx03248.svg|2 icon-themes/breeze_dark_svg/res/lx03248_32.svg |1 icon-themes/breeze_dark_svg/res/lx03249.svg|2 icon-themes/breeze_dark_svg/res/lx03249_32.svg |1 icon-themes/breeze_dark_svg/res/lx03250.svg|2 icon-themes/breeze_dark_svg/res/lx03250_32.svg |1 icon-themes/breeze_dark_svg/res/lx03251.svg|2 icon-themes/breeze_dark_svg/res/lx03251_32.svg |1 icon-themes/breeze_dark_svg/res/lx03255.svg|2 icon-themes/breeze_dark_svg/res/lx03255_32.svg |1 icon-themes/breeze_svg/cmd/lc_newhtmldoc.svg |1 icon-themes/breeze_svg/cmd/sc_newhtmldoc.svg |1 icon-themes/breeze_svg/cmd/sc_questionanswers.svg |2 icon-themes/breeze_svg/res/lx03245.svg |2 icon-themes/breeze_svg/res/lx03245_32.svg |1 icon-themes/breeze_svg/res/lx03246.svg |2 icon-themes/breeze_svg/res/lx03246_32.svg |1 icon-themes/breeze_svg/res/lx03247.svg |2 icon-themes/breeze_svg/res/lx03247_32.svg |1 icon-themes/breeze_svg/res/lx03248.svg |2 icon-themes/breeze_svg/res/lx03248_32.svg |1 icon-themes/breeze_svg/res/lx03249.svg |2 icon-themes/breeze_svg/res/lx03249_32.svg |1 icon-themes/breeze_svg/res/lx03250.svg |2 icon-themes/breeze_svg/res/lx03250_32.svg |1 icon-themes/breeze_svg/res/lx03251.svg |2 icon-themes/breeze_svg/res/lx03251_32.svg |1 icon-themes/breeze_svg/res/lx03255.svg |2 icon
[Libreoffice-commits] core.git: Branch 'feature/windows-cross-build' - 278 commits - accessibility/inc basctl/source basegfx/source basic/qa basic/source bin/get_config_variables bridges/Library_cpp_u
Rebased ref, commits from common ancestor:
commit 8acc3b1727f1615a0b7eed08917383b61578ce71
Author: Jan-Marek Glogowski
AuthorDate: Wed Jul 29 12:04:03 2020 +0200
Commit: Jan-Marek Glogowski
CommitDate: Tue Aug 11 01:46:31 2020 +0200
cross-build: fix Java NI linking
LibreOffice has a JNI component on Windows and Linux, the
officebean. Therefore we need a host JDK for linkage to the
jawt, and a build JDK to compile the Java code.
Change-Id: I4138628ab3ea2ef5900a5b4e9281050ae84e4eb5
diff --git a/config_host.mk.in b/config_host.mk.in
index d3d269394380..ce4e70a9bc5e 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -266,7 +266,6 @@ export HARFBUZZ_LIBS=$(gb_SPACE)@HARFBUZZ_LIBS@
export GSSAPI_LIBS=@GSSAPI_LIBS@
export GSTREAMER_1_0_CFLAGS=$(gb_SPACE)@GSTREAMER_1_0_CFLAGS@
export GSTREAMER_1_0_LIBS=$(gb_SPACE)@GSTREAMER_1_0_LIBS@
-export GTHREAD_CFLAGS=$(gb_SPACE)@GTHREAD_CFLAGS@
export GTK3_CFLAGS=$(gb_SPACE)@GTK3_CFLAGS@
export GTK3_LIBS=$(gb_SPACE)@GTK3_LIBS@
export USING_X11=@USING_X11@
@@ -319,15 +318,18 @@ export IWYU_PATH=@IWYU_PATH@
export JAVACOMPILER=@JAVACOMPILER@
export JAVADOC=@JAVADOC@
export JAVADOCISGJDOC=@JAVADOCISGJDOC@
-export JAVAFLAGS=@JAVAFLAGS@
+export JAVACFLAGS=@JAVACFLAGS@
export JAVAIFLAGS=@JAVAIFLAGS@
+export JAVAIFLAGS_FOR_BUILD=@JAVAIFLAGS@
export JAVA_CLASSPATH_NOT_SET=@JAVA_CLASSPATH_NOT_SET@
export JAVAINTERPRETER=@JAVAINTERPRETER@
export JAVA_HOME=@JAVA_HOME@
+export JAVA_HOME_FOR_BUILD=@JAVA_HOME_FOR_BUILD@
export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@
export JAVA_TARGET_VER=@JAVA_TARGET_VER@
export JAWTLIB=@JAWTLIB@
export JDK=@JDK@
+export JDK_FOR_BUILD=@JDK_FOR_BUILD@
export JFREEREPORT_JAR=@JFREEREPORT_JAR@
export JITC_PROCESSOR_TYPE=@JITC_PROCESSOR_TYPE@
export JVM_ONE_PATH_CHECK=@JVM_ONE_PATH_CHECK@
diff --git a/configure.ac b/configure.ac
index a636a396f3f5..008096708247 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4900,7 +4900,18 @@ if test "$cross_compiling" = "yes"; then
sub_conf_opts=""
test -n "$enable_ccache" && sub_conf_opts="$sub_conf_opts
--enable-ccache=$enable_ccache"
test -n "$with_ant_home" && sub_conf_opts="$sub_conf_opts
--with-ant-home=$with_ant_home"
-test $with_junit = no && sub_conf_opts="$sub_conf_opts --without-junit"
+test "$with_junit" = "no" && sub_conf_opts="$sub_conf_opts --without-junit"
+if test -n "$ENABLE_JAVA"; then
+if test "$_os" != "iOS" -a "$_os" != "Android"; then
+if ! echo "$with_build_platform_configure_options" | grep -q --
'--with-jdk-home='; then
+AC_MSG_ERROR([Missing build JDK (see
--with-build-platform-configure-options, --with-jdk-home and use 'cygpath -ms'
on Windows)!])
+fi
+else
+test -n "$with_jdk_home" && sub_conf_opts="$sub_conf_opts
--with-jdk-home=$with_jdk_home"
+fi
+else
+sub_conf_opts="$sub_conf_opts --without-java"
+fi
test -n "$TARFILE_LOCATION" && sub_conf_opts="$sub_conf_opts
--with-external-tar=$TARFILE_LOCATION"
test "$with_system_icu_for_build" = "yes" -o "$with_system_icu_for_build"
= "force" && sub_conf_opts="$sub_conf_opts --with-system-icu"
sub_conf_opts="$sub_conf_opts $with_build_platform_configure_options"
@@ -4920,7 +4931,6 @@ if test "$cross_compiling" = "yes"; then
--disable-skia \
--enable-icecream="$enable_icecream" \
--without-doxygen \
---without-java \
--without-webdav \
--with-parallelism="$with_parallelism" \
--with-theme="$with_theme" \
@@ -4972,15 +4982,53 @@ if test "$cross_compiling" = "yes"; then
mkdir -p ../config_build
mv config_host/*.h ../config_build
+# all these will get a _FOR_BUILD postfix
+DIRECT_FOR_BUILD_SETTINGS="
+CC
+CXX
+ILIB
+JAVA_HOME
+JAVAIFLAGS
+JDK
+LIBO_BIN_FOLDER
+LIBO_LIB_FOLDER
+LIBO_URE_LIB_FOLDER
+LIBO_URE_MISC_FOLDER
+OS
+SDKDIRNAME
+SYSTEM_LIBXML
+SYSTEM_LIBXSLT
+"
+# these overwrite host config with build config
+OVERWRITING_SETTINGS="
+ANT
+ANT_HOME
+ANT_LIB
+HSQLDB_USE_JDBC_4_1
+JAVA_CLASSPATH_NOT_SET
+JAVA_SOURCE_VER
+JAVA_TARGET_VER
+JAVACFLAGS
+JAVACOMPILER
+JAVADOC
+JAVADOCISGJDOC
+"
+# these need some special handling
+EXTRA_HANDLED_SETTINGS="
+INSTDIR
+INSTROOT
+PATH
+WORKDIR
+"
OLD_PATH=$PATH
-. ./bin/get_config_variables CC CXX ILIB INSTDIR INSTROOT LIBO_BIN_FOLDER
LIBO_LIB_FOLDER LIBO_URE_LIB_FOLDER LIBO_URE_MISC_FOLDER OS PATH SDKDIRNAME
SYSTEM_LIBXML SYSTEM_LIBXSLT WORKDIR
+. ./bin/get_config_variables $DIRECT_FOR_BUILD_SETTINGS
$OVERWRITING_SETTINGS $EXTRA_HANDLED_SETTINGS
BUILD_PATH=$PATH
PATH=$OLD_PATH
line=`echo "LO_PATH_FOR_BUILD='${BUILD_PATH}'" | sed -e
's,/CONF-FOR-BUILD,,
[Libreoffice-commits] core.git: Branch 'private/jmux/win-arm64' - 296 commits - accessibility/inc basctl/source basegfx/source basic/qa basic/source bin/get_config_variables bridges/inc bridges/Librar
Rebased ref, commits from common ancestor: commit bec5262785e530db0d9a1e582f6eccb39053bdfe Author: Jan-Marek Glogowski AuthorDate: Sat Jul 18 04:01:32 2020 +0200 Commit: Jan-Marek Glogowski CommitDate: Tue Aug 11 01:51:17 2020 +0200 Add my current Windows Arm64 build config Change-Id: I762049d34e6a00fec0960395f94d6537047f6061 diff --git a/distro-configs/LibreOfficeWinArm64.conf b/distro-configs/LibreOfficeWinArm64.conf new file mode 100644 index ..05a526a8786f --- /dev/null +++ b/distro-configs/LibreOfficeWinArm64.conf @@ -0,0 +1,25 @@ +--host=aarch64-pc-cygwin +--disable-ccache +--disable-coinmp +--disable-ext-nlpsolver +--disable-ext-wiki-publisher +--disable-firebird-sdbc +--disable-gpgmepp +--disable-odk +--disable-online-update +--disable-skia +--disable-werror +--enable-assert-always-abort +--enable-debug +--enable-extension-integration +--enable-pch +--enable-scripting-beanshell +--enable-scripting-javascript +--with-ant-home=/cygdrive/c/lode/packages/apache-ant-1.9.4 +--with-jdk-home=/cygdrive/c/Program Files/Java/jdk-14.0.1 +--with-junit=/cygdrive/c/lode/opt/share/java/junit.jar +--with-theme=colibre colibre_svg +--without-doxygen +--without-help +--without-helppack-integration +--without-java commit e0e60c79194790ee75a6fffab6700498cdfb3d8e Author: Jan-Marek Glogowski AuthorDate: Mon Aug 3 07:08:56 2020 +0200 Commit: Jan-Marek Glogowski CommitDate: Tue Aug 11 01:51:17 2020 +0200 jvmfwk: add vendorbase entry for Windows Arm64 Change-Id: Iea89befded02ecfd7513cc3d8f116dd6ac2913be diff --git a/jvmfwk/inc/vendorbase.hxx b/jvmfwk/inc/vendorbase.hxx index df536bc3477e..7e98a2409c35 100644 --- a/jvmfwk/inc/vendorbase.hxx +++ b/jvmfwk/inc/vendorbase.hxx @@ -39,6 +39,8 @@ namespace jfw_plugin #define JFW_PLUGIN_ARCH "sparc" #elif defined X86_64 #define JFW_PLUGIN_ARCH "amd64" +#elif defined ARM64 +#define JFW_PLUGIN_ARCH "arm64" #elif defined INTEL #define JFW_PLUGIN_ARCH "i386" #elif defined POWERPC64 commit a531cd42dcf22ea9dd94f225293d83c4b74392c0 Author: Jan-Marek Glogowski AuthorDate: Mon Aug 3 07:06:36 2020 +0200 Commit: Jan-Marek Glogowski CommitDate: Tue Aug 11 01:51:17 2020 +0200 Disable .NET support for Windows Arm64 The current .NET 5.0 Arm64 preview doesn't have a mscoree.lib, so linking the climaker isn't possible. Change-Id: Ibbac88aa465a9ca2eb8fb0efaad91d20f358229b diff --git a/cli_ure/Module_cli_ure.mk b/cli_ure/Module_cli_ure.mk index d1ff09073a18..91863abb59c9 100644 --- a/cli_ure/Module_cli_ure.mk +++ b/cli_ure/Module_cli_ure.mk @@ -10,6 +10,7 @@ $(eval $(call gb_Module_Module,cli_ure)) ifeq ($(COM),MSC) +ifneq ($(CPUNAME),ARM64) $(eval $(call gb_Module_add_targets,cli_ure,\ CliLibrary_cli_basetypes \ CliLibrary_cli_ure \ @@ -22,5 +23,6 @@ $(eval $(call gb_Module_add_targets,cli_ure,\ Package_cli_basetypes_copy \ )) endif +endif # vim: set noet sw=4 ts=4: diff --git a/unoil/Module_unoil.mk b/unoil/Module_unoil.mk index 5977368f2dab..6b1cb5fd064f 100644 --- a/unoil/Module_unoil.mk +++ b/unoil/Module_unoil.mk @@ -17,9 +17,11 @@ $(eval $(call gb_Module_add_targets,unoil,\ endif ifeq ($(COM),MSC) +ifneq ($(CPUNAME),ARM64) $(eval $(call gb_Module_add_targets,unoil,\ CliUnoApi_oootypes \ )) endif +endif # vim:set noet sw=4 ts=4: commit 95c1bfb3149d577fa34bf28197032074224d61d6 Author: Jan-Marek Glogowski AuthorDate: Mon Aug 3 07:04:28 2020 +0200 Commit: Jan-Marek Glogowski CommitDate: Tue Aug 11 01:51:17 2020 +0200 libcurl: fix Windows Arm64 build Change-Id: I22a203cb56e4b6dd8f80249cd30cf9a4efb676eb diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index fbb38e457459..5205d071301d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2748,7 +2748,7 @@ $(call gb_LinkTarget_set_include,$(1),\ ifeq ($(COM),MSC) $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,curl)/builds/libcurl-vc12-$(if $(filter X86_64,$(CPUNAME)),x64,x86)-$(if $(MSVC_USE_DEBUG_RUNTIME),debug,release)-dll-ipv6-sspi-winssl/lib/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),_debug).lib \ + $(call gb_UnpackedTarball_get_dir,curl)/builds/libcurl-vc12-$(gb_MSBUILD_PLATFORM)-$(gb_MSBUILD_CONFIG)-dll-ipv6-sspi-winssl/lib/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),_debug).lib \ ) else $(call gb_LinkTarget_add_libs,$(1),\ commit 802dd347c9db550098de4332ec3ec240ab23eea6 Author: Jan-Marek Glogowski AuthorDate: Mon Aug 3 06:49:32 2020 +0200 Commit: Jan-Marek Glogowski CommitDate: Tue Aug 11 01:51:16 2020 +0200 cppunit: fix Windows Arm64 build Change-Id: I75b169362ed703bcae0720aeac0602f389435317 diff --git a/external/cppunit/ExternalProject_cppunit.mk b/external/cppunit/ExternalProject_cppunit.mk index 9b4a69c627e1..1c5ac725af59 100644 --- a/external/cppunit/ExternalProject_cppunit.mk +++ b/external/cppunit/ExternalProject_cppunit.mk @@ -17,8 +17,8 @@ ifeq ($(OS),WNT) $(call gb_Exte
[Libreoffice-commits] core.git: Branch 'private/quwex/gsoc-box2d-experimental' - 3 commits - offapi/com slideshow/source
Rebased ref, commits from common ancestor:
commit 786cfdcf2ac6ce0e3d8a0cc48b5110b685db2aae
Author: Sarper Akdemir
AuthorDate: Mon Aug 10 15:30:26 2020 +0300
Commit: Sarper Akdemir
CommitDate: Tue Aug 11 01:38:59 2020 +0300
add version tag to ANIMATEPHYSICS
Change-Id: Ia6db8ca10a0311ae8492cdc5ab518efaba611cb2
diff --git a/offapi/com/sun/star/animations/AnimationNodeType.idl
b/offapi/com/sun/star/animations/AnimationNodeType.idl
index d0cd6e268fd6..7c6abb105947 100644
--- a/offapi/com/sun/star/animations/AnimationNodeType.idl
+++ b/offapi/com/sun/star/animations/AnimationNodeType.idl
@@ -68,7 +68,10 @@ constants AnimationNodeType
/** Defines a command effect. */
const short COMMAND = 11;
-/** Defines a physics animation */
+/** Defines a physics animation
+
+@since LibreOffice 7.1
+*/
const short ANIMATEPHYSICS = 12;
};
commit a5392206b824075e930880b5b379813982abb72f
Author: Sarper Akdemir
AuthorDate: Thu Aug 6 10:32:55 2020 +0300
Commit: Sarper Akdemir
CommitDate: Tue Aug 11 01:38:59 2020 +0300
make physics based animation effects always processed last
Change-Id: I92d436aced6ef3ee2c8b0bf0167c1f7e642ba3b5
diff --git a/slideshow/source/engine/activitiesqueue.cxx
b/slideshow/source/engine/activitiesqueue.cxx
index ba982385356e..38e79d1e5677 100644
--- a/slideshow/source/engine/activitiesqueue.cxx
+++ b/slideshow/source/engine/activitiesqueue.cxx
@@ -50,6 +50,8 @@ namespace slideshow::internal
{
for( const auto& pActivity : maCurrentActivitiesWaiting )
pActivity->dispose();
+for( const auto& pActivity :
maCurrentActivitiesToBeProcessedLast )
+pActivity->dispose();
for( const auto& pActivity : maCurrentActivitiesReinsert )
pActivity->dispose();
}
@@ -59,7 +61,7 @@ namespace slideshow::internal
}
}
-bool ActivitiesQueue::addActivity( const ActivitySharedPtr& pActivity )
+bool ActivitiesQueue::addActivity( const ActivitySharedPtr& pActivity,
const bool bProcessLast )
{
OSL_ENSURE( pActivity, "ActivitiesQueue::addActivity: activity ptr
NULL" );
@@ -67,7 +69,17 @@ namespace slideshow::internal
return false;
// add entry to waiting list
-maCurrentActivitiesWaiting.push_back( pActivity );
+if( !bProcessLast )
+{
+maCurrentActivitiesWaiting.push_back( pActivity );
+}
+else
+{
+// Activities that should be processed last is kept in a
different
+// ActivityQueue, and later added to the end of the
maCurrentActivitiesWaiting
+// at the start of ActivitiesQueue::process()
+maCurrentActivitiesToBeProcessedLast.push_back( pActivity );
+}
return true;
}
@@ -76,6 +88,12 @@ namespace slideshow::internal
{
SAL_INFO("slideshow.verbose", "ActivitiesQueue: outer loop
heartbeat" );
+// If there are activities to be processed last add them to the
end of the ActivitiesQueue
+maCurrentActivitiesWaiting.insert(
maCurrentActivitiesWaiting.end(),
+
maCurrentActivitiesToBeProcessedLast.begin(),
+
maCurrentActivitiesToBeProcessedLast.end() );
+maCurrentActivitiesToBeProcessedLast.clear();
+
// accumulate time lag for all activities, and lag time
// base if necessary:
double fLag = 0.0;
diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx
b/slideshow/source/engine/animationnodes/animationbasenode.cxx
index 4dcb640795aa..7999b5a7654a 100644
--- a/slideshow/source/engine/animationnodes/animationbasenode.cxx
+++ b/slideshow/source/engine/animationnodes/animationbasenode.cxx
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#include "nodetools.hxx"
#include
@@ -294,7 +295,10 @@ void AnimationBaseNode::activate_st()
mpActivity->setTargets( getShape(), maAttributeLayerHolder.get() );
// add to activities queue
-getContext().mrActivitiesQueue.addActivity( mpActivity );
+if( mxAnimateNode->getType() ==
css::animations::AnimationNodeType::ANIMATEPHYSICS )
+getContext().mrActivitiesQueue.addActivity(mpActivity, true);
+else
+getContext().mrActivitiesQueue.addActivity( mpActivity );
}
else {
// Actually, DO generate the event for empty activity,
diff --git a/slideshow/source/inc/activitiesqueue.hxx
b/slideshow/source/inc/activitiesqueue.hxx
index b4f88b1b39d1..76dc981f8f65 100644
--- a/slideshow/source/inc/activitiesqueue.hxx
+++ b/slideshow/source/inc/activitiesqueue.hxx
@@ -57,7 +57,7 @@ namespace slideshow
/*
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/table/tableproperties.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 99dff69b561a8fe2d9437e6aa67a9581af41
Author: Gülşah Köse
AuthorDate: Mon Aug 10 10:04:51 2020 +0300
Commit: Gülşah Köse
CommitDate: Mon Aug 10 23:51:39 2020 +0200
tdf#133015 Fix table position during import multicol textbox.
Change-Id: Ied1a03ff9f4556a551738b698ccb284fe74299da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100414
Tested-by: Jenkins
Reviewed-by: Gülşah Köse
diff --git a/oox/source/drawingml/table/tableproperties.cxx
b/oox/source/drawingml/table/tableproperties.cxx
index bf7d0dcfe7a2..1c12c10eda47 100644
--- a/oox/source/drawingml/table/tableproperties.cxx
+++ b/oox/source/drawingml/table/tableproperties.cxx
@@ -145,7 +145,7 @@ void TableProperties::pushToPropSet(const
::oox::core::XmlFilterBase& rFilterBas
for (auto& tableRow : mvTableRows)
{
sal_Int32 nColumn = 0;
-sal_Int32 nColumnSize = tableRow.getTableCells().size();
+sal_Int32 nColumnSize = mvTableGrid.size();
sal_Int32 nRemovedColumn = 0; //
for (sal_Int32 nColIndex = 0; nColIndex < nColumnSize; nColIndex++)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 2 commits - desktop/qa desktop/source sd/qa
desktop/qa/data/BlankDrawDocument.odg|binary
desktop/qa/desktop_lib/test_desktop_lib.cxx | 68 +++
desktop/source/lib/init.cxx | 52
sd/qa/unit/tiledrendering/data/dummy.odg |binary
sd/qa/unit/tiledrendering/tiledrendering.cxx | 56 +-
5 files changed, 172 insertions(+), 4 deletions(-)
New commits:
commit 68e5ff123e7bca884fcf23cf9f69422eb41fa0f7
Author: Tomaž Vajngerl
AuthorDate: Sun Jul 26 21:58:33 2020 +0200
Commit: Tomaž Vajngerl
CommitDate: Mon Aug 10 23:08:14 2020 +0200
allow to .uno:Save a PDF doc - divert to SaveAs to the doc. file
To save PDF annotations, we need to allow a .uno:Save if the
document was opened from a PDF file. When we get a .uno:Save
command, we need to divert that to SaveAs into the same file as
the current document was opened with.
Change-Id: I0c511c4e5501de03ea8b0efb5aaf37cd09936e6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99463
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
(cherry picked from commit 6f55a64f002d80a19201e2a9b0171725fb71a7fb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99883
Tested-by: Jenkins CollaboraOffice
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 906d3c4c6baa..fdd92d2d3430 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -105,6 +105,8 @@
#include
#include
#include
+#include
+#include
#include
#include
#include
@@ -721,6 +723,28 @@ std::string extractPrivateKey(const std::string &
privateKey)
return privateKey.substr(pos1, pos2);
}
+OUString lcl_getCurrentDocumentMimeType(LibLODocument_Impl* pDocument)
+{
+OUString aMimeType;
+SfxBaseModel* pBaseModel =
dynamic_cast(pDocument->mxComponent.get());
+if (!pBaseModel)
+return aMimeType;
+
+SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
+if (!pObjectShell)
+return aMimeType;
+
+SfxMedium* pMedium = pObjectShell->GetMedium();
+if (!pMedium)
+return aMimeType;
+
+auto pFilter = pMedium->GetFilter();
+if (!pFilter)
+return aMimeType;
+
+return pFilter->GetMimeType();
+}
+
// Gets an undo manager to enter and exit undo context. Needed by
ToggleOrientation
css::uno::Reference< css::document::XUndoManager > getUndoManager( const
css::uno::Reference< css::frame::XFrame >& rxFrame )
{
@@ -2463,6 +2487,9 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis,
const char* sUrl, const cha
OUString sFormat = getUString(pFormat);
OUString aURL(getAbsoluteURL(sUrl));
+
+uno::Reference xStorable(pDocument->mxComponent,
uno::UNO_QUERY_THROW);
+
if (aURL.isEmpty())
{
SetLastExceptionMsg("Filename to save to was not provided.");
@@ -2603,7 +2630,6 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis,
const char* sUrl, const cha
aSaveMediaDescriptor[MediaDescriptor::PROP_INTERACTIONHANDLER()]
<<= xInteraction;
}
-uno::Reference xStorable(pDocument->mxComponent,
uno::UNO_QUERY_THROW);
if (bTakeOwnership)
xStorable->storeAsURL(aURL,
aSaveMediaDescriptor.getAsConstPropertyValueList());
@@ -3785,6 +3811,30 @@ static void doc_postUnoCommand(LibreOfficeKitDocument*
pThis, const char* pComma
// handle potential interaction
if (gImpl && aCommand == ".uno:Save")
{
+// Check if saving a PDF file
+OUString aMimeType = lcl_getCurrentDocumentMimeType(pDocument);
+if (aMimeType == "application/pdf")
+{
+// If we have a PDF file (for saving annotations for example), we
need
+// to run save-as to the same file as the opened document. Plain
save
+// doesn't work as the PDF is not a "native" format.
+uno::Reference xStorable(pDocument->mxComponent,
uno::UNO_QUERY_THROW);
+OUString aURL = xStorable->getLocation();
+OString aURLUtf8 = OUStringToOString(aURL, RTL_TEXTENCODING_UTF8);
+bool bResult = doc_saveAs(pThis, aURLUtf8.getStr(), "pdf",
nullptr);
+
+// Send the result of save
+boost::property_tree::ptree aTree;
+aTree.put("commandName", pCommand);
+aTree.put("success", bResult);
+std::stringstream aStream;
+boost::property_tree::write_json(aStream, aTree);
+OString aPayload = aStream.str().c_str();
+
pDocument->mpCallbackFlushHandlers[nView]->queue(LOK_CALLBACK_UNO_COMMAND_RESULT,
aPayload.getStr());
+return;
+}
+
+
rtl::Reference const pInteraction(
new LOKInteractionHandler("save", gImpl, pDocument));
uno::Reference const
xInteraction(pInteraction.get());
commit b4d0b45ba6bce22501fbd623ac2ebf5da29ee356
Author: Tomaž Vajngerl
AuthorDate: Sat Jul 11 21:18:34 2020 +0200
Commit: Tomaž Vajngerl
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 2 commits - include/tools tools/qa tools/source
include/tools/json_writer.hxx | 66 +---
tools/qa/cppunit/test_json_writer.cxx | 38 ++-
tools/source/misc/json_writer.cxx | 112 ++
3 files changed, 190 insertions(+), 26 deletions(-)
New commits:
commit f271eca1eb24ed28658afe4c73d71cbf77a78dec
Author: Noel Grandin
AuthorDate: Wed Jun 24 18:24:37 2020 +0200
Commit: Tomaž Vajngerl
CommitDate: Mon Aug 10 23:07:32 2020 +0200
fix JsonWriter::reallocBuffer
was not updating mSpaceAllocated
Change-Id: Ie5404e58c6520d32b72c19ddfa58b2ab2b895199
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97049
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 3fb5c11ac69e6687e579d4129cb892c5ae746a5e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100445
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tomaž Vajngerl
diff --git a/tools/source/misc/json_writer.cxx
b/tools/source/misc/json_writer.cxx
index 251c44c0246f..f2b008ea6fd2 100644
--- a/tools/source/misc/json_writer.cxx
+++ b/tools/source/misc/json_writer.cxx
@@ -320,6 +320,7 @@ void JsonWriter::reallocBuffer(int noMoreBytesRequired)
free(mpBuffer);
mpBuffer = pNew;
mPos = mpBuffer + currentUsed;
+mSpaceAllocated = newSize;
}
/** Hands ownership of the underlying storage buffer to the caller,
commit 29954dbeb16ef206940a8fe7ed94e487f842d17a
Author: Noel Grandin
AuthorDate: Thu Jun 18 21:39:30 2020 +0200
Commit: Tomaž Vajngerl
CommitDate: Mon Aug 10 23:07:20 2020 +0200
improvements to JSON Writer
part of the master commit cb95276e6e6bf12a1c06d5c252551e55c788fcb2
Change-Id: Icf18fb4b3ebced375196a8cdbd2a543acf4e43c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100444
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tomaž Vajngerl
diff --git a/include/tools/json_writer.hxx b/include/tools/json_writer.hxx
index 588577d41303..bf07aa0aaa35 100644
--- a/include/tools/json_writer.hxx
+++ b/include/tools/json_writer.hxx
@@ -13,6 +13,11 @@
#include
#include
+namespace rtl
+{
+class OStringBuffer;
+}
+
/** Simple JSON encoder designed specifically for LibreOfficeKit purposes.
*
* (1) Minimal allocations/re-allocations/copying
@@ -22,10 +27,14 @@
namespace tools
{
class ScopedJsonWriterNode;
+class ScopedJsonWriterArray;
+class ScopedJsonWriterStruct;
class TOOLS_DLLPUBLIC JsonWriter
{
friend class ScopedJsonWriterNode;
+friend class ScopedJsonWriterArray;
+friend class ScopedJsonWriterStruct;
int mSpaceAllocated;
char* mpBuffer;
@@ -38,33 +47,36 @@ public:
~JsonWriter();
[[nodiscard]] ScopedJsonWriterNode startNode(const char*);
+[[nodiscard]] ScopedJsonWriterArray startArray(const char*);
+[[nodiscard]] ScopedJsonWriterStruct startStruct();
void put(const char* pPropName, const OUString& rPropValue);
void put(const char* pPropName, const OString& rPropValue);
void put(const char* pPropName, const char* pPropVal);
void put(const char*, int);
-/** Hands ownership of the the underlying storage buffer to the caller,
+/// This assumes that this data belongs at this point in the stream, and
is valid, and properly encoded
+void putRaw(const rtl::OStringBuffer&);
+
+/** Hands ownership of the underlying storage buffer to the caller,
* after this no more document modifications may be written. */
char* extractData();
OString extractAsOString();
private:
void endNode();
+void endArray();
+void endStruct();
void addCommaBeforeField();
+void reallocBuffer(int noMoreBytesRequired);
+// this part inline to speed up the fast path
inline void ensureSpace(int noMoreBytesRequired)
{
+assert(mpBuffer && "already extracted data");
int currentUsed = mPos - mpBuffer;
if (currentUsed + noMoreBytesRequired >= mSpaceAllocated)
-{
-auto newSize = std::max(mSpaceAllocated * 2, (currentUsed +
noMoreBytesRequired) * 2);
-char* pNew = static_cast(malloc(newSize));
-memcpy(pNew, mpBuffer, currentUsed);
-free(mpBuffer);
-mpBuffer = pNew;
-mPos = mpBuffer;
-}
+reallocBuffer(noMoreBytesRequired);
}
};
@@ -85,5 +97,41 @@ class ScopedJsonWriterNode
public:
~ScopedJsonWriterNode() { mrWriter.endNode(); }
};
+
+/**
+ * Auto-closes the node.
+ */
+class ScopedJsonWriterArray
+{
+friend class JsonWriter;
+
+JsonWriter& mrWriter;
+
+ScopedJsonWriterArray(JsonWriter& rWriter)
+: mrWriter(rWriter)
+{
+}
+
+public:
+~ScopedJsonWriterArray() { mrWriter.endArray(); }
+};
+
+/**
+ * Auto-closes the node.
+ */
+class ScopedJsonWriterStruct
+{
+friend class JsonWriter;
+
+JsonWriter& mrWriter;
+
+ScopedJsonWriterStruct(JsonWriter& rWriter)
+: mrWriter(rWriter)
+{
+}
+
+public:
+
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src
loleaflet/src/control/Control.Menubar.js |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 22649095ea1f0bace04c78766052915242097001
Author: Szymon Kłos
AuthorDate: Thu Aug 6 11:42:35 2020 +0200
Commit: Jan Holesovsky
CommitDate: Mon Aug 10 21:15:48 2020 +0200
Add missing table operations to menu in Impress
Change-Id: I1f644b0a69ee2eb17edf4c64f7de3e13b39e6192
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100207
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index d888a0740..f08d5d966 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -338,7 +338,12 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:InsertColumnsAfter'}]},
{name: _UNO('.uno:TableDeleteMenu',
'text'/*HACK should be 'presentation', but not in xcu*/), type: 'menu', menu: [
{uno: '.uno:DeleteRows'},
- {uno: '.uno:DeleteColumns'}]},
+ {uno: '.uno:DeleteColumns'},
+ {uno: '.uno:DeleteTable'}]},
+ {name: _UNO('.uno:TableSelectMenu', 'text'),
type: 'menu', menu: [
+ {uno: '.uno:SelectTable'},
+ {uno: '.uno:EntireRow'},
+ {uno: '.uno:EntireColumn'}]},
{uno: '.uno:MergeCells'}]
},
{name: _UNO('.uno:SlideMenu', 'presentation'), type:
'menu', menu: [
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - include/svx officecfg/registry sd/sdi sd/source svx/sdi svx/source
include/svx/svxids.hrc | 3 + officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 8 sd/sdi/tables.sdi| 5 ++ sd/source/ui/table/tableobjectbar.cxx| 1 svx/sdi/svx.sdi | 17 ++ svx/source/table/tablecontroller.cxx | 16 - 6 files changed, 47 insertions(+), 3 deletions(-) New commits: commit df4c1556478bf0cbe1f6c754e22d137a79a9b0d5 Author: Justin Luth AuthorDate: Fri Jul 3 11:45:24 2020 +0300 Commit: Jan Holesovsky CommitDate: Mon Aug 10 21:15:04 2020 +0200 tdf#100772 sd: add uno:DeleteTable to non-NB menus Delete Row and Delete Column were there, but no option to delete table, so that major omission was fixed for Draw and Impress. The notebookbar looks very incomplete. Also, I didn't really understand the pop-out menu configuration, and at least in the one case there didn't seem to be a good space to add delete table. So I left the notebookbar completely alone. Change-Id: I5d6c98e3238bc545a02325edfd62f5d937ac6371 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97821 Tested-by: Jenkins Tested-by: Maxim Monastirsky Reviewed-by: Justin Luth Reviewed-by: Maxim Monastirsky Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100205 Tested-by: Jenkins CollaboraOffice Reviewed-by: Jan Holesovsky diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index a9960d216b4e..0ffe72e3bb30 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -985,7 +985,8 @@ class SfxStringItem; #define SID_EDIT_SIGNATURELINE ( SID_SVX_START + 1174 ) #define SID_SIGN_SIGNATURELINE ( SID_SVX_START + 1175 ) #define SID_MEASURE_DLG ( SID_SVX_START + 1176 ) - +// free slots - available for use +#define SID_TABLE_DELETE_TABLE ( SID_SVX_START + 1184 ) #define SID_TABLE_MINIMAL_COLUMN_WIDTH ( SID_SVX_START + 1185 ) #define SID_TABLE_MINIMAL_ROW_HEIGHT( SID_SVX_START + 1186 ) #define SID_TABLE_OPTIMAL_COLUMN_WIDTH ( SID_SVX_START + 1187 ) diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 36a275b6268c..6390f895c2d9 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -1986,6 +1986,14 @@ 1 + + + Delete Table + + + 1 + + Select Table diff --git a/sd/sdi/tables.sdi b/sd/sdi/tables.sdi index a5918af490db..9943ce719e29 100644 --- a/sd/sdi/tables.sdi +++ b/sd/sdi/tables.sdi @@ -113,6 +113,11 @@ shell TableObjectBar ExecMethod = Execute; StateMethod = GetState; ] +SID_TABLE_DELETE_TABLE +[ +ExecMethod = Execute; +StateMethod = GetState; +] SID_TABLE_SELECT_ALL [ ExecMethod = Execute; diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx index 9b01ee63a290..54687d02d174 100644 --- a/sd/source/ui/table/tableobjectbar.cxx +++ b/sd/source/ui/table/tableobjectbar.cxx @@ -191,6 +191,7 @@ void TableObjectBar::Execute( SfxRequest& rReq ) case SID_OPTIMIZE_TABLE: case SID_TABLE_DELETE_ROW: case SID_TABLE_DELETE_COL: +case SID_TABLE_DELETE_TABLE: case SID_FORMAT_TABLE_DLG: case SID_TABLE_INSERT_ROW: case SID_TABLE_INSERT_COL: diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index f077e5abaddb..36fe1d2e528d 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -11108,6 +11108,23 @@ SfxVoidItem DeleteColumns SID_TABLE_DELETE_COL GroupId = SfxGroupId::Table; ] +SfxVoidItem DeleteTable SID_TABLE_DELETE_TABLE +() +[ +AutoUpdate = FALSE, +FastCall = TRUE, +ReadOnlyDoc = FALSE, +Toggle = FALSE, +Container = FALSE, +RecordAbsolute = FALSE, +RecordPerSet; + +AccelConfig = TRUE, +MenuConfig = TRUE, +ToolBoxConfig = TRUE, +GroupId = SfxGroupId::Table; +] + SfxVoidItem SelectTable SID_TABLE_SELECT_ALL () [ diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index d119367632a6..43c74993961b 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -468,6 +468,10 @@ void SvxTableController::GetState( SfxItemSet& rSet ) if( !mxTable.is() || !hasSelectedCells() || (!comphelper::LibreOfficeKit::isActive() && mxTable->getColumnCount()
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/src
loleaflet/css/mobilewizard.css |4 +
loleaflet/src/control/Control.JSDialogBuilder.js | 64 ++-
2 files changed, 66 insertions(+), 2 deletions(-)
New commits:
commit 402a42d3db9e5d3b1836c5fd5010c5a5f7054b02
Author: Szymon Kłos
AuthorDate: Mon Aug 10 12:58:53 2020 +0200
Commit: Jan Holesovsky
CommitDate: Mon Aug 10 21:12:12 2020 +0200
mobile-wizard: update selected cell border style
Change-Id: Id2f98c0824e589d63d658f00b384fa0abfb48f2f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100425
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 0d9ef8a62..8cba28d8e 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -299,6 +299,10 @@ p.mobile-wizard.ui-combobox-text.selected {
-webkit-box-shadow: inset 0px 0px 0px 2px #fff;
box-shadow: inset 0px 0px 0px 2px #fff;
}
+#mobile-wizard-content > #ScCellAppearancePropertyPanel >
.ui-content.level-0.mobile-wizard .borderbutton.selected {
+ -webkit-box-shadow: inset 0px 0px 0px 2px #0867af !important;
+ box-shadow: inset 0px 0px 0px 2px #0867af !important;
+}
.ui-header.mobile-wizard {
width: 100%;
height: 56px !important;
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 101e3d3bb..6a2f8e0aa 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1846,7 +1846,48 @@ L.Control.JSDialogBuilder = L.Control.extend({
return false;
},
- _borderControlItem: function(parentContainer, data, builder, i) {
+ _getCurrentBorderNumber: function(builder) {
+ var outer =
builder.map['stateChangeHandler'].getItemValue('.uno:BorderOuter');
+ var inner =
builder.map['stateChangeHandler'].getItemValue('.uno:BorderInner');
+
+ if (!outer || !inner)
+ return 0;
+
+ var left = outer.left === 'true';
+ var right = outer.right === 'true';
+ var bottom = outer.bottom === 'true';
+ var top = outer.top === 'true';
+ var horiz = inner.horizontal === 'true';
+ var vert = inner.vertical === 'true';
+
+ if (left && !right && !bottom && !top && !horiz && !vert) {
+ return 2;
+ } else if (!left && right && !bottom && !top && !horiz &&
!vert) {
+ return 3;
+ } else if (left && right && !bottom && !top && !horiz && !vert)
{
+ return 4;
+ } else if (!left && !right && !bottom && top && !horiz &&
!vert) {
+ return 5;
+ } else if (!left && !right && bottom && !top && !horiz &&
!vert) {
+ return 6;
+ } else if (!left && !right && bottom && top && !horiz && !vert)
{
+ return 7;
+ } else if (left && right && bottom && top && !horiz && !vert) {
+ return 8;
+ } else if (!left && !right && bottom && top && horiz && !vert) {
+ return 9;
+ } else if (left && right && bottom && top && horiz && !vert) {
+ return 10;
+ } else if (left && right && bottom && top && !horiz && vert) {
+ return 11;
+ } else if (left && right && bottom && top && horiz && vert) {
+ return 12;
+ }
+
+ return 1;
+ },
+
+ _borderControlItem: function(parentContainer, data, builder, i,
selected) {
var button = null;
var div = this._createIdentifiable('div', 'ui-content unospan',
parentContainer, data);
@@ -1856,6 +1897,9 @@ L.Control.JSDialogBuilder = L.Control.extend({
button.src = L.LOUtil.getImageURL('fr0' + i + '.svg');
button.id = buttonId;
+ if (selected)
+ $(button).addClass('selected');
+
$(div).click(function () {
var color = 0;
// Find our associated color picker
@@ -1870,8 +1914,24 @@ L.Control.JSDialogBuilder = L.Control.extend({
var bordercontrollabel = L.DomUtil.create('p',
builder.options.cssClass + ' ui-text', parentContainer);
bordercontrollabel.innerHTML = _('Cell borders');
bordercontrollabel.id = data.id + 'label';
+ var current = builder._getCurrentBorderNumber(builder);
for (var i = 1; i < 13; ++i)
- builder._borderControlItem(parentContainer, data,
builder, i);
+ builder._borderControlItem(parentContainer, data,
builder, i, i
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - desktop/source editeng/source include/editeng
desktop/source/lib/init.cxx |4 +++-
editeng/source/items/frmitems.cxx | 31 +++
include/editeng/boxitem.hxx |4
3 files changed, 38 insertions(+), 1 deletion(-)
New commits:
commit 035d850179688137dcf145cf3e779b6e05779239
Author: Szymon Kłos
AuthorDate: Mon Aug 10 12:57:00 2020 +0200
Commit: Jan Holesovsky
CommitDate: Mon Aug 10 21:09:01 2020 +0200
lok: send cell border state updates
Change-Id: I400ee3cb9f0a98804d98e25d0164fa5148b79191
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100424
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 7e6b71c77c1e..d33454297cf8 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2756,7 +2756,9 @@ static void doc_iniUnoCommands ()
OUString(".uno:ParaspaceIncrease"),
OUString(".uno:ParaspaceDecrease"),
OUString(".uno:AcceptTrackedChange"),
-OUString(".uno:RejectTrackedChange")
+OUString(".uno:RejectTrackedChange"),
+OUString(".uno:BorderInner"),
+OUString(".uno:BorderOuter")
};
util::URL aCommandURL;
diff --git a/editeng/source/items/frmitems.cxx
b/editeng/source/items/frmitems.cxx
index 0e1c22731ad7..d21e3ce75591 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1440,6 +1440,23 @@ SvxBoxItem& SvxBoxItem::operator=( const SvxBoxItem&
rBox )
}
+boost::property_tree::ptree SvxBoxItem::dumpAsJSON() const
+{
+boost::property_tree::ptree aTree;
+
+boost::property_tree::ptree aState;
+aState.put("top", GetTop() && !GetTop()->isEmpty());
+aState.put("bottom", GetBottom() && !GetBottom()->isEmpty());
+aState.put("left", GetLeft() && !GetLeft()->isEmpty());
+aState.put("right", GetRight() && !GetRight()->isEmpty());
+
+aTree.push_back(std::make_pair("state", aState));
+aTree.put("commandName", ".uno:BorderOuter");
+
+return aTree;
+}
+
+
static bool CmpBrdLn( const std::unique_ptr & pBrd1, const
SvxBorderLine* pBrd2 )
{
if( pBrd1.get() == pBrd2 )
@@ -2318,6 +2335,20 @@ SvxBoxInfoItem::~SvxBoxInfoItem()
{
}
+boost::property_tree::ptree SvxBoxInfoItem::dumpAsJSON() const
+{
+boost::property_tree::ptree aTree;
+
+boost::property_tree::ptree aState;
+aState.put("vertical", GetVert() && !GetVert()->isEmpty());
+aState.put("horizontal", GetHori() && !GetHori()->isEmpty());
+
+aTree.push_back(std::make_pair("state", aState));
+aTree.put("commandName", ".uno:BorderInner");
+
+return aTree;
+}
+
SvxBoxInfoItem &SvxBoxInfoItem::operator=( const SvxBoxInfoItem& rCpy )
{
if (this != &rCpy)
diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx
index 103967578f20..8cf1c2d60545 100644
--- a/include/editeng/boxitem.hxx
+++ b/include/editeng/boxitem.hxx
@@ -118,6 +118,8 @@ public:
static css::table::BorderLine2 SvxLineToLine( const
editeng::SvxBorderLine* pLine, bool bConvert );
static bool LineToSvxLine(const css::table::BorderLine& rLine,
editeng::SvxBorderLine& rSvxLine, bool bConvert);
static bool LineToSvxLine(const css::table::BorderLine2& rLine,
editeng::SvxBorderLine& rSvxLine, bool bConvert);
+
+virtual boost::property_tree::ptree dumpAsJSON() const override;
};
inline void SvxBoxItem::SetAllDistances(sal_uInt16 const nNew)
@@ -234,6 +236,8 @@ public:
nValidFlags &= ~nValid;
}
voidResetFlags();
+
+virtual boost::property_tree::ptree dumpAsJSON() const override;
};
namespace editeng
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/uiconfig
chart2/uiconfig/ui/tp_3D_SceneAppearance.ui | 33 ++-- 1 file changed, 8 insertions(+), 25 deletions(-) New commits: commit 386add495b3d8b7816a521bb28c5f48fc243bc99 Author: Caolán McNamara AuthorDate: Mon Aug 10 15:37:29 2020 +0100 Commit: Caolán McNamara CommitDate: Mon Aug 10 20:17:37 2020 +0200 tdf#135568 an unexpected model for a GtkComboBox Change-Id: I5d4ec47fe6dcce4c4f0891fae22ed4b44796a270 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100437 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/chart2/uiconfig/ui/tp_3D_SceneAppearance.ui b/chart2/uiconfig/ui/tp_3D_SceneAppearance.ui index a214ebe21247..6cf5681f3771 100644 --- a/chart2/uiconfig/ui/tp_3D_SceneAppearance.ui +++ b/chart2/uiconfig/ui/tp_3D_SceneAppearance.ui @@ -1,28 +1,7 @@ + - - - - - - - - - -Simple -0 - - -Realistic -1 - - -Custom -2 - - - True False @@ -38,10 +17,10 @@ True False -0 Sche_me True LB_SCHEME +0 False @@ -50,10 +29,14 @@ - + True False -liststoreSCHEME + + Simple + Realistic + Custom + False ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/builder.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit f9eea764389eae7e6b77076c1a80a8e6f280f9c4
Author: Caolán McNamara
AuthorDate: Mon Aug 10 15:55:50 2020 +0100
Commit: Caolán McNamara
CommitDate: Mon Aug 10 18:35:12 2020 +0200
tdf#135495 builder file format has annoyingly escaped into user config
Change-Id: I38882e2c6e1815ac5fd747642c8934e3e4ca3ffb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100438
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 2cdc33966ff6..2d27f27e9f1a 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1910,8 +1910,9 @@ VclPtr VclBuilder::makeObject(vcl::Window
*pParent, const OString &
xWindow = xListBox;
}
}
-else if (name == "VclOptionalBox")
+else if (name == "VclOptionalBox" || name == "sfxlo-OptionalBox")
{
+// tdf#135495 fallback sfxlo-OptionalBox to VclOptionalBox as a stopgap
xWindow = VclPtr::Create(pParent);
}
else if (name == "GtkIconView")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/sanitizers
solenv/sanitizers/ui/modules/schart.suppr |1 - 1 file changed, 1 deletion(-) New commits: commit 54ffd565154bd1ad890bbb8e8a252ba14d85d4b2 Author: Caolán McNamara AuthorDate: Mon Aug 10 15:33:30 2020 +0100 Commit: Caolán McNamara CommitDate: Mon Aug 10 17:52:39 2020 +0200 unused suppression Change-Id: I6c28703a577c63a410cadbd4f08fd9c03bc3229f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100436 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/solenv/sanitizers/ui/modules/schart.suppr b/solenv/sanitizers/ui/modules/schart.suppr index f68f0c120cb4..03a355609666 100644 --- a/solenv/sanitizers/ui/modules/schart.suppr +++ b/solenv/sanitizers/ui/modules/schart.suppr @@ -9,7 +9,6 @@ chart2/uiconfig/ui/dlg_InsertErrorBars.ui://GtkEntry[@id='ED_RANGE_NEGATIVE'] no chart2/uiconfig/ui/dlg_InsertErrorBars.ui://GtkLabel[@id='STR_DATA_SELECT_RANGE_FOR_POSITIVE_ERRORBARS'] orphan-label chart2/uiconfig/ui/dlg_InsertErrorBars.ui://GtkLabel[@id='STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS'] orphan-label chart2/uiconfig/ui/dlg_InsertErrorBars.ui://GtkLabel[@id='STR_CONTROLTEXT_ERROR_BARS_FROM_DATA'] orphan-label -chart2/uiconfig/ui/sidebarelements.ui://GtkCheckButton[@id='checkbutton_legend'] button-no-label chart2/uiconfig/ui/sidebarelements.ui://GtkLabel[@id='placement_label'] orphan-label chart2/uiconfig/ui/sidebarelements.ui://GtkComboBoxText[@id='comboboxtext_legend'] no-labelled-by chart2/uiconfig/ui/sidebarelements.ui://GtkLabel[@id='text_title'] orphan-label ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bridges/Library_cpp_uno.mk bridges/source cppuhelper/source sal/osl
bridges/Library_cpp_uno.mk| 16 +- bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx | 62 +- bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx |3 bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx |2 bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx | 10 + bridges/source/cpp_uno/gcc3_linux_aarch64/vtableslotcall.s| 11 + bridges/source/cpp_uno/shared/vtablefactory.cxx | 11 + cppuhelper/source/exc_thrower.cxx |6 sal/osl/unx/salinit.cxx |8 - 9 files changed, 115 insertions(+), 14 deletions(-) New commits: commit e2bd5afd726abd5df438b6b821416bd7cf496e4d Author: Tor Lillqvist AuthorDate: Sun Aug 9 10:51:22 2020 +0100 Commit: Tor Lillqvist CommitDate: Mon Aug 10 17:51:27 2020 +0200 Make the C++/UNO bridge work to some extent on macOS on arm64 Use the same code as for Linux on aarch64, with minor additional hacks. But that will not actually work in all cases, as there are slight differences in the ABI. See https://developer.apple.com/library/archive/documentation/Xcode/Conceptual/iPhoneOSABIReference/Articles/ARM64FunctionCallingConventions.html Thus we can drop the use of the lo_mobile_throwException() hack that was very temporarily used. The run-time code generation requires use of a new API on macOS to work: See the use of pthread_jit_write_protect_np() in bridges/source/cpp_uno/shared/vtablefactory.cxx. For some reason, with the Xcode 12 betas, when compiling for arm64-apple-macos, the symbols for the type_infos for the UNO exception types (_ZTIN3com3sun4star3uno16RuntimeExceptionE etc) end up as "weak private external" in the object file, as displayed by "nm -f darwin". We try to look them up with dlsym(), but that then fails. So use a gross hack: Introduce separate real variables that point to these typeinfos, and look up and dereference them instead. If this hack ends up needing to be permanent, instead of having a manually edited set of such pointer variables, we should teach codemaker to generate corresponding functions, and look up and invoke them to get the std::type_info pointer. When compiling for x86_64-apple-macos, the type_info symbols end up as "weak external" which is fine. With this, LibreOffice starts and seems to work to some extent, and many unit tests succeed. Change-Id: I05f46a122a51ade1ac7dccd57cb90e594547740e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100408 Tested-by: Jenkins Reviewed-by: Tor Lillqvist diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index cf6fb489c3a1..9adc891f4e3d 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -23,7 +23,7 @@ endif else ifeq ($(CPUNAME),AARCH64) -ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),) +ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX MACOSX NETBSD OPENBSD,$(OS)),) bridges_SELECTED_BRIDGE := gcc3_linux_aarch64 bridge_asm_objects := vtableslotcall bridge_exception_objects := abi cpp2uno uno2cpp @@ -32,10 +32,8 @@ $(eval $(call gb_Library_add_exception_objects,$(gb_CPPU_ENV)_uno, \ bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/callvirtualfunction, \ $(if $(HAVE_GCC_STACK_CLASH_PROTECTION),-fno-stack-clash-protection) \ )) -else ifneq ($(filter iOS MACOSX,$(OS)),) -# For now, use the same bridge for macOS on arm64 as for iOS. But we -# will eventually obviously want one that does generate code -# dynamically on macOS. + +else ifeq ($(OS),iOS) bridges_SELECTED_BRIDGE := gcc3_ios bridge_noopt_objects := cpp2uno except uno2cpp bridge_asm_objects := ios64_helper @@ -184,6 +182,14 @@ $(eval $(call gb_Library_use_internal_comprehensive_api,$(gb_CPPU_ENV)_uno,\ udkapi \ )) +ifeq ($(OS),MACOSX) +ifeq ($(CPUNAME),AARCH64) +$(eval $(call gb_Library_use_internal_comprehensive_api,$(gb_CPPU_ENV)_uno,\ + offapi \ +)) +endif +endif + $(eval $(call gb_Library_set_include,$(gb_CPPU_ENV)_uno,\ -I$(SRCDIR)/bridges/inc \ $$(INCLUDE) \ diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx index 4a5a1d1b662d..b0a35996784e 100644 --- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ /* * This file is part of the LibreOffice project. * @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -106,6 +107,31 @@ std::type_info * Rtti::getRtti(typelib_TypeDescription
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - chart2/uiconfig
chart2/uiconfig/ui/tp_3D_SceneAppearance.ui | 33 ++-- 1 file changed, 8 insertions(+), 25 deletions(-) New commits: commit e61e4ec53ad54a17a1726220f1dbe12ee3307e7b Author: Caolán McNamara AuthorDate: Mon Aug 10 15:37:29 2020 +0100 Commit: Caolán McNamara CommitDate: Mon Aug 10 17:40:28 2020 +0200 tdf#135568 an unexpected model for a GtkComboBox Change-Id: I5d4ec47fe6dcce4c4f0891fae22ed4b44796a270 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100360 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/chart2/uiconfig/ui/tp_3D_SceneAppearance.ui b/chart2/uiconfig/ui/tp_3D_SceneAppearance.ui index a214ebe21247..6cf5681f3771 100644 --- a/chart2/uiconfig/ui/tp_3D_SceneAppearance.ui +++ b/chart2/uiconfig/ui/tp_3D_SceneAppearance.ui @@ -1,28 +1,7 @@ + - - - - - - - - - -Simple -0 - - -Realistic -1 - - -Custom -2 - - - True False @@ -38,10 +17,10 @@ True False -0 Sche_me True LB_SCHEME +0 False @@ -50,10 +29,14 @@ - + True False -liststoreSCHEME + + Simple + Realistic + Custom + False ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: wsd/TileCache.cpp wsd/TileDesc.hpp
wsd/TileCache.cpp |2 +-
wsd/TileDesc.hpp | 12 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 999df3fffb9c100a86acd200fdc9066203a13553
Author: Ashod Nakashian
AuthorDate: Sun Aug 9 17:55:56 2020 -0400
Commit: Michael Meeks
CommitDate: Mon Aug 10 16:00:27 2020 +0200
wsd: hashmaps have better data locality
They are especially efficient for small lookups.
Change-Id: Ia005f40127cf222debe185515fc45cd92b8ae752
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100413
Tested-by: Jenkins CollaboraOffice
Tested-by: Jenkins
Reviewed-by: Michael Meeks
diff --git a/wsd/TileCache.cpp b/wsd/TileCache.cpp
index 982cd985b..d36ca1aa6 100644
--- a/wsd/TileCache.cpp
+++ b/wsd/TileCache.cpp
@@ -552,7 +552,7 @@ void TileCache::saveDataToCache(const TileDesc &desc, const
char *data, const si
TileCache::Tile tile = std::make_shared>(size);
std::memcpy(tile->data(), data, size);
-auto res = _cache.insert(std::make_pair(desc, tile));
+auto res = _cache.emplace(desc, tile);
if (!res.second)
{
_cacheSize -= itemCacheSize(res.first->second);
diff --git a/wsd/TileDesc.hpp b/wsd/TileDesc.hpp
index 28ecc4256..e60984359 100644
--- a/wsd/TileDesc.hpp
+++ b/wsd/TileDesc.hpp
@@ -10,7 +10,7 @@
#pragma once
#include
-#include
+#include
#include
#include
@@ -24,7 +24,7 @@ using TileBinaryHash = uint64_t;
/// Tile Descriptor
/// Represents a tile's coordinates and dimensions.
-class TileDesc
+class TileDesc final
{
public:
TileDesc(int normalizedViewId, int part, int width, int height, int
tilePosX, int tilePosY, int tileWidth,
@@ -206,7 +206,7 @@ public:
{
// We don't expect undocumented fields and
// assume all values to be int.
-std::map pairs;
+std::unordered_map pairs(16);
// Optional.
pairs["ver"] = -1;
@@ -261,7 +261,7 @@ public:
return tileID.str();
}
-protected:
+private:
int _normalizedViewId;
int _part;
int _width;
@@ -281,7 +281,7 @@ protected:
/// One or more tile header.
/// Used to request the rendering of multiple
/// tiles as well as the header of the response.
-class TileCombined
+class TileCombined final
{
private:
TileCombined(int normalizedViewId, int part, int width, int height,
@@ -465,7 +465,7 @@ public:
{
// We don't expect undocumented fields and
// assume all values to be int.
-std::map pairs;
+std::unordered_map pairs(16);
std::string tilePositionsX;
std::string tilePositionsY;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/admin
loleaflet/admin/admin.strings.js |1 +
loleaflet/admin/src/AdminSocketOverview.js |1 +
2 files changed, 2 insertions(+)
New commits:
commit 758b82ee19cf7cc63f3e28aae2d377fe8b18051a
Author: gokaysatir
AuthorDate: Mon Aug 10 10:43:03 2020 +0300
Commit: Michael Meeks
CommitDate: Mon Aug 10 15:44:34 2020 +0200
Admin Console: Add tooltip to kill session button.
Change-Id: I5a6117741c9635c52dc3768cebec66214e1fcbe7
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100415
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
diff --git a/loleaflet/admin/admin.strings.js b/loleaflet/admin/admin.strings.js
index dc48930d3..9ac1e2fb1 100644
--- a/loleaflet/admin/admin.strings.js
+++ b/loleaflet/admin/admin.strings.js
@@ -36,6 +36,7 @@ l10nstrings.strMemoryStatsCachesize = _('Cache size of memory
statistics');
l10nstrings.strMemoryStatsInterval = _('Time interval of memory statistics (in
ms)');
l10nstrings.strCpuStatsCachesize = _('Cache size of CPU statistics');
l10nstrings.strCpuStatsInterval = _('Time interval of CPU statistics (in ms)');
+l10nstrings.strKillSessionToolTip = _('Kill session.');
l10nstrings.strLimitVirtMemMb = _('Maximum Document process virtual memory (in
MB) - reduce only');
l10nstrings.strLimitStackMemKb = _('Maximum Document process stack memory (in
KB) - reduce only');
l10nstrings.strLimitFileSizeMb = _('Maximum file size allowed to write to disk
(in MB) - reduce only');
diff --git a/loleaflet/admin/src/AdminSocketOverview.js
b/loleaflet/admin/src/AdminSocketOverview.js
index abca74c1d..cb94193f4 100644
--- a/loleaflet/admin/src/AdminSocketOverview.js
+++ b/loleaflet/admin/src/AdminSocketOverview.js
@@ -88,6 +88,7 @@ function upsertDocsTable(doc, sName, socket) {
var sessionCloseCell = document.createElement('td'); // This cell will
open "Do you want to kill this session?" dialog.
sessionCloseCell.innerText = '✖';
+ sessionCloseCell.title = _('Kill session.');
sessionCloseCell.className = 'has-text-centered';
sessionCloseCell.style.cursor = 'pointer';
if (add === true) { row.appendChild(sessionCloseCell); } else {
row.cells[0] = sessionCloseCell; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 2 commits - cypress_test/Makefile.am cypress_test/package.json
cypress_test/Makefile.am | 10 +++---
cypress_test/package.json |2 +-
2 files changed, 4 insertions(+), 8 deletions(-)
New commits:
commit cfc62f864dfbea8e39ac053f37489b3e745485a2
Author: Tamás Zolnai
AuthorDate: Mon Aug 10 14:51:53 2020 +0200
Commit: Tamás Zolnai
CommitDate: Mon Aug 10 15:37:46 2020 +0200
cypress: use actual LOOLWSD version hash.
The related issue was fixed upstream.
Change-Id: I8b1191d3c0d5543233ace9322a7d768b3424d62d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100435
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index 0c343e9eb..230f8dc7d 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -52,10 +52,6 @@ FILTER_DEBUG=cypress:electron,cypress:launcher
export DEBUG=$(if $(ENABLE_LOGGING),$(FILTER_DEBUG),)
endif
-# We use a hard coded hash here, because of this issue:
-# https://github.com/cypress-io/cypress/issues/6891
-WSD_VERSION_HASH := ""
-
if HAVE_LO_PATH
MOBILE_TEST_FILES=$(subst $(MOBILE_TEST_FOLDER)/,,$(wildcard
$(MOBILE_TEST_FOLDER)/*_spec.js) $(wildcard $(MOBILE_TEST_FOLDER)/*/*_spec.js))
@@ -249,19 +245,19 @@ DESKTOP_CONFIG = \
integrationFolder=$(DESKTOP_TEST_FOLDER),supportFile=$(SUPPORT_FILE),userAgent=$(DESKTOP_USER_AGENT)
DESKTOP_ENV = \
-
DATA_FOLDER=$(DESKTOP_DATA_FOLDER),WORKDIR=$(DESKTOP_WORKDIR),WSD_VERSION_HASH=$(WSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)"
+
DATA_FOLDER=$(DESKTOP_DATA_FOLDER),WORKDIR=$(DESKTOP_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)"
MOBILE_CONFIG = \
integrationFolder=$(MOBILE_TEST_FOLDER),supportFile=$(SUPPORT_FILE),userAgent=$(MOBILE_USER_AGENT)
MOBILE_ENV = \
-
DATA_FOLDER=$(MOBILE_DATA_FOLDER),WORKDIR=$(MOBILE_WORKDIR),WSD_VERSION_HASH=$(WSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)"
+
DATA_FOLDER=$(MOBILE_DATA_FOLDER),WORKDIR=$(MOBILE_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)"
MULTIUSER_CONFIG = \
integrationFolder=$(MULTIUSER_TEST_FOLDER),supportFile=$(SUPPORT_FILE),userAgent=$(DESKTOP_USER_AGENT),defaultCommandTimeout=3
MULTIUSER_ENV = \
-
DATA_FOLDER=$(MULTIUSER_DATA_FOLDER),WORKDIR=$(MULTIUSER_WORKDIR),WSD_VERSION_HASH=$(WSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)"
+
DATA_FOLDER=$(MULTIUSER_DATA_FOLDER),WORKDIR=$(MULTIUSER_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT),LO_CORE_VERSION="$(CORE_VERSION)"
define run_interactive_desktop
$(if $(1),\
commit 76c2481190df40d040107f30a0f5b2b45aa8ce7d
Author: Tamás Zolnai
AuthorDate: Mon Aug 10 14:10:33 2020 +0200
Commit: Tamás Zolnai
CommitDate: Mon Aug 10 15:37:37 2020 +0200
update cypress: 4.9.0 -> 4.12.1.
Change-Id: I97e94f32697cac9002aa34632b6a80f8c6a0e127
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100434
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git a/cypress_test/package.json b/cypress_test/package.json
index 176b2ea0d..1e29462ed 100644
--- a/cypress_test/package.json
+++ b/cypress_test/package.json
@@ -4,7 +4,7 @@
"description": "Cypress integration test suit",
"license": "MPL-2.0",
"dependencies": {
-"cypress": "4.9.0",
+"cypress": "4.12.1",
"cypress-failed-log": "2.7.0",
"cypress-file-upload": "4.0.7",
"cypress-log-to-output": "1.0.8",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - cypress_test/integration_tests
cypress_test/integration_tests/mobile/calc/number_format_spec.js |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 17c813c48859da2d9d086fb7089b4ede64d02f81
Author: Tamás Zolnai
AuthorDate: Mon Aug 10 15:08:35 2020 +0200
Commit: Tamás Zolnai
CommitDate: Mon Aug 10 15:27:18 2020 +0200
cypress: disable randomly failing checks on co-4-2.
Change-Id: Id9d8a95c09fec6ad9aa3b8a998591728943eb411
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100433
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git a/cypress_test/integration_tests/mobile/calc/number_format_spec.js
b/cypress_test/integration_tests/mobile/calc/number_format_spec.js
index a80bf4716..2c8034338 100644
--- a/cypress_test/integration_tests/mobile/calc/number_format_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/number_format_spec.js
@@ -291,11 +291,11 @@ describe('Apply number formatting.', function() {
selectFormatting('Fraction');
// Decimal and leading zeros are changed.
- cy.get('#decimalplaces input')
- .should('have.attr', 'value', '1');
+ //cy.get('#decimalplaces input')
+ // .should('have.attr', 'value', '1');
- cy.get('#leadingzeroes input')
- .should('have.attr', 'value', '0');
+ //cy.get('#leadingzeroes input')
+ // .should('have.attr', 'value', '0');
calcHelper.selectAllMobile();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/mariadb-connector-c
external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk |1 - 1 file changed, 1 deletion(-) New commits: commit 301b56f92b9058731f76e32604a771cac460693d Author: Stephan Bergmann AuthorDate: Mon Aug 10 13:06:02 2020 +0200 Commit: Stephan Bergmann CommitDate: Mon Aug 10 15:18:20 2020 +0200 external/mariadb-connector-c: ma_bmove_upp is defined twice ...in UnpackedTarball/mariadb-connector-c/libmariadb/bmove_upp and in workdir/UnpackedTarball/mariadb-connector-c/libmariadb/ma_stmt_codec.c. Given that the first of the two contains nothing but that redundant declaration, lets drop it from the (hand-curated?) list of included source files. (I came across this when experimenting with --enable-lto on Linux and temporarily including static libraries as --whole-archive, which thus caused a "multiple definition" error when linking StaticLibrary_mariadb-connector-c into Library_mysqlc.) Change-Id: I8c5f4de476a4bbd036fd25940cdb44d11954ecc8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100427 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk index b0c62e1b160e..fee019afa4f8 100644 --- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk +++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk @@ -34,7 +34,6 @@ $(eval $(call gb_StaticLibrary_set_include,mariadb-connector-c,\ endif $(eval $(call gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\ - UnpackedTarball/mariadb-connector-c/libmariadb/bmove_upp \ UnpackedTarball/mariadb-connector-c/libmariadb/get_password \ UnpackedTarball/mariadb-connector-c/libmariadb/ma_alloc \ UnpackedTarball/mariadb-connector-c/libmariadb/ma_array \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/source solenv/bin
scp2/source/ooo/vc_redist.scp |4 +
solenv/bin/modules/installer/windows/mergemodule.pm | 43 +---
2 files changed, 34 insertions(+), 13 deletions(-)
New commits:
commit 0872e8cc87d753e6bdda9fad510a6b71cf96565f
Author: Mike Kaganski
AuthorDate: Mon Aug 10 13:58:57 2020 +0300
Commit: Mike Kaganski
CommitDate: Mon Aug 10 15:06:14 2020 +0200
tdf#135579: Don't uninstall vc_redist: make it permanent
Redist is a system component, that includes a varying set of DLLs,
and those DLLs are ref-counted. Installing a newer redist - i.e.
updating and increasing refcount of existing DLLs - may add new
DLLs (with initial refcount 1) in addition to the updated old DLLs
that start depending on the newly added ones; at uninstall, the
newly added DLLs may get removed because their refcount gets 0,
while other redist DLLs are kept at the updated levels - so their
dependencies now are not met, and redist gets broken.
Just mark the redist components permanent, which, according to [1],
"registers an extra system client for the component in the Windows
Installer registry settings".
A downside is that uninstall doesn't restore the original system
state ideally.
[1] https://docs.microsoft.com/en-us/windows/win32/msi/component-table
Change-Id: I3fe82bcb5844f826f5b1df622273b4e3a1e3c436
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100426
Tested-by: Mike Kaganski
Reviewed-by: Mike Kaganski
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index d32758312766..75ccf2b8d09d 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -32,22 +32,26 @@
#if defined(WINDOWS_X86_MERGEMODULE)
+/* Attributes: msidbComponentAttributesPermanent = 0x10 */
MergeModule WINDOWS_X86_MERGEMODULE
Feature = gm_Root;
Name = WINDOWS_X86_MERGEMODULE_FILE;
RootDir = "TARGETDIR";
ComponentCondition = "VC_REDIST=1";
+Attributes_Add = "0x10";
End
#endif
#if defined(WINDOWS_X64) && defined(WINDOWS_X64_MERGEMODULE)
+/* Attributes: msidbComponentAttributesPermanent = 0x10 */
MergeModule WINDOWS_X64_MERGEMODULE
Feature = gm_Root;
Name = WINDOWS_X64_MERGEMODULE_FILE;
RootDir = "TARGETDIR";
ComponentCondition = "VC_REDIST=1";
+Attributes_Add = "0x10";
End
#endif
diff --git a/solenv/bin/modules/installer/windows/mergemodule.pm
b/solenv/bin/modules/installer/windows/mergemodule.pm
index 68bb203f1053..defd59588c95 100644
--- a/solenv/bin/modules/installer/windows/mergemodule.pm
+++ b/solenv/bin/modules/installer/windows/mergemodule.pm
@@ -294,6 +294,7 @@ sub merge_mergemodules_into_msi_database
$onemergemodulehash{'filenumber'} = $filecounter;
$onemergemodulehash{'componentnames'} = \%componentnames;
$onemergemodulehash{'componentcondition'} =
$mergemodule->{'ComponentCondition'};
+$onemergemodulehash{'attributes_add'} =
$mergemodule->{'Attributes_Add'};
$onemergemodulehash{'cabfilename'} = $cabfilename;
$onemergemodulehash{'feature'} = $mergemodule->{'Feature'};
$onemergemodulehash{'rootdir'} = $mergemodule->{'RootDir'};
@@ -405,7 +406,7 @@ sub merge_mergemodules_into_msi_database
my $workingtables = "File Media Directory FeatureComponents"; #
required tables
# Optional tables can be added now
if ( $mergemodulehash->{'hasmsiassemblies'} ) { $workingtables =
$workingtables . " MsiAssembly"; }
-if ( $mergemodulehash->{'componentcondition'} ) { $workingtables =
$workingtables . " Component"; }
+if ( ( $mergemodulehash->{'componentcondition'} ) || (
$mergemodulehash->{'attributes_add'} ) ) { $workingtables = $workingtables . "
Component"; }
# Table "Feature" has to be exported, but it is not necessary to
import it.
if ( $^O =~ /cygwin/i ) {
@@ -462,7 +463,7 @@ sub merge_mergemodules_into_msi_database
change_msiassembly_table($mergemodulehash, $workdir);
}
-if ( $mergemodulehash->{'componentcondition'} )
+if ( ( $mergemodulehash->{'componentcondition'} ) || (
$mergemodulehash->{'attributes_add'} ) )
{
installer::logger::include_timestamp_into_logfile("\nPerformance Info: Changing
Component table");
change_component_table($mergemodulehash, $workdir);
@@ -1368,7 +1369,7 @@ sub change_featurecomponent_table
}
###
-# In the components table, the conditions of merge modules should be updated
+# In the components table, the conditions or attributes of merge modules
should be updated
###
sub change_component_table
@@ -1388,25 +13
[Libreoffice-commits] core.git: Branch 'private/quwex/gsoc-box2d-experimental' - 3 commits - offapi/com slideshow/source
Rebased ref, commits from common ancestor:
commit 5d2cbc804325571dd22c70f6e0e97a43268b2f59
Author: Sarper Akdemir
AuthorDate: Mon Aug 10 15:30:26 2020 +0300
Commit: Sarper Akdemir
CommitDate: Mon Aug 10 15:44:53 2020 +0300
add version tag to ANIMATEPHYSICS
Change-Id: Ia6db8ca10a0311ae8492cdc5ab518efaba611cb2
diff --git a/offapi/com/sun/star/animations/AnimationNodeType.idl
b/offapi/com/sun/star/animations/AnimationNodeType.idl
index d0cd6e268fd6..7c6abb105947 100644
--- a/offapi/com/sun/star/animations/AnimationNodeType.idl
+++ b/offapi/com/sun/star/animations/AnimationNodeType.idl
@@ -68,7 +68,10 @@ constants AnimationNodeType
/** Defines a command effect. */
const short COMMAND = 11;
-/** Defines a physics animation */
+/** Defines a physics animation
+
+@since LibreOffice 7.1
+*/
const short ANIMATEPHYSICS = 12;
};
commit cf744b80d177ba98a5f9c8ae45f7a77328eb2394
Author: Sarper Akdemir
AuthorDate: Thu Aug 6 10:32:55 2020 +0300
Commit: Sarper Akdemir
CommitDate: Mon Aug 10 15:44:53 2020 +0300
make physics based animation effects always processed last
Change-Id: I92d436aced6ef3ee2c8b0bf0167c1f7e642ba3b5
diff --git a/slideshow/source/engine/activitiesqueue.cxx
b/slideshow/source/engine/activitiesqueue.cxx
index ba982385356e..38e79d1e5677 100644
--- a/slideshow/source/engine/activitiesqueue.cxx
+++ b/slideshow/source/engine/activitiesqueue.cxx
@@ -50,6 +50,8 @@ namespace slideshow::internal
{
for( const auto& pActivity : maCurrentActivitiesWaiting )
pActivity->dispose();
+for( const auto& pActivity :
maCurrentActivitiesToBeProcessedLast )
+pActivity->dispose();
for( const auto& pActivity : maCurrentActivitiesReinsert )
pActivity->dispose();
}
@@ -59,7 +61,7 @@ namespace slideshow::internal
}
}
-bool ActivitiesQueue::addActivity( const ActivitySharedPtr& pActivity )
+bool ActivitiesQueue::addActivity( const ActivitySharedPtr& pActivity,
const bool bProcessLast )
{
OSL_ENSURE( pActivity, "ActivitiesQueue::addActivity: activity ptr
NULL" );
@@ -67,7 +69,17 @@ namespace slideshow::internal
return false;
// add entry to waiting list
-maCurrentActivitiesWaiting.push_back( pActivity );
+if( !bProcessLast )
+{
+maCurrentActivitiesWaiting.push_back( pActivity );
+}
+else
+{
+// Activities that should be processed last is kept in a
different
+// ActivityQueue, and later added to the end of the
maCurrentActivitiesWaiting
+// at the start of ActivitiesQueue::process()
+maCurrentActivitiesToBeProcessedLast.push_back( pActivity );
+}
return true;
}
@@ -76,6 +88,12 @@ namespace slideshow::internal
{
SAL_INFO("slideshow.verbose", "ActivitiesQueue: outer loop
heartbeat" );
+// If there are activities to be processed last add them to the
end of the ActivitiesQueue
+maCurrentActivitiesWaiting.insert(
maCurrentActivitiesWaiting.end(),
+
maCurrentActivitiesToBeProcessedLast.begin(),
+
maCurrentActivitiesToBeProcessedLast.end() );
+maCurrentActivitiesToBeProcessedLast.clear();
+
// accumulate time lag for all activities, and lag time
// base if necessary:
double fLag = 0.0;
diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx
b/slideshow/source/engine/animationnodes/animationbasenode.cxx
index 4dcb640795aa..7999b5a7654a 100644
--- a/slideshow/source/engine/animationnodes/animationbasenode.cxx
+++ b/slideshow/source/engine/animationnodes/animationbasenode.cxx
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#include "nodetools.hxx"
#include
@@ -294,7 +295,10 @@ void AnimationBaseNode::activate_st()
mpActivity->setTargets( getShape(), maAttributeLayerHolder.get() );
// add to activities queue
-getContext().mrActivitiesQueue.addActivity( mpActivity );
+if( mxAnimateNode->getType() ==
css::animations::AnimationNodeType::ANIMATEPHYSICS )
+getContext().mrActivitiesQueue.addActivity(mpActivity, true);
+else
+getContext().mrActivitiesQueue.addActivity( mpActivity );
}
else {
// Actually, DO generate the event for empty activity,
diff --git a/slideshow/source/inc/activitiesqueue.hxx
b/slideshow/source/inc/activitiesqueue.hxx
index b4f88b1b39d1..76dc981f8f65 100644
--- a/slideshow/source/inc/activitiesqueue.hxx
+++ b/slideshow/source/inc/activitiesqueue.hxx
@@ -57,7 +57,7 @@ namespace slideshow
/*
[Libreoffice-commits] core.git: cui/source
cui/source/customize/SvxMenuConfigPage.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f6e9feb5bf7d227b33fe9cd4e61720d6205e5143 Author: Caolán McNamara AuthorDate: Mon Aug 10 12:15:45 2020 +0100 Commit: Caolán McNamara CommitDate: Mon Aug 10 14:44:31 2020 +0200 Resolves: tdf#135603 crash on rename item in customize dialog Change-Id: Ib5b04ec8ce974c87646b6bf4989094c8334a0006 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100428 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx index c73502c573c7..a811264d2ca0 100644 --- a/cui/source/customize/SvxMenuConfigPage.cxx +++ b/cui/source/customize/SvxMenuConfigPage.cxx @@ -445,7 +445,7 @@ IMPL_LINK(SvxMenuConfigPage, ModifyItemHdl, const OString&, rIdent, void) aNewName = aNameDialog.GetName(); pEntry->SetName( aNewName ); -m_xContentsListBox->set_text(nActEntry, aNewName, 1); +m_xContentsListBox->set_text(nActEntry, aNewName, 0); GetSaveInData()->SetModified(); GetTopLevelSelection()->SetModified(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - oox/source sw/qa
oox/source/export/vmlexport.cxx| 41 +
sw/qa/extras/ooxmlexport/ooxmlexport15.cxx |4 ++
2 files changed, 44 insertions(+), 1 deletion(-)
New commits:
commit ad3813c0ab5303625cda7d04ebe6a6b48712255d
Author: Michael Stahl
AuthorDate: Fri Aug 7 15:50:12 2020 +0200
Commit: Xisco Fauli
CommitDate: Mon Aug 10 13:29:18 2020 +0200
oox: VML export: convert ESCHER_Prop_AnchorText to v-text-anchor
Change-Id: I903cac8d7b02138680613b5a1b6dab4b1c448158
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100333
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 8d83c29905ca6c4067ae0330d3544ddb983cafbc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100343
Reviewed-by: Xisco Fauli
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 964cf27c6921..79733db5ced0 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -430,6 +430,47 @@ void VMLExport::Commit( EscherPropertyContainer& rProps,
const tools::Rectangle&
bAlreadyWritten[ ESCHER_Prop_WrapText ] = true;
break;
+case ESCHER_Prop_AnchorText: // 135
+{
+char const* pValue(nullptr);
+switch (opt.nPropValue)
+{
+case ESCHER_AnchorTop:
+pValue = "top";
+break;
+case ESCHER_AnchorMiddle:
+pValue = "middle";
+break;
+case ESCHER_AnchorBottom:
+pValue = "bottom";
+break;
+case ESCHER_AnchorTopCentered:
+pValue = "top-center";
+break;
+case ESCHER_AnchorMiddleCentered:
+pValue = "middle-center";
+break;
+case ESCHER_AnchorBottomCentered:
+pValue = "bottom-center";
+break;
+case ESCHER_AnchorTopBaseline:
+pValue = "top-baseline";
+break;
+case ESCHER_AnchorBottomBaseline:
+pValue = "bottom-baseline";
+break;
+case ESCHER_AnchorTopCenteredBaseline:
+pValue = "top-center-baseline";
+break;
+case ESCHER_AnchorBottomCenteredBaseline:
+pValue = "bottom-center-baseline";
+break;
+}
+m_ShapeStyle.append(";v-text-anchor:");
+m_ShapeStyle.append(pValue);
+}
+break;
+
case ESCHER_Prop_txflTextFlow: // 136
{
// at least "bottom-to-top" only has an effect when it's
on the v:textbox element, not on v:shape
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index 67184ba57636..8dd905a6405b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -84,7 +84,9 @@ DECLARE_OOXMLEXPORT_TEST(testAtPageShapeRelOrientation,
"rotated_shape.fodt")
assertXPath(pXmlDocument,
"/w:document/w:body/w:p/w:r/mc:AlternateContent[1]/mc:Fallback/w:pict/v:shape/v:textbox",
"style", "mso-layout-flow-alt:bottom-to-top");
// text wrap -> VML
assertXPath(pXmlDocument,
"/w:document/w:body/w:p/w:r/mc:AlternateContent[1]/mc:Fallback/w:pict/v:shape/w10:wrap",
"type", "none");
-
+// vertical alignment -> VML
+OUString const style = getXPath(pXmlDocument,
"/w:document/w:body/w:p/w:r/mc:AlternateContent[1]/mc:Fallback/w:pict/v:shape",
"style");
+CPPUNIT_ASSERT(style.indexOf("v-text-anchor:middle") != -1);
}
DECLARE_OOXMLEXPORT_TEST(testRelativeAnchorHeightFromBottomMarginHasFooter,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - include/oox oox/source
include/oox/export/vmlexport.hxx |3 +++
oox/source/export/vmlexport.cxx | 36 ++--
2 files changed, 29 insertions(+), 10 deletions(-)
New commits:
commit d108af8aff3a5a03b8a3b68c69fb477c18c8cc1f
Author: Michael Stahl
AuthorDate: Fri Aug 7 15:45:25 2020 +0200
Commit: Xisco Fauli
CommitDate: Mon Aug 10 13:28:28 2020 +0200
oox: VML export: produce bottom-to-top in a better way
Replace code added in 090c61eb93db4302d4565d5f11f7673190835fdb
with something that uses the already generated ESCHER property; this
lets a warning about the unhandled property disappear too.
Change-Id: Ieed83dd8e17e92eea9901124fce5e6da2a17196a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100332
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 2af2b9be05a4733c691db7201e76b4058516c47b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100354
Reviewed-by: Xisco Fauli
diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx
index 61185e57d5de..71d3441fdaaa 100644
--- a/include/oox/export/vmlexport.hxx
+++ b/include/oox/export/vmlexport.hxx
@@ -99,6 +99,9 @@ class OOX_DLLPUBLIC VMLExport : public EscherEx
/// Remember style, the most important shape attribute ;-)
OStringBuffer m_ShapeStyle;
+/// style for textbox
+OStringBuffer m_TextboxStyle;
+
/// Remember the generated shape id.
OString m_sShapeId;
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 950b0afd240d..964cf27c6921 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -430,6 +430,28 @@ void VMLExport::Commit( EscherPropertyContainer& rProps,
const tools::Rectangle&
bAlreadyWritten[ ESCHER_Prop_WrapText ] = true;
break;
+case ESCHER_Prop_txflTextFlow: // 136
+{
+// at least "bottom-to-top" only has an effect when it's
on the v:textbox element, not on v:shape
+assert(m_TextboxStyle.isEmpty());
+switch (opt.nPropValue)
+{
+case ESCHER_txflHorzN:
+m_TextboxStyle.append("layout-flow:horizontal");
+break;
+case ESCHER_txflTtoBA:
+m_TextboxStyle.append("layout-flow:vertical");
+break;
+case ESCHER_txflBtoT:
+
m_TextboxStyle.append("mso-layout-flow-alt:bottom-to-top");
+break;
+default:
+assert(false); // unimplemented in escher export
+break;
+}
+}
+break;
+
// coordorigin
case ESCHER_Prop_geoLeft: // 320
case ESCHER_Prop_geoTop: // 321
@@ -1345,6 +1367,8 @@ sal_Int32 VMLExport::StartShape()
// start of the shape
m_pSerializer->startElementNS( XML_v, nShapeElement,
XFastAttributeListRef( m_pShapeAttrList ) );
+OString const textboxStyle(m_TextboxStyle.makeStringAndClear());
+
// now check if we have some editeng text (not associated textbox) and we
have a text exporter registered
const SdrTextObj* pTxtObj = dynamic_cast( m_pSdrObject
);
if (pTxtObj && m_pTextExport &&
msfilter::util::HasTextBoxContent(m_nShapeType) &&
!IsWaterMarkShape(m_pSdrObject->GetName()) && !lcl_isTextBox(m_pSdrObject))
@@ -1369,19 +1393,11 @@ sal_Int32 VMLExport::StartShape()
if( pParaObj )
{
-uno::Reference
xPropertySet(const_cast(m_pSdrObject)->getUnoShape(),
uno::UNO_QUERY);
sax_fastparser::FastAttributeList* pTextboxAttrList =
FastSerializerHelper::createAttrList();
sax_fastparser::XFastAttributeListRef
xTextboxAttrList(pTextboxAttrList);
-if
(xPropertySet->getPropertySetInfo()->hasPropertyByName("RotateAngle"))
+if (!textboxStyle.isEmpty())
{
-sal_Int32 nTextRotateAngle = sal_Int32();
-if (xPropertySet->getPropertyValue("RotateAngle") >>=
nTextRotateAngle)
-{
-if (nTextRotateAngle == 9000)
-{
-pTextboxAttrList->add(XML_style,
"mso-layout-flow-alt:bottom-to-top");
-}
-}
+pTextboxAttrList->add(XML_style, textboxStyle);
}
// this is reached only in case some text is attached to the shape
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - filter/source sw/qa
filter/source/msfilter/escherex.cxx| 20
sw/qa/extras/ooxmlexport/ooxmlexport15.cxx |2 ++
2 files changed, 22 insertions(+)
New commits:
commit 2eb4fe77fa7d8e7e2154f9807e1eed0076e1d7e2
Author: Michael Stahl
AuthorDate: Fri Aug 7 15:26:48 2020 +0200
Commit: Xisco Fauli
CommitDate: Mon Aug 10 13:27:35 2020 +0200
filter: MSO export: convert TextWrap property to Escher_Wrap*
There's a paucity of working wrapping modes in Escher unfortunately.
Change-Id: Ibaf99c3249a6492dc129f9c9b5707778038f9a4c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100331
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 2cb90a5c87fe46737c8d840967d8836284f92ffd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100353
Reviewed-by: Xisco Fauli
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index 443d533ecadb..8bf8c779af64 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -61,6 +61,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -692,6 +693,10 @@ void EscherPropertyContainer::CreateTextProperties(
bool bWordWrap ( false );
bool bAutoGrowSize ( false );
+uno::Any aTextWrap;
+
+EscherPropertyValueHelper::GetPropertyValue(aTextWrap, rXPropSet,
"TextWrap", true);
+
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet,
"TextWritingMode", true ) )
aAny >>= eWM;
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet,
"TextVerticalAdjust", true ) )
@@ -830,6 +835,21 @@ void EscherPropertyContainer::CreateTextProperties(
nTextAttr |= 0x20002;
}
}
+
+if (aTextWrap.hasValue())
+{ // explicit text wrap overrides whatever was inferred previously
+switch (aTextWrap.get())
+{
+case text::WrapTextMode_THROUGH:
+eWrapMode = ESCHER_WrapNone;
+break;
+// in theory there are 3 more Escher_Wrap, but [MS-ODRAW] says
they are useless
+default:
+eWrapMode = ESCHER_WrapSquare;
+break;
+}
+}
+
AddOpt( ESCHER_Prop_dxTextLeft, nLeft * 360 );
AddOpt( ESCHER_Prop_dxTextRight, nRight * 360 );
AddOpt( ESCHER_Prop_dyTextTop, nTop * 360 );
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index ad019ecd0504..67184ba57636 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -82,6 +82,8 @@ DECLARE_OOXMLEXPORT_TEST(testAtPageShapeRelOrientation,
"rotated_shape.fodt")
// now test text rotation -> VML writing direction
assertXPath(pXmlDocument,
"/w:document/w:body/w:p/w:r/mc:AlternateContent[1]/mc:Fallback/w:pict/v:shape/v:textbox",
"style", "mso-layout-flow-alt:bottom-to-top");
+// text wrap -> VML
+assertXPath(pXmlDocument,
"/w:document/w:body/w:p/w:r/mc:AlternateContent[1]/mc:Fallback/w:pict/v:shape/w10:wrap",
"type", "none");
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - dbaccess/source
dbaccess/source/ui/dlg/adtabdlg.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 09be57965fbdc291a25c4f48550f467b43a7177c
Author: Caolán McNamara
AuthorDate: Tue Aug 4 14:19:01 2020 +0100
Commit: Xisco Fauli
CommitDate: Mon Aug 10 13:18:17 2020 +0200
explicit text column to avoid dummy nodes for non-toggle case
Change-Id: If216705929454146d39b291b9a6483c68c3eac89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100061
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx
b/dbaccess/source/ui/dlg/adtabdlg.cxx
index 4ad01555d226..35e29ed17f31 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -106,12 +106,12 @@ OUString TableListFacade::getSelectedName( OUString&
_out_rAliasName ) const
if (rTableList.iter_parent(*xCatalog))
{
if (!xAll || !xCatalog->equal(*xAll))
-aCatalog = rTableList.get_text(*xCatalog);
+aCatalog = rTableList.get_text(*xCatalog, 0);
}
-aSchema = rTableList.get_text(*xSchema);
+aSchema = rTableList.get_text(*xSchema, 0);
}
}
-aTableName = rTableList.get_text(*xEntry);
+aTableName = rTableList.get_text(*xEntry, 0);
OUString aComposedName;
try
@@ -318,7 +318,7 @@ OUString QueryListFacade::getSelectedName( OUString&
_out_rAliasName ) const
std::unique_ptr xEntry(m_rQueryList.make_iterator());
const bool bEntry = m_rQueryList.get_selected(xEntry.get());
if (bEntry)
-sSelected = _out_rAliasName = m_rQueryList.get_text(*xEntry);
+sSelected = _out_rAliasName = m_rQueryList.get_text(*xEntry, 0);
return sSelected;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp
wsd/LOOLWSD.cpp |8
1 file changed, 8 insertions(+)
New commits:
commit e2e638c468f35322fc123664fd749b199f531780
Author: Gökhan Karabulut
AuthorDate: Sat Aug 8 23:05:17 2020 +0300
Commit: Michael Meeks
CommitDate: Mon Aug 10 12:20:08 2020 +0200
tdf#124478: Log maximum file descriptor related limits
The number of available file descriptors in a system limits the number
of documents we can open. We use an fd for client connection, another fd
for communication with a kit process and a wakeup pipe with 2 fds.
Therefore, we are left with the maximum number of fds divided by 4
documents. Out of these documents, reserve 8 (i.e., 32 fds) and log the
remaining number of documents allowed by the system. Note that Online
instance can further configure a limit for the maximum number of open
documents, which is also logged.
Also log the maximum file descriptor allowed by the system, which is the
number of available file descriptors - 1.
Change-Id: I3972690a6c9995e8d74dcfe25fe87b1ef4c33d4b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100393
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Tested-by: Michael Meeks
Reviewed-by: Michael Meeks
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 02feb23b7..b8c75e5b5 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -41,6 +41,7 @@
#include
#include
+#include
#include
#include
@@ -1327,6 +1328,13 @@ void LOOLWSD::initialize(Application& self)
LOOLWSD::MaxDocuments = LOOLWSD::MaxConnections;
}
+struct rlimit rlim;
+::getrlimit(RLIMIT_NOFILE, &rlim);
+LOG_INF("Maximum file descriptor supported by the system: " <<
rlim.rlim_cur - 1);
+// 4 fds per document are used for client connection, Kit process
communication, and
+// a wakeup pipe with 2 fds. 32 fds (i.e. 8 documents) are reserved.
+LOG_INF("Maximum number of open documents supported by the system: " <<
rlim.rlim_cur / 4 - 8);
+
LOG_INF("Maximum concurrent open Documents limit: " <<
LOOLWSD::MaxDocuments);
LOG_INF("Maximum concurrent client Connections limit: " <<
LOOLWSD::MaxConnections);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - svx/inc svx/source
svx/inc/CommonStylePreviewRenderer.hxx |2 ++
svx/source/styles/CommonStylePreviewRenderer.cxx | 12
2 files changed, 14 insertions(+)
New commits:
commit d67cd0efbc08c92492f3b5fd7ffe35556052d52f
Author: Caolán McNamara
AuthorDate: Wed Aug 5 15:50:31 2020 +0100
Commit: Xisco Fauli
CommitDate: Mon Aug 10 12:00:25 2020 +0200
tdf#135438 Paragraph styles preview in sidebar are clipped
since...
commit fe9a13dc0e6d1384416c2a2343223b33925fc925
Author: Caolán McNamara
Date: Sun Apr 26 15:43:25 2020 +0100
weld SfxTemplatePanelControl
getRenderSize used to be called after recalculate and before
render to change maSizePixel
Change-Id: Ifc1b6b0b3399c7de61d5f4d46f8346d13e72a4d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100069
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/svx/inc/CommonStylePreviewRenderer.hxx
b/svx/inc/CommonStylePreviewRenderer.hxx
index 55391327533e..5dfd41faa39a 100644
--- a/svx/inc/CommonStylePreviewRenderer.hxx
+++ b/svx/inc/CommonStylePreviewRenderer.hxx
@@ -31,6 +31,8 @@ class CommonStylePreviewRenderer final : public
sfx2::StylePreviewRenderer
Size maPixelSize;
OUString maStyleName;
+Size getRenderSize() const;
+
public:
CommonStylePreviewRenderer(const SfxObjectShell& rShell, OutputDevice&
rOutputDev,
SfxStyleSheetBase* pStyle, long nMaxHeight);
diff --git a/svx/source/styles/CommonStylePreviewRenderer.cxx
b/svx/source/styles/CommonStylePreviewRenderer.cxx
index d677a135461e..9920903df469 100644
--- a/svx/source/styles/CommonStylePreviewRenderer.cxx
+++ b/svx/source/styles/CommonStylePreviewRenderer.cxx
@@ -168,9 +168,21 @@ bool CommonStylePreviewRenderer::recalculate()
}
m_pFont = std::move(pFont);
+maPixelSize = getRenderSize();
return true;
}
+Size CommonStylePreviewRenderer::getRenderSize() const
+{
+assert(m_pFont);
+Size aPixelSize = m_pFont->GetTextSize(&mrOutputDev, maStyleName);
+
+if (aPixelSize.Height() > mnMaxHeight)
+aPixelSize.setHeight( mnMaxHeight );
+
+return aPixelSize;
+}
+
bool CommonStylePreviewRenderer::render(const tools::Rectangle& aRectangle,
RenderAlign eRenderAlign)
{
const OUString& rText = maStyleName;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/source
sw/source/core/docnode/ndtbl.cxx |9 +
1 file changed, 9 insertions(+)
New commits:
commit 0d5affd7a25396dbff866adae524a4c01329801f
Author: Caolán McNamara
AuthorDate: Wed Aug 5 21:08:04 2020 +0100
Commit: Xisco Fauli
CommitDate: Mon Aug 10 11:56:32 2020 +0200
tdf#135098 update SwTableCursor m_SelectedBoxes before merge
so it does not contain the soon to-be-deleted SwTableBox so if the rPam is
queried via a11y it doesn't claim the deleted cell still exists.
tdf#122844 may be the same issue
Change-Id: I1ac3752676162ba5a29c0916039b2b467e2ac41a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100214
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 00e249b9e0fb..15a49729ce51 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -2280,6 +2280,15 @@ TableMergeErr SwDoc::MergeTable( SwPaM& rPam )
while( &rPam != ( pTmp = pTmp->GetNext() ))
for( int i = 0; i < 2; ++i )
pTmp->GetBound( static_cast(i) ) = *rPam.GetPoint();
+
+if (SwTableCursor* pTableCursor =
dynamic_cast(&rPam))
+{
+// tdf#135098 update selection so rPam's m_SelectedBoxes is
updated
+// to not contain the soon to-be-deleted SwTableBox so if the
rPam
+// is queried via a11y it doesn't claim the deleted cell still
+// exists
+pTableCursor->NewTableSelection();
+}
}
// Merge them
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/source
sw/source/core/docnode/ndtbl.cxx |9 +
1 file changed, 9 insertions(+)
New commits:
commit 1bef764ac84d113a0bcb237a0634579ee8dccec0
Author: Caolán McNamara
AuthorDate: Wed Aug 5 21:08:04 2020 +0100
Commit: Xisco Fauli
CommitDate: Mon Aug 10 11:56:07 2020 +0200
tdf#135098 update SwTableCursor m_SelectedBoxes before merge
so it does not contain the soon to-be-deleted SwTableBox so if the rPam is
queried via a11y it doesn't claim the deleted cell still exists.
tdf#122844 may be the same issue
Change-Id: I1ac3752676162ba5a29c0916039b2b467e2ac41a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100213
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 4d5469e8fdac..5dcbdf86575f 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -2285,6 +2285,15 @@ TableMergeErr SwDoc::MergeTable( SwPaM& rPam )
while( &rPam != ( pTmp = pTmp->GetNext() ))
for( int i = 0; i < 2; ++i )
pTmp->GetBound( static_cast(i) ) = *rPam.GetPoint();
+
+if (SwTableCursor* pTableCursor =
dynamic_cast(&rPam))
+{
+// tdf#135098 update selection so rPam's m_SelectedBoxes is
updated
+// to not contain the soon to-be-deleted SwTableBox so if the
rPam
+// is queried via a11y it doesn't claim the deleted cell still
+// exists
+pTableCursor->NewTableSelection();
+}
}
// Merge them
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: download.lst external/nss
download.lst |4 -
external/nss/UnpackedTarball_nss.mk |1
external/nss/macos-dlopen.patch.0| 18
external/nss/nss.nspr-parallel-win-debug_build.patch | 40 ---
4 files changed, 11 insertions(+), 52 deletions(-)
New commits:
commit 495a5944a3d442cfe748a3bb0dcef76f6a961d30
Author: Michael Stahl
AuthorDate: Fri Aug 7 18:57:00 2020 +0200
Commit: Michael Stahl
CommitDate: Mon Aug 10 11:39:38 2020 +0200
nss: upgrade to release 3.55.0
Fixes CVE-2020-6829, CVE-2020-12400 CVE-2020-12401 CVE-2020-12403.
(also CVE-2020-12402 CVE-2020-12399 in older releases since 3.47)
* external/nss/nss.nspr-parallel-win-debug_build.patch:
remove, merged upstream
Change-Id: I8b48e25ce68a2327cde1420abdaea8f9e51a7888
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100345
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/download.lst b/download.lst
index 99538799357f..8558f095b4a9 100644
--- a/download.lst
+++ b/download.lst
@@ -193,8 +193,8 @@ export MYTHES_SHA256SUM :=
1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b
export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
export NEON_SHA256SUM :=
c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e17dc2718d
export NEON_TARBALL := neon-0.31.1.tar.gz
-export NSS_SHA256SUM :=
861a4510b7c21516f49a4cfa5b871aa796e4e1ef2dfe949091970e56f9d60cdf
-export NSS_TARBALL := nss-3.53-with-nspr-4.25.tar.gz
+export NSS_SHA256SUM :=
ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45
+export NSS_TARBALL := nss-3.55-with-nspr-4.27.tar.gz
export ODFGEN_SHA256SUM :=
2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2
export ODFGEN_VERSION_MICRO := 6
export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
diff --git a/external/nss/UnpackedTarball_nss.mk
b/external/nss/UnpackedTarball_nss.mk
index 5904e267b668..beb9afe11890 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.vs2015.pdb.patch \
external/nss/nss.bzmozilla1238154.patch \
external/nss/macos-dlopen.patch.0 \
-external/nss/nss.nspr-parallel-win-debug_build.patch \
external/nss/nss.getopt.patch.0 \
$(if $(filter iOS,$(OS)), \
external/nss/nss-ios.patch) \
diff --git a/external/nss/macos-dlopen.patch.0
b/external/nss/macos-dlopen.patch.0
index 8c484e4c6841..1889b8df7cd3 100644
--- a/external/nss/macos-dlopen.patch.0
+++ b/external/nss/macos-dlopen.patch.0
@@ -1,14 +1,14 @@
--- nspr/pr/src/linking/prlink.c
+++ nspr/pr/src/linking/prlink.c
-@@ -793,7 +793,7 @@
- /* ensure the file exists if it contains a slash character i.e. path
*/
- /* DARWIN's dlopen ignores the provided path and checks for the */
- /* plain filename in DYLD_LIBRARY_PATH */
--if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL ||
-+if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL || strncmp(name,
"@loader_path/", 13) == 0 ||
- PR_Access(name, PR_ACCESS_EXISTS) == PR_SUCCESS) {
- h = dlopen(name, dl_flags);
- }
+@@ -799,7 +799,7 @@
+ * The reason is that DARWIN's dlopen ignores the provided path
+ * and checks for the plain filename in DYLD_LIBRARY_PATH,
+ * which could load an unexpected version of a library. */
+-if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL) {
++if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL || strncmp(name,
"@loader_path/", 13) == 0) {
+ /* no slash, allow to load from any location */
+ okToLoad = PR_TRUE;
+ } else {
--- nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c
+++ nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c
@@ -224,7 +224,11 @@
diff --git a/external/nss/nss.nspr-parallel-win-debug_build.patch
b/external/nss/nss.nspr-parallel-win-debug_build.patch
deleted file mode 100644
index 86b55e1ccf7f..
--- a/external/nss/nss.nspr-parallel-win-debug_build.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Änderung:4866:23940b78e965
-Nutzer: Jan-Marek Glogowski
-Datum: Fri May 01 22:50:55 2020 +
-Dateien: pr/tests/Makefile.in
-Beschreibung:
-Bug 290526 Write separate PDBs for test OBJs r=glandium
-
-Quite often when running a parallel NSS build, I get the following
-compiler error message, resulting in a build failure, despite
-compiling with the -FS flag:
-
-.../nss/nspr/pr/tests/zerolen.c: fatal error C1041:
-Programmdatenbank "...\nss\nspr\out\pr\tests\vc140.pdb" kann nicht
-ge<94>ffnet werden; verwenden Sie /FS, wenn mehrere CL.EXE in
-dieselbe .PDB-Datei schreiben.
-
-The failing source file is always one of the last test object
-files. But the actual problem is not the compiler accessing the
-PDB file, but
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/source
sw/source/uibase/sidebar/ThemePanel.cxx | 23 ++-
1 file changed, 14 insertions(+), 9 deletions(-)
New commits:
commit bfcb7d1ef8185739de3fae4940bf46b3fe0e754b
Author: Caolán McNamara
AuthorDate: Thu Aug 6 11:30:49 2020 +0100
Commit: Xisco Fauli
CommitDate: Mon Aug 10 11:38:03 2020 +0200
tdf#135488 ensure something is selected in experimental theme colorset
so double click without something selected can't normally happen,
and bail out and do nothing if it does happen
Change-Id: Ic9ed756d4b2b51b87f09786ab7b8506b2d720d84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100217
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx
b/sw/source/uibase/sidebar/ThemePanel.cxx
index 18abd157b71a..290ca4106fb3 100644
--- a/sw/source/uibase/sidebar/ThemePanel.cxx
+++ b/sw/source/uibase/sidebar/ThemePanel.cxx
@@ -444,6 +444,9 @@ ThemePanel::ThemePanel(vcl::Window* pParent,
}
mxValueSetColors->SetOptimalSize();
+
+if (!aColorSets.empty())
+mxValueSetColors->SelectItem(1); // ItemId 1, position 0
}
ThemePanel::~ThemePanel()
@@ -480,17 +483,19 @@ IMPL_LINK_NOARG(ThemePanel, DoubleClickHdl,
weld::TreeView&, bool)
void ThemePanel::DoubleClickHdl()
{
SwDocShell* pDocSh = static_cast(SfxObjectShell::Current());
-if (pDocSh)
-{
-OUString sEntryFonts = mxListBoxFonts->get_selected_text();
-sal_uInt32 nItemId = mxValueSetColors->GetSelectedItemId();
-sal_uInt32 nIndex = nItemId - 1;
-OUString sEntryColors = maColorSets.getColorSet(nIndex).getName();
+if (!pDocSh)
+return;
-StyleSet aStyleSet = setupThemes();
+sal_uInt32 nItemId = mxValueSetColors->GetSelectedItemId();
+if (!nItemId)
+return;
+OUString sEntryFonts = mxListBoxFonts->get_selected_text();
+sal_uInt32 nIndex = nItemId - 1;
+OUString sEntryColors = maColorSets.getColorSet(nIndex).getName();
-applyTheme(pDocSh->GetStyleSheetPool(), sEntryFonts, sEntryColors,
aStyleSet, maColorSets);
-}
+StyleSet aStyleSet = setupThemes();
+
+applyTheme(pDocSh->GetStyleSheetPool(), sEntryFonts, sEntryColors,
aStyleSet, maColorSets);
}
void ThemePanel::NotifyItemUpdate(const sal_uInt16 /*nSId*/,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sd/source
sd/source/ui/sidebar/DocumentHelper.cxx |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 41e180f500a42a3afd53b673f538becd75a8f120 Author: Jim Raykowski AuthorDate: Thu Jul 16 13:25:47 2020 -0800 Commit: Xisco Fauli CommitDate: Mon Aug 10 11:31:25 2020 +0200 tdf#134847 fix nullptr use crash Grabbing focus back to the document when OLE object last had focus sets focus to the frame containing the OLE object. sd::ViewShell is no good in this case and crashes when undo manager tries to pass ViewShellId to EnterListAction. Other areas in the code set ViewShellId(-1) and then check if ViewShell is good before getting ViewShellId. This patch follows these practices. Change-Id: I89093686c4d98148ac032832711f80479366741d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99759 Tested-by: Jenkins Reviewed-by: Jim Raykowski (cherry picked from commit f52f86a3905fc099832187ad20fd29f0ab73b43f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100226 Reviewed-by: Xisco Fauli diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx index 151cc510622e..08fab9f247d3 100644 --- a/sd/source/ui/sidebar/DocumentHelper.cxx +++ b/sd/source/ui/sidebar/DocumentHelper.cxx @@ -312,9 +312,12 @@ void DocumentHelper::AssignMasterPageToPageList ( if (aCleanedList.empty() ) return; +ViewShellId nViewShellId(-1); +if (sd::ViewShell* pViewShell = rTargetDocument.GetDocSh()->GetViewShell()) +nViewShellId = pViewShell->GetViewShellBase().GetViewShellId(); SfxUndoManager* pUndoMgr = rTargetDocument.GetDocSh()->GetUndoManager(); if( pUndoMgr ) -pUndoMgr->EnterListAction(SdResId(STR_UNDO_SET_PRESLAYOUT), OUString(), 0, rTargetDocument.GetDocSh()->GetViewShell()->GetViewShellBase().GetViewShellId()); +pUndoMgr->EnterListAction(SdResId(STR_UNDO_SET_PRESLAYOUT), OUString(), 0, nViewShellId); SdPage* pMasterPageInDocument = ProvideMasterPage(rTargetDocument,pMasterPage,rpPageList); if (pMasterPageInDocument == nullptr) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - basic/qa basic/source
basic/qa/basic_coverage/test_for_each.vb | 43 +++
basic/source/runtime/runtime.cxx |5 ++-
2 files changed, 46 insertions(+), 2 deletions(-)
New commits:
commit 82ab191a074141aafa7567fc3c3cad9bc7ea0b24
Author: Mike Kaganski
AuthorDate: Thu Aug 6 18:50:08 2020 +0300
Commit: Xisco Fauli
CommitDate: Mon Aug 10 11:28:13 2020 +0200
tdf#135470: Fix checks
The check should prevent error in case when the variable has
wrong type. IsObject returns false e.g. for arrays, which are
valid iterables. So proper check is using GetFullType, which
will give SbxOBJECT for any variable for which GetObject does
not set error.
"Next" should also generate an error for uninitialized loops.
Regression after 5760c94b8847164f9a7a181f031c7c86643944af
Change-Id: Ib58e1cc76ef63aa1ff8a86c9d5dc956e4780fb49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100258
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit e67ffd5a62c8c27697da594a0fea2362317f221f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100225
Reviewed-by: Xisco Fauli
diff --git a/basic/qa/basic_coverage/test_for_each.vb
b/basic/qa/basic_coverage/test_for_each.vb
new file mode 100644
index ..654513e88332
--- /dev/null
+++ b/basic/qa/basic_coverage/test_for_each.vb
@@ -0,0 +1,43 @@
+'
+' This file is part of the LibreOffice project.
+'
+' This Source Code Form is subject to the terms of the Mozilla Public
+' License, v. 2.0. If a copy of the MPL was not distributed with this
+' file, You can obtain one at http://mozilla.org/MPL/2.0/.
+'
+
+Function doUnitTest as Integer
+Dim n As Integer, i
+Dim a(3)
+n = 0
+For Each i In a
+n = n + 1
+Next i
+If n <> 4 Then
+doUnitTest = "For Each over array failed"
+Exit Function
+End If
+
+If TestInvalidForEachWithErrorHandler <> "13 91 14 " Then
+doUnitTest = "For Each doesn't generate proper errors on bad arguments"
+Exit Function
+End If
+
+doUnitTest = 1
+End Function
+
+Function TestInvalidForEachWithErrorHandler
+Dim s As String
+On Error Goto ErrHandler
+' This For Each is given a bad iterable; it must generate first error ("Data
type mismatch") for b;
+For Each a In b
+' Then proceed here (Resume Next from ErrHandler), and generate "Object
variable not set" for c;
+c.d
+' Then proceed here (Resume Next from ErrHandler), and generate "Invalid
parameter" at Next.
+Next
+TestInvalidForEachWithErrorHandler = s
+Exit Function
+ErrHandler:
+s = s & Err & " "
+Resume Next
+End Function
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 774d58cf084a..7eb0d022e8ee 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -1144,7 +1144,7 @@ void SbiRuntime::PushForEach()
pForStk = p;
SbxVariableRef xObjVar = PopVar();
-SbxBase* pObj = xObjVar.is() && xObjVar->IsObject() ? xObjVar->GetObject()
: nullptr;
+SbxBase* pObj = xObjVar && xObjVar->GetFullType() == SbxOBJECT ?
xObjVar->GetObject() : nullptr;
if (SbxDimArray* pArray = dynamic_cast(pObj))
{
@@ -3118,8 +3118,9 @@ void SbiRuntime::StepTESTFOR( sal_uInt32 nOp1 )
}
case ForType::Error:
{
-// We are in Resume Next mode, and we already had one iteration
+// We are in Resume Next mode after failed loop initialization
bEndLoop = true;
+Error(ERRCODE_BASIC_BAD_PARAMETER);
break;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - oox/qa oox/source
oox/qa/unit/data/gradient-multistep-transparency.pptx |binary
oox/qa/unit/drawingml.cxx | 27 +
oox/source/drawingml/fillproperties.cxx | 36 --
3 files changed, 60 insertions(+), 3 deletions(-)
New commits:
commit 6f1cbda681545fa3667b107830ebea804b08c98c
Author: Miklos Vajna
AuthorDate: Thu Aug 6 12:31:35 2020 +0200
Commit: Xisco Fauli
CommitDate: Mon Aug 10 10:43:36 2020 +0200
tdf#134183 PPTX: improve import of transparency in multi-step gradients
Impress core only support a single step, improve the conversion from
multi-step to single step to take transparency into account explicitly.
Once we select the widest segment, look backwards and forward if there
are other next segments which have the same RGB color, just different
transparency and include them. This helps in general, because in case a
0% or 100% transparency is mishandled, that's very visible.
(cherry picked from commit 73993fdb5d4b507694cd0edf80887d19f7e2bf9a)
Change-Id: I11d593c01a6a4b16149ce74c1408c2a39895e941
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100283
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/oox/qa/unit/data/gradient-multistep-transparency.pptx
b/oox/qa/unit/data/gradient-multistep-transparency.pptx
new file mode 100644
index ..83946c71b403
Binary files /dev/null and
b/oox/qa/unit/data/gradient-multistep-transparency.pptx differ
diff --git a/oox/qa/unit/drawingml.cxx b/oox/qa/unit/drawingml.cxx
index ee5ae764af70..d88f91797304 100644
--- a/oox/qa/unit/drawingml.cxx
+++ b/oox/qa/unit/drawingml.cxx
@@ -10,7 +10,9 @@
#include
#include
+#include
#include
+#include
#include
#include
#include
@@ -199,6 +201,31 @@ CPPUNIT_TEST_FIXTURE(OoxDrawingmlTest,
testChartDataLabelCharColor)
CPPUNIT_ASSERT_EQUAL(static_cast(0xff), nCharColor);
}
+CPPUNIT_TEST_FIXTURE(OoxDrawingmlTest, testGradientMultiStepTransparency)
+{
+// Load a document with a multi-step gradient.
+OUString aURL
+= m_directories.getURLFromSrc(DATA_DIRECTORY) +
"gradient-multistep-transparency.pptx";
+load(aURL);
+
+// Check the end transparency of the gradient.
+uno::Reference
xDrawPagesSupplier(getComponent(), uno::UNO_QUERY);
+uno::Reference
xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0),
+ uno::UNO_QUERY);
+uno::Reference xShape(xDrawPage->getByIndex(1),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("Rectangle 4"), xShape->getName());
+uno::Reference xShapeProps(xShape, uno::UNO_QUERY);
+awt::Gradient aTransparence;
+xShapeProps->getPropertyValue("FillTransparenceGradient") >>=
aTransparence;
+
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 16777215 (0xff)
+// - Actual : 3487029 (0x353535)
+// i.e. the end transparency was not 100%, but was 21%, leading to an
unexpected visible line on
+// the right of this shape.
+CPPUNIT_ASSERT_EQUAL(static_cast(0xff),
aTransparence.EndColor);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/fillproperties.cxx
b/oox/source/drawingml/fillproperties.cxx
index f203e9e2823e..7082cbee0186 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -512,21 +512,51 @@ void FillProperties::pushToPropMap( ShapePropertyMap&
rPropMap,
// convert DrawingML angle (in 1/6 degrees) to API
angle (in 1/10 degrees)
aGradient.Angle = static_cast< sal_Int16 >( (8100 -
(nDmlAngle / (PER_DEGREE / 10))) % 3600 );
Color aStartColor, aEndColor;
+
+// Try to grow the widest segment backwards: if a previous
segment has the same
+// color, just different transparency, include it.
+while (aWidestSegmentStart != aGradientStops.begin())
+{
+auto it = std::prev(aWidestSegmentStart);
+if (it->second.getColor(rGraphicHelper, nPhClr)
+!=
aWidestSegmentStart->second.getColor(rGraphicHelper, nPhClr))
+{
+break;
+}
+
+aWidestSegmentStart = it;
+}
+
+auto aWidestSegmentEnd = std::next(aWidestSegmentStart);
+// Try to grow the widest segment forward: if a neext
segment has the same
+// color, just different transparency, include it.
+while (aWidestSegmentEnd !=
std::prev(aGradientStops.end()))
+{
+auto it = std::next(aWidestSegmentEnd);
+if (it->second.getCo
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/ooxmlexport13.cxx |2 +-
sw/qa/extras/ooxmlexport/ooxmlexport4.cxx |5 +++--
sw/qa/extras/ooxmlexport/ooxmlexport8.cxx |3 ++-
writerfilter/source/dmapper/SdtHelper.cxx |9 +
4 files changed, 15 insertions(+), 4 deletions(-)
New commits:
commit 73b2bacf2f3f531896fc20aeecb51d433ecd5a9c
Author: Serge Krot
AuthorDate: Mon Jul 20 15:15:47 2020 +0200
Commit: Xisco Fauli
CommitDate: Mon Aug 10 10:39:39 2020 +0200
tdf#134572 DOCX: Incorrect default value in dropdown text fields
Change-Id: I3169e817c2f033d1525adc3b02ac3680ad220d70
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99074
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit 89b6b2dbb728abea2186ff1ae158c0adb67d05be)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100216
Reviewed-by: Xisco Fauli
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index 430749768862..1b9621b473b0 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -1052,7 +1052,7 @@ DECLARE_OOXMLEXPORT_TEST(tdf119809, "tdf119809.docx")
CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.text.textfield.DropDown"));
uno::Sequence aItems = getProperty< uno::Sequence
>(aField, "Items");
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aItems.getLength());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aItems.getLength());
}
}
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index 22d069a90864..c6cb3c351843 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -741,9 +741,10 @@ void Test::verifyComboBoxExport(bool aComboBoxAsDropDown)
CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.text.textfield.DropDown"));
uno::Sequence aItems = getProperty< uno::Sequence
>(aField, "Items");
-CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aItems.getLength());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aItems.getLength());
CPPUNIT_ASSERT_EQUAL(OUString("manolo"), aItems[0]);
CPPUNIT_ASSERT_EQUAL(OUString("pepito"), aItems[1]);
+CPPUNIT_ASSERT_EQUAL(OUString("Manolo"), aItems[2]);
}
else
{
@@ -767,7 +768,7 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testComboBoxControl,
"combobox-control.docx"
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
assertXPath(pXmlDoc,
"/w:document/w:body/w:p/w:sdt/w:sdtPr/w:dropDownList/w:listItem[1]", "value",
"manolo");
assertXPath(pXmlDoc,
"/w:document/w:body/w:p/w:sdt/w:sdtPr/w:dropDownList/w:listItem[2]", "value",
"pepito");
-assertXPathContent(pXmlDoc,
"/w:document/w:body/w:p/w:sdt/w:sdtContent/w:r/w:t", "manolo");
+assertXPathContent(pXmlDoc,
"/w:document/w:body/w:p/w:sdt/w:sdtContent/w:r/w:t", "Manolo");
// check imported control
verifyComboBoxExport(getShapes() == 0);
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
index 5f401b266bfc..5b09147a0ad2 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
@@ -948,9 +948,10 @@ DECLARE_OOXMLEXPORT_TEST(testN779630, "n779630.docx")
CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.text.textfield.DropDown"));
uno::Sequence aItems = getProperty< uno::Sequence
>(aField, "Items");
-CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aItems.getLength());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aItems.getLength());
CPPUNIT_ASSERT_EQUAL(OUString("Yes"), aItems[0]);
CPPUNIT_ASSERT_EQUAL(OUString("No"), aItems[1]);
+CPPUNIT_ASSERT_EQUAL(OUString("dropdown default text"), aItems[2]);
}
}
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx
b/writerfilter/source/dmapper/SdtHelper.cxx
index 4e437ae0e562..60153d4c6126 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -90,6 +90,15 @@ void SdtHelper::createDropDownControl()
m_rDM_Impl.GetTextFactory()->createInstance("com.sun.star.text.TextField.DropDown"),
uno::UNO_QUERY);
+const auto it = std::find_if(
+m_aDropDownItems.begin(), m_aDropDownItems.end(),
+[aDefaultText](const OUString& item) -> bool { return
!item.compareTo(aDefaultText); });
+
+if (m_aDropDownItems.end() == it)
+{
+m_aDropDownItems.push_back(aDefaultText);
+}
+
// set properties
uno::Reference xPropertySet(xControlModel,
uno::UNO_QUERY);
xPropertySet->setPropertyValue("SelectedItem",
uno::makeAny(aDefaultText));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/app/AppDetailView.cxx | 24 +---
dbaccess/source/ui/app/AppDetailView.hxx |4 +++-
2 files changed, 20 insertions(+), 8 deletions(-)
New commits:
commit 6ad2f463784a24c566477cdd60ae729651bb8564
Author: Caolán McNamara
AuthorDate: Sat Aug 8 14:06:49 2020 +0100
Commit: Caolán McNamara
CommitDate: Mon Aug 10 10:24:30 2020 +0200
restore removing the entries which are not enabled currently
Change-Id: If24474e362aa80a3a0240a6ab899aa9e71066aef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100389
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx
b/dbaccess/source/ui/app/AppDetailView.cxx
index 2f77244699d3..e6e318c661d4 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -51,10 +51,11 @@ using namespace ::com::sun::star::beans;
using ::com::sun::star::util::URL;
using ::com::sun::star::sdb::application::NamedDatabaseObject;
-TaskEntry::TaskEntry( const char* _pAsciiUNOCommand, const char* _pHelpID,
const char* pTitleResourceID )
+TaskEntry::TaskEntry( const char* _pAsciiUNOCommand, const char* _pHelpID,
const char* pTitleResourceID, bool _bHideWhenDisabled )
:sUNOCommand( OUString::createFromAscii( _pAsciiUNOCommand ) )
,pHelpID( _pHelpID )
,sTitle( DBA_RES(pTitleResourceID) )
+,bHideWhenDisabled( _bHideWhenDisabled )
{
}
@@ -341,9 +342,7 @@ void OApplicationDetailView::impl_createPage( ElementType
_eType, const Referenc
Resize();
}
-namespace {
-
-void impl_fillTaskPaneData(ElementType _eType, TaskPaneData& _rData)
+void OApplicationDetailView::impl_fillTaskPaneData(ElementType _eType,
TaskPaneData& _rData) const
{
TaskEntryList& rList( _rData.aTasks );
rList.clear(); rList.reserve( 4 );
@@ -353,7 +352,7 @@ void impl_fillTaskPaneData(ElementType _eType,
TaskPaneData& _rData)
case E_TABLE:
rList.emplace_back( ".uno:DBNewTable",
RID_STR_TABLES_HELP_TEXT_DESIGN, RID_STR_NEW_TABLE );
rList.emplace_back( ".uno:DBNewTableAutoPilot",
RID_STR_TABLES_HELP_TEXT_WIZARD, RID_STR_NEW_TABLE_AUTO );
-rList.emplace_back( ".uno:DBNewView", RID_STR_VIEWS_HELP_TEXT_DESIGN,
RID_STR_NEW_VIEW );
+rList.emplace_back( ".uno:DBNewView", RID_STR_VIEWS_HELP_TEXT_DESIGN,
RID_STR_NEW_VIEW, true );
_rData.pTitleId = RID_STR_TABLES_CONTAINER;
break;
@@ -364,7 +363,7 @@ void impl_fillTaskPaneData(ElementType _eType,
TaskPaneData& _rData)
break;
case E_REPORT:
-rList.emplace_back( ".uno:DBNewReport", RID_STR_REPORT_HELP_TEXT,
RID_STR_NEW_REPORT );
+rList.emplace_back( ".uno:DBNewReport", RID_STR_REPORT_HELP_TEXT,
RID_STR_NEW_REPORT, true );
rList.emplace_back( ".uno:DBNewReportAutoPilot",
RID_STR_REPORTS_HELP_TEXT_WIZARD, RID_STR_NEW_REPORT_AUTO );
_rData.pTitleId = RID_STR_REPORTS_CONTAINER;
break;
@@ -379,8 +378,19 @@ void impl_fillTaskPaneData(ElementType _eType,
TaskPaneData& _rData)
default:
OSL_FAIL( "OApplicationDetailView::impl_fillTaskPaneData: illegal
element type!" );
}
-}
+// remove the entries which are not enabled currently
+for (TaskEntryList::iterator pTask = rList.begin(); pTask != rList.end();)
+{
+if ( pTask->bHideWhenDisabled
+&&
!getBorderWin().getView()->getCommandController().isCommandEnabled(
pTask->sUNOCommand )
+)
+pTask = rList.erase( pTask );
+else
+{
+++pTask;
+}
+}
}
const TaskPaneData& OApplicationDetailView::impl_getTaskPaneData( ElementType
_eType )
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx
b/dbaccess/source/ui/app/AppDetailView.hxx
index bca1145f2010..a00e7f4ba642 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -47,11 +47,12 @@ namespace dbaui
OUStringsUNOCommand;
const char* pHelpID;
OUStringsTitle;
+boolbHideWhenDisabled;
// TODO: we should be consistent in the task pane and the
menus/toolbars:
// If an entry is disabled in the latter, it should also be
disabled in the former.
// If an entry is *hidden* in the former, it should also be hidden
in the latter.
-TaskEntry( const char* _pAsciiUNOCommand, const char* pHelpID, const
char* pTitleResourceID );
+TaskEntry( const char* _pAsciiUNOCommand, const char* pHelpID, const
char* pTitleResourceID, bool _bHideWhenDisabled = false );
};
typedef std::vector< TaskEntry > TaskEntryList;
@@ -313,6 +314,7 @@ namespace dbaui
);
const TaskPaneData& impl_getTaskPaneData( ElementType _eType );
+voidimpl_fillTaskPaneData( ElementType _eType,
TaskPaneData& _rData ) const;
};
}
#endif // INCLUDED_DBACCESS_
[Libreoffice-commits] core.git: include/svtools svtools/source svtools/uiconfig
include/svtools/editbrowsebox.hxx |1
svtools/source/brwbox/ebbcontrols.cxx |4 ++
svtools/uiconfig/ui/datewindow.ui | 67 --
3 files changed, 45 insertions(+), 27 deletions(-)
New commits:
commit dd0ee0ccf79918526cd1753e66a55f289a7b6ea3
Author: Caolán McNamara
AuthorDate: Sun Aug 9 16:01:37 2020 +0100
Commit: Caolán McNamara
CommitDate: Mon Aug 10 10:24:04 2020 +0200
tdf#135529 today/none only used by DateControl
Change-Id: Id8987e65ef3fae9c009af59d3a1f9d0e83726648
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100404
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/svtools/editbrowsebox.hxx
b/include/svtools/editbrowsebox.hxx
index 130dae510486..725cc081d044 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -687,6 +687,7 @@ namespace svt
std::unique_ptr m_xCalendarBuilder;
std::unique_ptr m_xTopLevel;
std::unique_ptr m_xCalendar;
+std::unique_ptr m_xExtras;
std::unique_ptr m_xTodayBtn;
std::unique_ptr m_xNoneBtn;
diff --git a/svtools/source/brwbox/ebbcontrols.cxx
b/svtools/source/brwbox/ebbcontrols.cxx
index 6958a1f63fab..b15927af9e58 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -429,6 +429,7 @@ namespace svt
, m_xCalendarBuilder(Application::CreateBuilder(m_xMenuButton.get(),
"svt/ui/datewindow.ui"))
, m_xTopLevel(m_xCalendarBuilder->weld_widget("date_popup_window"))
, m_xCalendar(m_xCalendarBuilder->weld_calendar("date"))
+, m_xExtras(m_xCalendarBuilder->weld_widget("extras"))
, m_xTodayBtn(m_xCalendarBuilder->weld_button("today"))
, m_xNoneBtn(m_xCalendarBuilder->weld_button("none"))
{
@@ -439,6 +440,8 @@ namespace svt
m_xMenuButton->set_visible(bDropDown);
m_xMenuButton->connect_toggled(LINK(this, DateControl, ToggleHdl));
+m_xExtras->show();
+
m_xTodayBtn->connect_clicked(LINK(this, DateControl, ImplClickHdl));
m_xNoneBtn->connect_clicked(LINK(this, DateControl, ImplClickHdl));
@@ -484,6 +487,7 @@ namespace svt
{
m_xTodayBtn.reset();
m_xNoneBtn.reset();
+m_xExtras.reset();
m_xCalendar.reset();
m_xTopLevel.reset();
m_xCalendarBuilder.reset();
diff --git a/svtools/uiconfig/ui/datewindow.ui
b/svtools/uiconfig/ui/datewindow.ui
index 0e7729afe74e..b3c1b2d73085 100644
--- a/svtools/uiconfig/ui/datewindow.ui
+++ b/svtools/uiconfig/ui/datewindow.ui
@@ -27,46 +27,59 @@
-
-True
-False
-
-
-False
-True
-1
-
-
-
-
-True
+
False
+True
+vertical
6
-spread
-
-Today
+
True
-True
-True
-True
-True
+False
-True
+False
True
0
-
-None
+
True
-True
-True
+False
+6
+spread
+
+
+Today
+True
+True
+True
+True
+True
+
+
+True
+True
+0
+
+
+
+
+None
+True
+True
+True
+
+
+True
+True
+1
+
+
-True
+False
True
1
@@ -75,7 +88,7 @@
False
True
-2
+1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - include/tools tools/source
include/tools/json_writer.hxx |1 +
tools/source/misc/json_writer.cxx |8
2 files changed, 9 insertions(+)
New commits:
commit cf6388b6a5f3e3baa54ed8b02020e9a25487b32b
Author: Tomaž Vajngerl
AuthorDate: Sat Aug 1 08:40:10 2020 +0200
Commit: Tomaž Vajngerl
CommitDate: Mon Aug 10 09:35:19 2020 +0200
add extractAsOString to JsonWriter
Change-Id: I761fcf885a4965f88107f84b839108960805a1b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99909
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tomaž Vajngerl
diff --git a/include/tools/json_writer.hxx b/include/tools/json_writer.hxx
index 34930584730d..588577d41303 100644
--- a/include/tools/json_writer.hxx
+++ b/include/tools/json_writer.hxx
@@ -47,6 +47,7 @@ public:
/** Hands ownership of the the underlying storage buffer to the caller,
* after this no more document modifications may be written. */
char* extractData();
+OString extractAsOString();
private:
void endNode();
diff --git a/tools/source/misc/json_writer.cxx
b/tools/source/misc/json_writer.cxx
index 3040fda8a080..ab109dae669c 100644
--- a/tools/source/misc/json_writer.cxx
+++ b/tools/source/misc/json_writer.cxx
@@ -255,5 +255,13 @@ char* JsonWriter::extractData()
return pRet;
}
+OString JsonWriter::extractAsOString()
+{
+char* pChar = extractData();
+OString ret(pChar);
+free(pChar);
+return ret;
+}
+
} // namespace tools
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
