[Libreoffice-commits] core.git: configure.ac

[Tor Lillqvist (via logerrit)]

 configure.ac |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 4fd879cfc898e53e75506ac33fe53116b3649856
Author: Tor Lillqvist 
AuthorDate: Sun Oct 25 01:54:14 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Sun Oct 25 07:38:11 2020 +0100

Fix the find_msvc function for building on WSL

Use the PROGRAMFILESX86 environment variable that autogen.sh exports.

Use the $formatted_path_unix return value from PathFormat.

Change-Id: Ifa2c05e57248a9c05d60ebf7b93fbdc1c1e59b1b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104764
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/configure.ac b/configure.ac
index 06793fc606cd..7580e90413fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3744,10 +3744,14 @@ find_msvc()
 unset vctest vcnum vcnumwithdot vcbuildnumber
 
 vs_versions_to_check "$1"
-vswhere="$(perl -e 'print $ENV{"ProgramFiles(x86)"}')"
+if test "$build_os" = wsl; then
+vswhere="$PROGRAMFILESX86"
+else
+vswhere="$(perl -e 'print $ENV{"ProgramFiles(x86)"}')"
+fi
 vswhere+="\\Microsoft Visual Studio\\Installer\\vswhere.exe"
 PathFormat "$vswhere"
-vswhere=$formatted_path
+vswhere=$formatted_path_unix
 for ver in $vsversions; do
 vswhereoutput=`$vswhere -version "@<:@ $ver , $(expr $ver + 1) @:}@" 
-requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property 
installationPath | head -1`
 # Fall back to all MS products (this includes VC++ Build Tools)
@@ -3757,7 +3761,7 @@ find_msvc()
 fi
 if test -n "$vswhereoutput"; then
 PathFormat "$vswhereoutput"
-vctest=$formatted_path
+vctest=$formatted_path_unix
 break
 fi
 done
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

[Tor Lillqvist (via logerrit)]

 configure.ac |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit f0b282b6edc6317b3768f85de5debbfba7bb0c2b
Author: Tor Lillqvist 
AuthorDate: Sun Oct 25 02:22:54 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Sun Oct 25 07:38:33 2020 +0100

More cases of treating wsl like cygwin

Change-Id: I7ae3c86fc42d5232b168a55d1993ad373075b773
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104765
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/configure.ac b/configure.ac
index 7580e90413fb..985bfb0eb68f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3555,7 +3555,7 @@ reg_get_value_64()
 }
 
 case "$host_os" in
-cygwin*)
+cygwin*|wsl*)
 COM=MSC
 USING_X11=
 OS=WNT
@@ -4603,7 +4603,7 @@ aix*)
 P_SEP=:
 ;;
 
-cygwin*)
+cygwin*|wsl*)
 # Already handled
 ;;
 
@@ -8312,7 +8312,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAINC"; then
 test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC 
-I$JAVA_HOME/include/native_thread"
 ;;
 
-cygwin*)
+cygwin*|wsl*)
 JAVAINC="-I$JAVA_HOME/include/win32"
 JAVAINC="$JAVAINC -I$JAVA_HOME/include"
 ;;
@@ -13932,7 +13932,7 @@ AC_SUBST(TEMP_DIRECTORY)
 if test -n "$LO_PATH_FOR_BUILD"; then
 LO_PATH="$LO_PATH_FOR_BUILD"
 case "$host_os" in
-cygwin*)
+cygwin*|wsl*)
 pathmunge "$MSVC_HOST_PATH" "before"
 ;;
 esac
@@ -13947,7 +13947,7 @@ else
 fi
 ;;
 
-cygwin*)
+cygwin*|wsl*)
 # Win32 make needs native paths
 if test "$GNUMAKE_WIN_NATIVE" = "TRUE" ; then
 LO_PATH=`cygpath -p -m "$PATH"`
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

[Tor Lillqvist (via logerrit)]

 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 187bdeb38f6c82fa492080ad379e40ec01458824
Author: Tor Lillqvist 
AuthorDate: Sun Oct 25 01:31:05 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Sun Oct 25 07:37:30 2020 +0100

Interix is dead since long, but check for WSL instead

Change-Id: I0f5324528b87ca76c602cb788e9c8648e61188ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104763
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/configure.ac b/configure.ac
index 18dca65bca86..06793fc606cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -866,7 +866,7 @@ gnu)
 _os=GNU
  ;;
 
-cygwin*|interix*)
+cygwin*|wsl*)
 
 # When building on Windows normally with MSVC under Cygwin,
 # configure thinks that the host platform (the platform the
@@ -8818,7 +8818,7 @@ else
 if test -n "$NASM"; then
 AC_MSG_CHECKING([for object file format of host system])
 case "$host_os" in
-  cygwin* | mingw* | pw32* | interix*)
+  cygwin* | mingw* | pw32* | wsl*)
 case "$host_cpu" in
   x86_64)
 objfmt='Win64-COFF'
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Tomaž Vajngerl (via logerrit)]

 sc/source/filter/xml/xmlexprt.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e69b57d7f55eeab6253b9fab7edce06da50121f9
Author: Tomaž Vajngerl 
AuthorDate: Sat Oct 24 23:56:17 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Sun Oct 25 07:27:15 2020 +0100

tdf#115588 write autoDataStyles for master-slides

If we don't trigger this, then the numeric styles won't be
written to the auto-styles and the style.xml will refer to
styles, that don't exists. In particular a reference to "N2",
where "N2" number-style wouldn't be defined.

Flat ODS, that writes all into one document, was unaffected by
this (because we trigger the autoDataStyles funtion in when also
exporting the content.

Change-Id: Iddfc264756d828b098ca8a351299c961b7e63dab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104760
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index 9c8dff177c95..999cfb866ba4 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -2648,6 +2648,7 @@ void ScXMLExport::ExportAutoStyles_()
 
 if (getExportFlags() & SvXMLExportFlags::MASTERSTYLES)
 {
+exportAutoDataStyles();
 GetPageExport()->exportAutoStyles();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Calc fault on Pivot Table

[Ilmari Lauhakangas]

Don Gardner kirjoitti 25.10.2020 klo 7.59:

Fault in Pivot table


Instructions for reporting bugs: 
https://wiki.documentfoundation.org/QA/BugReport


Ilmari
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Calc fault on Pivot Table

[Don Gardner]

Hi

Fault in Pivot table

Open Calc New Document or Open a saved sheet

Select Pivot Table

Inert or Edit

Current Selection

OK

Pivot Table Editor opens

Click OK  without doing any thing

Looks Like Calc has closed

but is  still there frozen with nothing Working

Have to end through task Manager

OK if you select Cancel

Ok if you drag something from the list if a list is available

Regard Don Gardner

Lakeside drv Wallan Victoria Aus

+61 497148980



___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Build system help adding system obj file

[Deborah Barkley-Yeung]

Hello,

I'm trying to fix bug #48413. So looking at
https://docs.microsoft.com/en-us/cpp/c-language/expanding-wildcard-arguments?view=vs-2019,
I think I just need to link setargv.obj.

 However I don't understand the build system well enough to know how to
make it link in a system object file. Does anyone have any suggestions
about how to approach this?

Thanks in advance.
Deb.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: soffice --writer fails with 'com::sun::star::container::NoSuchElementException'

[mcmurchy1917techy]

If it helps I 've attached the backtrace generated by


$ /home/alex/master/instdir/program/soffice --writer --backtrace
GNU gdb (GDB) 9.2
Copyright (C) 2020 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later 


This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
Type "show copying" and "show warranty" for details.
This GDB was configured as "x86_64-slackware-linux".
Type "show configuration" for configuration details.
For bug reporting instructions, please see:
.
Find the GDB manual and other documentation resources online at:
    .

For help, type "help".
Type "apropos word" to search for commands related to "word"...
Reading symbols from /home/alex/master/instdir/program/soffice.bin...
log will be saved as gdbtrace.log, this will take some time, patience...
[Detaching after fork from child process 19652]
terminate called after throwing an instance of 
'com::sun::star::container::NoSuchElementException'


Alex


On 24/10/2020 17:51, mcmurchy1917techy wrote:
I've had a successful compile of LibreOffice after cloning from 
https://gerrit.libreoffice.org/core


When running soffice It bombs out


$ /home/alex/master/instdir/program/soffice --writer
terminate called after throwing an instance of 
'com::sun::star::container::NoSuchElementException'


It doesn't give me much of a clue as to where to look.

Anyone give me a pointer as to where to start.

If it's any help I'm compiling against JDK11.

Alex


warning: Currently logging to gdbtrace.log.  Turn the logging off and on to make the new setting effective.
warning: File "/home/alex/master/instdir/program/libuno_sal.so.3-gdb.py" auto-loading has been declined by your `auto-load safe-path' set to "$debugdir:$datadir/auto-load".
To enable execution of this file add
	add-auto-load-safe-path /home/alex/master/instdir/program/libuno_sal.so.3-gdb.py
line to your configuration file "/home/alex/.gdbinit".
To completely disable this security protection add
	set auto-load safe-path /
line to your configuration file "/home/alex/.gdbinit".
For more information about this security protection see the
"Auto-loading safe path" section in the GDB manual.  E.g., run from the shell:
	info "(gdb)Auto-loading safe path"
[Thread debugging using libthread_db enabled]
Using host libthread_db library "/lib64/libthread_db.so.1".
warning: File "/home/alex/master/instdir/program/libuno_cppu.so.3-gdb.py" auto-loading has been declined by your `auto-load safe-path' set to "$debugdir:$datadir/auto-load".
warning: File "/home/alex/master/instdir/program/libsvllo.so-gdb.py" auto-loading has been declined by your `auto-load safe-path' set to "$debugdir:$datadir/auto-load".
warning: File "/home/alex/master/instdir/program/libtllo.so-gdb.py" auto-loading has been declined by your `auto-load safe-path' set to "$debugdir:$datadir/auto-load".
warning: File "/home/alex/master/instdir/program/libvcllo.so-gdb.py" auto-loading has been declined by your `auto-load safe-path' set to "$debugdir:$datadir/auto-load".
warning: File "/home/alex/master/instdir/program/libbasegfxlo.so-gdb.py" auto-loading has been declined by your `auto-load safe-path' set to "$debugdir:$datadir/auto-load".
[Detaching after fork from child process 19652]
[New Thread 0x7fffedb17700 (LWP 19667)]
[New Thread 0x7fffed316700 (LWP 19668)]

Thread 1 "soffice.bin" received signal SIGABRT, Aborted.
0x77c51d6b in raise () from /lib64/libc.so.6
#0  0x77c51d6b in raise () at /lib64/libc.so.6
#1  0x77c32548 in abort () at /lib64/libc.so.6
#2  0x77ac2693 in  () at /usr/lib64/libstdc++.so.6
#3  0x77acdf06 in  () at /usr/lib64/libstdc++.so.6
#4  0x77acdf71 in  () at /usr/lib64/libstdc++.so.6
#5  0x77ace1c4 in  () at /usr/lib64/libstdc++.so.6
#6  0x7fffede96fec in  () at /usr/lib64/libreoffice/program/../program/libconfigmgrlo.so
#7  0x7fffedede7ad in  () at /usr/lib64/libreoffice/program/../program/libconfigmgrlo.so
#8  0x7709bb13 in comphelper::detail::ConfigurationWrapper::getPropertyValue(rtl::OUString const&) const (this=this@entry=0x77161a60 , (anonymous namespace)::TheConfigurationWrapper>::get(com::sun::star::uno::Reference const&)::instance>, path=...) at /home/alex/master/comphelper/source/misc/configuration.cxx:136
#9  0x77eb4437 in comphelper::ConfigurationProperty::get(com::sun::star::uno::Reference const&) (context=...) at /home/alex/master/include/rtl/stringutils.hxx:209
#10 desktop::Desktop::Main() (this=0x7fffde50) at /home/alex/master/desktop/source/app/app.cxx:1245
#11 0x744fa009 in ImplSVMain() () at /home/alex/master/vcl/source/app/svmain.cxx:196
#12 0x77edba0f in soffice_main() () at /home/alex/master/desktop/source/app/sofficemain.cxx:98
#13 0x0040106c in sal_main () at /home/alex/master/desktop/s

[Libreoffice-commits] core.git: configure.ac

[Tor Lillqvist (via logerrit)]

 configure.ac |   71 ---
 1 file changed, 63 insertions(+), 8 deletions(-)

New commits:
commit a34caaa3e68bb8acadb4051481ceeedcb6827b27
Author: Tor Lillqvist 
AuthorDate: Sun Oct 25 00:09:44 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Sun Oct 25 01:26:20 2020 +0200

Add another return value to the PathFormat function, for WSL

This is just one step towards the goal of being able to build for
Windows on WSL (instead of Cygwin).

Unlike Cygwin, WSL can not use Windows pathnames at all. So to be able
to build for Windows on WSL, we will need to be much more careful in
keeping track of which pathnames are in Windows format and which are
in Unix format. Add a second return value for PathFormat that on WSL
is in Unix format.

Like in c6d8e4b36f9575267244119c0a7e6a2275168625, also add a simple
"unit test" (just for visual inspection) of the new functionality.

Change-Id: Ief4584243227677d0705de2c83e2a0bf54eac0a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104761
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/configure.ac b/configure.ac
index 1584480f84bf..18dca65bca86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,12 +63,20 @@ FilterLibs()
 
 PathFormat()
 {
-# Args: $1: A pathname. On Cygwin, in either the Unix or the Windows 
format.
+# Args: $1: A pathname. On Cygwin and WSL, in either the Unix or the 
Windows format. Note that this
+# function is called also on Unix.
 #
-# Return value: $formatted_path. The pathname in Windows format, but using 
forward slashes instead
-# of backslashes, using 8.3 pathnames if necessary.
+# Return value: $formatted_path and $formatted_path_unix.
 #
-# Errors out if 8.3 names are needed but aren't present for some of the 
path component.
+# $formatted_path is the argument in Windows format, but using forward 
slashes instead of
+# backslashes, using 8.3 pathname components if necessary (if it otherwise 
would contains spaces
+# or shell metacharacters).
+#
+# $formatted_path_unix is the argument in a form usable in Cygwin or WSL, 
using 8.3 components if
+# necessary. On Cygwin, it is the same as $formatted_path, but on WSL it 
is $formatted_path as a
+# Unix pathname.
+#
+# Errors out if 8.3 names are needed but aren't present for some of the 
path components.
 
 # Examples:
 #
@@ -86,8 +94,16 @@ PathFormat()
 #
 # /usr/bin/find.exe => C:/cygwin64/bin/find.exe
 
+if test -n "$UNITTEST_WSL_PATHFORMAT"; then
+printf "PathFormat $1 ==> "
+fi
+
 formatted_path="$1"
-if test "$build_os" = "cygwin"; then
+if test "$build_os" = "cygwin" -o "$build_os" = "wsl"; then
+if test "$build_os" = "wsl"; then
+formatted_path=$(echo "$formatted_path" | tr -d '\r')
+fi
+
 pf_conv_to_dos=
 # spaces,parentheses,brackets,braces are problematic in pathname
 # so are backslashes
@@ -97,7 +113,14 @@ PathFormat()
 ;;
 esac
 if test "$pf_conv_to_dos" = "yes"; then
-if test "$GNUMAKE_WIN_NATIVE" = "TRUE" ; then
+if test "$build_os" = "wsl"; then
+case "$formatted_path" in
+/*)
+formatted_path=$(wslpath -w "$formatted_path")
+;;
+esac
+formatted_path=$($BUILDDIR/solenv/wsl/wsl-lo-helper.exe --8.3 
"$formatted_path")
+elif test "$GNUMAKE_WIN_NATIVE" = "TRUE" ; then
 formatted_path=`cygpath -sm "$formatted_path"`
 else
 formatted_path=`cygpath -d "$formatted_path"`
@@ -112,12 +135,20 @@ PathFormat()
 if test "$fp_count_colon" = "0"; then
 new_formatted_path=`realpath "$formatted_path"`
 if test $? -ne 0;  then
-AC_MSG_WARN([realpath failed for "$1", not necessarily a 
problem.])
+AC_MSG_WARN([realpath failed for "$formatted_path", not 
necessarily a problem.])
 else
 formatted_path="$new_formatted_path"
 fi
 fi
-formatted_path=`cygpath -m "$formatted_path"`
+if test "$build_os" = "wsl"; then
+if test "$fp_count_colon" != "0"; then
+formatted_path=$(wslpath -m $(wslpath "$formatted_path"))
+else
+formatted_path=$(wslpath -m "$formatted_path")
+fi
+else
+formatted_path=`cygpath -m "$formatted_path"`
+fi
 if test $? -ne 0;  then
 AC_MSG_ERROR([path conversion failed for "$1".])
 fi
@@ -127,6 +158,13 @@ PathFormat()
 AC_MSG_ERROR([converted path "$formatted_path" still contains 
spaces. Short filenames (8.3 filenames

[Libreoffice-commits] core.git: solenv/wsl

[Tor Lillqvist (via logerrit)]

 solenv/wsl/wsl-lo-helper.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 53591aa0d1570cf9031799269a198b5cfe4dd076
Author: Tor Lillqvist 
AuthorDate: Sun Oct 25 01:38:57 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Sun Oct 25 01:25:30 2020 +0200

Improve error message

Change-Id: I4f6f7ca56c42cac8303d591cbbba74425ee2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104762
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/solenv/wsl/wsl-lo-helper.cpp b/solenv/wsl/wsl-lo-helper.cpp
index 0b641ceb04bd..2bbc8cec16f8 100644
--- a/solenv/wsl/wsl-lo-helper.cpp
+++ b/solenv/wsl/wsl-lo-helper.cpp
@@ -63,7 +63,7 @@ int wmain(int argc, wchar_t** argv)
 wchar_t woutput[1000];
 if (GetShortPathNameW(argv[2], woutput, sizeof(woutput) / 
sizeof(woutput[0])) == 0)
 {
-fprintf(stderr, "%S --8.3: Could not get short pathname.\n", 
argv[0]);
+fprintf(stderr, "%S --8.3: Could not get short pathname of %S.\n", 
argv[0], argv[2]);
 exit(1);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

[Tor Lillqvist (via logerrit)]

 configure.ac |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 07f028e706420ddb9a955222fb6ebab046be237a
Author: Tor Lillqvist 
AuthorDate: Sun Oct 25 00:53:30 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Sun Oct 25 01:14:10 2020 +0200

Set also ac_cv_{build,host}_{cpu,os} in the case of building for Windows on 
WSL

Change-Id: I095f5169c0e9969531995ff0b533642aeaae9135
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104759
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/configure.ac b/configure.ac
index 67d1cbad9d3a..1584480f84bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -210,7 +210,11 @@ dnl 
===
 # Linux on WSL) trust that.
 if test -z "$host" -a -z "$build" -a "`wslsys -v 2>/dev/null`" != ""; then
 ac_cv_host="x86_64-pc-wsl"
+ac_cv_host_cpu="x86_64"
+ac_cv_host_os="wsl"
 ac_cv_build="$ac_cv_host"
+ac_cv_build_cpu="$ac_cv_host_cpu"
+ac_cv_build_os="$ac_cv_host_os"
 
 # Emulation of Cygwin's cygpath command for WSL.
 cygpath()
@@ -308,6 +312,7 @@ if test -z "$host" -a -z "$build" -a "`wslsys -v 
2>/dev/null`" != ""; then
 fi
 
 AC_CANONICAL_HOST
+AC_CANONICAL_BUILD
 
 AC_MSG_CHECKING([for product name])
 PRODUCTNAME="AC_PACKAGE_NAME"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basegfx/source

[Betül İnce (via logerrit)]

 basegfx/source/inc/stringconversiontools.hxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 5219c6bd804f626b30a783ec012b24c01911c575
Author: Betül İnce 
AuthorDate: Thu Oct 22 20:10:36 2020 +0300
Commit: Gülşah Köse 
CommitDate: Sat Oct 24 23:19:21 2020 +0200

tdf#124176 Using pragma once instead of include guards

Change-Id: Ib8cfeb774851afd62e2bd5b29b0d61d52a0dbad9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104694
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 

diff --git a/basegfx/source/inc/stringconversiontools.hxx 
b/basegfx/source/inc/stringconversiontools.hxx
index f50d33bdb90a..9b788bf3421e 100644
--- a/basegfx/source/inc/stringconversiontools.hxx
+++ b/basegfx/source/inc/stringconversiontools.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_BASEGFX_SOURCE_INC_STRINGCONVERSIONTOOLS_HXX
-#define INCLUDED_BASEGFX_SOURCE_INC_STRINGCONVERSIONTOOLS_HXX
+
+#pragma once
 
 #include 
 #include 
@@ -57,6 +57,4 @@ namespace basegfx::internal
 
 } // namespace basegfx::internal
 
-#endif // INCLUDED_BASEGFX_SOURCE_INC_STRINGCONVERSIONTOOLS_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: soffice --writer fails with 'com::sun::star::container::NoSuchElementException'

[mcmurchy1917techy]

Hi all

Ask the question and the answer materialises

I realised that i still had


$ UNO_PATH=/usr/lib64/libreoffice/program
$ 
URE_BOOTSTRAP=vnd.sun.star.pathname:/usr/lib64/libreoffice/program/fundamentalrc


when i redirected the variables to where I'd compiled libreoffice


UNO_PATH=/home/alex/master/instdir/program
URE_BOOTSTRAP=vnd.sun.star.pathname:/home/alex/master/instdir/program/fundamentalrc


every thing worked as expected and LibreOffice started up successfully

Problem solved.

Alex






On 24/10/2020 18:02, mcmurchy1917techy wrote:

If it helps I 've attached the backtrace generated by


$ /home/alex/master/instdir/program/soffice --writer --backtrace
GNU gdb (GDB) 9.2
Copyright (C) 2020 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later 


This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
Type "show copying" and "show warranty" for details.
This GDB was configured as "x86_64-slackware-linux".
Type "show configuration" for configuration details.
For bug reporting instructions, please see:
.
Find the GDB manual and other documentation resources online at:
.

For help, type "help".
Type "apropos word" to search for commands related to "word"...
Reading symbols from /home/alex/master/instdir/program/soffice.bin...
log will be saved as gdbtrace.log, this will take some time, patience...
[Detaching after fork from child process 19652]
terminate called after throwing an instance of 
'com::sun::star::container::NoSuchElementException'


Alex


On 24/10/2020 17:51, mcmurchy1917techy wrote:
I've had a successful compile of LibreOffice after cloning from 
https://gerrit.libreoffice.org/core


When running soffice It bombs out


$ /home/alex/master/instdir/program/soffice --writer
terminate called after throwing an instance of 
'com::sun::star::container::NoSuchElementException'


It doesn't give me much of a clue as to where to look.

Anyone give me a pointer as to where to start.

If it's any help I'm compiling against JDK11.

Alex




___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sc/source

[Caolán McNamara (via logerrit)]

 sc/source/ui/app/inputwin.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 802dc2fec107585dff333edd709a6fc399663df5
Author: Caolán McNamara 
AuthorDate: Sat Oct 24 20:32:24 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sat Oct 24 22:25:31 2020 +0200

tdf#137713 don't crash if there is no m_xEditView

Change-Id: I8b35459c7d5a704d9e2c0e2bfa4fce1aef152846
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104757
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 1632ce1f3e09..5d9012827d70 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1533,10 +1533,12 @@ bool ScTextWnd::MouseButtonDown( const MouseEvent& 
rMEvt )
 TextGrabFocus();
 }
 
+bool bClickOnSelection = false;
 if (m_xEditView)
+{
 m_xEditView->SetEditEngineUpdateMode( true );
-
-bool bClickOnSelection = 
m_xEditView->IsSelectionAtPoint(rMEvt.GetPosPixel());
+bClickOnSelection = 
m_xEditView->IsSelectionAtPoint(rMEvt.GetPosPixel());
+}
 if (!bClickOnSelection)
 {
 rtl::Reference xTransferable(new 
TransferDataContainer);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/window/builder.cxx |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit ebefba54523a7e0b7d66f9d278cc2509e2116a34
Author: Caolán McNamara 
AuthorDate: Fri Oct 23 21:31:47 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sat Oct 24 20:09:00 2020 +0200

only sfxlo and svtlo still exist

Change-Id: Id1138c2eb9f7c551d9d2855a68a364e3e21306cd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104748
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index b708eba955b8..7bd21299e16b 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1595,11 +1595,7 @@ void VclBuilder::preload()
 // find -name '*ui*' | xargs grep 'class=".*lo-' |
 // sed 's/.*class="//' | sed 's/-.*$//' | sort | uniq
 static const char *aWidgetLibs[] = {
-"sfxlo",  "svtlo", "svxcorelo", "foruilo",
-"vcllo",  "svxlo", "cuilo", "swlo",
-"swuilo", "sclo",  "sdlo",  "chartcontrollerlo",
-"smlo",   "scuilo","basctllo",  "sduilo",
-"scnlo",  "xsltdlglo", "pcrlo" // "dbulo"
+"sfxlo",  "svtlo"
 };
 for (const auto & lib : aWidgetLibs)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source

[Caolán McNamara (via logerrit)]

 svx/source/dialog/weldeditview.cxx |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 3b29b80398d9e3b8c086c8d45599611440239b86
Author: Caolán McNamara 
AuthorDate: Fri Oct 23 15:55:30 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sat Oct 24 20:08:35 2020 +0200

use SetSelection and DeleteSelected to make cursor go to the right place

Change-Id: I6452f9a45fac67b64c7b84f290029e96eb9623e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104735
Tested-by: Justin Luth 
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Caolán McNamara 

diff --git a/svx/source/dialog/weldeditview.cxx 
b/svx/source/dialog/weldeditview.cxx
index 1031385282e5..c90b211cee23 100644
--- a/svx/source/dialog/weldeditview.cxx
+++ b/svx/source/dialog/weldeditview.cxx
@@ -1449,15 +1449,14 @@ int WeldEditView::GetSurroundingText(OUString& 
rSurrounding)
 bool WeldEditView::DeleteSurroundingText(const Selection& rRange)
 {
 bool bRes(false);
-EditEngine* pEditEngine = m_xEditView ? m_xEditView->GetEditEngine() : 
nullptr;
-if (pEditEngine)
+if (m_xEditView)
 {
 ESelection aSel(m_xEditView->GetSelection());
 aSel.nEndPara = aSel.nStartPara;
 aSel.nStartPos = rRange.Min();
 aSel.nEndPos = rRange.Max();
-pEditEngine->QuickDelete(aSel);
-pEditEngine->QuickFormatDoc();
+m_xEditView->SetSelection(aSel);
+m_xEditView->DeleteSelected();
 bRes = true;
 }
 return bRes;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/generic/glyphs/freetype_glyphcache.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 80e5e3826f6919e68c75d63f9dfe6417577d41ed
Author: Caolán McNamara 
AuthorDate: Fri Oct 23 15:22:46 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sat Oct 24 20:08:05 2020 +0200

crashtesting: avoid assert on loading tdf98681-3.docx

these limits are possibly totally archaic and maybe should be removed
entirely given the number of freetype releases since their introduction.
Just widen the range here.

Change-Id: Ic6648bbcd0a996ab342ca4c310850cf81bd504eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104733
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx 
b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
index d2addb9327a4..9e4a4d44974c 100644
--- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
@@ -436,7 +436,7 @@ FreetypeFont::FreetypeFont(FreetypeFontInstance& 
rFontInstance, const std::share
 SAL_WARN("vcl", "FreetypeFont negative font width of: " << mnWidth);
 return;
 }
-if (mfStretch > +64.0 || mfStretch < -64.0)
+if (mfStretch > +96.0 || mfStretch < -96.0)
 {
 SAL_WARN("vcl", "FreetypeFont excessive stretch of: " << mfStretch);
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svtools/source

[Caolán McNamara (via logerrit)]

 svtools/source/control/toolbarmenu.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7ccb90bcef40795ab7f6366e8a20efad489eaec1
Author: Caolán McNamara 
AuthorDate: Fri Oct 23 12:58:29 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sat Oct 24 20:07:45 2020 +0200

Resolves: tdf#137703 crash on 2nd launch of cell bg color dropdown

Change-Id: I263edf36d70b3b81051c7aa5ca44523d0193975f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104719
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/svtools/source/control/toolbarmenu.cxx 
b/svtools/source/control/toolbarmenu.cxx
index 259115c90a98..b376490fa4fd 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -218,6 +218,7 @@ void InterimToolbarPopup::dispose()
 m_xContainer->move(m_xPopup->getContainer(), m_xPopup->getTopLevel());
 m_xPopup.reset();
 m_xContainer.reset();
+m_xBuilder.reset();
 m_xBox.clear();
 m_xFrame.clear();
 DockingWindow::dispose();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Seth Chaiklin (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 89862ba0ac3d4ebfb212f58a6831c93dc6c3f1ac
Author: Seth Chaiklin 
AuthorDate: Sat Oct 24 18:23:12 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Sat Oct 24 18:23:12 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 78da740de2209037f3a4d3fc94eaa3f0f1b525f4
  - add link to reference submenu for Edit menu

 Also:
   - add access command to reference submenu
   - update Undo page (/shared/01/0201.xhp): 
,,,

Change-Id: I60c38c255904088feb32b2fb3012364b2106049e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104686
Reviewed-by: Seth Chaiklin 
Tested-by: Jenkins

diff --git a/helpcontent2 b/helpcontent2
index 0ea920cfb0b3..78da740de220 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0ea920cfb0b3e78018621cdaf38cfbdecd6b6e86
+Subproject commit 78da740de2209037f3a4d3fc94eaa3f0f1b525f4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Seth Chaiklin (via logerrit)]

 source/text/shared/00/edit_menu.xhp   |1 +
 source/text/shared/01/0201.xhp|   12 ++--
 source/text/swriter/01/edit_reference_submenu.xhp |2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 78da740de2209037f3a4d3fc94eaa3f0f1b525f4
Author: Seth Chaiklin 
AuthorDate: Sat Oct 24 17:58:34 2020 +0200
Commit: Seth Chaiklin 
CommitDate: Sat Oct 24 18:23:12 2020 +0200

add link to reference submenu for Edit menu

 Also:
   - add access command to reference submenu
   - update Undo page (/shared/01/0201.xhp): ,,,

Change-Id: I60c38c255904088feb32b2fb3012364b2106049e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104686
Reviewed-by: Seth Chaiklin 
Tested-by: Jenkins

diff --git a/source/text/shared/00/edit_menu.xhp 
b/source/text/shared/00/edit_menu.xhp
index f372c75be..5087a78ee 100644
--- a/source/text/shared/00/edit_menu.xhp
+++ b/source/text/shared/00/edit_menu.xhp
@@ -258,5 +258,6 @@
 Choose Edit - Object.
 Choose Edit - Object - Edit, also in the 
context menu of selected object.
 Choose Edit - Object - 
Open.
+Choose Edit - 
Reference.
 
 
diff --git a/source/text/shared/01/0201.xhp 
b/source/text/shared/01/0201.xhp
index 671cd0061..f74a486d0 100644
--- a/source/text/shared/01/0201.xhp
+++ b/source/text/shared/01/0201.xhp
@@ -29,26 +29,26 @@
 
 
 
-Can this removed?
+
 undoing;editing
 editing;undoing
 
 
 
-Undo
+Undo
   Reverses the last command or the last entry you typed. To select the 
command that you want to reverse, click the arrow next to the Undo 
icon on the Standard bar.
 
 
 
   
 
-To change the number 
of commands that you can undo, go to the Expert 
configuration and set a new value of the property 
"/org.openoffice.Office.Common/Undo Steps".
+To change the number of commands that 
you can undo, go to the Expert 
configuration and set a new value of the property 
"/org.openoffice.Office.Common/Undo Steps".
 Some commands (for 
example, editing Styles) cannot be undone.
-You can cancel the 
Undo command by choosing Edit - Redo.
-About 
the Undo command in database tables
+You can cancel the Undo command by 
choosing Edit - Redo.
+About the Undo command in database 
tables
   When you are 
working with database tables, you can only undo the last command.
   If you change 
the content of a record in a database table that has not been saved, and then 
use the Undo command, the record is erased.
-About 
the Undo command in presentations
+About the Undo command in 
presentations
   The 
Undo list is cleared when you apply a new layout to a 
slide.
 
 
diff --git a/source/text/swriter/01/edit_reference_submenu.xhp 
b/source/text/swriter/01/edit_reference_submenu.xhp
index 9dfe3fa5f..532d1e9f0 100644
--- a/source/text/swriter/01/edit_reference_submenu.xhp
+++ b/source/text/swriter/01/edit_reference_submenu.xhp
@@ -18,7 +18,7 @@
 
 
 
-Reference
+Reference
 A submenu that offers 
possibilities to edit footnotes, endnotes, index entries, and bibliography 
entries.
 
 
___
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' - helpcontent2

[Ilmari Lauhakangas (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5169e8e131ff15af354ba07130de8db5892a9fa5
Author: Ilmari Lauhakangas 
AuthorDate: Sat Oct 24 19:19:35 2020 +0300
Commit: Gerrit Code Review 
CommitDate: Sat Oct 24 18:19:35 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to c9675a9cdcbe6228f697fbe08f8171f59206710a
  - Use z-index: 100 for TopLeftHeader

The tooltip functionality was making things messy with the sticky header

Change-Id: I8a77b11c950c54f00bde0c040a2945f503f993b5
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104749
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 
(cherry picked from commit 4c9cd88154a6130360ac550b7e406ea0b59a4994)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104685
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 423094e2f75d..c9675a9cdcbe 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 423094e2f75d923ee464d6c5dddc8677a8790476
+Subproject commit c9675a9cdcbe6228f697fbe08f8171f59206710a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-7-0' - help3xsl/default.css

[Ilmari Lauhakangas (via logerrit)]

 help3xsl/default.css |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c9675a9cdcbe6228f697fbe08f8171f59206710a
Author: Ilmari Lauhakangas 
AuthorDate: Sat Oct 24 12:46:27 2020 +0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Oct 24 18:19:35 2020 +0200

Use z-index: 100 for TopLeftHeader

The tooltip functionality was making things messy with the sticky header

Change-Id: I8a77b11c950c54f00bde0c040a2945f503f993b5
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104749
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 
(cherry picked from commit 4c9cd88154a6130360ac550b7e406ea0b59a4994)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104685
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/help3xsl/default.css b/help3xsl/default.css
index 6f165e85c..1d0beb269 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -340,6 +340,7 @@ h6 {
 display: flex;
 flex-wrap: wrap;
 justify-content: flex-start;
+z-index: 100;
 }
 .dropdowns {
 /* allow for scrolling */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 730964a4367d5a1f444a35168b6206010a355f49
Author: Johnny_M 
AuthorDate: Sat Oct 24 18:00:30 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Sat Oct 24 18:00:30 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 0ea920cfb0b3e78018621cdaf38cfbdecd6b6e86
  - tdf#132643 Translate German section IDs

Change-Id: Id6e65a7f62effc9d9652aea3e665919ce78735e2
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104754
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 8ba4d840b790..0ea920cfb0b3 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8ba4d840b7905b70322e69b7c6f6350b57682540
+Subproject commit 0ea920cfb0b3e78018621cdaf38cfbdecd6b6e86
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Johnny_M (via logerrit)]

 source/text/shared/01/0503.xhp  |2 +-
 source/text/shared/01/0605.xhp  |2 +-
 source/text/shared/01/06050300.xhp  |2 +-
 source/text/swriter/01/05030800.xhp |2 +-
 source/text/swriter/01/05130004.xhp |2 +-
 source/text/swriter/01/0606.xhp |2 +-
 source/text/swriter/01/06060100.xhp |2 +-
 source/text/swriter/02/0211.xhp |2 +-
 source/text/swriter/main0202.xhp|2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 0ea920cfb0b3e78018621cdaf38cfbdecd6b6e86
Author: Johnny_M 
AuthorDate: Sat Oct 24 15:51:02 2020 +0200
Commit: Olivier Hallot 
CommitDate: Sat Oct 24 18:00:30 2020 +0200

tdf#132643 Translate German section IDs

Change-Id: Id6e65a7f62effc9d9652aea3e665919ce78735e2
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104754
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/01/0503.xhp 
b/source/text/shared/01/0503.xhp
index 2bef61a97..5a9a1a307 100644
--- a/source/text/shared/01/0503.xhp
+++ b/source/text/shared/01/0503.xhp
@@ -42,7 +42,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/shared/01/0605.xhp 
b/source/text/shared/01/0605.xhp
index 2304bc2cb..886bbd69e 100644
--- a/source/text/shared/01/0605.xhp
+++ b/source/text/shared/01/0605.xhp
@@ -42,7 +42,7 @@
 The 
Bullets and Numbering dialog has the following tabs:
 
 
-
+
 
 
 
diff --git a/source/text/shared/01/06050300.xhp 
b/source/text/shared/01/06050300.xhp
index 019b1e4f8..677c30dd9 100644
--- a/source/text/shared/01/06050300.xhp
+++ b/source/text/shared/01/06050300.xhp
@@ -30,7 +30,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/swriter/01/05030800.xhp 
b/source/text/swriter/01/05030800.xhp
index 048f6fb00..03749874c 100644
--- a/source/text/swriter/01/05030800.xhp
+++ b/source/text/swriter/01/05030800.xhp
@@ -27,7 +27,7 @@
   


-  
+  
 
 
 Outline & 
Numbering
diff --git a/source/text/swriter/01/05130004.xhp 
b/source/text/swriter/01/05130004.xhp
index 4cb78482f..4c33a6c6a 100644
--- a/source/text/swriter/01/05130004.xhp
+++ b/source/text/swriter/01/05130004.xhp
@@ -39,7 +39,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/swriter/01/0606.xhp 
b/source/text/swriter/01/0606.xhp
index 39d190934..7b6b01a74 100644
--- a/source/text/swriter/01/0606.xhp
+++ b/source/text/swriter/01/0606.xhp
@@ -41,7 +41,7 @@
 Chapter 
numbering is linked to paragraph styles. By default, the "Heading" paragraph 
styles (1-10) are assigned to the corresponding chapter and outline number 
levels (1-10). If you want, you can assign different paragraph styles to the 
outline number level.
 If you want numbered 
headings, use the Tools - Chapter Numbering menu command to assign 
numbering to a paragraph style. Do not use the Numbering icon on the Formatting 
toolbar.
 To highlight the 
screen display of chapter and outline numbers, choose View - Field 
Shadings.
-
+
 
 
 
diff --git a/source/text/swriter/01/06060100.xhp 
b/source/text/swriter/01/06060100.xhp
index 5b42c15a7..553a51040 100644
--- a/source/text/swriter/01/06060100.xhp
+++ b/source/text/swriter/01/06060100.xhp
@@ -28,7 +28,7 @@
 
 
 
-
+
 
 Numbering
 
diff --git a/source/text/swriter/02/0211.xhp 
b/source/text/swriter/02/0211.xhp
index 03bec6a72..56aef03fe 100644
--- a/source/text/swriter/02/0211.xhp
+++ b/source/text/swriter/02/0211.xhp
@@ -30,7 +30,7 @@
 
 
 
-
+
 
 Numbering 
On/Off
 Adds or removes numbering from the selected 
paragraphs. To define the numbering format, choose Format - 
Bullets and Numbering. To display the Bullets and Numbering 
Bar, choose View - Toolbars - Bullets and Numbering.UFI 
changed last sentence, see #60925
diff --git a/source/text/swriter/main0202.xhp b/source/text/swriter/main0202.xhp
index 8cec2be42..b05af83a5 100644
--- a/source/text/swriter/main0202.xhp
+++ b/source/text/swriter/main0202.xhp
@@ -53,7 +53,7 @@
   
   
   
-  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6d8c1097ff241635ddbbeee20aa1a992b4da9207
Author: Johnny_M 
AuthorDate: Sat Oct 24 17:58:49 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Sat Oct 24 17:58:49 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 8ba4d840b7905b70322e69b7c6f6350b57682540
  - tdf#132643 Translate German section IDs

Change-Id: I4a6689f6992196025d53f4800ba0592a42d896b3
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104753
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 8b5a210d6e02..8ba4d840b790 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8b5a210d6e0239b8ba7f24487570e83c0a1bdfaa
+Subproject commit 8ba4d840b7905b70322e69b7c6f6350b57682540
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6d97a6eb52177edb9487e884c48ed973a5af3b9e
Author: Johnny_M 
AuthorDate: Sat Oct 24 17:57:55 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Sat Oct 24 17:57:55 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 8b5a210d6e0239b8ba7f24487570e83c0a1bdfaa
  - tdf#132643 Translate German section IDs

Change-Id: I665a4321420c7f6da3ac1e645d37de2fe95a7d9f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104184
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 7d722e323b25..8b5a210d6e02 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7d722e323b259f9f16f738957eb47c3bea5b4700
+Subproject commit 8b5a210d6e0239b8ba7f24487570e83c0a1bdfaa
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Johnny_M (via logerrit)]

 source/text/sdraw/main_tools.xhp|2 +-
 source/text/shared/01/0603.xhp  |2 +-
 source/text/simpress/main_tools.xhp |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8ba4d840b7905b70322e69b7c6f6350b57682540
Author: Johnny_M 
AuthorDate: Sat Oct 24 15:19:35 2020 +0200
Commit: Olivier Hallot 
CommitDate: Sat Oct 24 17:58:49 2020 +0200

tdf#132643 Translate German section IDs

Change-Id: I4a6689f6992196025d53f4800ba0592a42d896b3
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104753
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/sdraw/main_tools.xhp b/source/text/sdraw/main_tools.xhp
index a949469f4..6bd12cdbe 100644
--- a/source/text/sdraw/main_tools.xhp
+++ b/source/text/sdraw/main_tools.xhp
@@ -36,7 +36,7 @@
 
 ImageMap
 
-
+
 
 
 
diff --git a/source/text/shared/01/0603.xhp 
b/source/text/shared/01/0603.xhp
index 2a804ece6..b634fbace 100644
--- a/source/text/shared/01/0603.xhp
+++ b/source/text/shared/01/0603.xhp
@@ -27,7 +27,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/simpress/main_tools.xhp 
b/source/text/simpress/main_tools.xhp
index 7b813fe4d..c39b11072 100644
--- a/source/text/simpress/main_tools.xhp
+++ b/source/text/simpress/main_tools.xhp
@@ -39,7 +39,7 @@
 
 ImageMap
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Johnny_M (via logerrit)]

 source/text/scalc/main0203.xhp   |4 ++--
 source/text/scalc/main0214.xhp   |4 ++--
 source/text/shared/00/00040501.xhp   |4 ++--
 source/text/shared/01/0525.xhp   |2 +-
 source/text/shared/01/05250100.xhp   |4 ++--
 source/text/shared/main0226.xhp  |4 ++--
 source/text/simpress/01/0525.xhp |2 +-
 source/text/swriter/main0205.xhp |4 ++--
 source/text/swriter/main0215.xhp |4 ++--
 source/text/swriter/main0216.xhp |4 ++--
 10 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 8b5a210d6e0239b8ba7f24487570e83c0a1bdfaa
Author: Johnny_M 
AuthorDate: Sun Oct 11 13:53:28 2020 +0200
Commit: Olivier Hallot 
CommitDate: Sat Oct 24 17:57:55 2020 +0200

tdf#132643 Translate German section IDs

Change-Id: I665a4321420c7f6da3ac1e645d37de2fe95a7d9f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104184
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/scalc/main0203.xhp b/source/text/scalc/main0203.xhp
index 28b757baf..9d53c4118 100644
--- a/source/text/scalc/main0203.xhp
+++ b/source/text/scalc/main0203.xhp
@@ -58,8 +58,8 @@
 
 
 
-
-
+
+
 
 
 
diff --git a/source/text/scalc/main0214.xhp b/source/text/scalc/main0214.xhp
index 1cafac525..e238de046 100644
--- a/source/text/scalc/main0214.xhp
+++ b/source/text/scalc/main0214.xhp
@@ -46,8 +46,8 @@
 
 
 
-
-
+
+
 
 
 
diff --git a/source/text/shared/00/00040501.xhp 
b/source/text/shared/00/00040501.xhp
index 7b03076eb..789bd8d29 100644
--- a/source/text/shared/00/00040501.xhp
+++ b/source/text/shared/00/00040501.xhp
@@ -212,12 +212,12 @@
 
 
 
-
+
 Choose Format - 
Arrange - Bring to Front ($[officename] Writer, $[officename] 
Calc).
 Choose Shape - 
Arrange - Bring to Front ($[officename] Draw).
 Shift+CommandCtrl+plus
 sign ($[officename] Impress, $[officename] Draw).
 Open context menu - 
choose Arrange - Bring to Front ($[officename] 
Impress).
-
+
 
 
 
diff --git a/source/text/shared/01/0525.xhp 
b/source/text/shared/01/0525.xhp
index 578c0f09a..33d8470cf 100644
--- a/source/text/shared/01/0525.xhp
+++ b/source/text/shared/01/0525.xhp
@@ -51,7 +51,7 @@
 
 Layer 
for text and graphics
 Each object 
that you place in your document is successively stacked on the preceding 
object. Use the arrange commands to change the stacking order of objects in 
your document. You cannot change the stacking order of text.
-
+
 
 
 
diff --git a/source/text/shared/01/05250100.xhp 
b/source/text/shared/01/05250100.xhp
index 54affb00c..6a4163d9f 100644
--- a/source/text/shared/01/05250100.xhp
+++ b/source/text/shared/01/05250100.xhp
@@ -32,13 +32,13 @@
 
   
   
-  
+  
 
 Bring to 
Front
   Moves the selected object to the 
top of the stacking order, so that it is in front of other 
objects.
   
   
-  
+  
 
   
   Layer
diff --git a/source/text/shared/main0226.xhp b/source/text/shared/main0226.xhp
index 24d6431b2..ea4a33d13 100644
--- a/source/text/shared/main0226.xhp
+++ b/source/text/shared/main0226.xhp
@@ -51,8 +51,8 @@
 
 
 
-
-
+
+
 
 
 Group
diff --git a/source/text/simpress/01/0525.xhp 
b/source/text/simpress/01/0525.xhp
index d49e45122..54b2d33e0 100644
--- a/source/text/simpress/01/0525.xhp
+++ b/source/text/simpress/01/0525.xhp
@@ -36,7 +36,7 @@
   
 
 
-
+
 
 
 
diff --git a/source/text/swriter/main0205.xhp b/source/text/swriter/main0205.xhp
index 39b83d259..191ffe6fd 100644
--- a/source/text/swriter/main0205.xhp
+++ b/source/text/swriter/main0205.xhp
@@ -60,8 +60,8 @@
 
 
 
-
-
+
+
 
 
 
diff --git a/source/text/swriter/main0215.xhp b/source/text/swriter/main0215.xhp
index b45936955..e52761570 100644
--- a/source/text/swriter/main0215.xhp
+++ b/source/text/swriter/main0215.xhp
@@ -70,8 +70,8 @@
 Frame 
Properties
 
 
-
-
+
+
 
 
 
diff --git a/source/text/swriter/main0216.xhp b/source/text/swriter/main0216.xhp
index ddd9e489f..f39df1599 100644
--- a/source/text/swriter/main0216.xhp
+++ b/source/text/swriter/main0216.xhp
@@ -70,8 +70,8 @@
 Object 
Properties
 
 
-
-
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Johnny_M (via logerrit)]

 source/text/scalc/01/format_graphic.xhp  |2 +-
 source/text/scalc/main0203.xhp   |4 ++--
 source/text/schart/01/05010100.xhp   |2 +-
 source/text/schart/01/05010200.xhp   |2 +-
 source/text/schart/01/05020100.xhp   |2 +-
 source/text/schart/01/05020200.xhp   |2 +-
 source/text/schart/01/0503.xhp   |2 +-
 source/text/schart/01/05040100.xhp   |2 +-
 source/text/schart/01/05040200.xhp   |2 +-
 source/text/schart/01/05050100.xhp   |2 +-
 source/text/schart/01/0506.xhp   |2 +-
 source/text/schart/01/0507.xhp   |2 +-
 source/text/schart/01/0508.xhp   |2 +-
 source/text/sdraw/main0202.xhp   |4 ++--
 source/text/shared/00/00040502.xhp   |6 +++---
 source/text/shared/01/0520.xhp   |6 +++---
 source/text/shared/01/05200100.xhp   |4 ++--
 source/text/simpress/main0202.xhp|4 ++--
 source/text/swriter/01/format_object.xhp |2 +-
 source/text/swriter/main0205.xhp |4 ++--
 20 files changed, 29 insertions(+), 29 deletions(-)

New commits:
commit 7d722e323b259f9f16f738957eb47c3bea5b4700
Author: Johnny_M 
AuthorDate: Sat Oct 24 15:16:04 2020 +0200
Commit: Olivier Hallot 
CommitDate: Sat Oct 24 17:45:05 2020 +0200

tdf#132643 Translate German section IDs

Change-Id: Ic363b3163b757f11cdd8905e9eccfedf7acfb10e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104752
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/scalc/01/format_graphic.xhp 
b/source/text/scalc/01/format_graphic.xhp
index d07f0a646..291ca395d 100644
--- a/source/text/scalc/01/format_graphic.xhp
+++ b/source/text/scalc/01/format_graphic.xhp
@@ -36,7 +36,7 @@
 Opens a submenu to edit the properties of the selected 
object.
 
 
-
+
 
 Define Text Attributes
 Sets the layout 
and anchoring properties for text in the selected drawing or text 
object.
diff --git a/source/text/scalc/main0203.xhp b/source/text/scalc/main0203.xhp
index f7795501d..28b757baf 100644
--- a/source/text/scalc/main0203.xhp
+++ b/source/text/scalc/main0203.xhp
@@ -35,8 +35,8 @@
 Drawing 
Object Properties Bar
 The Drawing Object Properties Bar for 
objects that you select in the sheet contains formatting and alignment 
commands.
 
-
-
+
+
 
 
 Line 
Style
diff --git a/source/text/schart/01/05010100.xhp 
b/source/text/schart/01/05010100.xhp
index be2f8ed55..c67c535cf 100644
--- a/source/text/schart/01/05010100.xhp
+++ b/source/text/schart/01/05010100.xhp
@@ -37,7 +37,7 @@
   
   
 
-  
+  
   
   
   
diff --git a/source/text/schart/01/05010200.xhp 
b/source/text/schart/01/05010200.xhp
index 4ed724bfe..f6bebfdc1 100644
--- a/source/text/schart/01/05010200.xhp
+++ b/source/text/schart/01/05010200.xhp
@@ -32,7 +32,7 @@
 
   
 
-
+
 
 
 
diff --git a/source/text/schart/01/05020100.xhp 
b/source/text/schart/01/05020100.xhp
index 888cf0a31..a18228ff5 100644
--- a/source/text/schart/01/05020100.xhp
+++ b/source/text/schart/01/05020100.xhp
@@ -41,7 +41,7 @@
   
  
   
-  
+  
   
   
   
diff --git a/source/text/schart/01/05020200.xhp 
b/source/text/schart/01/05020200.xhp
index e74c4bd79..e4ac4b86e 100644
--- a/source/text/schart/01/05020200.xhp
+++ b/source/text/schart/01/05020200.xhp
@@ -35,7 +35,7 @@
 
   
 
-
+
 
 
 
diff --git a/source/text/schart/01/0503.xhp 
b/source/text/schart/01/0503.xhp
index 64868498c..4683a943b 100644
--- a/source/text/schart/01/0503.xhp
+++ b/source/text/schart/01/0503.xhp
@@ -30,7 +30,7 @@
 
   
 
-
+
 
 
 
diff --git a/source/text/schart/01/05040100.xhp 
b/source/text/schart/01/05040100.xhp
index cdc0cc77e..6b2ad0bdf 100644
--- a/source/text/schart/01/05040100.xhp
+++ b/source/text/schart/01/05040100.xhp
@@ -36,7 +36,7 @@
 
 The Y axis has an enhanced 
dialog. For X-Y charts, the X axis chart is also enhanced by the Scaling 
tab.
 Scaling the X axis is only possible in the X-Y chart 
type.
-
+
 
 
 
diff --git a/source/text/schart/01/05040200.xhp 
b/source/text/schart/01/05040200.xhp
index f50be17ec..fc5bdef01 100644
--- a/source/text/schart/01/05040200.xhp
+++ b/source/text/schart/01/05040200.xhp
@@ -36,7 +36,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/schart/01/05050100.xhp 
b/source/text/schart/01/05050100.xhp
index ce65a4f6b..131f6ac04 100644
--- a/source/text/schart/01/05050100.xhp
+++ b/source/text/schart/01/05050100.xhp
@@ -47,7 +47,7 @@
 
   
 
-
+
 
 
 
diff --git a/source/text/schart/01/0506.xhp 
b/source/text/schart/01/0506.xhp
index 130ece508..a8feea474 100644
--- a/source/text/schart/01/0506.xhp
+++ b/source/text/schart/01/0506.xhp
@@ -37,7 +37,7 @@
   
   
 
-  
+  
   
   
   
diff --git a/source/text/schart/01/0507.xhp 
b/source/text/schart/01/0507.xhp
index 80af699bb..2082f1233 100644
--- a/source/text/schart/01/0507.xhp
+++ b/source/text/schart/01/0507.xhp
@@ -40,7 +40,7 @@
 
   
 
-
+
 
 
 
diff --git a/source/text/schart/

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d2b8bc2dc2b3e35041e125d6974f1fd14ce8eedf
Author: Johnny_M 
AuthorDate: Sat Oct 24 17:45:05 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Sat Oct 24 17:45:05 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 7d722e323b259f9f16f738957eb47c3bea5b4700
  - tdf#132643 Translate German section IDs

Change-Id: Ic363b3163b757f11cdd8905e9eccfedf7acfb10e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104752
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 1474a3e00fd3..7d722e323b25 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1474a3e00fd3cf428e2a7bbf02404f3a7b47169e
+Subproject commit 7d722e323b259f9f16f738957eb47c3bea5b4700
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Seth Chaiklin (via logerrit)]

 source/text/shared/00/0401.xhp   |   72 
+-
 source/text/shared/01/ref_pdf_export_universal_accessibility.xhp |4 
 2 files changed, 38 insertions(+), 38 deletions(-)

New commits:
commit 1474a3e00fd3cf428e2a7bbf02404f3a7b47169e
Author: Seth Chaiklin 
AuthorDate: Fri Oct 23 02:59:12 2020 +0200
Commit: Olivier Hallot 
CommitDate: Sat Oct 24 17:39:16 2020 +0200

add missing paren

+ Ajdust icon size & alt contents
+ Fix dash vs comma

Change-Id: I3d193aad4ced081609f626c23f54bb04e77d26b8
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104676
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/00/0401.xhp 
b/source/text/shared/00/0401.xhp
index 862e74e90..a07198099 100644
--- a/source/text/shared/00/0401.xhp
+++ b/source/text/shared/00/0401.xhp
@@ -38,7 +38,7 @@
 
 
 
-Icon
+Icon New
 
 
 New
@@ -69,15 +69,15 @@
 Choose File - New - Business Cards - Private 
tab.
 Choose File - New - Business Cards - Business 
tab.
 
-Choose 
File - Open.
-CommandCtrl+O
+Choose 
File - Open.
+CommandCtrl+O
 On the 
Standard bar, click
 
 
 
 
 
-Icon
+Icon Open
 
 
 Open 
File
@@ -88,8 +88,8 @@
 
 
 
-Menu 
File - Open, File type Text Encoded 
selected.
-Menu 
File - Save As, File type Text Encoded 
selected.
+Menu 
File - Open, File type Text Encoded 
selected.
+Menu 
File - Save As, File type Text Encoded 
selected.
 
 Choose File - Wizards.
 Choose File - Wizards - 
Letter.
@@ -133,7 +133,7 @@
 Address Data Source Wizards - Field 
assignment
 Choose File - Close.
 
-Choose 
File - Save.
+Choose 
File - Save.
 CommandCtrl+S
   Open 
Standard or Table Data bar, click
 
@@ -141,7 +141,7 @@
 
 
 
-Icon
+Icon Save
 
 
 Save
@@ -156,7 +156,7 @@
 
 
 
-Icon
+Icon Save 
as
 
 
 Save 
As
@@ -173,10 +173,10 @@
 $[officename] Draw or $[officename] Impress menu File 
- Export, select HTML file type, page 5 of the 
wizard.
 $[officename] Draw or $[officename] Impress menu File 
- Export, select HTML file type, page 6 of the 
wizard.
 Choose File - Export, select a graphics 
file type. The dialog opens after you click 
Save.
-Choose File - Save All.
-Choose File - Save As.
+Choose File - Save All.
+Choose File - Save As.
 
-Choose 
File - Reload.
+Choose 
File - Reload.
 
 Choose File - Properties.
 Choose File - Properties - General 
tab.
@@ -206,7 +206,7 @@
 
 
 
-Icon
+Icon Print 
preview
 
 
 Print 
Preview
@@ -227,7 +227,7 @@
 
 
 
-Icon
+Icon Email 
Document
 
 
 Email 
Document
@@ -237,15 +237,15 @@
 
 
 
-Choose File - Export.
+Choose File - Export.
 
 
-   Choose File - Export As - Export as 
EPUB.
+   Choose File - Export As - Export as 
EPUB.




-   Export as EPUB
+Icon Export as EPUB



@@ -256,32 +256,32 @@
 
 
 
-Choose 
File - Export As - Export as PDF, Digital 
Signatures tab.
+Choose 
File - Export As - Export as PDF - Digital Signatures 
tab.
 
 
-Choose 
File - Export As - Export as PDF, Security 
tab.
+Choose 
File - Export As - Export as PDF - Security 
tab.
 
 
-Choose 
File - Export As - Export as PDF, General 
tab.
+Choose 
File - Export As - Export as PDF - General tab.
 
 
-Choose 
File - Export As - Export as PDF, Initial 
View tab.
+Choose 
File - Export As - Export as PDF - Initial View 
tab.
 
 
-Choose 
File - Export As - Export as PDF, Links 
tab.
+Choose 
File - Export As - Export as PDF - Links tab.
 
 
-Choose 
File - Export As - Export as PDF, User 
Interface tab.
+Choose 
File - Export As - Export as PDF - User Interface 
tab.
 
 
-Choose 
File - Export As - Export as PDF.
+Choose 
File - Export As - Export as PDF.
 
 
 
 
 
 
-Icon
+Icon Export Directly as 
PDF
 
 
 Export 
Directly as PDF
@@ -290,19 +290,19 @@
 
 
 
-Choose 
File - Send - Email as PDF.
+Choose 
File - Send - Email as PDF.
 
-Choose File - Send - Create Master 
Document.
+Choose File - Send - Create Master 
Document.
 
-Choose 
File - Print.
-CommandCtrl+P
+Choose 
File - Print.
+CommandCtrl+P
   On the 
Standard bar, click
 
 
 
 
 
-Icon
+Icon Print File 
Directly
 
 
 Print File 
Directly
@@ -318,7 +318,7 @@
 
 
 
-Icon
+Icon Print Page 
Preview
 
 
 Print Page 
Preview
@@ -333,13 +333,13 @@
 Choose 
File - Exit %PRODUCTNAME.
 CommandCtrl+Q
 
-Choose File - New - Master 
Document.
+Choose File - New - Master 
Document.
 
-Choose 
File - Open - File type, select Text CSV.
-Choose 
Data - Text to Columns (Calc).
+Choose 
File - Open - File type, select Text 
CSV.
+Choose 
Data - Text to Columns (Calc).
 
-Choose File - Export, if EPS is selected as file 
type, this dialog opens automatically.
-Choose File - Export, if PBM, PPM or PGM is 
selected as file type, the dialog opens automatically.
+Choose File - Export, if EPS is selected as 
file type, this dialog opens automatically.
+Choose File - Export, if PBM, PPM or PGM is 
selected a

[Libreoffice-commits] core.git: helpcontent2

[Seth Chaiklin (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 04fbc40fc698b530fd99dbe25636971fbd81f4b3
Author: Seth Chaiklin 
AuthorDate: Sat Oct 24 17:39:16 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Sat Oct 24 17:39:16 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 1474a3e00fd3cf428e2a7bbf02404f3a7b47169e
  - add missing paren

+ Ajdust icon size & alt contents
+ Fix dash vs comma

Change-Id: I3d193aad4ced081609f626c23f54bb04e77d26b8
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104676
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 4c9cd88154a6..1474a3e00fd3 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4c9cd88154a6130360ac550b7e406ea0b59a4994
+Subproject commit 1474a3e00fd3cf428e2a7bbf02404f3a7b47169e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/tvajngerl/staging' - 804 commits - accessibility/inc accessibility/source android/source autogen.sh avmedia/source basctl/source basctl/uiconfig basegfx

[Tomaž Vajngerl (via logerrit)]

Rebased ref, commits from common ancestor:
commit 87eb6a84dc358a7ea05136e555986db04760ecc8
Author: Tomaž Vajngerl 
AuthorDate: Tue May 22 14:44:39 2018 +0900
Commit: Tomaž Vajngerl 
CommitDate: Sat Oct 24 17:23:07 2020 +0200

Command Popup

Change-Id: I92cdd3130b8de42ee0863c9e7154e7c7246d9377

diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 88472346951c..d6b496971c21 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -383,7 +383,7 @@ class SvxSearchItem;
 
 // default-ids for windows
 
-// free (SID_SFX_START + 610)
+#define SID_COMMAND_POPUP   (SID_SFX_START + 610)
 #define SID_NEWWINDOW   (SID_SFX_START + 620)
 #define SID_CLOSEWIN(SID_SFX_START + 621)
 #define SID_VIEWSHELL   (SID_SFX_START + 623)
diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index b8a46cfc035a..2db3f82fc808 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -313,6 +313,12 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
   .uno:OptionsTreeDialog
 
   
+  
+
+  I10N SHORTCUTS - NO 
TRANSLATE
+  .uno:CommandPopup
+
+  
 
 
   
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index d7e9837838ad..3d4548574004 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6515,6 +6515,14 @@
   1
 
   
+  
+
+  Command Popup
+
+
+  1
+
+  
 
 
   
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index cb0b099eb37d..4c7d994de08d 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -296,6 +296,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
 sfx2/source/styles/StyleManager \
 sfx2/source/toolbox/tbxitem \
 sfx2/source/toolbox/weldutils \
+sfx2/source/view/CommandPopup \
 sfx2/source/view/classificationcontroller \
 sfx2/source/view/classificationhelper \
 sfx2/source/view/frame \
diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index 5bb91d7ac6f6..da64557e8964 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\
sfx2/uiconfig/ui/classificationbox \
sfx2/uiconfig/ui/cmisinfopage \
sfx2/uiconfig/ui/cmisline \
+   sfx2/uiconfig/ui/commandpopup \
sfx2/uiconfig/ui/custominfopage \
sfx2/uiconfig/ui/descriptioninfopage \
sfx2/uiconfig/ui/dockingwindow \
diff --git a/sfx2/sdi/frmslots.sdi b/sfx2/sdi/frmslots.sdi
index 09aafef95b7d..a7c8a472e73d 100644
--- a/sfx2/sdi/frmslots.sdi
+++ b/sfx2/sdi/frmslots.sdi
@@ -262,6 +262,11 @@ interface TopWindow : BrowseWindow
 ExecMethod = MiscExec_Impl ;
 StateMethod = MiscState_Impl ;
 ]
+SID_COMMAND_POPUP
+[
+ExecMethod = MiscExec_Impl ;
+StateMethod = MiscState_Impl ;
+]
 SID_CLOSEWIN // ole(no) api(final/play/rec)
 [
 ExecMethod = Exec_Impl ;
@@ -307,4 +312,3 @@ shell SfxViewFrame
 StateMethod = GetState_Impl ;
 ]
 }
-
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index a0de55dbfddb..bb76e2cbc56e 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -1271,6 +1271,23 @@ SfxStringItem FullName SID_DOCFULLNAME
 GroupId = ;
 ]
 
+SfxVoidItem CommandPopup SID_COMMAND_POPUP
+[
+AutoUpdate = TRUE,
+FastCall = FALSE,
+ReadOnlyDoc = TRUE,
+Toggle = FALSE,
+Container = TRUE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+Asynchron;
+
+
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+ToolBoxConfig = TRUE,
+GroupId = SfxGroupId::View;
+]
 
 SfxBoolItem FullScreen SID_WIN_FULLSCREEN
 
diff --git a/sfx2/source/view/CommandPopup.cxx 
b/sfx2/source/view/CommandPopup.cxx
new file mode 100644
index ..0bbe8adba5b2
--- /dev/null
+++ b/sfx2/source/view/CommandPopup.cxx
@@ -0,0 +1,220 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ */
+
+#include "CommandPopup.hxx"
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+#include 
+
+#include 
+
+using namespace css;
+
+CommandListBox::CommandListBox(vcl::Wi

[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - 243 commits - accessibility/inc accessibility/source avmedia/source basctl/source basctl/uiconfig basegfx/source basic/source bin/li

[Tomaž Vajngerl (via logerrit)]

Rebased ref, commits from common ancestor:
commit c8863f05497c0923a2d28d0f1efe10f313f667f4
Author: Tomaž Vajngerl 
AuthorDate: Wed Oct 21 21:07:40 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Sat Oct 24 17:15:12 2020 +0200

remove linestartendattribute.hxx from clang-format excludelist

Change-Id: I2d6cef1d3dff33c6cb2695c645d4f30e899c4616

diff --git a/include/drawinglayer/attribute/linestartendattribute.hxx 
b/include/drawinglayer/attribute/linestartendattribute.hxx
index ea2bf22235fd..f894a335da4c 100644
--- a/include/drawinglayer/attribute/linestartendattribute.hxx
+++ b/include/drawinglayer/attribute/linestartendattribute.hxx
@@ -22,48 +22,47 @@
 #include 
 #include 
 
-namespace basegfx {
-class B2DPolyPolygon;
+namespace basegfx
+{
+class B2DPolyPolygon;
 }
 
-namespace drawinglayer::attribute {
-class ImpLineStartEndAttribute;
+namespace drawinglayer::attribute
+{
+class ImpLineStartEndAttribute;
 }
 
-
 namespace drawinglayer::attribute
-{
-class DRAWINGLAYER_DLLPUBLIC LineStartEndAttribute
-{
-public:
-typedef o3tl::cow_wrapper< ImpLineStartEndAttribute > ImplType;
+{
+class DRAWINGLAYER_DLLPUBLIC LineStartEndAttribute
+{
+public:
+typedef o3tl::cow_wrapper ImplType;
 
-private:
-ImplType mpLineStartEndAttribute;
+private:
+ImplType mpLineStartEndAttribute;
 
-public:
-/// constructors/assignmentoperator/destructor
-LineStartEndAttribute(
-double fWidth,
-const basegfx::B2DPolyPolygon& rPolyPolygon,
-bool bCentered);
-LineStartEndAttribute();
-LineStartEndAttribute(const LineStartEndAttribute&);
-LineStartEndAttribute& operator=(const LineStartEndAttribute&);
-~LineStartEndAttribute();
+public:
+/// constructors/assignmentoperator/destructor
+LineStartEndAttribute(double fWidth, const basegfx::B2DPolyPolygon& 
rPolyPolygon,
+  bool bCentered);
+LineStartEndAttribute();
+LineStartEndAttribute(const LineStartEndAttribute&);
+LineStartEndAttribute& operator=(const LineStartEndAttribute&);
+~LineStartEndAttribute();
 
-// checks if the incarnation is default constructed
-bool isDefault() const;
+// checks if the incarnation is default constructed
+bool isDefault() const;
 
-// compare operator
-bool operator==(const LineStartEndAttribute& rCandidate) const;
+// compare operator
+bool operator==(const LineStartEndAttribute& rCandidate) const;
 
-// data read access
-double getWidth() const;
-const basegfx::B2DPolyPolygon& getB2DPolyPolygon() const;
-bool isCentered() const;
-bool isActive() const;
-};
+// data read access
+double getWidth() const;
+const basegfx::B2DPolyPolygon& getB2DPolyPolygon() const;
+bool isCentered() const;
+bool isActive() const;
+};
 
 } // end of namespace drawinglayer::attribute
 
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 1d6138d1af43..3280f68e3812 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -5713,7 +5713,6 @@ include/desktop/exithelper.h
 include/desktop/minidump.hxx
 include/drawinglayer/XShapeDumper.hxx
 include/drawinglayer/animation/animationtiming.hxx
-include/drawinglayer/attribute/linestartendattribute.hxx
 include/drawinglayer/attribute/materialattribute3d.hxx
 include/drawinglayer/attribute/sdrallattribute3d.hxx
 include/drawinglayer/attribute/sdrfillattribute.hxx
commit 00dd69cb0e4ac94ff62cd5254cbe2cdbda449678
Author: Tomaž Vajngerl 
AuthorDate: Wed Oct 21 21:05:51 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Sat Oct 24 17:15:12 2020 +0200

pragma once for linestartendattribute.hxx

Change-Id: Ic5fbc26d35c17159667dbf3a0e579789d14677f0

diff --git a/include/drawinglayer/attribute/linestartendattribute.hxx 
b/include/drawinglayer/attribute/linestartendattribute.hxx
index bceeb378eec4..ea2bf22235fd 100644
--- a/include/drawinglayer/attribute/linestartendattribute.hxx
+++ b/include/drawinglayer/attribute/linestartendattribute.hxx
@@ -17,15 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINESTARTENDATTRIBUTE_HXX
-#define INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINESTARTENDATTRIBUTE_HXX
+#pragma once
 
 #include 
 #include 
 
-
-// predefines
-
 namespace basegfx {
 class B2DPolyPolygon;
 }
@@ -71,7 +67,4 @@ namespace drawinglayer::attribute
 
 } // end of namespace drawinglayer::attribute
 
-
-#endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINESTARTENDATTRIBUTE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 44efd7a076ecac0509fdc3388e5a034ff0bd8f04
Author: Tomaž Vajngerl 
AuthorDate: Wed Oct 21 21:01:43 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Sat O

[Libreoffice-commits] core.git: sc/qa uitest/calc_tests

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/autofilter/autofilter.py |7 +++
 sc/qa/uitest/autofilter/tdf117276.py  |8 +++-
 sc/qa/uitest/autofilter/tdf117276_autofilter_reset.py |6 +++---
 sc/qa/uitest/autofilter/tdf122260.py  |6 +++---
 sc/qa/uitest/autofilter/tdf130070.py  |8 +++-
 sc/qa/uitest/calc_tests/CalcPasteOnly.py  |4 
 sc/qa/uitest/calc_tests/tdf133855.py  |5 +++--
 sc/qa/uitest/calc_tests2/tdf37623.py  |3 +--
 sc/qa/uitest/calc_tests3/tdf68290.py  |7 ---
 sc/qa/uitest/calc_tests4/tdf131170.py |5 +++--
 sc/qa/uitest/calc_tests4/tdf85403.py  |4 ++--
 sc/qa/uitest/calc_tests4/trackedChanges.py|7 +++
 sc/qa/uitest/calc_tests6/tdf121263.py |3 ---
 sc/qa/uitest/calc_tests8/navigator.py |5 +++--
 sc/qa/uitest/calc_tests8/tdf119343.py |3 +--
 sc/qa/uitest/chart/tdf129587.py   |5 +++--
 sc/qa/uitest/conditional_format/tdf96453.py   |9 +++--
 sc/qa/uitest/search_replace/replace.py|9 +++--
 sc/qa/uitest/search_replace/tdf132783.py  |5 +++--
 19 files changed, 47 insertions(+), 62 deletions(-)

New commits:
commit c7caec046f8bfff8c46fc930738f29631cf16df9
Author: Xisco Fauli 
AuthorDate: Fri Oct 23 14:59:03 2020 +0200
Commit: Xisco Fauli 
CommitDate: Sat Oct 24 14:30:09 2020 +0200

uitest: sc: get_url_for_data_file -> pathlib.Path

Change-Id: Iea16b30e74a5bbc5fe155f1265d5c05bf104995c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104729
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/autofilter/autofilter.py 
b/sc/qa/uitest/autofilter/autofilter.py
index abb776ea8b99..a97a9fe1f3db 100644
--- a/sc/qa/uitest/autofilter/autofilter.py
+++ b/sc/qa/uitest/autofilter/autofilter.py
@@ -7,14 +7,13 @@
 
 from uitest.framework import UITestCase
 from uitest.uihelper.common import get_state_as_dict
-from uitest.path import get_srcdir_url
-
 from libreoffice.uno.propertyvalue import mkPropertyValues
 from libreoffice.calc.document import get_row
-
+import org.libreoffice.unotest
+import pathlib
 
 def get_url_for_data_file(file_name):
-return get_srcdir_url() + "/sc/qa/uitest/autofilter/data/" + file_name
+return 
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
 
 def is_row_hidden(doc, index):
 row = get_row(doc, index)
diff --git a/sc/qa/uitest/autofilter/tdf117276.py 
b/sc/qa/uitest/autofilter/tdf117276.py
index fabfa1d9a7b2..6ea392fc787b 100644
--- a/sc/qa/uitest/autofilter/tdf117276.py
+++ b/sc/qa/uitest/autofilter/tdf117276.py
@@ -7,13 +7,11 @@
 from uitest.framework import UITestCase
 from libreoffice.uno.propertyvalue import mkPropertyValues
 from libreoffice.calc.document import get_row
-# import org.libreoffice.unotest
-# import pathlib
-from uitest.path import get_srcdir_url
+import org.libreoffice.unotest
+import pathlib
 
 def get_url_for_data_file(file_name):
-#return 
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
-return get_srcdir_url() + "/sc/qa/uitest/autofilter/data/" + file_name
+return 
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
 
 def is_row_hidden(doc, index):
 row = get_row(doc, index)
diff --git a/sc/qa/uitest/autofilter/tdf117276_autofilter_reset.py 
b/sc/qa/uitest/autofilter/tdf117276_autofilter_reset.py
index da681fb0fd18..f065e6455ebf 100644
--- a/sc/qa/uitest/autofilter/tdf117276_autofilter_reset.py
+++ b/sc/qa/uitest/autofilter/tdf117276_autofilter_reset.py
@@ -8,11 +8,11 @@ from uitest.framework import UITestCase
 from uitest.uihelper.calc import enter_text_to_cell
 from libreoffice.uno.propertyvalue import mkPropertyValues
 from libreoffice.calc.document import get_row
-from uitest.path import get_srcdir_url
-
+import org.libreoffice.unotest
+import pathlib
 
 def get_url_for_data_file(file_name):
-return get_srcdir_url() + "/sc/qa/uitest/autofilter/data/" + file_name
+return 
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
 
 def is_row_hidden(doc, index):
 row = get_row(doc, index)
diff --git a/sc/qa/uitest/autofilter/tdf122260.py 
b/sc/qa/uitest/autofilter/tdf122260.py
index a1e09f25ab7f..5d9977b7f731 100644
--- a/sc/qa/uitest/autofilter/tdf122260.py
+++ b/sc/qa/uitest/autofilter/tdf122260.py
@@ -7,11 +7,11 @@
 from uitest.framework import UITestCase
 from libreoffice.uno.propertyvalue import mkPropertyValues
 from libreoffice.calc.document import get_row
+import org.libreoffice.unotest
+import pathlib
 
-
-from uitest.path import get_srcdir_url
 def get_url_for_data_file(file_name):
-return get_srcdir_url() + "/sc/qa/uitest/autofilter/data/" + file_name
+return 
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file

[Libreoffice-commits] core.git: sw/qa sw/source

[László Németh (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter2.cxx |   33 +
 sw/source/core/undo/unredln.cxx |6 ++
 2 files changed, 39 insertions(+)

New commits:
commit fe1fc9615511994ac128e52f9ad1cda4e86188f5
Author: László Németh 
AuthorDate: Thu Oct 22 17:49:56 2020 +0200
Commit: László Németh 
CommitDate: Sat Oct 24 14:26:51 2020 +0200

tdf#137684 sw ChangesInMargin: fix crash on Undo of characters

deleted by pressing Delete.

Follow-up of commit 62596e7f52492305b49dab70bdf81daf82b930a1
(tdf#137526 sw ChangesInMargin: fix Undo of deleted words).

Change-Id: I1a3c3e446f67de94ff3b750b45421f9bc93e5cc2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104691
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index b59708576b6b..0d3b1aee820c 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -1892,6 +1892,39 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf137526)
 CPPUNIT_ASSERT(!pWrtShell->GetViewOptions()->IsShowChangesInMargin());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf137684)
+{
+load(DATA_DIRECTORY, "tdf132160.odt");
+
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+// switch on "Show changes in margin" mode
+dispatchCommand(mxComponent, ".uno:ShowChangesInMargin", {});
+
+SwWrtShell* const pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+CPPUNIT_ASSERT(pWrtShell->GetViewOptions()->IsShowChangesInMargin());
+
+// select and delete a word letter by letter
+for (int i = 0; i <= 10; ++i)
+{
+dispatchCommand(mxComponent, ".uno:Delete", {});
+}
+CPPUNIT_ASSERT(getParagraph(1)->getString().startsWith("support"));
+
+// this would crash due to bad redline range
+for (int i = 0; i <= 10; ++i)
+{
+dispatchCommand(mxComponent, ".uno:Undo", {});
+}
+// TODO: fix order of the characters after Undo
+CPPUNIT_ASSERT(getParagraph(1)->getString().startsWith(" noitpyrcnE"));
+
+// switch off "Show changes in margin" mode
+dispatchCommand(mxComponent, ".uno:ShowChangesInMargin", {});
+CPPUNIT_ASSERT(!pWrtShell->GetViewOptions()->IsShowChangesInMargin());
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf52391)
 {
 load(DATA_DIRECTORY, "tdf52391.fodt");
diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx
index d2d60b60841f..1d48861a4432 100644
--- a/sw/source/core/undo/unredln.cxx
+++ b/sw/source/core/undo/unredln.cxx
@@ -97,6 +97,12 @@ void SwUndoRedline::UndoImpl(::sw::UndoRedoContext & 
rContext)
 if ( pRedline && !pRedline->IsVisible() )
 {
 const SwRedlineTable& rTable = 
rDoc.getIDocumentRedlineAccess().GetRedlineTable();
+// skip older redlines in the same position
+while ( nCurRedlinePos + 1 < rTable.size() &&
+*pRedline->GetPoint() == *rTable[nCurRedlinePos + 1]->GetPoint() )
+{
+++nCurRedlinePos;
+}
 SwRangeRedline * pHiddenRedline( rTable[nCurRedlinePos] );
 pHiddenRedline->Show(0, rTable.GetPos(pHiddenRedline), 
/*bForced=*/true);
 pHiddenRedline->Show(1, rTable.GetPos(pHiddenRedline), 
/*bForced=*/true);
___
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' - icon-themes/colibre icon-themes/colibre_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/colibre/cmd/32/bold.png|binary
 icon-themes/colibre/cmd/32/ca/bold.png |binary
 icon-themes/colibre/cmd/32/ca/italic.png   |binary
 icon-themes/colibre/cmd/32/ca/underline.png|binary
 icon-themes/colibre/cmd/32/ca/underlinedouble.png  |binary
 icon-themes/colibre/cmd/32/de/bold.png |binary
 icon-themes/colibre/cmd/32/de/italic.png   |binary
 icon-themes/colibre/cmd/32/defaultcharstyle.png|binary
 icon-themes/colibre/cmd/32/emphasischarstyle.png   |binary
 icon-themes/colibre/cmd/32/fr/bold.png |binary
 icon-themes/colibre/cmd/32/heading1parastyle.png   |binary
 icon-themes/colibre/cmd/32/heading2parastyle.png   |binary
 icon-themes/colibre/cmd/32/heading3parastyle.png   |binary
 icon-themes/colibre/cmd/32/heading4parastyle.png   |binary
 icon-themes/colibre/cmd/32/heading5parastyle.png   |binary
 icon-themes/colibre/cmd/32/heading6parastyle.png   |binary
 icon-themes/colibre/cmd/32/hu/italic.png   |binary
 icon-themes/colibre/cmd/32/hu/underline.png|binary
 icon-themes/colibre/cmd/32/hu/underlinedouble.png  |binary
 icon-themes/colibre/cmd/32/italic.png  |binary
 icon-themes/colibre/cmd/32/km/bold.png |binary
 icon-themes/colibre/cmd/32/km/italic.png   |binary
 icon-themes/colibre/cmd/32/km/underline.png|binary
 icon-themes/colibre/cmd/32/km/underlinedouble.png  |binary
 icon-themes/colibre/cmd/32/ko/bold.png |binary
 icon-themes/colibre/cmd/32/ko/charfontname.png |binary
 icon-themes/colibre/cmd/32/ko/color.png|binary
 icon-themes/colibre/cmd/32/ko/grow.png |binary
 icon-themes/colibre/cmd/32/ko/italic.png   |binary
 icon-themes/colibre/cmd/32/ko/outlinefont.png  |binary
 icon-themes/colibre/cmd/32/ko/overline.png |binary
 icon-themes/colibre/cmd/32/ko/resetattributes.png  |binary
 icon-themes/colibre/cmd/32/ko/shadowed.png |binary
 icon-themes/colibre/cmd/32/ko/strikeout.png|binary
 icon-themes/colibre/cmd/32/ko/underline.png|binary
 icon-themes/colibre/cmd/32/ko/underlinedouble.png  |binary
 icon-themes/colibre/cmd/32/nl/bold.png |binary
 icon-themes/colibre/cmd/32/nl/underline.png|binary
 icon-themes/colibre/cmd/32/nl/underlinedouble.png  |binary
 icon-themes/colibre/cmd/32/overline.png|binary
 icon-themes/colibre/cmd/32/pl/underline.png|binary
 icon-themes/colibre/cmd/32/pl/underlinedouble.png  |binary
 icon-themes/colibre/cmd/32/preformattedparastyle.png   |binary
 icon-themes/colibre/cmd/32/quotecharstyle.png  |binary
 icon-themes/colibre/cmd/32/quoteparastyle.png  |binary
 icon-themes/colibre/cmd/32/ru/bold.png |binary
 icon-themes/colibre/cmd/32/ru/underline.png|binary
 icon-themes/colibre/cmd/32/ru/underlinedouble.png  |binary
 icon-themes/colibre/cmd/32/shadowed.png|binary
 icon-themes/colibre/cmd/32/sl/bold.png |binary
 icon-themes/colibre/cmd/32/sl/italic.png   |binary
 icon-themes/colibre/cmd/32/sourcecharstyle.png |binary
 icon-themes/colibre/cmd/32/strikeout.png   |binary
 icon-themes/colibre/cmd/32/strongemphasischarstyle.png |binary
 icon-themes/colibre/cmd/32/subscript.png   |binary
 icon-themes/colibre/cmd/32/subtitleparastyle.png   |binary
 icon-themes/colibre/cmd/32/superscript.png |binary
 icon-themes/colibre/cmd/32/textbodyparastyle.png   |binary
 icon-themes/colibre/cmd/32/titleparastyle.png  |binary
 icon-themes/colibre/cmd/32/tr/italic.png   |binary
 icon-themes/colibre/cmd/32/underline.png   |binary
 icon-themes/colibre/cmd/32/underlinedouble.png |binary
 icon-themes/colibre/cmd/ca/lc_bold.png |binary
 icon-themes/colibre/cmd/ca/lc_italic.png   |binary
 icon-themes/colibre/cmd/ca/lc_underline.png|binary
 icon-themes/colibre/cmd/ca/lc_underlinedouble.png  |binary
 icon-themes/colibre/cmd/ca/sc_bold.png |binary
 icon-themes/colibre/cmd/ca/sc_italic.png   |binary
 icon-themes/colibre/cmd/ca/sc_underline.png|binary
 icon-themes/colibre/cmd/ca/sc_underlinedouble.png  |binary
 icon-themes/colibre/cmd/de/lc_bold.png |binary
 icon-themes/colibre/cmd/de/lc_italic.png   |binary
 icon-themes/colibre/cmd/de/sc_bold.png |binary
 icon-themes/colibre/cmd/de/sc_ital

[Libreoffice-commits] core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f359366aca6efcf1288ca9ebe5716b370daf31dc
Author: Ilmari Lauhakangas 
AuthorDate: Sat Oct 24 12:58:50 2020 +0300
Commit: Gerrit Code Review 
CommitDate: Sat Oct 24 11:58:50 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 4c9cd88154a6130360ac550b7e406ea0b59a4994
  - Use z-index: 100 for TopLeftHeader

The tooltip functionality was making things messy with the sticky header

Change-Id: I8a77b11c950c54f00bde0c040a2945f503f993b5
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104749
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index 4e397eae35d1..4c9cd88154a6 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4e397eae35d108b7167cbafd9ad8da371c21dbad
+Subproject commit 4c9cd88154a6130360ac550b7e406ea0b59a4994
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: help3xsl/default.css

[Ilmari Lauhakangas (via logerrit)]

 help3xsl/default.css |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4c9cd88154a6130360ac550b7e406ea0b59a4994
Author: Ilmari Lauhakangas 
AuthorDate: Sat Oct 24 12:46:27 2020 +0300
Commit: Ilmari Lauhakangas 
CommitDate: Sat Oct 24 11:58:50 2020 +0200

Use z-index: 100 for TopLeftHeader

The tooltip functionality was making things messy with the sticky header

Change-Id: I8a77b11c950c54f00bde0c040a2945f503f993b5
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104749
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 

diff --git a/help3xsl/default.css b/help3xsl/default.css
index bd4819181..197052902 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -340,6 +340,7 @@ h6 {
 display: flex;
 flex-wrap: wrap;
 justify-content: flex-start;
+z-index: 100;
 }
 .dropdowns {
 /* allow for scrolling */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/LibreOfficeKit solenv/bin

[Gleb Popov (via logerrit)]

 include/LibreOfficeKit/LibreOfficeKitInit.h |2 +-
 solenv/bin/concat-deps.c|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4e94fe97236e9dd169f00801980e369d67c6cda6
Author: Gleb Popov <6year...@gmail.com>
AuthorDate: Fri Oct 23 12:34:24 2020 +0400
Commit: Mike Kaganski 
CommitDate: Sat Oct 24 11:04:21 2020 +0200

Fix remaining invalid usages of __FreeBSD_kernel__ define.

Change-Id: Ib4b412353dc93434a5669fd92d220f64d9747fe8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104710
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h 
b/include/LibreOfficeKit/LibreOfficeKitInit.h
index ff541fb2c113..8a48bd8392be 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -345,7 +345,7 @@ int lok_preinit( const char *install_path,  const char 
*user_profile_url )
 
 #undef SEPARATOR // It is used at least in enum class MenuItemType
 
-#endif // defined(__linux__) || defined (__FreeBSD_kernel__) || defined(_AIX) 
|| defined(_WIN32) || defined(__APPLE__)
+#endif // defined(__linux__) || defined (__FreeBSD__) || defined(_AIX) || 
defined(_WIN32) || defined(__APPLE__)
 
 #ifdef __cplusplus
 }
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 09416f103515..155328bf9360 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -32,7 +32,7 @@
 #define CORE_LITTLE_ENDIAN
 #endif /* Def _MSC_VER */
 
-#if defined(__linux) || defined(__FreeBSD_kernel__)
+#if defined(__linux) || defined(__FreeBSD__)
 #include 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
 #undef CORE_BIG_ENDIAN
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig extras/source vcl/Package_tipoftheday.mk

[Heiko Tietze (via logerrit)]

 cui/inc/tipoftheday.hrc|2 
 cui/source/dialogs/tipofthedaydlg.cxx  |   28 --
 cui/source/inc/tipofthedaydlg.hxx  |7 ++
 cui/uiconfig/ui/tipofthedaydialog.ui   |   79 +
 extras/source/tipoftheday/marchingants.gif |binary
 vcl/Package_tipoftheday.mk |1 
 6 files changed, 56 insertions(+), 61 deletions(-)

New commits:
commit 92ab0afa1c36bfbc99de25a53a108b6f28e0e627
Author: Heiko Tietze 
AuthorDate: Fri Oct 23 13:30:17 2020 +0200
Commit: Heiko Tietze 
CommitDate: Sat Oct 24 10:12:08 2020 +0200

Show animated GIFs in TotD

marchingants.gif added as an example

Change-Id: I555aebc4a4e191b8afb4be06dfc1e5f3e6d1a911
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104718
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index e78d4aaa019d..0448f6dd87cc 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -133,7 +133,7 @@ const std::tuple 
TIPOFTHEDAY_STRINGARRAY[] =
  { NC_("RID_CUI_TIPOFTHEDAY", "Date/time value is just a number of days 
since a chosen day zero; in the number, integer part represents date, and 
fractional part is time (elapsed part of a day), with 0.5 representing noon."), 
"", "tipoftheday_c.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Shift+%MOD1+Del deletes from cursor to the 
end of the current sentence."), "", "tipoftheday_w.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Use column or row labels in formulas. For 
example, if you have two columns, “Time” and “KM”, use =Time/KM to get minutes 
per kilometer."), "", "tipoftheday_c.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Annoyed by the “marching ants” around cells 
in Calc? Press escape to stop them; the copied content will remain available 
for pasting."), "", "tipoftheday_c.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Annoyed by the “marching ants” around cells 
in Calc? Press escape to stop them; the copied content will remain available 
for pasting."), "", "marchingants.gif"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Want to become a %PRODUCTNAME Ambassador? 
There are certifications for developers, admins, and trainers."), 
"http://www.documentfoundation.org/certification";, ""},
  { NC_("RID_CUI_TIPOFTHEDAY", "Mix portrait and landscape orientations in 
a Calc spreadsheet by applying different page styles on sheets."), "", 
"tipoftheday_c.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Click on the special character icon in the 
toolbar to get quick access to favorite and recent characters to insert."), "", 
""},
diff --git a/cui/source/dialogs/tipofthedaydlg.cxx 
b/cui/source/dialogs/tipofthedaydlg.cxx
index beed468ba5b6..b88369890529 100644
--- a/cui/source/dialogs/tipofthedaydlg.cxx
+++ b/cui/source/dialogs/tipofthedaydlg.cxx
@@ -25,8 +25,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 
 #include 
 #include 
@@ -46,11 +44,11 @@
 
 TipOfTheDayDialog::TipOfTheDayDialog(weld::Window* pParent)
 : GenericDialogController(pParent, "cui/ui/tipofthedaydialog.ui", 
"TipOfTheDayDialog")
-, m_pImage(m_xBuilder->weld_image("imImage"))
 , m_pText(m_xBuilder->weld_label("lbText"))
 , m_pShowTip(m_xBuilder->weld_check_button("cbShowTip"))
 , m_pNext(m_xBuilder->weld_button("btnNext"))
 , m_pLink(m_xBuilder->weld_link_button("btnLink"))
+, m_pPreview(new weld::CustomWeld(*m_xBuilder, "imPreview", m_aPreview))
 {
 
m_pShowTip->set_active(officecfg::Office::Common::Misc::ShowTipOfTheDay::get());
 m_pNext->connect_clicked(LINK(this, TipOfTheDayDialog, OnNextClick));
@@ -62,6 +60,8 @@ TipOfTheDayDialog::TipOfTheDayDialog(weld::Window* pParent)
 if (m_nDay > officecfg::Office::Common::Misc::LastTipOfTheDayShown::get())
 m_nCurrentTip++;
 
+m_aPreview.init(&m_aGraphic, LINK(this, TipOfTheDayDialog, ImplModifyHdl));
+
 UpdateTip();
 }
 
@@ -172,20 +172,16 @@ void TipOfTheDayDialog::UpdateTip()
 // image
 OUString aURL("$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/tipoftheday/");
 rtl::Bootstrap::expandMacros(aURL);
-OUString aImage = sImage;
+OUString aImageName = sImage;
 // use default image if none is available with the number
-if (aImage.isEmpty() || !file_exists(aURL + aImage))
-aImage = "tipoftheday.png";
-// draw image
-Graphic aGraphic;
-if (GraphicFilter::LoadGraphic(aURL + aImage, OUString(), aGraphic) == 
ERRCODE_NONE)
-{
-ScopedVclPtr m_pVirDev = 
m_pImage->create_virtual_device();
-m_pVirDev->SetOutputSizePixel(aGraphic.GetSizePixel());
-m_pVirDev->DrawBitmapEx(Point(0, 0), aGraphic.GetBitmapEx());
-m_pImage->set_image(m_pVirDev.get());
-m_pVirDev.disposeAndClear();
-}
+if (aImageName.isEmpty() || !file_exists(aURL + aImageName))
+aImageName = "tipoftheday.png";
+GraphicFilter::LoadGraphic(aURL + aImageName, OUString(), m_aGraphic);
+}
+
+IMPL_LINK_NOARG(TipOfTheDayD