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/vcl/button.hxx | 2
sw/qa/extras/ooxmlexport/data/tdf132766.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport12.cxx | 21 ++-----
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx | 16 +++++
sw/qa/uitest/writer_tests2/tdf116474.py | 4 -
sw/source/core/frmedt/fews.cxx | 43 ---------------
sw/source/filter/ww8/docxattributeoutput.cxx | 5 +
sw/source/filter/ww8/wrtw8num.cxx | 65 +++++++++--------------
toolkit/source/awt/vclxwindows.cxx | 21 ++++---
vcl/source/control/button.cxx | 4 -
vcl/unx/gtk3/gtk3gtkinst.cxx | 12 ++--
37 files changed, 111 insertions(+), 141 deletions(-)
New commits:
commit e03bcd79dc49ef8fd2749f1e47f1c1ef8382958d
Author: Vasily Melenchuk <vasily.melenc...@cib.de>
AuthorDate: Sat May 9 14:35:25 2020 +0300
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri May 15 14:20:06 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.behr...@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 fd8910058f0e..100deecef305 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -421,6 +421,22 @@ CPPUNIT_TEST_FIXTURE(SwModelTestBase,
testSemiTransparentText)
CPPUNIT_ASSERT_EQUAL(nTransparence, nActual);
}
+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 39a0d5b2fcd9..a2e8bebfd6e4 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6896,7 +6896,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 3864b09bf681..59f69e506686 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -460,7 +460,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)
{
@@ -498,44 +502,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;
@@ -555,16 +535,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())
@@ -572,6 +542,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 18f16b9cd5c66b9ccefe179d3a952291a2411c87
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu May 14 14:47:21 2020 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri May 15 14:18:03 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 <caol...@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 2fc5e123b0f3..86347f7ec52b 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 dda87fd701ae78d2bcdf1712b87c30ee730b545b
Author: Rizal Muttaqin <riz_17_...@yahoo.co.id>
AuthorDate: Thu May 14 13:31:33 2020 +0700
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri May 15 14:18:03 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_...@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 2dadcb89bbeb4e4b9276f704bbf461c9aa1100bd
Author: Rizal Muttaqin <riz_17_...@yahoo.co.id>
AuthorDate: Wed May 13 17:33:44 2020 +0700
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri May 15 14:18:03 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_...@yahoo.co.id>
(cherry picked from commit bca57a7e5e5edf5f0d5d88ce100d974626353c10)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94002
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Tested-by: Rizal Muttaqin <riz_17_...@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";>/&amp;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;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";>/&gt;<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";>/&amp;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
commit 86207d7d11a23ff6aba7c43f9b3985fb1fde091c
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed May 6 11:06:45 2020 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri May 15 14:18:02 2020 +0200
Resolves: tdf#123801 captioning issues
revert attempt to by default create a msword roundtrip friendly caption.
commit 2333786aa0eaf70c45c80e546239fb3565b1b4e7
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Mar 20 11:48:28 2018 +0000
Resolves: tdf#116474 bring hidden text property under undo control
commit ebd43aee5b9cf98ed96ce28985267ad0bc980b7a
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Apr 7 13:41:38 2017 +0100
rework setting hidden property on line break
commit feedd45ba2dd308af2d3a1b2f64681b9467535b6
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Oct 27 14:37:03 2016 +0100
in msword the hard-break between image and caption has a width
commit ba401ee10be2fb051bc961680f35b04e4e77a32d
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Sep 1 09:39:37 2016 +0100
coverity#1372378 Dereference null return value
commit 93ab0ff24cb71c36c9e7958046e96d7472b5af90
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Sep 10 15:46:57 2015 +0100
Related: tdf#93676 default to as-char inside captions
Change-Id: I460046a10f36bed13e2f4651b4c0a9b9b0662015
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93530
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/sw/qa/uitest/writer_tests2/tdf116474.py
b/sw/qa/uitest/writer_tests2/tdf116474.py
index e85943d77043..e5bb89209835 100644
--- a/sw/qa/uitest/writer_tests2/tdf116474.py
+++ b/sw/qa/uitest/writer_tests2/tdf116474.py
@@ -41,13 +41,13 @@ class tdf116474(UITestCase):
xOkBtn.executeAction("CLICK", tuple())
xFrame = document.TextFrames[0]
- self.assertEqual(document.TextFrames[0].Text.String, "\nFigure 1:
Caption")
+ self.assertEqual(document.TextFrames[0].Text.String, "Figure 1:
Caption")
self.assertEqual(document.GraphicObjects.getCount(), 1) #nr. of images
#Undo, redo
self.xUITest.executeCommand(".uno:Undo")
self.xUITest.executeCommand(".uno:Redo")
#Verify
- self.assertEqual(document.TextFrames[0].Text.String, "\nFigure 1:
Caption")
+ self.assertEqual(document.TextFrames[0].Text.String, "Figure 1:
Caption")
self.assertEqual(document.GraphicObjects.getCount(), 1) #nr. of images
self.ui_test.close_doc()
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index b20c37d28674..e0def10a3d05 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -19,7 +19,6 @@
#include <svx/svdobj.hxx>
#include <comphelper/lok.hxx>
-#include <editeng/charhiddenitem.hxx>
#include <init.hxx>
#include <fesh.hxx>
#include <tabcol.hxx>
@@ -502,48 +501,6 @@ void SwFEShell::InsertLabel( const SwLabelType eType,
const OUString &rText, con
pFlyFormat = GetDoc()->InsertLabel(eType, rText, rSeparator,
rNumberSeparator, bBefore, nId,
nIdx, rCharacterStyle, bCpyBrd);
-
- //if we succeeded in putting a caption on the content, and the
- //content was a frame/graphic, then set the contained element
- //to as-char anchoring because that's all msword is able to
- //do when inside a frame, and in writer for freshly captioned
- //elements it's largely irrelevant what the anchor of the contained
- //type is but making it as-char by default results in very
- //good roundtripping
- if (pFlyFormat && bInnerCntIsFly)
- {
- SwNodeIndex aAnchIdx(*pFlyFormat->GetContent().GetContentIdx(), 1);
- SwTextNode *pTextNode = aAnchIdx.GetNode().GetTextNode();
-
- SwFormatAnchor aAnc(RndStdIds::FLY_AS_CHAR);
- sal_Int32 nInsertPos = bBefore ? pTextNode->Len() : 0;
- SwPosition aPos(*pTextNode, nInsertPos);
-
- aAnc.SetAnchor(&aPos);
-
- SwFlyFrame *pFly = GetSelectedOrCurrFlyFrame();
- OSL_ENSURE(pFly, "SetFlyFrameAttr, no Fly selected.");
- if (pFly)
- {
- SfxItemSet
aSet(makeItemSetFromFormatAnchor(GetDoc()->GetAttrPool(), aAnc));
- SwFlyFrameFormat* pInnerFlyFormat = pFly->GetFormat();
- GetDoc()->SetFlyFrameAttr(*pInnerFlyFormat, aSet);
- }
- //put a hard-break after the graphic to keep it separated
- //from the caption text if the outer frame is resized
- const sal_Int32 nIndex = bBefore ? nInsertPos : 1;
- SwIndex aIdx(pTextNode, nIndex);
- pTextNode->InsertText("\n", aIdx);
- //set the hard-break to be hidden, otherwise it has
- //non-zero width in word and so hard-break flows on
- //the next line, pushing the caption text out of
- //the frame making the caption apparently disappear
- SvxCharHiddenItem aHidden(true, RES_CHRATR_HIDDEN);
- SfxItemSet aSet(GetDoc()->GetAttrPool(), {{aHidden.Which(),
aHidden.Which()}});
- aSet.Put(aHidden);
- SwPaM aPam(*pTextNode, nIndex, *pTextNode, nIndex + 1);
- SetAttrSet(aSet, SetAttrMode::DEFAULT, &aPam);
- }
}
if (pFlyFormat)
commit 5d74827f088c9bbcca7f41a59696d62395029f68
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon May 11 08:45:19 2020 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri May 15 14:18:02 2020 +0200
tdf#132832 calcAdjustedSize: Take max width into account
Actually take into account the preferred width when
calculating the size of radio button, checkbox and
hyperlink controls.
This e.g. makes word wrap work properly when the
multiline property is set for a checkbox, radio or hyperlink
control and the single line text exceeds the preferred width,
rather than keeping the whole text in one line that exceeds
the preferred width.
Change-Id: Id04668e4e1afe7c10a28468eff05cf04c10ae3c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93947
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
(cherry picked from commit 2539f1d142e0077dfeec36ef349a1f5443f1c94b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93798
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index b0b2884c9ad0..f37b714faf9f 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -350,7 +350,7 @@ public:
static Image GetRadioImage( const AllSettings& rSettings,
DrawButtonFlags nFlags );
- Size CalcMinimumSize() const;
+ Size CalcMinimumSize( long nMaxWidth = 0 ) const;
virtual Size GetOptimalSize() const override;
void SetToggleHdl( const Link<RadioButton&,void>& rLink ) {
maToggleHdl = rLink; }
diff --git a/toolkit/source/awt/vclxwindows.cxx
b/toolkit/source/awt/vclxwindows.cxx
index 5645bf099288..c356aba16ee1 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -941,7 +941,7 @@ css::awt::Size VCLXCheckBox::calcAdjustedSize( const
css::awt::Size& rNewSize )
VclPtr< CheckBox > pCheckBox = GetAs< CheckBox >();
if ( pCheckBox )
{
- Size aMinSz = pCheckBox->CalcMinimumSize();
+ Size aMinSz = pCheckBox->CalcMinimumSize(rNewSize.Width);
if ( ( aSz.Width() > aMinSz.Width() ) && ( aSz.Height() <
aMinSz.Height() ) )
aSz.setHeight( aMinSz.Height() );
else
@@ -1290,7 +1290,7 @@ css::awt::Size VCLXRadioButton::calcAdjustedSize( const
css::awt::Size& rNewSize
VclPtr< RadioButton > pRadioButton = GetAs< RadioButton >();
if ( pRadioButton )
{
- Size aMinSz = pRadioButton->CalcMinimumSize();
+ Size aMinSz = pRadioButton->CalcMinimumSize(rNewSize.Width);
if ( ( aSz.Width() > aMinSz.Width() ) && ( aSz.Height() <
aMinSz.Height() ) )
aSz.setHeight( aMinSz.Height() );
else
@@ -3023,13 +3023,18 @@ css::awt::Size VCLXFixedHyperlink::getPreferredSize( )
css::awt::Size VCLXFixedHyperlink::calcAdjustedSize( const css::awt::Size&
rNewSize )
{
SolarMutexGuard aGuard;
+ Size aSz( VCLUnoHelper::ConvertToVCLSize( rNewSize ));
+ VclPtr< FixedText > pFixedText = GetAs< FixedText >();
+ if (pFixedText)
+ {
+ Size aMinSz = pFixedText->CalcMinimumSize(rNewSize.Width);
+ if ( ( aSz.Width() > aMinSz.Width() ) && ( aSz.Height() <
aMinSz.Height() ) )
+ aSz.setHeight( aMinSz.Height() );
+ else
+ aSz = aMinSz;
+ }
- css::awt::Size aSz = rNewSize;
- css::awt::Size aMinSz = getMinimumSize();
- if ( aSz.Height != aMinSz.Height )
- aSz.Height = aMinSz.Height;
-
- return aSz;
+ return VCLUnoHelper::ConvertToAWTSize(aSz);
}
void VCLXFixedHyperlink::setProperty( const OUString& PropertyName, const
css::uno::Any& Value)
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index f3fedd972a68..a4ae36cffe15 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -2814,7 +2814,7 @@ void RadioButton::ImplSetMinimumNWFSize()
Pop();
}
-Size RadioButton::CalcMinimumSize() const
+Size RadioButton::CalcMinimumSize(long nMaxWidth) const
{
Size aSize;
if ( !maImage )
@@ -2838,7 +2838,7 @@ Size RadioButton::CalcMinimumSize() const
{
bool bTopImage = (GetStyle() & WB_TOP) != 0;
- Size aTextSize = GetTextRect( tools::Rectangle( Point(), Size(
0x7fffffff, 0x7fffffff ) ),
+ Size aTextSize = GetTextRect( tools::Rectangle( Point(), Size(
nMaxWidth > 0 ? nMaxWidth : 0x7fffffff, 0x7fffffff ) ),
aText, FixedText::ImplGetTextStyle(
GetStyle() ) ).GetSize();
aSize.AdjustWidth(2 ); // for focus rect
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
