[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - 17 commits - configure.ac dbaccess/source helpcontent2 icon-themes/breeze icon-themes/breeze_dark icon-themes/colibre icon-themes/colibre_svg icon-themes/elementary icon-themes/elementary_svg icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_dark_svg icon-themes/sifr_svg include/o3tl include/svl package/source sc/inc sc/source svl/source sw/qa sw/source vcl/source vcl/unx writerfilter/source xmloff/source
Michael Weghorn (via logerrit)
logerrit at kemper.freedesktop.org
Mon May 18 15:05:05 UTC 2020
configure.ac | 18 +++-
dbaccess/source/ui/dlg/ConnectionPage.cxx | 1
helpcontent2 | 2
icon-themes/breeze/links.txt | 5 -
icon-themes/breeze_dark/links.txt | 5 -
icon-themes/colibre/links.txt | 9 --
icon-themes/colibre/res/fp010.png |binary
icon-themes/colibre/res/fp015.png |binary
icon-themes/colibre/svtools/res/folder.png |binary
icon-themes/colibre_svg/res/fp010.svg | 1
icon-themes/colibre_svg/res/fp015.svg | 2
icon-themes/colibre_svg/svtools/res/folder.svg | 2
icon-themes/elementary/fpicker/res/fp015.png |binary
icon-themes/elementary/links.txt | 5 -
icon-themes/elementary/res/fp015.png |binary
icon-themes/elementary/sfx2/res/grip.png |binary
icon-themes/elementary_svg/fpicker/res/fp015.svg | 1
icon-themes/elementary_svg/res/fp015.svg | 1
icon-themes/elementary_svg/sfx2/res/grip.svg | 2
icon-themes/sifr/links.txt | 11 +-
icon-themes/sifr/res/fp015.png |binary
icon-themes/sifr/svtools/res/folder.png |binary
icon-themes/sifr_dark/links.txt | 11 +-
icon-themes/sifr_dark/res/fp015.png |binary
icon-themes/sifr_dark/svtools/res/folder.png |binary
icon-themes/sifr_dark_svg/res/fp015.svg | 1
icon-themes/sifr_dark_svg/svtools/res/folder.svg | 1
icon-themes/sifr_svg/res/fp015.svg | 1
icon-themes/sifr_svg/svtools/res/folder.svg | 1
include/o3tl/enumarray.hxx | 24 ++---
include/svl/macitem.hxx | 2
package/source/xstor/xstorage.hxx | 6 -
sc/inc/pivot.hxx | 1
sc/inc/scmatrix.hxx | 3
sc/source/core/data/pivot2.cxx | 8 -
sc/source/core/opencl/formulagroupcl.cxx | 4
svl/source/items/macitem.cxx | 12 --
svl/source/numbers/zformat.cxx | 16 +++
svl/source/numbers/zforscan.hxx | 1
sw/qa/extras/ooxmlexport/data/tdf132514.docx |binary
sw/qa/extras/ooxmlexport/data/tdf132766.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport12.cxx | 21 +---
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx | 16 +++
sw/qa/extras/ooxmlexport/ooxmlexport6.cxx | 10 ++
sw/source/core/inc/mvsave.hxx | 7 -
sw/source/core/unocore/unodraw.cxx | 11 ++
sw/source/filter/ww8/docxattributeoutput.cxx | 5 -
sw/source/filter/ww8/wrtw8num.cxx | 65 ++++++---------
sw/source/filter/ww8/ww8par.cxx | 5 -
sw/source/filter/ww8/ww8par.hxx | 1
vcl/source/app/salvtables.cxx | 10 ++
vcl/source/window/paint.cxx | 6 -
vcl/unx/gtk3/gtk3gtkinst.cxx | 12 +-
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 3
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 17 +++
writerfilter/source/dmapper/DomainMapperTableManager.hxx | 3
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 10 --
writerfilter/source/dmapper/PropertyMap.hxx | 9 ++
xmloff/source/core/attrlist.cxx | 6 -
xmloff/source/style/xmlprmap.cxx | 17 ---
61 files changed, 204 insertions(+), 189 deletions(-)
New commits:
commit 3f98a148e689bf1c1a2c6c9fd6579bfd54b06672
Merge: 71a734b66731 0a4d3852794b
Author: Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Mon May 18 17:04:18 2020 +0200
Commit: Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Mon May 18 17:04:18 2020 +0200
Merge branch 'libreoffice-6-4'
into distro/lhm/libreoffice-6-4+backports
Change-Id: I6861987a5897fa12bf962d4274f1ce52c3efa05e
commit 0a4d3852794bae8887dc11613b47cb8d2c4aa829
Author: Vasily Melenchuk <vasily.melenchuk at cib.de>
AuthorDate: Tue May 5 15:47:44 2020 +0300
Commit: Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Mon May 18 12:54:28 2020 +0200
tdf#128665: sw: set unique name for shape format
Set name even if received shape name is empty. This is required
to have unique style name for undo/redo correct work.
Change-Id: I26cc8ec7ec831286c7afa8e17b94e6c0a270cf20
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93479
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94373
Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index b205802231df..698b05b5ac96 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -712,7 +712,16 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
if (pFormat)
{
if (pFormat->GetName().isEmpty())
- pFormat->SetName(pSvxShape->GetSdrObject()->GetName(), false);
+ {
+ if (pSvxShape->GetSdrObject()->GetName().isEmpty())
+ {
+ pFormat->SetName(pDoc->GetUniqueShapeName(), false);
+ }
+ else
+ {
+ pFormat->SetName(pSvxShape->GetSdrObject()->GetName(), false);
+ }
+ }
pShape->SetFrameFormat(pFormat);
}
pShape->m_bDescriptor = false;
commit 080dc8a2950261ea7d6cf69aff997b4fcc424fef
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Dec 6 16:59:34 2019 +0100
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Sun May 17 22:47:29 2020 +0200
loplugin:implicitboolconversion
...in non-dependent templated code that Clang trunk now apparently processes
more aggressively, presumably since <https://github.com/llvm/llvm-project/
commit/878a24ee244a24c39d1c57e9af2e88c621f7cce9> "Reapply 'Fix crash on switch
conditions of non-integer types in templates'"
Change-Id: I561d046c736b4e9574565c01daf0f59e7d5ec414
Reviewed-on: https://gerrit.libreoffice.org/84656
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93696
Reviewed-by: Tor Lillqvist <tml at collabora.com>
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index 27f3d2674ab7..f126311d5bf3 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1204,9 +1204,9 @@ public:
size_t GetWindowSize() const { return mpDVR->GetRefRowSize(); }
- size_t GetStartFixed() const { return bIsStartFixed; }
+ bool GetStartFixed() const { return bIsStartFixed; }
- size_t GetEndFixed() const { return bIsEndFixed; }
+ bool GetEndFixed() const { return bIsEndFixed; }
protected:
bool bIsStartFixed, bIsEndFixed;
commit b4836035432a722f171e2eb546e1e8080f2aef64
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Nov 25 17:05:45 2019 +0100
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Sun May 17 21:39:19 2020 +0200
Remove bogus enumarray[_const]_iterator assignment ops
...that write into the m_buf of reference type (or at least would try to if the
assignment op were ever instantiated for enumarray_const_iterator). They have
been present since a0032a2dc2e4ac7615baaacdde5fefa64048822e "improve
o3tl::enumarray const-ness" turned m_buf from a pointer to a reference. (Found
with recent Clang 10 trunk -Werror,-Wdeprecated-copy, cf.
<https://gerrit.libreoffice.org/#/c/83698/> "Remove some redundantly
user-declared copy ctors and assignment ops".)
But then at least some MSVC 2017 would still want to implicitly define them as
non-deleted (see <https://ci.libreoffice.org/job/gerrit_windows/50602/> trying
to build a prior version of this change) and fail, so change m_buf from
reference to pointer.
Change-Id: I3d4a420d2c4c6a6e966df74cfa33b5e00e0af5f6
Reviewed-on: https://gerrit.libreoffice.org/83701
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93693
Reviewed-by: Tor Lillqvist <tml at collabora.com>
diff --git a/include/o3tl/enumarray.hxx b/include/o3tl/enumarray.hxx
index ca012e197f27..a3c09d56bea0 100644
--- a/include/o3tl/enumarray.hxx
+++ b/include/o3tl/enumarray.hxx
@@ -85,7 +85,7 @@ public:
template<typename EA>
class enumarray_iterator {
- EA& m_buf;
+ EA* m_buf;
size_t m_pos;
public:
typedef enumarray_iterator<EA> self_type;
@@ -100,19 +100,17 @@ public:
typedef typename EA::value_type& reference;
enumarray_iterator(EA& b, size_t start_pos)
- : m_buf(b), m_pos(start_pos) {}
- value_type& operator*() const { return m_buf[static_cast<key_type>(m_pos)]; }
+ : m_buf(&b), m_pos(start_pos) {}
+ value_type& operator*() const { return (*m_buf)[static_cast<key_type>(m_pos)]; }
value_type* operator->() const { return &(operator*()); }
self_type& operator++() { ++m_pos; return *this; }
- bool operator!=(self_type const & other) const { return &m_buf != &other.m_buf || m_pos != other.m_pos; }
- bool operator==(self_type const & other) const { return &m_buf == &other.m_buf && m_pos == other.m_pos; }
- enumarray_iterator&
- operator=(self_type const & other) { m_buf = other.m_buf; m_pos = other.m_pos; return *this; }
+ bool operator!=(self_type const & other) const { return m_buf != other.m_buf || m_pos != other.m_pos; }
+ bool operator==(self_type const & other) const { return m_buf == other.m_buf && m_pos == other.m_pos; }
};
template<typename EA>
class enumarray_const_iterator {
- EA const & m_buf;
+ EA const * m_buf;
size_t m_pos;
public:
typedef enumarray_const_iterator<EA> self_type;
@@ -127,14 +125,12 @@ public:
typedef typename EA::value_type const & reference;
enumarray_const_iterator(EA const & b, size_t start_pos)
- : m_buf(b), m_pos(start_pos) {}
- value_type& operator*() const { return m_buf[static_cast<key_type>(m_pos)]; }
+ : m_buf(&b), m_pos(start_pos) {}
+ value_type& operator*() const { return (*m_buf)[static_cast<key_type>(m_pos)]; }
value_type* operator->() const { return &(operator*()); }
self_type& operator++() { ++m_pos; return *this; }
- bool operator!=(self_type const & other) const { return &m_buf != &other.m_buf || m_pos != other.m_pos; }
- bool operator==(self_type const & other) const { return &m_buf == &other.m_buf && m_pos == other.m_pos; }
- enumarray_const_iterator&
- operator=(self_type const & other) { m_buf = other.m_buf; m_pos = other.m_pos; return *this; }
+ bool operator!=(self_type const & other) const { return m_buf != other.m_buf || m_pos != other.m_pos; }
+ bool operator==(self_type const & other) const { return m_buf == other.m_buf && m_pos == other.m_pos; }
};
}; // namespace o3tl
commit 6475fd5b4db997d35b52cd5a3294044a62be9dc9
Author: Yunusemre Şentürk <yunusemre at collabora.com>
AuthorDate: Thu May 14 17:32:59 2020 +0300
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Sun May 17 20:44:10 2020 +0200
Fix typo.
It was causing "./configure: line 9997: =no: command not found"
when autogen.sh is used.
Change-Id: Iee57fb43c7bfbe4ac64ea5f995af05ddc8a26ad4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94004
Tested-by: Andras Timar <andras.timar at collabora.com>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94375
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/configure.ac b/configure.ac
index 8364138bdc96..614e40eb9497 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2147,7 +2147,7 @@ libo_FUZZ_ARG_WITH(latest-c++,
AS_HELP_STRING([--with-latest-c++],
[Try to enable the latest features of the C++ compiler, even if they are not yet part of a
published standard.]),,
- [$with_latest_c__=no])
+ [with_latest_c__=no])
dnl ===================================================================
dnl Branding
commit f0b74640137f07ed74027f98fbf6d1c0d98939bf
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Apr 20 11:40:24 2020 +0200
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Sun May 17 20:43:50 2020 +0200
Add --with-latest-c++ to explicitly opt in for -std=c++20/-std:c++latest
Adaptation of this change to this branch. The point is to avoid
compiling as C++2a as the code for externals has not been patched
properly for that here. Here is the original commit message even if I
assume it is a bit misleading in this branch:
cd472d1d8489f30797f47d3f6dafede28c1feb90 "Compile as C++2a, where available" had
started to unconditionally check for support of -std=c++2a (and later also
-std=c++20) for Clang and GCC, but that can cause occasional issues especially
for Linux distros, see e.g. 55c724b93dfd4c9a1afb10d60fbc2d7a9a66cf61 "replace
boost::bimap in sdext pdfimport" or
<https://bugzilla.redhat.com/show_bug.cgi?id=1818723>
"/usr/include/boost/format/alt_sstream_impl.hpp incompatible with -std=c++20
(std::allocator::allocate hint argument)" (where
677c8de4fa79cd9b278b142013ba7f1c9e4e41c3 "external/boost: Adapt to
std::allocator parts removed in C++20" is not picked up due to
--with-system-boost).
So better require an explicit opt-in via a new --with-latest-c++. And while at
it, also make that enable -std:c++latest for MSVC.
Change-Id: I2d1f03144fad9a7884562e56b1b76cab5eb8f080
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92555
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93204
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Tor Lillqvist <tml at collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93692
Tested-by: Tor Lillqvist <tml at collabora.com>
diff --git a/configure.ac b/configure.ac
index 78080305f3d6..8364138bdc96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2143,6 +2143,12 @@ libo_FUZZ_ARG_WITH(lxml,
report widget classes and ids.]),
,)
+libo_FUZZ_ARG_WITH(latest-c++,
+ AS_HELP_STRING([--with-latest-c++],
+ [Try to enable the latest features of the C++ compiler, even if they are not yet part of a
+ published standard.]),,
+ [$with_latest_c__=no])
+
dnl ===================================================================
dnl Branding
dnl ===================================================================
@@ -6456,9 +6462,17 @@ dnl ===================================================================
AC_MSG_CHECKING([whether $CXX_BASE supports C++17])
CXXFLAGS_CXX11=
if test "$COM" = MSC -a "$COM_IS_CLANG" != TRUE; then
- CXXFLAGS_CXX11='-std:c++17 -Zc:__cplusplus'
+ if test "$with_latest_c__" = yes; then
+ CXXFLAGS_CXX11=-std:c++latest
+ else
+ CXXFLAGS_CXX11=-std:c++17
+ fi
+ CXXFLAGS_CXX11="$CXXFLAGS_CXX11 -Zc:__cplusplus"
elif test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
- my_flags='-std=c++2a -std=c++17 -std=c++1z'
+ my_flags='-std=c++17 -std=c++1z'
+ if test "$with_latest_c__" = yes; then
+ my_flags="-std=gnu++2a -std=c++2a $my_flags"
+ fi
for flag in $my_flags; do
if test "$COM" = MSC; then
flag="-Xclang $flag"
commit 10444727db12d371e99c4ce4bdb74cf9ca8b87b8
Author: Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sat May 16 19:39:29 2020 +0200
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Sun May 17 11:20:34 2020 +0200
tdf#97416: fix Database password properties in ODB file not re-settable via UI
Just call save_state() of the checkbox
Change-Id: I3fa434b080efdcd284fba8e2f73d8e4846870576
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94363
Tested-by: Jenkins
Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94374
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 2fec1cee16b6..e763e3097c2d 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -238,6 +238,7 @@ namespace dbaui
m_xUserName->save_value();
m_xConnectionURL->save_value();
m_xJavaDriver->save_value();
+ m_xPasswordRequired->save_state();
}
}
commit 0bc91ebbe4e947d92a904401a3a05b293100fd51
Author: Eike Rathke <erack at redhat.com>
AuthorDate: Fri May 15 15:52:17 2020 +0200
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat May 16 21:05:44 2020 +0200
Handle conversion of locale modifiers not of the same originating locale
This popped up when attempting to replace the zh-CN keyword
'General' with '常规' for tdf#88233, which led to
CppunitTest_sc_subsequent_export_test failing for
ScExportTest::testNatNumInNumberFormatXLSX with
- Expected: [DBNum2][$-804]General;[RED][DBNum2][$-804]General
- Actual : [$-1F000804]ge\ner"al";[RED][$-1F000804]ge\ner"al"
The reason was that from the English format string loaded from .xlsx
[DBNum2][$-804]General;[RED][DBNum2][$-804]General
the resulting zh-CN format was
[DBNum2]General;[RED][DBNum2][$-804]General
like before, which when reparsed in a zh-CN locale now without the
'General' keyword first led to
[DBNum2]GEnERal;[RED][DBNum2][$-804]GEnERal
with GE and ER calendar keywords, which then is exported correctly as
[$-1F000804]ge\ner"al";[RED][$-1F000804]ge\ner"al"
So when detecting the "format belongs to another locale" condition
also switch the target locale of the ongoing conversion, which
results in the then correct
[DBNum2]常规;[RED][DBNum2][$-804]常规
exported as
[DBNum2][$-804]General;[RED][DBNum2][$-804]General
again.
Such could had happened with any format code using a [$-...]
locale modifier if keywords differ between originating and target
locale, but cases seem to be not that widespread.
Change-Id: Ib4d444a4085ace251d03e87498eb0f4871eadc8d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94313
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack at redhat.com>
(cherry picked from commit 18956dc02a936d781efe6800b7dc457ebda49fc2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94276
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index ce04f095c68f..01eb9c319d92 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -1036,6 +1036,22 @@ SvNumberformat::SvNumberformat(OUString& rString,
{
maLocale = aTmpLocale;
eLan = aTmpLocale.meLanguage; // return to caller
+
+ // Set new target locale also at scanner.
+ // We have to do this because switching locale
+ // may make replacing keywords and separators
+ // necessary.
+ // We can do this because it's the first
+ // subformat and we're still at parsing the
+ // modifiers, not keywords.
+ rScan.SetNewLnge( eLan);
+ // We can not force conversion though because
+ // the caller may have explicitly not set it.
+ // In the usual case the target locale is the
+ // originating locale the conversion is not
+ // necessary, when reading alien documents
+ // conversion is enabled anyway.
+
/* TODO: fiddle with scanner to make this
* known? A change in the locale may affect
* separators and keywords. On the other
diff --git a/svl/source/numbers/zforscan.hxx b/svl/source/numbers/zforscan.hxx
index 77f8eef513a8..a5e7ecaa8b3e 100644
--- a/svl/source/numbers/zforscan.hxx
+++ b/svl/source/numbers/zforscan.hxx
@@ -161,6 +161,7 @@ public:
bool GetConvertMode() const { return bConvertMode; }
LanguageType GetNewLnge() const { return eNewLnge; } // Read access on ConvertMode and convert country/language
LanguageType GetTmpLnge() const { return eTmpLnge; } // Read access on StartCountry/Language
+ void SetNewLnge( LanguageType e ) { eNewLnge = e; } // Set new convert country/language
/// get Thai T speciality
sal_uInt8 GetNatNumModifier() const { return nNatNumModifier; }
commit d6304a7db28f92bbe5cd98648aa133d64c05b5ff
Author: Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu May 14 12:31:55 2020 +0200
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri May 15 16:20:01 2020 +0200
tdf#132788 vcl: fix redraw on theme change
Regression from commit f4e0cc1ff145287f80738f070a8c46a64b2f76d1
(tdf#92079 vcl: fix missing image background on dialog from basic,
2019-06-13), the original scenario was about an unexpected change from
bitmap wallpaper to a non-bitmap one.
That means the condition for the above change can be more strict: just
restore the old wallpaper if it's now a non-bitmap one, otherwise leave
it alone. This way the above scenario keeps working and changing themes
again doesn't require a restart of the process.
(cherry picked from commit 52389ed19da6bcfdedef909532913ff3e2ab4afc)
Change-Id: I256372ad30184cc150d6819dd61cdd38af7d83ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94194
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index a99ae752de45..6e6b8b4bfe6c 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -302,9 +302,11 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion)
// direct painting
Wallpaper aBackground = m_pWindow->GetBackground();
m_pWindow->ApplySettings(*m_pWindow);
- // Restore lost bitmap background.
- if (aBackground.IsBitmap())
+ // Restore bitmap background if it was lost.
+ if (aBackground.IsBitmap() && !m_pWindow->GetBackground().IsBitmap())
+ {
m_pWindow->SetBackground(aBackground);
+ }
m_pWindow->PushPaintHelper(this, *m_pWindow);
m_pWindow->Paint(*m_pWindow, m_aPaintRect);
}
commit 98d3ef152b7655e1aab2023304d4644380d5850c
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri May 15 09:45:19 2020 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri May 15 13:19:53 2020 +0200
tdf#131333 SalMenus propogate to parent their selected id conditionally
Menu::Select depends on its handler returning false to allow propogating a
submens's selected id to its parent menu to become its selected id.
without this, while gen menus already have propogated this to its parent in
MenuFloatingWindow::EndExecute, SalMenus as used under kf5/macOS won't
propogate the selected id
Change-Id: I1d87cb0deacdf5fbfb837acc21c2d23b79525aae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94268
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Tested-by: Jenkins
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 9bfeb9997041..042008200709 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -930,7 +930,15 @@ public:
IMPL_LINK_NOARG(SalInstanceMenu, SelectMenuHdl, ::Menu*, bool)
{
signal_activate(m_xMenu->GetCurItemIdent());
- return true;
+ /* tdf#131333 Menu::Select depends on a false here to allow
+ propogating a submens's selected id to its parent menu to become its
+ selected id.
+
+ without this, while gen menus already have propogated this to its parent
+ in MenuFloatingWindow::EndExecute, SalMenus as used under kf5/macOS
+ won't propogate the selected id
+ */
+ return false;
}
class SalInstanceToolbar : public SalInstanceWidget, public virtual weld::Toolbar
commit 81a3e3416dab99c11f7bfa61d1a859edbacbcacf
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Nov 25 16:52:49 2019 +0100
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri May 15 12:12:38 2020 +0200
Remove some redundantly user-declared copy ctors and assignment ops
...that trigger -Werror,-Wdeprecated-copy ("definition of implicit copy
{constructor, assignment operator} for ... is deprecated beause it has a
user-declared copy {assignment operator, constructor}") new in recent Clang 10
trunk (and which apparently warns about more cases then its GCC counterpart, for
which we already adapted the code in the past, see e.g. the various
"-Werror=deprecated-copy (GCC trunk towards GCC 9)" commits)
Change-Id: Ie37bd820e6c0c05c74e1a862bb1d4ead5fb7cc9c
Reviewed-on: https://gerrit.libreoffice.org/83698
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93694
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx
index 7a062f2aec47..f796d1d3586b 100644
--- a/include/svl/macitem.hxx
+++ b/include/svl/macitem.hxx
@@ -60,8 +60,6 @@ public:
ScriptType GetScriptType() const { return eType; }
bool HasMacro() const { return !aMacName.isEmpty(); }
-
- SvxMacro& operator=( const SvxMacro& rBase );
};
inline SvxMacro::SvxMacro( const OUString &rMacName, const OUString &rLibName,
diff --git a/package/source/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx
index d4f48e282627..0c6cc442acde 100644
--- a/package/source/xstor/xstorage.hxx
+++ b/package/source/xstor/xstorage.hxx
@@ -104,12 +104,6 @@ struct StorageHolder_Impl
css::uno::WeakReference< css::embed::XStorage > m_xWeakRef;
explicit inline StorageHolder_Impl( OStorage* pStorage );
-
- StorageHolder_Impl( const StorageHolder_Impl& aSH )
- : m_pPointer( aSH.m_pPointer )
- , m_xWeakRef( aSH.m_xWeakRef )
- {
- }
};
class SwitchablePersistenceStream;
diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx
index 2dcb9b2f1e0b..6bdd24353285 100644
--- a/sc/inc/pivot.hxx
+++ b/sc/inc/pivot.hxx
@@ -122,7 +122,6 @@ struct ScPivotField
sal_uInt8 mnDupCount;
explicit ScPivotField( SCCOL nNewCol = 0 );
- ScPivotField( const ScPivotField& r );
long getOriginalDim() const;
};
diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index 3856eef9aaef..ca9d3496be7a 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -149,9 +149,6 @@ public:
IterateResult(double fFirst, double fRest, size_t nCount) :
mfFirst(fFirst), mfRest(fRest), mnCount(nCount) {}
-
- IterateResult(const IterateResult& r) :
- mfFirst(r.mfFirst), mfRest(r.mfRest), mnCount(r.mnCount) {}
};
/** Checks nC or nR for zero and uses GetElementsMax() whether a matrix of
diff --git a/sc/source/core/data/pivot2.cxx b/sc/source/core/data/pivot2.cxx
index 3c1ce479a845..111df0a0947c 100644
--- a/sc/source/core/data/pivot2.cxx
+++ b/sc/source/core/data/pivot2.cxx
@@ -80,14 +80,6 @@ ScPivotField::ScPivotField(SCCOL nNewCol) :
mnDupCount(0)
{}
-ScPivotField::ScPivotField( const ScPivotField& rPivotField ) :
- maFieldRef(rPivotField.maFieldRef),
- mnOriginalDim(rPivotField.mnOriginalDim),
- nFuncMask(rPivotField.nFuncMask),
- nCol(rPivotField.nCol),
- mnDupCount(rPivotField.mnDupCount)
-{}
-
long ScPivotField::getOriginalDim() const
{
return mnOriginalDim >= 0 ? mnOriginalDim : static_cast<long>(nCol);
diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index 5f923774b513..37a895d3673e 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
@@ -55,18 +55,6 @@ OUString SvxMacro::GetLanguage()const
return aLibName;
}
-SvxMacro& SvxMacro::operator=( const SvxMacro& rBase )
-{
- if( this != &rBase )
- {
- aMacName = rBase.aMacName;
- aLibName = rBase.aLibName;
- eType = rBase.eType;
- }
- return *this;
-}
-
-
SvxMacroTableDtor& SvxMacroTableDtor::operator=( const SvxMacroTableDtor& rTbl )
{
if (this != &rTbl)
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index c8ff124af161..bdbab23f08ab 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.hxx
@@ -165,13 +165,6 @@ class ZSortFly
public:
ZSortFly( const SwFrameFormat* pFrameFormat, const SwFormatAnchor* pFlyAnchor,
sal_uInt32 nArrOrdNum );
- ZSortFly& operator=( const ZSortFly& rCpy )
- {
- pFormat = rCpy.pFormat;
- pAnchor = rCpy.pAnchor;
- nOrdNum = rCpy.nOrdNum;
- return *this;
- }
bool operator==( const ZSortFly& ) const { return false; }
bool operator<( const ZSortFly& rCmp ) const
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 5839bf219039..1031e772eccd 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -6555,11 +6555,6 @@ namespace sw
{
}
- Position::Position(const Position &rPos)
- : maPtNode(rPos.maPtNode), mnPtContent(rPos.mnPtContent)
- {
- }
-
Position::operator SwPosition() const
{
SwPosition aRet(maPtNode);
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 4221eb3b454c..61e30e6618ed 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -546,7 +546,6 @@ namespace sw
sal_Int32 mnPtContent;
public:
explicit Position(const SwPosition &rPos);
- Position(const Position &rPos);
operator SwPosition() const;
const SwNodeIndex& GetPtNode() const { return maPtNode; };
sal_Int32 GetPtContent() const { return mnPtContent; };
diff --git a/xmloff/source/core/attrlist.cxx b/xmloff/source/core/attrlist.cxx
index 805cafdd45b6..5db3e8c27b18 100644
--- a/xmloff/source/core/attrlist.cxx
+++ b/xmloff/source/core/attrlist.cxx
@@ -38,12 +38,6 @@ struct SvXMLTagAttribute_Impl
{
}
- SvXMLTagAttribute_Impl( const SvXMLTagAttribute_Impl& r ) :
- sName(r.sName),
- sValue(r.sValue)
- {
- }
-
OUString sName;
OUString sValue;
};
diff --git a/xmloff/source/style/xmlprmap.cxx b/xmloff/source/style/xmlprmap.cxx
index ff55ebd3b7a5..bad5361c1408 100644
--- a/xmloff/source/style/xmlprmap.cxx
+++ b/xmloff/source/style/xmlprmap.cxx
@@ -63,9 +63,6 @@ struct XMLPropertySetMapperEntry_Impl
const XMLPropertyMapEntry& rMapEntry,
const rtl::Reference< XMLPropertyHandlerFactory >& rFactory );
- XMLPropertySetMapperEntry_Impl(
- const XMLPropertySetMapperEntry_Impl& rEntry );
-
sal_uInt32 GetPropType() const { return nType & XML_TYPE_PROP_MASK; }
};
@@ -85,20 +82,6 @@ XMLPropertySetMapperEntry_Impl::XMLPropertySetMapperEntry_Impl(
assert(pHdl);
}
-XMLPropertySetMapperEntry_Impl::XMLPropertySetMapperEntry_Impl(
- const XMLPropertySetMapperEntry_Impl& rEntry ) :
- sXMLAttributeName( rEntry.sXMLAttributeName),
- sAPIPropertyName( rEntry.sAPIPropertyName),
- nType( rEntry.nType),
- nXMLNameSpace( rEntry.nXMLNameSpace),
- nContextId( rEntry.nContextId),
- nEarliestODFVersionForExport( rEntry.nEarliestODFVersionForExport ),
- bImportOnly( rEntry.bImportOnly),
- pHdl( rEntry.pHdl)
-{
- assert(pHdl);
-}
-
struct XMLPropertySetMapper::Impl
{
std::vector<XMLPropertySetMapperEntry_Impl> maMapEntries;
commit 6b812999c944e50ac7a9ac8245800f4cf99421ce
Author: László Németh <nemeth at numbertext.org>
AuthorDate: Mon May 4 13:42:14 2020 +0200
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri May 15 12:11:03 2020 +0200
tdf#132514 DOCX import: fix lost table style with footer
Table paragraphs collected for table style processing
were mixed when both body text and footer contain tables,
i.e. clearing paragraph vector at processing the first table
resulted missing paragraph vector and table style processing
for the other one. (Note: only missing bottom paragraph margin
and line spacing were the problems here, not all table style
based paragraph settings, as in branch 'master'.)
Now tables in footer, also nested tables collect their
paragraphs in separated table paragraph vectors.
Regression from commit 6c5da2cd7af5c2d90e4d8e9635ba8c9989c87923
(tdf#119054 DOCX: fix not table style based bottom margin).
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93415
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth at numbertext.org>
(cherry picked from commit 81ce88aa80f8e7cde4fdc5b211e9500a3599643c)
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
writerfilter/source/dmapper/DomainMapperTableHandler.cxx
writerfilter/source/dmapper/DomainMapperTableManager.cxx
writerfilter/source/dmapper/DomainMapper_Impl.cxx
writerfilter/source/dmapper/PropertyMap.hxx
Change-Id: Ib8568d8379cfb7da869120cdc7fe12895252d661
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93525
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
diff --git a/sw/qa/extras/ooxmlexport/data/tdf132514.docx b/sw/qa/extras/ooxmlexport/data/tdf132514.docx
new file mode 100644
index 000000000000..d32f84104e26
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf132514.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
index d460679b50ba..a459e8a57f27 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
@@ -480,6 +480,16 @@ DECLARE_OOXMLEXPORT_TEST(testTdf119054, "tdf119054.docx")
assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:p[1]/w:pPr/w:spacing", "line", "240");
}
+DECLARE_OOXMLEXPORT_TEST(testTdf132514, "tdf132514.docx")
+{
+ xmlDocPtr pXmlDoc = parseExport();
+ if (!pXmlDoc)
+ return;
+ // Keep table style setting, when the footer also contain a table
+ assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[1]/w:tc[2]/w:p[2]/w:pPr/w:spacing", "before", "0");
+ assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[1]/w:tc[2]/w:p[2]/w:pPr/w:spacing", "after", "0");
+}
+
DECLARE_OOXMLEXPORT_TEST(testFdo69636, "fdo69636.docx")
{
/*
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index a0b214a76555..5a0ee4eb8b16 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -1026,7 +1026,7 @@ void DomainMapperTableHandler::ApplyParaProperty(css::beans::PropertyValues aTab
if (pTableProp != aTableProperties.end())
{
uno::Any aValue = pTableProp->Value;
- for (const auto& rParaProp : m_rDMapper_Impl.m_aParagraphsToEndTable)
+ for (const auto& rParaProp : *m_rDMapper_Impl.getTableManager().getCurrentParagraphs())
{
// there is no direct paragraph formatting
if (!rParaProp.m_pPropertyMap->isSet(eId))
@@ -1224,7 +1224,6 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel, bool bTab
m_aCellProperties.clear();
m_aRowProperties.clear();
m_bHadFootOrEndnote = false;
- m_rDMapper_Impl.m_aParagraphsToEndTable.clear();
#ifdef DBG_UTIL
TagLogger::getInstance().endElement();
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index f4d025739915..618ca603efe6 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -57,6 +57,7 @@ DomainMapperTableManager::DomainMapperTableManager() :
m_bPushCurrentWidth(false),
m_bTableSizeTypeInserted(false),
m_nLayoutType(0),
+ m_aParagraphsToEndTable(),
m_pTablePropsHandler(new TablePropertiesHandler())
{
m_pTablePropsHandler->SetTableManager( this );
@@ -430,6 +431,11 @@ TablePositionHandler* DomainMapperTableManager::getCurrentTableRealPosition()
return nullptr;
}
+TableParagraphVectorPtr DomainMapperTableManager::getCurrentParagraphs( )
+{
+ return m_aParagraphsToEndTable.top( );
+}
+
void DomainMapperTableManager::setIsInShape(bool bIsInShape)
{
m_bIsInShape = bIsInShape;
@@ -446,6 +452,12 @@ void DomainMapperTableManager::startLevel( )
oCurrentWidth = m_aCellWidths.back()->back();
m_aCellWidths.back()->pop_back();
}
+ boost::optional<TableParagraph> oParagraph;
+ if (getTableDepthDifference() > 0 && !m_aParagraphsToEndTable.empty() && !m_aParagraphsToEndTable.top()->empty())
+ {
+ oParagraph = m_aParagraphsToEndTable.top()->back();
+ m_aParagraphsToEndTable.top()->pop_back();
+ }
IntVectorPtr pNewGrid( new vector<sal_Int32> );
IntVectorPtr pNewSpans( new vector<sal_Int32> );
@@ -464,10 +476,14 @@ void DomainMapperTableManager::startLevel( )
m_aGridBefore.push_back( 0 );
m_nTableWidth = 0;
m_nLayoutType = 0;
+ TableParagraphVectorPtr pNewParagraphs( new vector<TableParagraph> );
+ m_aParagraphsToEndTable.push( pNewParagraphs );
// And push it back to the right level.
if (oCurrentWidth)
m_aCellWidths.back()->push_back(*oCurrentWidth);
+ if (oParagraph)
+ m_aParagraphsToEndTable.top()->push_back(*oParagraph);
}
void DomainMapperTableManager::endLevel( )
@@ -511,6 +527,7 @@ void DomainMapperTableManager::endLevel( )
// Pop back the table position after endLevel as it's used
// in the endTable method called in endLevel.
m_aTablePositions.pop_back();
+ m_aParagraphsToEndTable.pop();
}
void DomainMapperTableManager::endOfCellAction()
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index 219986870ef3..a3a8487b22d9 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -65,6 +65,8 @@ class DomainMapperTableManager : public TableManager
bool m_bTableSizeTypeInserted;
/// Table layout algorithm, IOW if we should consider fixed column width or not.
sal_uInt32 m_nLayoutType;
+ /// Collected table paragraphs for table style handling
+ std::stack< TableParagraphVectorPtr > m_aParagraphsToEndTable;
std::unique_ptr<TablePropertiesHandler> m_pTablePropsHandler;
PropertyMapPtr m_pStyleProps;
@@ -94,6 +96,7 @@ public:
IntVectorPtr const & getCurrentSpans( );
IntVectorPtr const & getCurrentCellWidths( );
sal_uInt32 getCurrentGridBefore( );
+ TableParagraphVectorPtr getCurrentParagraphs( );
/// Turn the attributes collected so far in m_aTableLook into a property and clear the container.
void finishTableLook();
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index a59e9cc6d1d2..1130007df6f7 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1739,7 +1739,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con
if (xParaProps && m_nTableDepth > 0)
{
TableParagraph aPending{pParaContext, xParaProps};
- m_aParagraphsToEndTable.push_back(aPending);
+ getTableManager().getCurrentParagraphs()->push_back(aPending);
}
// tdf#118521 set paragraph top or bottom margin based on the paragraph style
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index cce1178214bc..2f264c4c9c19 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -419,13 +419,6 @@ struct SymbolData
{ }
};
-/// Information about a paragraph to be finished after a table end.
-struct TableParagraph
-{
- PropertyMapPtr m_pPropertyMap;
- css::uno::Reference<css::beans::XPropertySet> m_rPropertySet;
-};
-
class DomainMapper;
class DomainMapper_Impl final
{
@@ -1066,9 +1059,6 @@ public:
bool m_bIsActualParagraphFramed;
std::vector<css::uno::Any> aFramedRedlines;
- /// Table paragraph properties may need style update based on table style
- std::vector<TableParagraph> m_aParagraphsToEndTable;
-
private:
void PushPageHeaderFooter(bool bHeader, SectionPropertyMap::PageType eType);
// Start a new index section; if needed, finish current paragraph
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 64e9969fa038..608496083636 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -576,6 +576,15 @@ public:
typedef tools::SvRef< TablePropertyMap > TablePropertyMapPtr;
+/// Information about a paragraph to be finished after a table end.
+struct TableParagraph
+{
+ PropertyMapPtr m_pPropertyMap;
+ css::uno::Reference<css::beans::XPropertySet> m_rPropertySet;
+};
+
+typedef std::shared_ptr< std::vector<TableParagraph> > TableParagraphVectorPtr;
+
} // namespace dmapper
} // namespace writerfilter
commit a3cddae03c34608f717f2610912b61fa336337a3
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Fri May 15 05:59:09 2020 +0200
Commit: Gerrit Code Review <gerrit at gerrit.libreoffice.org>
CommitDate: Fri May 15 05:59:09 2020 +0200
Update git submodules
* Update helpcontent2 from branch 'libreoffice-6-4'
to 5995b61e8d08489f44e0473f8d0d21e189a0b3db
- remove *.google.com and *.googleapis.com from Content-Security-Policy
These are obsolete, since search is based on xapian-omega not on google search
Change-Id: I1858a3118f6b4778266c4a3d2a6559866ce8cb09
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/94257
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
(cherry picked from commit dc2b016f2014208b27f7af5ad33863b6bd0d760b)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/94266
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
diff --git a/helpcontent2 b/helpcontent2
index 1bbe610c7358..5995b61e8d08 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1bbe610c73586f36d1e1354484388cac479dbd27
+Subproject commit 5995b61e8d08489f44e0473f8d0d21e189a0b3db
commit ec43d70911736b821e527109fadb3537635091de
Author: Vasily Melenchuk <vasily.melenchuk at cib.de>
AuthorDate: Sat May 9 14:35:25 2020 +0300
Commit: Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Thu May 14 21:52:44 2020 +0200
tdf#132766: DOCX export: always try to set bullet font for list
There are some problems with bullet if we use MS Wingdigs bullets
and do not specify Symbol font for it. It shiuld be either UTF-8
or Symbol, but not mixture of both.
Change-Id: Ie4a6f7e8fee6cfab21a18fc080f33d1bff455dd9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93846
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94158
diff --git a/sw/qa/extras/ooxmlexport/data/tdf132766.docx b/sw/qa/extras/ooxmlexport/data/tdf132766.docx
new file mode 100644
index 000000000000..aba5e82312b7
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf132766.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
index ad7297a6db5b..7fabda15147d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
@@ -946,19 +946,14 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf94628, "tdf94628.docx")
uno::Sequence<beans::PropertyValue> aProps;
xLevels->getByIndex(0) >>= aProps; // 1st level
- for (int i = 0; i < aProps.getLength(); ++i)
- {
- const beans::PropertyValue& rProp = aProps[i];
- if (rProp.Name == "BulletChar")
- {
- // Check for 'BLACK UPPER RIGHT TRIANGLE' (U+25E5) as a bullet
- CPPUNIT_ASSERT_EQUAL(OUString(u"\u25E5"), rProp.Value.get<OUString>());
- return;
- }
- }
-
- // Shouldn't reach here
- CPPUNIT_FAIL("Did not find bullet with level 0");
+ OUString sBulletChar = std::find_if(aProps.begin(), aProps.end(),
+ [](const beans::PropertyValue& rValue) {
+ return rValue.Name == "BulletChar";
+ })
+ ->Value.get<OUString>();
+ // Actually for 'BLACK UPPER RIGHT TRIANGLE' is \u25E5
+ // But we use Wingdings 3 font here, so code is different
+ CPPUNIT_ASSERT_EQUAL(OUString(u"\uF07B"), sBulletChar);
}
DECLARE_OOXMLEXPORT_TEST(testTdf122594, "tdf122594.docx")
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 37248db1500c..c59bc16709df 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -244,6 +244,22 @@ DECLARE_OOXMLEXPORT_TEST(testTdf121658, "tdf121658.docx")
assertXPath(pXmlSettings, "/w:settings/w:doNotHyphenateCaps");
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf132766, "tdf132766.docx")
+{
+ xmlDocPtr pXmlDoc = parseExport("word/numbering.xml");
+ CPPUNIT_ASSERT(pXmlDoc);
+
+ // Ensure that for list=1 and level=0 we wrote correct bullet char and correct font
+ assertXPath(pXmlDoc, "//w:numbering/w:abstractNum[@w:abstractNumId='1']/w:lvl[@w:ilvl='0']/w:lvlText",
+ "val", u"\uF0B7");
+ assertXPath(pXmlDoc, "//w:numbering/w:abstractNum[@w:abstractNumId='1']/w:lvl[@w:ilvl='0']/w:rPr/w:rFonts",
+ "ascii", "Symbol");
+ assertXPath(pXmlDoc, "//w:numbering/w:abstractNum[@w:abstractNumId='1']/w:lvl[@w:ilvl='0']/w:rPr/w:rFonts",
+ "hAnsi", "Symbol");
+ assertXPath(pXmlDoc, "//w:numbering/w:abstractNum[@w:abstractNumId='1']/w:lvl[@w:ilvl='0']/w:rPr/w:rFonts",
+ "cs", "Symbol");
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf124367, "tdf124367.docx")
{
uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY);
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 80c79b9a1287..432c7f919039 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6871,7 +6871,10 @@ void DocxAttributeOutput::NumberingLevel( sal_uInt8 nLevel,
FSNS( XML_w, XML_cs ), aFamilyName,
FSNS( XML_w, XML_hint ), "default" );
}
- m_rExport.OutputItemSet( *pOutSet, false, true, i18n::ScriptType::LATIN, m_rExport.m_bExportModeRTF );
+ else
+ {
+ m_rExport.OutputItemSet(*pOutSet, false, true, i18n::ScriptType::LATIN, m_rExport.m_bExportModeRTF);
+ }
WriteCollectedRunProperties();
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index afe0204a48cd..ffd793d6db79 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -451,7 +451,11 @@ void MSWordExportBase::NumberingLevel(
// #i86652#
if (rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION)
{
- nFollow = 2; // ixchFollow: 0 - tab, 1 - blank, 2 - nothing
+ // <nFollow = 2>, if minimum label width equals 0 and
+ // minimum distance between label and text equals 0
+ nFollow = (rFormat.GetFirstLineOffset() == 0 &&
+ rFormat.GetCharTextDistance() == 0)
+ ? 2 : 0; // ixchFollow: 0 - tab, 1 - blank, 2 - nothing
}
else if (rFormat.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT)
{
@@ -489,44 +493,20 @@ void MSWordExportBase::NumberingLevel(
const vcl::Font* pBulletFont=nullptr;
rtl_TextEncoding eChrSet=0;
FontFamily eFamily=FAMILY_DECORATIVE;
-
if (!rRule.Get(nLvl).GetListFormat().isEmpty())
{
- // We have stored list format, use it
+ // Nothing to construct: we have it already
sNumStr = rRule.Get(nLvl).GetListFormat();
}
else if (SVX_NUM_CHAR_SPECIAL == rFormat.GetNumberingType() ||
SVX_NUM_BITMAP == rFormat.GetNumberingType())
{
+ // Use bullet
sNumStr = OUString(rFormat.GetBulletChar());
- bWriteBullet = true;
-
- pBulletFont = rFormat.GetBulletFont();
- if (!pBulletFont)
- {
- pBulletFont = &numfunc::GetDefBulletFont();
- }
-
- eChrSet = pBulletFont->GetCharSet();
- sFontName = pBulletFont->GetFamilyName();
- eFamily = pBulletFont->GetFamilyType();
-
- if (IsStarSymbol(sFontName))
- SubstituteBullet( sNumStr, eChrSet, sFontName );
-
- // #i86652#
- if (rFormat.GetPositionAndSpaceMode() ==
- SvxNumberFormat::LABEL_WIDTH_AND_POSITION)
- {
- // <nFollow = 2>, if minimum label width equals 0 and
- // minimum distance between label and text equals 0
- nFollow = (rFormat.GetFirstLineOffset() == 0 &&
- rFormat.GetCharTextDistance() == 0)
- ? 2 : 0; // ixchFollow: 0 - tab, 1 - blank, 2 - nothing
- }
}
else
{
+ // Construct list format string from prefix, level numbers and suffix
if (SVX_NUM_NUMBER_NONE != rFormat.GetNumberingType())
{
sal_uInt8* pLvlPos = aNumLvlPos;
@@ -546,16 +526,6 @@ void MSWordExportBase::NumberingLevel(
sNumStr = sNumStr.replaceAt( nFnd, 1, OUString(static_cast<char>(i)) );
}
}
- // #i86652#
- if (rFormat.GetPositionAndSpaceMode() ==
- SvxNumberFormat::LABEL_WIDTH_AND_POSITION)
- {
- // <nFollow = 2>, if minimum label width equals 0 and
- // minimum distance between label and text equals 0
- nFollow = (rFormat.GetFirstLineOffset() == 0 &&
- rFormat.GetCharTextDistance() == 0)
- ? 2 : 0; // ixchFollow: 0 - tab, 1 - blank, 2 - nothing
- }
}
if (!rFormat.GetPrefix().isEmpty())
@@ -563,6 +533,25 @@ void MSWordExportBase::NumberingLevel(
sNumStr += rFormat.GetSuffix();
}
+ if (SVX_NUM_CHAR_SPECIAL == rFormat.GetNumberingType() ||
+ SVX_NUM_BITMAP == rFormat.GetNumberingType())
+ {
+ bWriteBullet = true;
+
+ pBulletFont = rFormat.GetBulletFont();
+ if (!pBulletFont)
+ {
+ pBulletFont = &numfunc::GetDefBulletFont();
+ }
+
+ eChrSet = pBulletFont->GetCharSet();
+ sFontName = pBulletFont->GetFamilyName();
+ eFamily = pBulletFont->GetFamilyType();
+
+ if (IsStarSymbol(sFontName))
+ SubstituteBullet(sNumStr, eChrSet, sFontName);
+ }
+
// Attributes of the numbering
std::unique_ptr<wwFont> pPseudoFont;
const SfxItemSet* pOutSet = nullptr;
commit 8c496d3992c91027513c1c4c4811b6cb4c0f88f7
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu May 14 14:47:21 2020 +0200
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu May 14 20:27:06 2020 +0200
Keep order of GDK input events intact
As explained at <https://bugzilla.redhat.com/show_bug.cgi?id=1377293#c12>
"[Wayland] When typing fast at high CPU load, LibreOffice breaks key (letter)
order": "with a local LO master --with-lang=ALL ASan+UBSan build (i.e., which
executes somewhat slowly): When typing 'file' in Writer right after it started
up (but no longer after more typing), that gets garbled as 'fiel'." The reason
for that (but probably not for the original issue reported in that rhbz#1377293)
apparently was:
Two GDK_KEY_PRESS events (A and B) were in the GTK event queue.
GtkInstance::AnyInput consumed only A, because it broke from the first while
loop as soon as it saw the first event of appropriate type. In the second while
loop it put A back on the end of the GTK event loop, so that it now followed B.
GtkSalFrame::signalKey (vcl/unx/gtk3/gtk3gtkframe.cxx) thus received the events
in the wrong order.
Dropping the "break" also reveals that GtkInstance::AnyInput should obviously
use a queue (i.e., deque) rather than a stack to hold the events it consumed and
needs to re-enqueue.
This appears to be a regression introduced with
658954e8b50fc264428402dc5a95b0d6f690d191 "Resolves: fdo#48011 writer
idle-callbacks are halting when events pending".
Change-Id: I87d601df118a20ea3dd59e9cebbcf5176db04be8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94202
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Jenkins
(cherry picked from commit a9a19777d53beb762fabad3a67ddc68ad75bca6c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94005
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 820828c3e796..93b2a94b4c07 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -7,6 +7,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include <sal/config.h>
+
+#include <deque>
#include <stack>
#include <string.h>
#include <osl/process.h>
@@ -397,25 +400,24 @@ bool GtkInstance::AnyInput( VclInputFlags nType )
return true;
bool bRet = false;
- std::stack<GdkEvent*> aEvents;
+ std::deque<GdkEvent*> aEvents;
GdkEvent *pEvent = nullptr;
while ((pEvent = gdk_event_get()))
{
- aEvents.push(pEvent);
+ aEvents.push_back(pEvent);
VclInputFlags nEventType = categorizeEvent(pEvent);
if ( (nEventType & nType) || ( nEventType == VclInputFlags::NONE && (nType & VclInputFlags::OTHER) ) )
{
bRet = true;
- break;
}
}
while (!aEvents.empty())
{
- pEvent = aEvents.top();
+ pEvent = aEvents.front();
gdk_event_put(pEvent);
gdk_event_free(pEvent);
- aEvents.pop();
+ aEvents.pop_front();
}
return bRet;
}
commit f8e6e545a6cc205fe7450f00acaff9d72e2d617c
Author: Rizal Muttaqin <riz_17_oke at yahoo.co.id>
AuthorDate: Thu May 14 13:31:33 2020 +0700
Commit: Rizal Muttaqin <riz_17_oke at yahoo.co.id>
CommitDate: Thu May 14 11:18:59 2020 +0200
elementary:tdf#133012 gripper icons looks like a more option button
Change-Id: Iaf825b586027f9d1556aa92507fb4894bd8ac433
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94179
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin <riz_17_oke at yahoo.co.id>
(cherry picked from commit 879d293d2f7734d7de51e57532743a24a3dd322d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94003
diff --git a/icon-themes/elementary/sfx2/res/grip.png b/icon-themes/elementary/sfx2/res/grip.png
index 3ea42a710bad..f402583652f9 100644
Binary files a/icon-themes/elementary/sfx2/res/grip.png and b/icon-themes/elementary/sfx2/res/grip.png differ
diff --git a/icon-themes/elementary_svg/sfx2/res/grip.svg b/icon-themes/elementary_svg/sfx2/res/grip.svg
index 6bd9585ef73e..c313403b966e 100644
--- a/icon-themes/elementary_svg/sfx2/res/grip.svg
+++ b/icon-themes/elementary_svg/sfx2/res/grip.svg
@@ -1 +1 @@
-<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(.57484957 0 0 .42975531 -1164.0142 -1377.7717)" gradientUnits="userSpaceOnUse" x1="2035.1652" x2="2035.1652" y1="3208.0737" y2="3241.9966"><stop offset="0" stop-color="#fdfdfd"/><stop offset="1" stop-color="#e1e1e1"/></linearGradient><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="7.814092" x2="7.814092" y1="1.282271" y2="14.669901"><stop offset="0" stop-color="#fff"/><stop offset=".507761" stop-color="#fff" stop-opacity=".235294"/><stop offset=".83456558" stop-color="#fff" stop-opacity=".156863"/><stop offset="1" stop-color="#fff" stop-opacity=".392157"/></linearGradient><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="8" x2="8" y1="15" y2="0"><stop offset="0" stop-color="#808080"/><stop offset=".87326682" stop-color="#6d6d6d"/><stop offset="1" stop-color="#4f5053"/></linearGradient><path d="m8 .50000007c-4.138
2429 0-7.50000006 3.36175713-7.50000006 7.49999993 0 4.138243 3.36175716 7.5 7.50000006 7.5 4.138243 0 7.500007-3.361757 7.5-7.5 0-4.1382428-3.361757-7.49999993-7.5-7.49999993z" fill="url(#a)" opacity=".99"/><path d="m8 .50000008c-4.1382429 0-7.50000006 3.36175712-7.50000006 7.50000002s3.36175716 7.4999999 7.50000006 7.4999999c4.138243 0 7.500007-3.361757 7.5-7.4999999 0-4.1382429-3.361757-7.50000002-7.5-7.50000002z" fill="none" stroke="url(#c)" stroke-linecap="round" stroke-linejoin="round"/><path d="m14.5 7.9997643c0 3.5899727-2.910367 6.5002357-6.4999212 6.5002357-3.5898836 0-6.5000789-2.910298-6.5000789-6.5002357 0-3.5898014 2.9101953-6.4997709 6.5000789-6.4997709 3.5895542 0 6.4999212 2.9099695 6.4999212 6.4997709z" fill="none" opacity=".5" stroke="url(#b)" stroke-linecap="round" stroke-linejoin="round"/><path d="m8 3c-1.0471976 0-2 .9528024-2 2s.9528024 2 2 2 2-.9528024 2-2-.9528024-2-2-2zm0 4c-1.0471976 0-2 .9528024-2 2 0 1.047198.9528024 2 2 2s2-.952802 2-2c0-1.0471976-.9528
024-2-2-2zm0 4c-1.0471976 0-2 .952802-2 2s.9528024 2 2 2 2-.952802 2-2-.9528024-2-2-2z" fill="#4d4d4d" fill-opacity=".992157" opacity=".05"/><path d="m8 4a1 1 0 0 0 -1 1 1 1 0 0 0 1 1 1 1 0 0 0 1-1 1 1 0 0 0 -1-1zm0 4a1 1 0 0 0 -1 1 1 1 0 0 0 1 1 1 1 0 0 0 1-1 1 1 0 0 0 -1-1zm0 4a1 1 0 0 0 -1 1 1 1 0 0 0 1 1 1 1 0 0 0 1-1 1 1 0 0 0 -1-1z" fill="#949494" opacity=".38"/><path d="m8 3a1 1 0 0 0 -1 1 1 1 0 0 0 1 1 1 1 0 0 0 1-1 1 1 0 0 0 -1-1zm0 4a1 1 0 0 0 -1 1 1 1 0 0 0 1 1 1 1 0 0 0 1-1 1 1 0 0 0 -1-1zm0 4a1 1 0 0 0 -1 1 1 1 0 0 0 1 1 1 1 0 0 0 1-1 1 1 0 0 0 -1-1z" fill="#6f6f6f"/></svg>
\ No newline at end of file
+<svg height="16" viewBox="0 0 4.2333332 4.2333335" width="16" xmlns="http://www.w3.org/2000/svg"><g transform="translate(0 -292.76665)"><path d="m3 0c-1.0471979 0-2 .9528063-2 2s.9528021 2 2 2c1.0471975 0 2-.9528063 2-2s-.9528025-2-2-2zm0 4c-1.0471979 0-2 .9528063-2 2s.9528021 2 2 2c1.0471975 0 2-.9528063 2-2s-.9528025-2-2-2zm0 4c-1.0471979 0-2 .9528063-2 2 0 1.047194.9528021 2 2 2 1.0471975 0 2-.952806 2-2 0-1.0471937-.9528025-2-2-2zm0 4c-1.0471979 0-2 .952806-2 2s.9528021 2 2 2c1.0471975 0 2-.952806 2-2s-.9528025-2-2-2z" fill="#4d4d4d" fill-opacity=".992157" opacity=".05" transform="matrix(.26458333 0 0 .26458333 0 292.76665)"/><g stroke-width=".264583"><path d="m.79375 293.03123a.26458333.26458333 0 0 0 -.2645834.26458.26458333.26458333 0 0 0 .2645834.26458.26458333.26458333 0 0 0 .2645833-.26458.26458333.26458333 0 0 0 -.2645833-.26458zm0 1.05833a.26458333.26458333 0 0 0 -.2645834.26458.26458333.26458333 0 0 0 .2645834.26459.26458333.26458333 0 0 0 .2645833-.26459.26458333.26458
333 0 0 0 -.2645833-.26458zm0 1.05833a.26458333.26458333 0 0 0 -.2645834.26459.26458333.26458333 0 0 0 .2645834.26458.26458333.26458333 0 0 0 .2645833-.26458.26458333.26458333 0 0 0 -.2645833-.26459z" fill="#d7d7d7" opacity=".38"/><path d="m.79375 293.03123c-.1461254 0-.2645834.11845-.2645834.26458s.118458.26458.2645834.26458c.1461253 0 .2645833-.11845.2645833-.26458s-.118458-.26458-.2645833-.26458z" fill="#808080"/><path d="m.79375 295.14789c-.1461254 0-.2645834.11846-.2645834.26459 0 .14612.118458.26458.2645834.26458.1461253 0 .2645833-.11846.2645833-.26458 0-.14613-.118458-.26459-.2645833-.26459z" fill="#808080"/><path d="m.79375 294.08956c-.1461254 0-.2645834.11846-.2645834.26458 0 .14613.118458.26459.2645834.26459.1461253 0 .2645833-.11846.2645833-.26459 0-.14612-.118458-.26458-.2645833-.26458z" fill="#808080"/><path d="m.79375 296.20623c-.1461254 0-.2645834.11846-.2645834.26458 0 .14613.118458.26459.2645834.26459.1461253 0 .2645833-.11846.2645833-.26459 0-.14612-.118458-.26458
-.2645833-.26458z" fill="#808080"/></g></g></svg>
\ No newline at end of file
commit fe67fa54dff3a88562dc0690b43dd268dcd739ad
Author: Rizal Muttaqin <riz_17_oke at yahoo.co.id>
AuthorDate: Wed May 13 17:33:44 2020 +0700
Commit: Rizal Muttaqin <riz_17_oke at yahoo.co.id>
CommitDate: Thu May 14 10:11:27 2020 +0200
All icons: tdf#132968 folder icons in file picker dialog
Change-Id: I4151ad86923821953c1e49bce6a8015932f98910
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94117
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin <riz_17_oke at yahoo.co.id>
(cherry picked from commit bca57a7e5e5edf5f0d5d88ce100d974626353c10)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94002
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Tested-by: Rizal Muttaqin <riz_17_oke at yahoo.co.id>
diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index a2c4f13fe5ce..9be4cc33ffe4 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -2115,7 +2115,7 @@ formula/res/fx.png cmd/sc_dbviewfunctions.png
# fpicker
# ==============================================
-fpicker/res/fp014.png cmd/sc_open.png
+fpicker/res/fp014.png res/fp015.png
fpicker/res/fp015.png cmd/sc_starshapes.png
fpicker/res/fp016.png desktop/res/shared_16.png
@@ -2151,7 +2151,7 @@ res/dir-open.png cmd/sc_open.png
res/fileopen.png cmd/sc_open.png
res/foldercl.png cmd/sc_open.png
res/folderop.png cmd/sc_open.png
-res/fp010.png cmd/sc_open.png
+res/fp010.png cmd/sc_upsearch.png
res/info.png cmd/lc_helpindex.png
res/info_16.png cmd/sc_helpindex.png
res/im30821.png cmd/sc_insertscript.png
@@ -2287,7 +2287,6 @@ res/sx18002.png res/plus.png
res/sx18003.png res/minus.png
res/basbrk.png cmd/sc_addwatch.png
-res/fp015.png cmd/sc_starshapes.png
# sc
# ==============================================
diff --git a/icon-themes/breeze_dark/links.txt b/icon-themes/breeze_dark/links.txt
index a2c4f13fe5ce..9be4cc33ffe4 100644
--- a/icon-themes/breeze_dark/links.txt
+++ b/icon-themes/breeze_dark/links.txt
@@ -2115,7 +2115,7 @@ formula/res/fx.png cmd/sc_dbviewfunctions.png
# fpicker
# ==============================================
-fpicker/res/fp014.png cmd/sc_open.png
+fpicker/res/fp014.png res/fp015.png
fpicker/res/fp015.png cmd/sc_starshapes.png
fpicker/res/fp016.png desktop/res/shared_16.png
@@ -2151,7 +2151,7 @@ res/dir-open.png cmd/sc_open.png
res/fileopen.png cmd/sc_open.png
res/foldercl.png cmd/sc_open.png
res/folderop.png cmd/sc_open.png
-res/fp010.png cmd/sc_open.png
+res/fp010.png cmd/sc_upsearch.png
res/info.png cmd/lc_helpindex.png
res/info_16.png cmd/sc_helpindex.png
res/im30821.png cmd/sc_insertscript.png
@@ -2287,7 +2287,6 @@ res/sx18002.png res/plus.png
res/sx18003.png res/minus.png
res/basbrk.png cmd/sc_addwatch.png
-res/fp015.png cmd/sc_starshapes.png
# sc
# ==============================================
diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index fdd64618f814..7cde194ef780 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -1892,7 +1892,7 @@ extensions/res/buttonplus.png extensions/res/scanner/plus.png
# formula
# ==============================================
-formula/res/fapclose.png cmd/sc_open.png
+formula/res/fapclose.png svtools/res/folder.png
formula/res/faperror.png cmd/sc_cancel.png
formula/res/fapok.png cmd/sc_ok.png
formula/res/fapopen.png cmd/sc_open.png
@@ -1901,7 +1901,7 @@ formula/res/fx.png cmd/sc_dbviewfunctions.png
# fpicker
# ==============================================
fpicker/res/fp011.png cmd/sc_firstpage.png
-fpicker/res/fp014.png cmd/sc_open.png
+fpicker/res/fp014.png res/fp015.png
fpicker/res/fp015.png cmd/sc_starshapes.png
fpicker/res/fp016.png desktop/res/shared_16.png
@@ -1938,9 +1938,8 @@ res/dir-open.png cmd/sc_open.png
res/extension_plus_26.png cmd/lc_insertplugin.png
res/extension_plus_32.png cmd/32/insertplugin.png
res/fileopen.png cmd/sc_open.png
-res/foldercl.png cmd/sc_open.png
+res/foldercl.png svtools/res/folder.png
res/folderop.png cmd/sc_open.png
-res/fp010.png cmd/sc_open.png
res/im30820.png cmd/sc_scriptorganizer.png
res/im30821.png cmd/sc_choosemacro.png
res/info.png cmd/lc_helpindex.png
@@ -1985,6 +1984,7 @@ res/sx03127.png res/sx03126.png
res/sx03130.png res/sx03123.png
res/sx03137.png res/sx03125.png
res/sx03140.png res/sx03125.png
+res/sx03141.png svtools/res/folder.png
res/sx03145.png res/sx03144.png
res/sx03152.png res/sx03125.png
res/sx03153.png res/sx03125.png
@@ -2100,7 +2100,6 @@ res/sx18002.png res/plus.png
res/sx18003.png res/minus.png
res/basbrk.png cmd/sc_addwatch.png
-res/fp015.png cmd/sc_starshapes.png
# sc
# ==============================================
diff --git a/icon-themes/colibre/res/fp010.png b/icon-themes/colibre/res/fp010.png
new file mode 100644
index 000000000000..9c6135f2323e
Binary files /dev/null and b/icon-themes/colibre/res/fp010.png differ
diff --git a/icon-themes/colibre/res/fp015.png b/icon-themes/colibre/res/fp015.png
new file mode 100644
index 000000000000..3fde987bce45
Binary files /dev/null and b/icon-themes/colibre/res/fp015.png differ
diff --git a/icon-themes/colibre/svtools/res/folder.png b/icon-themes/colibre/svtools/res/folder.png
index c97908106328..990f1aab3e3a 100644
Binary files a/icon-themes/colibre/svtools/res/folder.png and b/icon-themes/colibre/svtools/res/folder.png differ
diff --git a/icon-themes/colibre_svg/res/fp010.svg b/icon-themes/colibre_svg/res/fp010.svg
new file mode 100644
index 000000000000..a2760450ce3b
--- /dev/null
+++ b/icon-themes/colibre_svg/res/fp010.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">/&gt;<g fill-rule="evenodd"><path d="m12.482422.9921875c-.483082.0084746-.904483.1513805-1.189453.3007813l-2.7070315 1.7070312h-7.5859375c-.5522619.0000552-.9999448.4477379-1 1v1 10h16v-10-3c-.000055-.5522619-.447738-.9999448-1-1zm-.482422 1.0078125h3v2h-6z" fill="#eac282"/><path d="m12 2-3 2h6v-2z" fill="#fff"/></g><path d="m11.995067 9.4727814c-.0041-.1300477-.05875-.2533713-.152344-.34375l-2.916015-2.9160159c-.189481-.3405645-.678563-.3427598-.871094-.00391l-2.9101563 2.9199219c-.4700545.4726558.2389295 1.1777376.708984.705082l2.1367193-2.1445313v5.7854219c-.03591.700353 1.033956.700353.998047 0v-5.7893282l2.148437 2.1484376c.317136.3255156.868916.092988.857422-.361328z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/res/fp015.svg b/icon-themes/colibre_svg/res/fp015.svg
new file mode 100644
index 000000000000..6630e31a5db5
--- /dev/null
+++ b/icon-themes/colibre_svg/res/fp015.svg
@@ -0,0 +1,2 @@
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+/&amp;gt;<g fill-rule="evenodd"><path d="m12.482422.9921875c-.483082.0084746-.904483.1513804-1.189453.3007813l-2.7070315 1.7070312h-7.5859375c-.5522619.0000552-.9999448.4477379-1 1v1 10h9v-2h-2c-1.0907028 0-2-.909297-2-2 0-1.0907028.9092972-2 2-2h2v-2c0-1.0907028.9092972-2 2-2 1.090703 0 2 .9092972 2 2v2h2c.363969 0 .703481.1077387 1 .2832031v-4.2832031-3c-.000055-.5522619-.447738-.9999448-1-1zm-.482422 1.0078125h3v2h-6zm4 10.716797c-.296519.175464-.636031.283203-1 .283203h-2v2h3z" fill="#eac282"/><path d="m12 2-3 2h6v-2z" fill="#fff"/></g><path d="m11 6c-.554 0-1 .446-1 1v3h-3c-.554 0-1 .446-1 1s.446 1 1 1h3v3c0 .554.446 1 1 1s1-.446 1-1v-3h3c.554 0 1-.446 1-1s-.446-1-1-1h-3v-3c0-.554-.446-1-1-1z" fill="#4d82b8"/></svg>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/svtools/res/folder.svg b/icon-themes/colibre_svg/svtools/res/folder.svg
index e1750f00b94f..4d2587478b93 100644
--- a/icon-themes/colibre_svg/svtools/res/folder.svg
+++ b/icon-themes/colibre_svg/svtools/res/folder.svg
@@ -1 +1 @@
-<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">/><g fill-rule="evenodd"><path d="m12.482422 1.9921875c-.483082.0084746-.904483.1513805-1.189453.3007813l-2.7070315 1.7070312h-7.5859375c-.5522619.0000552-.9999448.4477379-1 1v1 8h16v-8-3c-.000055-.5522619-.447738-.9999448-1-1zm-.482422 1.0078125h3v2h-6z" fill="#eac282"/><path d="m12 3-3 2h6v-2z" fill="#fff"/></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">/&gt;<g fill-rule="evenodd"><path d="m12.482422.9921875c-.483082.0084746-.904483.1513805-1.189453.3007813l-2.7070315 1.7070312h-7.5859375c-.5522619.0000552-.9999448.4477379-1 1v1 10h16v-10-3c-.000055-.5522619-.447738-.9999448-1-1zm-.482422 1.0078125h3v2h-6z" fill="#eac282"/><path d="m12 2-3 2h6v-2z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/icon-themes/elementary/fpicker/res/fp015.png b/icon-themes/elementary/fpicker/res/fp015.png
new file mode 100644
index 000000000000..dd2f7f387349
Binary files /dev/null and b/icon-themes/elementary/fpicker/res/fp015.png differ
diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt
index c85753c9e5fb..2130c9be7c48 100644
--- a/icon-themes/elementary/links.txt
+++ b/icon-themes/elementary/links.txt
@@ -1913,8 +1913,7 @@ formula/res/fx.png cmd/sc_dbviewfunctions.png
# fpicker
# ==============================================
-fpicker/res/fp014.png cmd/sc_open.png
-fpicker/res/fp015.png cmd/sc_starshapes.star5.png
+fpicker/res/fp014.png res/fp015.png
fpicker/res/fp016.png desktop/res/shared_16.png
# reportdesign
@@ -1936,7 +1935,7 @@ res/dir-open.png cmd/sc_open.png
res/fileopen.png cmd/sc_open.png
res/foldercl.png formula/res/fapclose.png
res/folderop.png cmd/sc_open.png
-res/fp010.png cmd/sc_open.png
+res/fp010.png cmd/sc_upsearch.png
res/grafikei.png cmd/sc_graphic.png
res/info.png cmd/lc_helpindex.png
res/info_16.png cmd/sc_helpindex.png
diff --git a/icon-themes/elementary/res/fp015.png b/icon-themes/elementary/res/fp015.png
new file mode 100644
index 000000000000..fb26a3663a8b
Binary files /dev/null and b/icon-themes/elementary/res/fp015.png differ
diff --git a/icon-themes/elementary_svg/fpicker/res/fp015.svg b/icon-themes/elementary_svg/fpicker/res/fp015.svg
new file mode 100644
index 000000000000..cae485f2e3f6
--- /dev/null
+++ b/icon-themes/elementary_svg/fpicker/res/fp015.svg
@@ -0,0 +1 @@
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(.55048262 0 0 .57815823 -3.826225 -5.276228)" gradientUnits="userSpaceOnUse" x1="24.046366" x2="24.046366" y1="11.673002" y2="34.713669"><stop offset="0" stop-color="#fff"/><stop offset=".33380178" stop-color="#fff" stop-opacity=".235294"/><stop offset=".67927718" stop-color="#fff" stop-opacity=".156863"/><stop offset="1" stop-color="#fff" stop-opacity=".392157"/></linearGradient><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="7.37326710305" x2="9.15858924422" y1="33.63699642066" y2="39.34449386392"><stop offset="0" stop-color="#fff" stop-opacity=".27451"/><stop offset="1" stop-color="#fff" stop-opacity="0"/></linearGradient><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="8.000001" x2="8.000001" y1=".496136" y2="15.977216"><stop offset="0" stop-color="#ffe16b"/><stop offset="1" stop-color="#f9c440"/></linearGra
dient><path d="m8.0000006.49613568c.5064396 0 2.1391894 4.28357812 2.5489094 4.59622212.409717.3126432 4.793178.6198528 4.949676 1.125721.156499.505868-3.217866 3.4604743-3.374364 3.9663412-.156498.505868 1.285496 4.979313.875778 5.291956-.409718.312645-4.4935598-2.144886-5.0000001-2.144886-.5064395 0-4.5902812 2.457531-4.9999999 2.144886-.4097182-.312643 1.0322763-4.786089.8757779-5.291956-.1564985-.5058669-3.53086246-3.4604739-3.37436393-3.966342.15649845-.5058674 4.53995813-.813077 4.94967683-1.1257202.409718-.312644 2.0424703-4.59622212 2.5489098-4.59622212z" fill="url(#c)" stroke="#ad5f00" stroke-linejoin="round" stroke-opacity=".498039" stroke-width=".992271"/><path d="m11.96875 26.375c-.506596.779667-1.63252 2.593568-2.90625 5.59375a.14192008.14192008 0 0 1 -.03125.03125.14192008.14192008 0 0 1 -.03125.03125.14192008.14192008 0 0 1 -.03125 0 .14192008.14192008 0 0 1 -.03125.03125.14192008.14192008 0 0 1 -.03125-.03125.14192008.14192008 0 0 1 -.03125 0 .14192008.14192008 0 0 1
-.03125-.03125.14192008.14192008 0 0 1 -.03125-.03125.14192008.14192008 0 0 1 0-.03125.14192008.14192008 0 0 1 -.03125 0c.00461-.0064-.035912.0063-.03125 0 .00522-.0059-.00527.03708 0 .03125.00556-.0056-.036852.0055-.03125 0 .00608-.005-.00612.03618 0 .03125.00629-.0047-.037574.0047-.03125 0 .00682-.0039-.038107.0038-.03125 0 .00692-.0037-.00695.03492 0 .03125.00726-.003-.038533.003-.03125 0a.14192008.14192008 0 0 1 0 .03125.14192008.14192008 0 0 1 .03125 0 .14192008.14192008 0 0 1 .03125.03125.14192008.14192008 0 0 1 .03125.03125.14192008.14192008 0 0 1 0 .03125.14192008.14192008 0 0 1 0 .03125.14192008.14192008 0 0 1 0 .03125.14192008.14192008 0 0 1 0 .03125.14192008.14192008 0 0 1 -.03125.03125.14192008.14192008 0 0 1 -.03125.03125.14192008.14192008 0 0 1 -.03125 0c-2.0575321.335503-4.6049536.679328-6.34375 1.09375 1.0525595 1.235411 2.264992 2.404007 3.4375 3.59375l15.03125-2.71875c.0052-.0052.02606.0052.03125 0 .28516-.285558.552815-.584263.84375-.875-1.985656-.473093-4.21957-
.75757-6.28125-1.09375a.14192008.14192008 0 0 1 -.03125 0 .14192008.14192008 0 0 1 -.03125-.03125.14192008.14192008 0 0 1 -.03125-.03125.14192008.14192008 0 0 1 0-.03125.14192008.14192008 0 0 1 0-.03125.14192008.14192008 0 0 1 0-.03125.14192008.14192008 0 0 1 0-.03125.14192008.14192008 0 0 1 .03125-.03125.14192008.14192008 0 0 1 .03125-.03125.14192008.14192008 0 0 1 .03125 0 .14192008.14192008 0 0 1 0-.03125c.0075.0027-.0387-.0027-.03125 0 .0071.0035-.03835-.0035-.03125 0 .007.0037-.007-.03496 0-.03125.0066.0044-.03785-.0044-.03125 0 .0062.0049-.0062-.03622 0-.03125.006.0052-.03724-.0052-.03125 0 .0054.0058-.0053-.03713 0-.03125.0052.006-.03638-.006-.03125 0 .0045.0065-.0045-.0378 0-.03125.004.0069-.0352-.0069-.03125 0 .0037.007-.0037-.03828 0-.03125l-.125.0625-.125.0625c-.985076-2.286983-2.388794-4.698127-2.9375-5.625z" fill="url(#b)" opacity=".8" transform="matrix(.71439082 0 0 .70011588 -.572408 -16.954765)"/><path d="m8 2.3125003c-.5795026 1.0967235-1.0411109 2.2564459-1.6574842
3.3321931-.4355928.5786297-1.2016958.5640806-1.8445342.7006123-.7990951.1487384-1.6040837.2624313-2.4042316.4046946.8321477 1.0057613 1.9042251 1.803058 2.6553809 2.8730975.2931609.5612752.086735 1.1940262.048954 1.7875722-.1300362.873671-.7822554 2.011403-.8721349 2.890749 1.1003565-.559851 2.6237664-1.531888 3.7910708-1.94011.6246409-.12796 1.1682081.254232 1.7115393.49593.7264099.38268 1.7399469.939694 2.4653779 1.324105-.123973-1.302273-.773372-2.733611-.799425-4.042542.09173-.7298892.734153-1.1887208 1.185876-1.7078873.556483-.5461027 1.116396-1.0897375 1.625861-1.6809144-1.211014-.2155824-2.435696-.3737737-3.634767-.6459894-.7510947-.2936551-.937663-1.1434347-1.2928787-1.7800564-.3267359-.6702695-.6326855-1.3506457-.9786043-2.0114542z" fill="none" opacity=".8" stroke="url(#a)" stroke-linecap="square" stroke-width=".992"/></svg>
\ No newline at end of file
diff --git a/icon-themes/elementary_svg/res/fp015.svg b/icon-themes/elementary_svg/res/fp015.svg
new file mode 100644
index 000000000000..e1a021f96910
--- /dev/null
+++ b/icon-themes/elementary_svg/res/fp015.svg
@@ -0,0 +1 @@
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(.89189031 0 0 .94046961 3.14398 5.346537)" gradientUnits="userSpaceOnUse" x1="11.350123" x2="11.350123" y1=".666966" y2="8.172179"><stop offset="0" stop-color="#fff"/><stop offset=".0097359" stop-color="#fff" stop-opacity=".235294"/><stop offset=".99001008" stop-color="#fff" stop-opacity=".156863"/><stop offset="1" stop-color="#fff" stop-opacity=".392157"/></linearGradient><linearGradient id="b" gradientTransform="matrix(.33333327 0 0 .32971018 -17.44063 -.647843)" gradientUnits="userSpaceOnUse" x1="62.988873" x2="62.988873" y1="11.645091" y2="15.385052"><stop offset="0" stop-color="#fff"/><stop offset="1" stop-color="#d8d8d8"/></linearGradient><linearGradient id="c" gradientTransform="matrix(.50413225 0 0 .49333391 93.640247 -24.864023)" gradientUnits="userSpaceOnUse" x1="-162.6788" x2="-162.6788" y1="58.56691" y2="80.030975"><st
op offset="0" stop-color="#efdfc4"/><stop offset="1" stop-color="#e7c591"/></linearGradient><radialGradient id="d" cx="64.575233" cy="48.605404" gradientTransform="matrix(0 .38528829 -.41958841 0 32.389496 -16.793007)" gradientUnits="userSpaceOnUse" r="31.000002"><stop offset="0" stop-color="#cdf87e"/><stop offset=".26238" stop-color="#a2e34f"/><stop offset=".66093999" stop-color="#68b723"/><stop offset="1" stop-color="#1d7e0d"/></radialGradient><path d="m15.5 3.9996665v-1.273333c0-.1385-.08818-.2263335-.22668-.2263335h-6.77332v-.742083c0-.1385-.08818-.257917-.22668-.257917h-6.5c-.1385 0-.27332.119417-.27332.257917v.742083h-.727c-.1385 0-.273.088167-.273.226667v1.273333" fill="none" opacity=".5" stroke="#7e8087" stroke-linecap="square"/><path d="m2 2v1h-1v4h14v-4h-7v-1z" fill="url(#b)"/><path d="m.5 4.5h15v10h-15z" fill="url(#c)" stroke="#987124" stroke-linejoin="round" stroke-opacity=".498039"/><path d="m1.5 5.5h13v8h-13z" fill="none" opacity=".5" stroke="url(#a)" stroke-linecap="r
ound"/><path d="m10.5 10.5v-2.0072863h3v2.0072863h2.007286v3h-2.007286v2.007286h-3v-2.007286h-2.0072863v-3z" fill="url(#d)"/><path d="m10.5 10.5v-2.0072863h3v2.0072863h2.007286v3h-2.007286v2.007286h-3v-2.007286h-2.0072863v-3z" fill="none" opacity=".5" stroke="#0f5a00" stroke-linecap="round" stroke-linejoin="round"/><g fill="#fff"><path d="m11 9h2v1h-2z" opacity=".5"/><path d="m11 14h2v1h-2z" opacity=".2"/><path d="m9 11h2v1h-2z" opacity=".4"/><path d="m13 11h2v1h-2z" opacity=".4"/></g></svg>
\ No newline at end of file
diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt
index c8aec162cee8..91567f9107fc 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -1872,7 +1872,7 @@ res/tables_32.png cmd/32/dbviewtables.png
# formula
# ==============================================
-formula/res/fapclose.png cmd/sc_open.png
+formula/res/fapclose.png svtools/res/folder.png
formula/res/faperror.png cmd/sc_cancel.png
formula/res/fapok.png cmd/sc_ok.png
formula/res/fapopen.png cmd/sc_open.png
@@ -1881,7 +1881,7 @@ formula/res/fx.png cmd/sc_dbviewfunctions.png
# fpicker
# ==============================================
fpicker/res/fp011.png cmd/sc_firstpage.png
-fpicker/res/fp014.png cmd/sc_open.png
+fpicker/res/fp014.png res/fp015.png
fpicker/res/fp015.png cmd/sc_starshapes.png
fpicker/res/fp016.png desktop/res/shared_16.png
@@ -1918,10 +1918,9 @@ res/dir-open.png cmd/sc_open.png
res/extension_plus_26.png cmd/lc_insertplugin.png
res/extension_plus_32.png cmd/32/insertplugin.png
res/fileopen.png cmd/sc_open.png
-res/foldercl.png cmd/sc_open.png
+res/foldercl.png svtools/res/folder.png
res/folderop.png cmd/sc_open.png
-res/fp010.png cmd/sc_open.png
-res/fp015.png cmd/sc_starshapes.png
+res/fp010.png cmd/sc_upsearch.png
res/hldocntp.png cmd/32/adddirect.png
res/hldoctp.png cmd/32/insertreferencefield.png
res/hlinettp.png cmd/32/browseview.png
@@ -1989,6 +1988,7 @@ res/sc10867.png cmd/sc_grafblue.png
res/sc10868.png cmd/sc_grafgamma.png
res/sc10869.png cmd/sc_graftransparence.png
res/script.png cmd/sc_insertscript.png
+res/sx03141.png svtools/res/folder.png
res/sx03150.png cmd/sc_showsinglepage.png
res/sx03164.png res/harddisk_16.png
res/sx03188.png cmd/sc_dbviewtables.png
@@ -2159,7 +2159,6 @@ svtools/res/back_large.png cmd/lc_prevrecord.png
svtools/res/back_small.png cmd/sc_prevrecord.png
svtools/res/bmpfont.png cmd/color.png
svtools/res/ed06.png dbaccess/res/pkey.png
-svtools/res/folder.png cmd/sc_open.png
svtools/res/folderop.png cmd/sc_open.png
svtools/res/info_large.png cmd/lc_alignleft.png
svtools/res/info_small.png cmd/sc_alignleft.png
diff --git a/icon-themes/sifr/res/fp015.png b/icon-themes/sifr/res/fp015.png
new file mode 100644
index 000000000000..98023ea4a98c
Binary files /dev/null and b/icon-themes/sifr/res/fp015.png differ
diff --git a/icon-themes/sifr/svtools/res/folder.png b/icon-themes/sifr/svtools/res/folder.png
new file mode 100644
index 000000000000..02b1efc4c9f0
Binary files /dev/null and b/icon-themes/sifr/svtools/res/folder.png differ
diff --git a/icon-themes/sifr_dark/links.txt b/icon-themes/sifr_dark/links.txt
index c8aec162cee8..91567f9107fc 100644
--- a/icon-themes/sifr_dark/links.txt
+++ b/icon-themes/sifr_dark/links.txt
@@ -1872,7 +1872,7 @@ res/tables_32.png cmd/32/dbviewtables.png
# formula
# ==============================================
-formula/res/fapclose.png cmd/sc_open.png
+formula/res/fapclose.png svtools/res/folder.png
formula/res/faperror.png cmd/sc_cancel.png
formula/res/fapok.png cmd/sc_ok.png
formula/res/fapopen.png cmd/sc_open.png
@@ -1881,7 +1881,7 @@ formula/res/fx.png cmd/sc_dbviewfunctions.png
# fpicker
# ==============================================
fpicker/res/fp011.png cmd/sc_firstpage.png
-fpicker/res/fp014.png cmd/sc_open.png
+fpicker/res/fp014.png res/fp015.png
fpicker/res/fp015.png cmd/sc_starshapes.png
fpicker/res/fp016.png desktop/res/shared_16.png
@@ -1918,10 +1918,9 @@ res/dir-open.png cmd/sc_open.png
res/extension_plus_26.png cmd/lc_insertplugin.png
res/extension_plus_32.png cmd/32/insertplugin.png
res/fileopen.png cmd/sc_open.png
-res/foldercl.png cmd/sc_open.png
+res/foldercl.png svtools/res/folder.png
res/folderop.png cmd/sc_open.png
-res/fp010.png cmd/sc_open.png
-res/fp015.png cmd/sc_starshapes.png
+res/fp010.png cmd/sc_upsearch.png
res/hldocntp.png cmd/32/adddirect.png
res/hldoctp.png cmd/32/insertreferencefield.png
res/hlinettp.png cmd/32/browseview.png
@@ -1989,6 +1988,7 @@ res/sc10867.png cmd/sc_grafblue.png
res/sc10868.png cmd/sc_grafgamma.png
res/sc10869.png cmd/sc_graftransparence.png
res/script.png cmd/sc_insertscript.png
+res/sx03141.png svtools/res/folder.png
res/sx03150.png cmd/sc_showsinglepage.png
res/sx03164.png res/harddisk_16.png
res/sx03188.png cmd/sc_dbviewtables.png
@@ -2159,7 +2159,6 @@ svtools/res/back_large.png cmd/lc_prevrecord.png
svtools/res/back_small.png cmd/sc_prevrecord.png
svtools/res/bmpfont.png cmd/color.png
svtools/res/ed06.png dbaccess/res/pkey.png
-svtools/res/folder.png cmd/sc_open.png
svtools/res/folderop.png cmd/sc_open.png
svtools/res/info_large.png cmd/lc_alignleft.png
svtools/res/info_small.png cmd/sc_alignleft.png
diff --git a/icon-themes/sifr_dark/res/fp015.png b/icon-themes/sifr_dark/res/fp015.png
new file mode 100644
index 000000000000..0885856352ed
Binary files /dev/null and b/icon-themes/sifr_dark/res/fp015.png differ
diff --git a/icon-themes/sifr_dark/svtools/res/folder.png b/icon-themes/sifr_dark/svtools/res/folder.png
new file mode 100644
index 000000000000..f3eb9e079f40
Binary files /dev/null and b/icon-themes/sifr_dark/svtools/res/folder.png differ
diff --git a/icon-themes/sifr_dark_svg/res/fp015.svg b/icon-themes/sifr_dark_svg/res/fp015.svg
new file mode 100644
index 000000000000..b424b0ea6baa
--- /dev/null
+++ b/icon-themes/sifr_dark_svg/res/fp015.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><g fill="#aaa8ac" transform="translate(-301 -727)"><path d="m313 736v1.9968h-2v1.9967h2v1.9967h2v-1.9967h2v-1.9967h-2v-1.9968z"/><path d="m303 728c-.83333 0-1.5253.56422-1.7695 1.0527-.24426.48852-.23047.94727-.23047.94727v10c0 .83333.56422 1.5253 1.0527 1.7695.48852.24426.94727.23047.94727.23047h6s1 0 1-1-1-1-1-1h-6v-10h4.5859l2 2h5.4141v2c0 1 1 1 1 1s1 0 1-1v-2s.0138-.45875-.23047-.94727c-.24426-.48851-.9362-1.0527-1.7695-1.0527h-4.5859l-2-2z" fill-rule="evenodd"/></g></svg>
\ No newline at end of file
diff --git a/icon-themes/sifr_dark_svg/svtools/res/folder.svg b/icon-themes/sifr_dark_svg/svtools/res/folder.svg
new file mode 100644
index 000000000000..92e7cbd88a5a
--- /dev/null
+++ b/icon-themes/sifr_dark_svg/svtools/res/folder.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="m461.03 176.99-.0312 11.01c.00002.83333.57399 1.5057 1.0625 1.75.48851.24436.9375.25.9375.25h12s.44899-.006.9375-.25c.48851-.24426 1.0647-.91667 1.0625-1.75v-7h-13.031l-.46875 7.0312c-.0164.2618-.26945.48511-.53125.46875-.2618-.0164-.48511-.26945-.46875-.53125l.5-7.5c.01-.22281.18713-.42714.40625-.46875.0312-.003.0626-.003.0937 0h11.5l.0312-1.0101c0-1-.96528-.98993-.96528-.98993h-5.066l-1.9688-2.0101h-5s-1 0-1 1z" fill="#aaa8ac" transform="translate(-461 -174.99)"/></svg>
\ No newline at end of file
diff --git a/icon-themes/sifr_svg/res/fp015.svg b/icon-themes/sifr_svg/res/fp015.svg
new file mode 100644
index 000000000000..87600f0f0d4b
--- /dev/null
+++ b/icon-themes/sifr_svg/res/fp015.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><g fill="#555753" transform="translate(-301 -727)"><path d="m313 736v1.9968h-2v1.9967h2v1.9967h2v-1.9967h2v-1.9967h-2v-1.9968z"/><path d="m303 728c-.83333 0-1.5253.56422-1.7695 1.0527-.24426.48852-.23047.94727-.23047.94727v10c0 .83333.56422 1.5253 1.0527 1.7695.48852.24426.94727.23047.94727.23047h6s1 0 1-1-1-1-1-1h-6v-10h4.5859l2 2h5.4141v2c0 1 1 1 1 1s1 0 1-1v-2s.0138-.45875-.23047-.94727c-.24426-.48851-.9362-1.0527-1.7695-1.0527h-4.5859l-2-2z" fill-rule="evenodd"/></g></svg>
\ No newline at end of file
diff --git a/icon-themes/sifr_svg/svtools/res/folder.svg b/icon-themes/sifr_svg/svtools/res/folder.svg
new file mode 100644
index 000000000000..c9614bbd4229
--- /dev/null
+++ b/icon-themes/sifr_svg/svtools/res/folder.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="m461.03 176.99-.0312 11.01c.00002.83333.57399 1.5057 1.0625 1.75.48851.24436.9375.25.9375.25h12s.44899-.006.9375-.25c.48851-.24426 1.0647-.91667 1.0625-1.75v-7h-13.031l-.46875 7.0312c-.0164.2618-.26945.48511-.53125.46875-.2618-.0164-.48511-.26945-.46875-.53125l.5-7.5c.01-.22281.18713-.42714.40625-.46875.0312-.003.0626-.003.0937 0h11.5l.0312-1.0101c0-1-.96528-.98993-.96528-.98993h-5.066l-1.9688-2.0101h-5s-1 0-1 1z" fill="#555753" transform="translate(-461 -174.99)"/></svg>
\ No newline at end of file
More information about the Libreoffice-commits
mailing list