[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sw/inc sw/qa sw/source writerfilter/source
sw/inc/autostyle_helper.hxx | 31 +++ sw/qa/extras/ooxmlimport/data/tdf141969-font_in_table_with_style.docx |binary sw/qa/extras/ooxmlimport/ooxmlimport2.cxx | 17 + sw/source/core/unocore/unoobj.cxx | 52 + sw/source/core/unocore/unostyle.cxx | 67 -- writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 99 ++ 6 files changed, 213 insertions(+), 53 deletions(-) New commits: commit 1db2c58efedb36703ae39f42dc21c6796b1fd675 Author: Mike Kaganski AuthorDate: Tue Jul 4 08:14:02 2023 +0300 Commit: Miklos Vajna CommitDate: Wed Jul 5 08:15:03 2023 +0200 tdf#141969: use paragraph autostyle to mimic Word's table style Word's table styles may define paragraph and character properties. They are handled in DomainMapperTableHandler::ApplyParagraphPropertiesFromTableStyle. When setting such a character property using setPropertyValue, it may apply to the text runs inside the paragraph, overriding values from character style and direct formatting, which must be kept. To fix that, this change creates a *paragraph* autostyle first, containing the properties; and then applies only this autostyle to the paragraph; the autostyle can't apply to runs, so the properties apply at paragraph level. Sadly, it is impossible to create a useful autostyle in writerfilter using UNO, because of the same problem that caused tdf#155945. UNO properties may define only parts of complex SfxPoolItem; setting them without having already applied values of such SfxPoolItem's would create wrong values for properties that weren't set by the UNO properties, but happen to share the same SfxPoolItem. To workaround that in writerfilter, a map of UNO names to sets of UNO names defining the complex property would be required, and then maintained. Instead, introduce a hidded 'ParaAutoStyleDef' property of SwXTextCursor, taking the same PropertyValue sequence as in XAutoStyleFamily::insertStyle. Implement it similarly to SwUnoCursorHelper::SetPropertyValues: first, build a WhichRangesContainer for specific WIDs needed for the properties; then obtain the actual values for these WIDs from the paragraph; and then set properties from the PropertyValue sequence. To create the autostyle properly, the code from SwXAutoStyleFamily::insertStyle is reused. There are more "proper" ways to fix this in part or as a whole, e.g.: * Split all complex SfxPoolItem's to simple ones, as done for one of them in commit db115bec9254417ef7a3faf687478fe5424ab378 (tdf#78510 sw,cui: split SvxLRSpaceItem for SwTextNode, SwTextFormatColl, 2023-02-24); * Rewrite writerfilter in sw; * Implement the missing proper table styles with paragraph and character properties, having the same precedence. But I don't feel crazy enough for any of these :D Change-Id: I07142cb23e8ec51f0e8ac8609f367ba247d94438 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153947 Tested-by: Jenkins Reviewed-by: Mike Kaganski Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154010 Reviewed-by: Miklos Vajna diff --git a/sw/inc/autostyle_helper.hxx b/sw/inc/autostyle_helper.hxx new file mode 100644 index ..9336085db02e --- /dev/null +++ b/sw/inc/autostyle_helper.hxx @@ -0,0 +1,31 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#pragma once + +#include + +#include + +#include +#include + +#include + +#include "istyleaccess.hxx" +#include "swatrset.hxx" + +class SwDoc; + +std::shared_ptr +PropValuesToAutoStyleItemSet(SwDoc& rDoc, IStyleAccess::SwAutoStyleFamily eFamily, + const css::uno::Sequence& Values, + SfxItemSet& rSet); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/sw/qa/extras/ooxmlimport/data/tdf141969-font_in_table_with_style.docx b/sw/qa/extras/ooxmlimport/data/tdf141969-font_in_table_with_style.docx new file mode 100644 index ..6cbb8fb72e9d Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf141969-font_in_table_with_style.docx differ diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx index a8e0c64c8712..ca1aeafccc5e 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx @@ -1132,6 +1132,23 @@
[Libreoffice-commits] core.git: svx/source svx/uiconfig sw/uiconfig
svx/source/sidebar/text/TextPropertyPanel.cxx |8 --
svx/source/sidebar/text/TextPropertyPanel.hxx |2 -
svx/uiconfig/ui/sidebartextpanel.ui | 32 +++---
sw/uiconfig/sglobal/toolbar/textstylebar.xml |2 -
sw/uiconfig/swriter/toolbar/textstylebar.xml |2 -
sw/uiconfig/swriter/ui/notebookbar_groups.ui |2 -
6 files changed, 8 insertions(+), 40 deletions(-)
New commits:
commit c0f1f67bfd2853554b58127e91443526c44163d7
Author: Maxim Monastirsky
AuthorDate: Wed Jul 5 01:28:05 2023 +0300
Commit: Maxim Monastirsky
CommitDate: Wed Jul 5 08:14:20 2023 +0200
Swap .uno:FontColor for .uno:Color
Following tdf#105293, which left some UI elements unchanged.
This also simplifies the sidebar, as .uno:Color is universal
while .uno:FontColor works only with Writer text. It also
benefits tdf#154270, as using the same command in the toolbar
and the sidebar will keep their color in sync.
Change-Id: Ia6e1ffef4012b6f8db4c9079d0b0c99a59887670
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154012
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx
b/svx/source/sidebar/text/TextPropertyPanel.cxx
index d5bfc2a480df..5b4e907cd86b 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -49,9 +49,7 @@ TextPropertyPanel::TextPropertyPanel(weld::Widget* pParent,
const css::uno::Refe
, mxFontEffectsDispatch(new ToolbarUnoDispatcher(*mxFontEffects,
*m_xBuilder, rxFrame))
, mxFontAdjust(m_xBuilder->weld_toolbar("fontadjust"))
, mxFontAdjustDispatch(new ToolbarUnoDispatcher(*mxFontAdjust,
*m_xBuilder, rxFrame))
-, mxToolBoxFontColorSw(m_xBuilder->weld_toolbar("colorbar_writer"))
-, mxToolBoxFontColorSwDispatch(new
ToolbarUnoDispatcher(*mxToolBoxFontColorSw, *m_xBuilder, rxFrame))
-, mxToolBoxFontColor(m_xBuilder->weld_toolbar("colorbar_others"))
+, mxToolBoxFontColor(m_xBuilder->weld_toolbar("colorbar"))
, mxToolBoxFontColorDispatch(new ToolbarUnoDispatcher(*mxToolBoxFontColor,
*m_xBuilder, rxFrame))
, mxToolBoxBackgroundColor(m_xBuilder->weld_toolbar("colorbar_background"))
, mxToolBoxBackgroundColorDispatch(new
ToolbarUnoDispatcher(*mxToolBoxBackgroundColor, *m_xBuilder, rxFrame))
@@ -78,7 +76,6 @@ TextPropertyPanel::~TextPropertyPanel()
mxDefaultBarDispatch.reset();
mxPositionBarDispatch.reset();
mxSpacingBarDispatch.reset();
-mxToolBoxFontColorSwDispatch.reset();
mxToolBoxFontColorDispatch.reset();
mxToolBoxBackgroundColorDispatch.reset();
mxFontAdjustDispatch.reset();
@@ -90,7 +87,6 @@ TextPropertyPanel::~TextPropertyPanel()
mxDefaultBar.reset();
mxPositionBar.reset();
mxSpacingBar.reset();
-mxToolBoxFontColorSw.reset();
mxToolBoxFontColor.reset();
mxToolBoxBackgroundColor.reset();
mxFontAdjust.reset();
@@ -143,8 +139,6 @@ void TextPropertyPanel::HandleContextChange (
break;
}
-mxToolBoxFontColor->set_visible(!bWriterText);
-mxToolBoxFontColorSw->set_visible(bWriterText);
mxToolBoxBackgroundColor->set_visible(bWriterText || bDrawText);
mxResetBar->set_visible(bWriterText || bCalcText);
mxDefaultBar->set_visible(bDrawText);
diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx
b/svx/source/sidebar/text/TextPropertyPanel.hxx
index 3ad44bde78ac..c383ef1bd891 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.hxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.hxx
@@ -53,8 +53,6 @@ private:
std::unique_ptr mxFontEffectsDispatch;
std::unique_ptr mxFontAdjust;
std::unique_ptr mxFontAdjustDispatch;
-std::unique_ptr mxToolBoxFontColorSw;
-std::unique_ptr mxToolBoxFontColorSwDispatch;
std::unique_ptr mxToolBoxFontColor;
std::unique_ptr mxToolBoxFontColorDispatch;
std::unique_ptr mxToolBoxBackgroundColor;
diff --git a/svx/uiconfig/ui/sidebartextpanel.ui
b/svx/uiconfig/ui/sidebartextpanel.ui
index 732c3ee421ed..97a92d97a0f5 100644
--- a/svx/uiconfig/ui/sidebartextpanel.ui
+++ b/svx/uiconfig/ui/sidebartextpanel.ui
@@ -161,31 +161,7 @@
False
6
-
-True
-True
-icons
-False
-2
-
-
-True
-True
-
-
-False
-False
-
-
-
-
-False
-True
-0
-
-
-
-
+
True
True
icons
@@ -205,7 +181,7 @@
False
True
-1
+0
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/htmlexport/htmlexport.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit e501e4549b3343f69b7ce19957e7bbc17d007d65
Author: Miklos Vajna
AuthorDate: Wed Jul 5 08:08:28 2023 +0200
Commit: Miklos Vajna
CommitDate: Wed Jul 5 09:02:41 2023 +0200
CppunitTest_sw_htmlexport: avoid reqif magic in testFieldShadeReqIf
Set the filter options explicitly, rather than inferring it from the
test name.
Change-Id: I949cae81ee74ac7f85e6ff6685fad74c200fa575
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154015
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index f83f446f9589..d5c68498bb8f 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -1119,8 +1119,12 @@ DECLARE_HTMLEXPORT_TEST(testTdf132739, "tdf132739.odt")
"background: #5983b0; border: 1px solid #33; padding:
0.04in");
}
-DECLARE_HTMLEXPORT_TEST(testFieldShadeReqIf, "field-shade-reqif.odt")
+CPPUNIT_TEST_FIXTURE(HtmlExportTest, testFieldShadeReqIf)
{
+createSwDoc("field-shade-reqif.odt");
+setFilterOptions("xhtmlns=reqif-xhtml");
+save(mpFilter);
+
htmlDocUniquePtr pDoc = parseHtml(maTempFile);
CPPUNIT_ASSERT(pDoc);
ESC meeting agenda: 2023-07-06 16:00 CEST
Hi, The prototype agenda is below. Extra items are appreciated either in this document or as a reply to this mail: https://pad.documentfoundation.org/p/esc You can join using Jitsi here: https://jitsi.documentfoundation.org/esc Regards, Miklos --- * Present: + * Completed Action Items: * Pending Action Items: + give Jaume commit access (Cloph) + send the invite mail to Jaume (Caolan) * Release Engineering update (Cloph/Xisco) + 7.6 status: rc 1 this week? + 7.5 status: 7.5.5 rc2 next week? * Documentation (Olivier) + Bugzilla Documentation statistics 273(273) bugs open + Updates: BZ changes 1 week 1 month 3 months 12 months created 5(-2)28(-1) 82(-11)299(-9) commented 1(-26) 67(-6)197(-55) 1009(-31) resolved 0(-1) 5(-1) 31(-6) 165(-7) + top 10 contributors: Stéphane Guillou made 42 changes in 1 month, and 261 changes in 1 year Olivier Hallot made 24 changes in 1 month, and 477 changes in 1 year Seth Chaiklin made 12 changes in 1 month, and 302 changes in 1 year Kaganski, Mike made 7 changes in 1 month, and 104 changes in 1 year Nabet, Julien made 6 changes in 1 month, and 32 changes in 1 year Robert Großkopf made 4 changes in 1 month, and 14 changes in 1 year Heiko Tietze made 3 changes in 1 month, and 108 changes in 1 year Leroy made 3 changes in 1 month, and 3 changes in 1 year Eyal Rozenberg made 2 changes in 1 month, and 15 changes in 1 year Perdreau, Regis made 2 changes in 1 month, and 9 changes in 1 year * UX Update (Heiko) + Bugzilla (topicUI) statistics 273(273) (topicUI) bugs open, 68(68) (needsUXEval) needs to be evaluated by the UXteam + Updates: BZ changes 1 week 1 month3 months 12 months added 5(1) 18(3) 30(-1) 60(3) commented 46(6)207(-32) 825(-9)2449(6) removed 0(-1) 1(-1) 9(-2) 29(0) resolved 2(0) 21(-6)101(-3) 316(-2) + top 10 contributors: Heiko Tietze made 103 changes in 1 month, and 1482 changes in 1 year Stéphane Guillou made 53 changes in 1 month, and 394 changes in 1 year Eyal Rozenberg made 46 changes in 1 month, and 292 changes in 1 year Kaganski, Mike made 31 changes in 1 month, and 150 changes in 1 year ady made 30 changes in 1 month, and 74 changes in 1 year Justin Luth made 29 changes in 1 month, and 78 changes in 1 year Ilmari Lauhakangas made 24 changes in 1 month, and 224 changes in 1 year Vernon, Stuart Foote made 21 changes in 1 month, and 386 changes in 1 year Dieter made 14 changes in 1 month, and 258 changes in 1 year Hossein made 13 changes in 1 month, and 72 changes in 1 year * Crash Reporting (Caolan) + 61(+26) import failure, 30(+27) export failures + ??? coverity issues + Google / ossfuzz: ?? fuzzers active now * Crash Reporting (Xisco) + 7.5.1.223190(+669) + 7.5.2.216393(+699) + 7.5.3.213933(+1214) + 7.5.4.24081(+1565) * Mentoring (Hossein) committer... 1 week1 month3 months12 months open 71(4) 107(-3)169(-9) 179(-10) reviews 340(62) 1084(38) 3022(106) 10776(48) merged 321(36) 1267(86) 3317(100) 12397(30) abandoned 13(3) 57(3) 156(-2) 647(-9) own commits 179(17)740(29) 2331(-4)10206(17) review commits 64(18)220(15)727(28) 3007(16) contributor... 1 week1 month 3 months12 months open 22(-3) 40(1) 235(4) 240(4) reviews 866(82) 2964(178) 8172(166) 31728(108) merged 16(9) 50(-8) 367(-5) 2732(37) abandoned 3(-1) 10(2) 53(-2) 504(12) own commits 21(12) 65(-3) 236(5) 1012(8) review commits 0(0) 0(0)0(0) 0(0) + easyHack statistics: needsDevEval 8(8) needsUXEval 1(1) cleanup_comments 329(329) total 398(398) assigned 27(27) open 344(344) + top 10 contributors: Dipam Turkar made 6 patches in 1 month, and 9 patches in 1 year Dr. David Alan Gilbert made 6 patches in 1 month, and 18 patches in 1 year Luigi Iucci made 4 patches in 1 month, and 5 patches in 1 year Armin Le Grand (allotropia) made 4 patches in 1 month, and 71 patches in 1 year Colomban Wendling made 3 patches in 1 month, and 24 patches in 1 year Baole Fang made 3 patches in 1 month, and 24 patches in 1 year Juan C. Sanz made 2 patches in 1 month, and 6 patches in 1 year
[Libreoffice-commits] core.git: config_host/config_zxing.h.in configure.ac cui/source
config_host/config_zxing.h.in |2 ++
configure.ac | 21 +
cui/source/dialogs/QrCodeGenDialog.cxx | 10 ++
3 files changed, 33 insertions(+)
New commits:
commit 8dbbeadbc7eabe76736d37fe3bcafe3e537f0bc0
Author: TRaXIn
AuthorDate: Sat Feb 25 17:03:27 2023 +0530
Commit: Hossein
CommitDate: Wed Jul 5 15:33:08 2023 +0200
tdf#153328 ZXing::ToSVG() Conditional usage
Change-Id: I8874f596be808d5d255139654a19b25f71299179
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147677
Tested-by: Jenkins
Tested-by: Hossein
Reviewed-by: Hossein
diff --git a/config_host/config_zxing.h.in b/config_host/config_zxing.h.in
index 6463cb6b4fd1..01b5400c686d 100644
--- a/config_host/config_zxing.h.in
+++ b/config_host/config_zxing.h.in
@@ -12,6 +12,8 @@
#define ENABLE_ZXING 0
+#define HAVE_ZXING_TOSVG 0
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configure.ac b/configure.ac
index 59703a6932e3..80f2e5aa54f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11223,10 +11223,31 @@ else
AC_MSG_RESULT([internal])
SYSTEM_ZXING=
BUILD_TYPE="$BUILD_TYPE ZXING"
+ZXING_CFLAGS="-I${WORKDIR}/UnpackedTarball/zxing/core/src"
fi
if test "$ENABLE_ZXING" = TRUE; then
AC_DEFINE(ENABLE_ZXING)
fi
+AC_MSG_CHECKING([whether zxing::tosvg function is available])
+AC_LANG_PUSH([C++])
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11 $ZXING_CFLAGS"
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+#include
+#include
+int main(){
+ZXing::BitMatrix matrix(1, 1);
+matrix.set(0, 0, true);
+ZXing::ToSVG(matrix);
+return 0;
+}
+])], [
+AC_DEFINE([HAVE_ZXING_TOSVG],[1])
+AC_MSG_RESULT([yes])
+], [AC_MSG_RESULT([no])])
+CXXFLAGS=$save_CXXFLAGS
+AC_LANG_POP([C++])
+AC_SUBST(HAVE_ZXING_TOSVG)
fi
AC_SUBST(SYSTEM_ZXING)
AC_SUBST(ENABLE_ZXING)
diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx
b/cui/source/dialogs/QrCodeGenDialog.cxx
index 6982ca7f8e69..887ccaf44de4 100644
--- a/cui/source/dialogs/QrCodeGenDialog.cxx
+++ b/cui/source/dialogs/QrCodeGenDialog.cxx
@@ -35,6 +35,10 @@
#pragma GCC diagnostic pop
#endif
+#if HAVE_ZXING_TOSVG
+#include
+#endif
+
#endif // ENABLE_ZXING
#include
@@ -73,6 +77,7 @@ namespace
{
#if ENABLE_ZXING
// Implementation adapted from the answer:
https://stackoverflow.com/questions/10789059/create-qr-code-in-vector-image/60638350#60638350
+#if !HAVE_ZXING_TOSVG
OString ConvertToSVGFormat(const ZXing::BitMatrix& bitmatrix)
{
OStringBuffer sb;
@@ -96,6 +101,7 @@ OString ConvertToSVGFormat(const ZXing::BitMatrix& bitmatrix)
sb.append("\"/>\n");
return sb.toString();
}
+#endif
std::string GetBarCodeType(int type)
{
@@ -143,7 +149,11 @@ OString GenerateQRCode(std::u16string_view aQRText,
tools::Long aQRECC, int aQRB
auto writer =
ZXing::MultiFormatWriter(format).setMargin(aQRBorder).setEccLevel(bqrEcc);
writer.setEncoding(ZXing::CharacterSet::UTF8);
ZXing::BitMatrix bitmatrix =
writer.encode(ZXing::TextUtfEncoding::FromUtf8(QRText), 0, 0);
+#if HAVE_ZXING_TOSVG
+return OString(ZXing::ToSVG(bitmatrix));
+#else
return ConvertToSVGFormat(bitmatrix);
+#endif
}
#endif
[Libreoffice-commits] core.git: svgio/qa svgio/source
svgio/qa/cppunit/SvgImportTest.cxx | 38
svgio/qa/cppunit/data/tdf156168.svg | 34
svgio/source/svgreader/svgnode.cxx |4 +--
3 files changed, 74 insertions(+), 2 deletions(-)
New commits:
commit e6ab906ebe9995fb813db7b66df4f9b2def76a1c
Author: Xisco Fauli
AuthorDate: Wed Jul 5 14:36:06 2023 +0200
Commit: Xisco Fauli
CommitDate: Wed Jul 5 17:15:25 2023 +0200
tdf#156168: do nothing when there is no concatenation
Regression from:
tdf#156034: check for css style further up in the hierarchy
Change-Id: I92c6673f1249cc4a273c490cdc0496474ce1f0c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153498
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
Change-Id: Ie699f40ea813d2ba5dc031008d56e2fce73a5715
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154056
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/svgio/qa/cppunit/SvgImportTest.cxx
b/svgio/qa/cppunit/SvgImportTest.cxx
index a72bb39b993f..788eab52fdf5 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -403,6 +403,44 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf145896)
assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[3]",
"color", "#ff");
}
+CPPUNIT_TEST_FIXTURE(Test, testTdf156168)
+{
+Primitive2DSequence aSequence =
parseSvg(u"/svgio/qa/cppunit/data/tdf156168.svg");
+CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequence.getLength()));
+
+drawinglayer::Primitive2dXmlDump dumper;
+xmlDocUniquePtr pDocument = dumper.dumpAndParse(aSequence);
+
+CPPUNIT_ASSERT (pDocument);
+
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", 8);
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[1]",
"color", "#ff");
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[2]",
"color", "#ff");
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[3]",
"color", "#ff");
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[4]",
"color", "#ff");
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[5]",
"color", "#00");
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[6]",
"color", "#00");
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[7]",
"color", "#ff");
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[8]",
"color", "#ff");
+
+// Without the fix in place, this test would have failed with
+// - Expected: 4
+// - Actual : 3
+assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke", 4);
+assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke[1]/line",
"width", "5");
+
+assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke[1]/line",
"color", "#00ff00");
+assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke[2]/line",
"width", "5");
+
+assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke[2]/line",
"color", "#00ff00");
+assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke[3]/line",
"width", "5");
+
+assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke[3]/line",
"color", "#00ff00");
+assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke[4]/line",
"width", "5");
+
+assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke[4]/line",
"color", "#00ff00");
+}
+
CPPUNIT_TEST_FIXTURE(Test, testTdf156034)
{
Primitive2DSequence aSequence =
parseSvg(u"/svgio/qa/cppunit/data/tdf156034.svg");
diff --git a/svgio/qa/cppunit/data/tdf156168.svg
b/svgio/qa/cppunit/data/tdf156168.svg
new file mode 100644
index ..2cdbd35afd09
--- /dev/null
+++ b/svgio/qa/cppunit/data/tdf156168.svg
@@ -0,0 +1,34 @@
+
+
+http://www.w3.org/2000/svg;
+ xmlns:xlink="http://www.w3.org/1999/xlink;
+ style="font-family: 'Times New Roman', serif;
+font-size:large" >
+stroke enabled
+
+
+#MyRed {
+fill: red;
+}
+#MyBlue {
+fill: blue;
+}
+.MyLime {
+stroke: lime;
+stroke-width: 5;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svgio/source/svgreader/svgnode.cxx
b/svgio/source/svgreader/svgnode.cxx
index 992aaf72bce0..4f82a16ebf1e 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -120,7 +120,7 @@ namespace {
addCssStyle(rDocument, aNewConcatenated);
// look further up in the hierarchy
-if(pParent && pParent->getId())
+if(!aConcatenated.isEmpty() && pParent && pParent->getId())
{
const OUString& rParentId = pParent->getId().value();
addCssStyle(rDocument, "#" + rParentId +
aConcatenated);
@@ -140,7
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/inc/ShapeController.h | 38 ---
chart2/source/controller/main/DrawCommandDispatch.cxx| 131 +--
chart2/source/controller/main/DrawCommandDispatch.h | 42 ---
chart2/source/controller/main/DrawCommandDispatch.hxx|4
chart2/source/controller/main/FeatureCommandDispatchBase.cxx |4
chart2/source/controller/main/FeatureCommandDispatchBase.hxx | 44 +++
chart2/source/controller/main/ShapeController.cxx| 87 +++
chart2/source/controller/main/ShapeController.hxx|2
8 files changed, 154 insertions(+), 198 deletions(-)
New commits:
commit 29eb0b94f27b956d3c9917b318ef7077c6e01036
Author: Noel Grandin
AuthorDate: Wed Jul 5 12:05:34 2023 +0200
Commit: Noel Grandin
CommitDate: Wed Jul 5 14:55:55 2023 +0200
convert *CommandId enum to scoped enum
merging two different enums in the process
Change-Id: I81ff8f10158a19a1b3a4ffe35fac6653beb677ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154028
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/controller/inc/ShapeController.h
b/chart2/source/controller/inc/ShapeController.h
deleted file mode 100644
index 433f6af5250f..
--- a/chart2/source/controller/inc/ShapeController.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#pragma once
-
-//Shape Controller Command Ids:
-enum ShapeControllerCommandID
-{
-COMMAND_ID_FORMAT_LINE = 1,
-COMMAND_ID_FORMAT_AREA = 2,
-COMMAND_ID_TEXT_ATTRIBUTES = 3,
-COMMAND_ID_TRANSFORM_DIALOG = 4,
-COMMAND_ID_OBJECT_TITLE_DESCRIPTION = 5,
-COMMAND_ID_RENAME_OBJECT= 6,
-COMMAND_ID_BRING_TO_FRONT = 8,
-COMMAND_ID_FORWARD = 9,
-COMMAND_ID_BACKWARD = 10,
-COMMAND_ID_SEND_TO_BACK = 11,
-COMMAND_ID_FONT_DIALOG = 15,
-COMMAND_ID_PARAGRAPH_DIALOG = 16
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx
b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 935c0832d649..1446059a0223 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -18,7 +18,6 @@
*/
#include "DrawCommandDispatch.hxx"
-#include "DrawCommandDispatch.h"
#include
#include
#include
@@ -68,7 +67,7 @@ DrawCommandDispatch::~DrawCommandDispatch()
bool DrawCommandDispatch::isFeatureSupported( const OUString& rCommandURL )
{
-sal_uInt16 nFeatureId = 0;
+ChartCommandID nFeatureId = ChartCommandID::NONE;
OUString aBaseCommand;
OUString aCustomShapeType;
return parseCommandURL( rCommandURL, , ,
);
@@ -165,7 +164,7 @@ void DrawCommandDispatch::setAttributes( SdrObject* pObj )
void DrawCommandDispatch::setLineEnds( SfxItemSet& rAttr )
{
-if ( !(m_nFeatureId == COMMAND_ID_LINE_ARROW_END && m_pChartController) )
+if ( !(m_nFeatureId == ChartCommandID::DrawLineArrowEnd &&
m_pChartController) )
return;
DrawModelWrapper* pDrawModelWrapper =
m_pChartController->GetDrawModelWrapper();
@@ -217,27 +216,27 @@ FeatureState DrawCommandDispatch::getState( const
OUString& rCommand )
aReturn.bEnabled = false;
aReturn.aState <<= false;
-sal_uInt16 nFeatureId = 0;
+ChartCommandID nFeatureId = ChartCommandID::NONE;
OUString aBaseCommand;
OUString aCustomShapeType;
if ( parseCommandURL( rCommand, , ,
) )
{
switch ( nFeatureId )
{
-case COMMAND_ID_OBJECT_SELECT:
-case COMMAND_ID_DRAW_LINE:
-case COMMAND_ID_LINE_ARROW_END:
-case COMMAND_ID_DRAW_RECT:
-case COMMAND_ID_DRAW_ELLIPSE:
-case COMMAND_ID_DRAW_FREELINE_NOFILL:
-case COMMAND_ID_DRAW_TEXT:
-case COMMAND_ID_DRAW_CAPTION:
-case COMMAND_ID_DRAWTBX_CS_BASIC:
-case
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/CppunitTest_sw_core_text.mk sw/qa sw/source
sw/CppunitTest_sw_core_text.mk |1
sw/qa/core/text/data/floattable-negative-vert-offset-empty.docx |binary
sw/qa/core/text/itratr.cxx | 58
++
sw/source/core/inc/txtfrm.hxx |4
sw/source/core/text/frmform.cxx |9 +
sw/source/core/text/itratr.cxx | 41 +++
sw/source/core/text/porrst.cxx |7 +
sw/source/core/text/widorp.cxx | 25
8 files changed, 124 insertions(+), 21 deletions(-)
New commits:
commit ecdeed57693617263a88bdff87f11622b94e6889
Author: Miklos Vajna
AuthorDate: Mon Jul 3 08:30:21 2023 +0200
Commit: Caolán McNamara
CommitDate: Wed Jul 5 15:15:41 2023 +0200
sw floattable: fix negative vert offset with on page boundary without anch
text
The bugdoc has 3 floating tables on page 1, and the anchor of the last
floating table goes to page 2. All anchors are empty (no text), apart
from serving as an anchor for the floating tables. The last floating
table goes to page 2 in Writer, but not in Word.
The problem is quite similar to what commit
2d0a4ef1d83b8de6cb133970c2c35ae706fb058e (sw floattable: fix negative
vertical offset handling on page boundary, 2023-06-20) fixed already,
but here the anchor of the floating table is empty, and there it had
some text, which is a different codepath.
Fix the problem by first requesting a frame split in
SwTextFrame::FormatAdjust() even for empty paragraphs with flys (so the
fly part can go to page 1 and the empty paragraph can go to page 2) and
second disabling the SwTextFrame::FormatEmpty() optimization that would
assume no split is needed, while a split is required for a correct
layout here.
With this, the DOCX version of the original bnc#816603 document finally
renders without overlaps (4 pages, 11 floating tables).
(cherry picked from commit 16b5b21d36da87be9b50235acbbb8008ed23b8bb)
Conflicts:
sw/source/core/inc/txtfrm.hxx
Change-Id: Ie64ce92bf19b3dee8059fa14294d7599b41cc53f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154018
Tested-by: Jenkins CollaboraOffice
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/sw/CppunitTest_sw_core_text.mk b/sw/CppunitTest_sw_core_text.mk
index 79ac4a0320bf..a04824e08e07 100644
--- a/sw/CppunitTest_sw_core_text.mk
+++ b/sw/CppunitTest_sw_core_text.mk
@@ -15,6 +15,7 @@ $(eval $(call
gb_CppunitTest_use_common_precompiled_header,sw_core_text))
$(eval $(call gb_CppunitTest_add_exception_objects,sw_core_text, \
sw/qa/core/text/frmform \
+sw/qa/core/text/itratr \
sw/qa/core/text/text \
))
diff --git a/sw/qa/core/text/data/floattable-negative-vert-offset-empty.docx
b/sw/qa/core/text/data/floattable-negative-vert-offset-empty.docx
new file mode 100644
index ..132fde553825
Binary files /dev/null and
b/sw/qa/core/text/data/floattable-negative-vert-offset-empty.docx differ
diff --git a/sw/qa/core/text/itratr.cxx b/sw/qa/core/text/itratr.cxx
new file mode 100644
index ..6913d0037dbd
--- /dev/null
+++ b/sw/qa/core/text/itratr.cxx
@@ -0,0 +1,58 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+namespace
+{
+/// Covers sw/source/core/text/itratr.cxx fixes.
+class Test : public SwModelTestBase
+{
+public:
+Test()
+: SwModelTestBase("/sw/qa/core/text/data/")
+{
+}
+};
+
+CPPUNIT_TEST_FIXTURE(Test, testFloattableNegativeVertOffsetEmptyAnchor)
+{
+// Given a document with 3 floating tables, all of them on page 1, but the
anchor of the last
+// floating table is on page 2, but that anchor has no own text:
+createSwDoc("floattable-negative-vert-offset-empty.docx");
+
+// When laying out that document:
+calcLayout();
+
+// Then make sure the that 3rd floating table is not shifted to page 2:
+SwDoc* pDoc = getSwDoc();
+SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
+auto pPage1 = dynamic_cast(pLayout->Lower());
+CPPUNIT_ASSERT(pPage1);
+CPPUNIT_ASSERT(pPage1->GetSortedObjs());
+const SwSortedObjs& rPage1Objs = *pPage1->GetSortedObjs();
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 3
+// - Actual : 2
+// i.e. the last floating table was shifted to page 2, which lead to
overlapping text in the
+
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - svgio/qa svgio/source
svgio/qa/cppunit/SvgImportTest.cxx | 38
svgio/qa/cppunit/data/tdf156168.svg | 34
svgio/source/svgreader/svgnode.cxx |4 +--
3 files changed, 74 insertions(+), 2 deletions(-)
New commits:
commit 88e3e855006e18e146a0619311629c44788a2d71
Author: Xisco Fauli
AuthorDate: Wed Jul 5 14:36:06 2023 +0200
Commit: Xisco Fauli
CommitDate: Wed Jul 5 17:09:09 2023 +0200
tdf#156168: do nothing when there is no concatenation
Regression from:
tdf#156034: check for css style further up in the hierarchy
Change-Id: I92c6673f1249cc4a273c490cdc0496474ce1f0c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153498
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
Change-Id: Ie699f40ea813d2ba5dc031008d56e2fce73a5715
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154034
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/svgio/qa/cppunit/SvgImportTest.cxx
b/svgio/qa/cppunit/SvgImportTest.cxx
index c2dad58de2de..8e301469394b 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -403,6 +403,44 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf145896)
assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[3]",
"color", "#ff");
}
+CPPUNIT_TEST_FIXTURE(Test, testTdf156168)
+{
+Primitive2DSequence aSequence =
parseSvg(u"/svgio/qa/cppunit/data/tdf156168.svg");
+CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequence.getLength()));
+
+drawinglayer::Primitive2dXmlDump dumper;
+xmlDocUniquePtr pDocument = dumper.dumpAndParse(aSequence);
+
+CPPUNIT_ASSERT (pDocument);
+
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", 8);
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[1]",
"color", "#ff");
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[2]",
"color", "#ff");
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[3]",
"color", "#ff");
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[4]",
"color", "#ff");
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[5]",
"color", "#00");
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[6]",
"color", "#00");
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[7]",
"color", "#ff");
+assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[8]",
"color", "#ff");
+
+// Without the fix in place, this test would have failed with
+// - Expected: 4
+// - Actual : 3
+assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke", 4);
+assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke[1]/line",
"width", "5");
+
+assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke[1]/line",
"color", "#00ff00");
+assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke[2]/line",
"width", "5");
+
+assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke[2]/line",
"color", "#00ff00");
+assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke[3]/line",
"width", "5");
+
+assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke[3]/line",
"color", "#00ff00");
+assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke[4]/line",
"width", "5");
+
+assertXPath(pDocument, "/primitive2D/transform/polypolygonstroke[4]/line",
"color", "#00ff00");
+}
+
CPPUNIT_TEST_FIXTURE(Test, testTdf156034)
{
Primitive2DSequence aSequence =
parseSvg(u"/svgio/qa/cppunit/data/tdf156034.svg");
diff --git a/svgio/qa/cppunit/data/tdf156168.svg
b/svgio/qa/cppunit/data/tdf156168.svg
new file mode 100644
index ..2cdbd35afd09
--- /dev/null
+++ b/svgio/qa/cppunit/data/tdf156168.svg
@@ -0,0 +1,34 @@
+
+
+http://www.w3.org/2000/svg;
+ xmlns:xlink="http://www.w3.org/1999/xlink;
+ style="font-family: 'Times New Roman', serif;
+font-size:large" >
+stroke enabled
+
+
+#MyRed {
+fill: red;
+}
+#MyBlue {
+fill: blue;
+}
+.MyLime {
+stroke: lime;
+stroke-width: 5;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svgio/source/svgreader/svgnode.cxx
b/svgio/source/svgreader/svgnode.cxx
index d87c76d81e20..bbf0f2342d22 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -120,7 +120,7 @@ namespace {
addCssStyle(rDocument, aNewConcatenated);
// look further up in the hierarchy
-if(pParent && pParent->getId())
+if(!aConcatenated.isEmpty() && pParent && pParent->getId())
{
const OUString& rParentId = pParent->getId().value();
addCssStyle(rDocument, "#" + rParentId +
aConcatenated);
@@ -140,7
[Libreoffice-commits] core.git: external/skia
external/skia/Library_skia.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 451f15888a7f3e747a34d24a047d4ec73a40c6c5 Author: Rene Engelhard AuthorDate: Tue Jul 4 20:36:46 2023 +0200 Commit: Noel Grandin CommitDate: Wed Jul 5 14:57:20 2023 +0200 don't use SSE in skia on "INTEL" (except on Windows...) as i386/i686 in Debian is non-MMX, non-SSE, cf. https://wiki.debian.org/ArchitectureSpecificsMemo#i386-1 Regression from 9c9a711ac5d8f32ac318d0e4ecab7b3a26bc2150 which claims to have set the define instead of skia_sk_cpu_sse_level_0_by_default.patch.1 but actually sets it to SSE2... Change-Id: I4157a580470732fd7bbc5cf1b2384b76182340cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153984 Tested-by: René Engelhard Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk index 4b7d9ee56407..7a7f59eccdb3 100644 --- a/external/skia/Library_skia.mk +++ b/external/skia/Library_skia.mk @@ -20,7 +20,8 @@ $(eval $(call gb_Library_add_defs,skia,\ -DSKIA_IMPLEMENTATION=1 \ -DSKIA_DLL \ -DSK_USER_CONFIG_HEADER="<$(BUILDDIR)/config_host/config_skia.h>" \ -$(if $(filter INTEL X86_64,$(CPUNAME)),-DSK_CPU_SSE_LEVEL=SK_CPU_SSE_LEVEL_SSE2) \ +$(if $(filter INTEL,$(CPUNAME)),$(if $(filter WNT,$(OS)),-DSK_CPU_SSE_LEVEL=SK_CPU_SSE_LEVEL_SSE1,-DSK_CPU_SSE_LEVEL=0)) \ +$(if $(filter X86_64,$(CPUNAME)),-DSK_CPU_SSE_LEVEL=SK_CPU_SSE_LEVEL_SSE2) \ )) # SK_DEBUG controls runtime checks and is controlled by config_skia.h and depends on DBG_UTIL.
[Libreoffice-commits] core.git: svgio/inc svgio/source
svgio/inc/svgdocument.hxx |6 ++
svgio/source/svgreader/svgnode.cxx |9 ++---
2 files changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 0dfd8288a87b58e503bb3a41be6137485fbf3f68
Author: Caolán McNamara
AuthorDate: Wed Jul 5 09:31:58 2023 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 5 15:08:05 2023 +0200
ofz#60384 Direct-leak
since:
commit 13a41e7a12598c7896d6dc8d34aba6af5b80b83c
Date: Mon Jul 3 14:11:43 2023 +0200
tdf#150124: do nothing when parent is of unkown type
Change-Id: I58edf5f63d97e8afb1cd58c7e23452a9ea6a87eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154023
Reviewed-by: Xisco Fauli
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/svgio/inc/svgdocument.hxx b/svgio/inc/svgdocument.hxx
index 9f79342c0c55..77b4d3891179 100644
--- a/svgio/inc/svgdocument.hxx
+++ b/svgio/inc/svgdocument.hxx
@@ -34,6 +34,9 @@ namespace svgio::svgreader
/// the document hierarchy with all root nodes
SvgNodeVector maNodes;
+/// invalid nodes that have no parent
+SvgNodeVector maOrphanNodes;
+
/// the absolute path of the Svg file in progress (if available)
const OUString maAbsolutePath;
@@ -72,6 +75,9 @@ namespace svgio::svgreader
/// data read access
const SvgNodeVector& getSvgNodeVector() const { return maNodes; }
const OUString& getAbsolutePath() const { return maAbsolutePath; }
+
+/// invalid nodes that have no parent
+void addOrphanNode(SvgNode* pOrphan) {
maOrphanNodes.emplace_back(pOrphan); }
};
} // end of namespace svgio::svgreader
diff --git a/svgio/source/svgreader/svgnode.cxx
b/svgio/source/svgreader/svgnode.cxx
index d87c76d81e20..992aaf72bce0 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -395,10 +395,13 @@ namespace {
mbDecomposing(false),
mbCssStyleVectorBuilt(false)
{
-// tdf#150124 ignore when parent is unknown
-if(pParent && pParent->getType() != SVGToken::Unknown)
+if (pParent)
{
-pParent->maChildren.emplace_back(this);
+// tdf#150124 ignore when parent is unknown
+if (pParent->getType() != SVGToken::Unknown)
+pParent->maChildren.emplace_back(this);
+else
+mrDocument.addOrphanNode(this);
}
}
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - external/skia
external/skia/Library_skia.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit afed68d15d1e62e43ced81787e54f11782ec8af2 Author: Rene Engelhard AuthorDate: Tue Jul 4 20:36:46 2023 +0200 Commit: René Engelhard CommitDate: Wed Jul 5 17:53:28 2023 +0200 don't use SSE in skia on "INTEL" (except on Windows...) as i386/i686 in Debian is non-MMX, non-SSE, cf. https://wiki.debian.org/ArchitectureSpecificsMemo#i386-1 Regression from 9c9a711ac5d8f32ac318d0e4ecab7b3a26bc2150 which claims to have set the define instead of skia_sk_cpu_sse_level_0_by_default.patch.1 but actually sets it to SSE2... Change-Id: I4157a580470732fd7bbc5cf1b2384b76182340cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153984 Tested-by: René Engelhard Tested-by: Jenkins Reviewed-by: Noel Grandin (cherry picked from commit 451f15888a7f3e747a34d24a047d4ec73a40c6c5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154035 Reviewed-by: René Engelhard diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk index 4b7d9ee56407..7a7f59eccdb3 100644 --- a/external/skia/Library_skia.mk +++ b/external/skia/Library_skia.mk @@ -20,7 +20,8 @@ $(eval $(call gb_Library_add_defs,skia,\ -DSKIA_IMPLEMENTATION=1 \ -DSKIA_DLL \ -DSK_USER_CONFIG_HEADER="<$(BUILDDIR)/config_host/config_skia.h>" \ -$(if $(filter INTEL X86_64,$(CPUNAME)),-DSK_CPU_SSE_LEVEL=SK_CPU_SSE_LEVEL_SSE2) \ +$(if $(filter INTEL,$(CPUNAME)),$(if $(filter WNT,$(OS)),-DSK_CPU_SSE_LEVEL=SK_CPU_SSE_LEVEL_SSE1,-DSK_CPU_SSE_LEVEL=0)) \ +$(if $(filter X86_64,$(CPUNAME)),-DSK_CPU_SSE_LEVEL=SK_CPU_SSE_LEVEL_SSE2) \ )) # SK_DEBUG controls runtime checks and is controlled by config_skia.h and depends on DBG_UTIL.
[Libreoffice-commits] core.git: bin/generate-bash-completion.py
bin/generate-bash-completion.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5b1f68461ccfa475f70640cafd0af769b814e3fa Author: Rene Engelhard AuthorDate: Tue Jul 4 23:25:08 2023 +0200 Commit: René Engelhard CommitDate: Wed Jul 5 17:53:37 2023 +0200 add .pages to bin/generate-bash-completion.py Change-Id: I7ec0244dad1b80eb577bfbe0bb6e3e46b14dce9b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154011 Reviewed-by: Christian Lohmaier Tested-by: Jenkins diff --git a/bin/generate-bash-completion.py b/bin/generate-bash-completion.py index db6f49e814b5..1c0377b97387 100755 --- a/bin/generate-bash-completion.py +++ b/bin/generate-bash-completion.py @@ -39,7 +39,7 @@ WEBDOCS = ["htm", "html", "stw", "txt", "vor", "oth"] WRITERDOCS = ["doc", "dot", "rtf", "sxw", "stw", "sdw", "vor", "txt", "htm?", "xml", "wp", "wpd", "wps", "odt", "ott", "fodt", "docm", "docx", - "dotm", "dotx"] + "dotm", "dotx", "pages"] TEMPLATES = ["stw", "dot", "vor", "stc", "xlt", "sti", "pot", "std", "stw", "dotm", "dotx", "potm", "potx", "xltm", "xltx"]
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/drawing/Shape.idl | 20 1 file changed, 20 insertions(+) New commits: commit a67675e7e248e056637be8b70d620379cdfb682e Author: Michael Stahl AuthorDate: Wed Jul 5 13:06:15 2023 +0200 Commit: Michael Stahl CommitDate: Wed Jul 5 15:45:55 2023 +0200 offapi: add Title/Description properties from CWS aw038 (OOo 2.2) Change-Id: I2a851ef76b840d1fa5479dcb182a63590a2d4065 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154052 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/offapi/com/sun/star/drawing/Shape.idl b/offapi/com/sun/star/drawing/Shape.idl index e2faa4fbec48..118031488426 100644 --- a/offapi/com/sun/star/drawing/Shape.idl +++ b/offapi/com/sun/star/drawing/Shape.idl @@ -182,6 +182,26 @@ published service Shape @since LibreOffice 4.3 */ [optional, property] short RelativeWidthRelation; + +/** contains short title for the object + +This short title is visible as an alternative tag in HTML format. +Accessibility tools can read this text. + +@since OOo 2.2 +*/ +[optional, property] string Title; + +/** contains description for the object + +The long description text can be entered to describe an object in +more detail to users with screen reader software. The description is +visible as an alternative tag for accessibility tools. + +@since OOo 2.2 +*/ +[optional, property] string Description; + };
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - oox/source
oox/source/export/shapes.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit b8d2abeff262b25ff1b7d4204cdd844ac595d847
Author: Xisco Fauli
AuthorDate: Wed Jul 5 09:55:18 2023 +0200
Commit: Xisco Fauli
CommitDate: Wed Jul 5 16:50:25 2023 +0200
oox: fix crash in lcl_GetGluePointId
See
https://crashreport.libreoffice.org/stats/signature/static%20long%20oox::drawingml::lcl_GetGluePointId(const%20class%20com::sun::star::uno::Reference%3Ccom::sun::star::drawing::XShape%3E%20&%20const,%20long)
Regression from b7c542b5085374f1d031183cb86ceeefcf24964d
"tdf#154363 sd: fix line connectors regression of mirrored shapes"
Change-Id: I926d32f5b68582df588c28a800b0ec10e7e3e19f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154021
Reviewed-by: Caolán McNamara
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
(cherry picked from commit 66fbe1fcc36b7ac67c4b06d7917705cd1171c2ea)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154030
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 0fc6eb337513..cfc980f95b96 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -1675,7 +1675,8 @@ static sal_Int32 lcl_GetGluePointId(const
Reference& xShape, sal_Int32 n
bool bFlipH = false;
bool bFlipV = false;
Reference xShapeProps(xShape, UNO_QUERY);
-if
(xShapeProps->getPropertySetInfo()->hasPropertyByName("CustomShapeGeometry"))
+if (xShapeProps.is() && xShapeProps->getPropertySetInfo()
+&&
xShapeProps->getPropertySetInfo()->hasPropertyByName("CustomShapeGeometry"))
{
Sequence aGeometrySeq;
xShapeProps->getPropertyValue("CustomShapeGeometry") >>=
aGeometrySeq;
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 19 +++
1 file changed, 5 insertions(+), 14 deletions(-)
New commits:
commit 4cb31f481e8bc271a39aaa4953edda8d898413be
Author: Mike Kaganski
AuthorDate: Wed Jul 5 09:10:05 2023 +0300
Commit: Mike Kaganski
CommitDate: Wed Jul 5 09:29:43 2023 +0200
Related: tdf#131062 Simplify a bit
The overly complicated processing was added in commit
7f805108a4ccc5751d7cbcb722ded5247e398578 (tdf#131062 DOCX import:
fix table-style paragraph background color, 2020-03-02). Setting
sPropertyName to "ParaBackColor" was then nullified by not using
its value for PROP_FILL_COLOR case, and using the old "FillColor"
value instead. Likely that was just forgotten cleanup after some
experimentation.
Change-Id: I1facec63bf74a50b1f16a7accd243345c017a032
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154016
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index cd77182657c8..36add41691b0 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -1115,15 +1115,10 @@ void
DomainMapperTableHandler::ApplyParagraphPropertiesFromTableStyle(TableParag
// handle paragraph background color defined in
CellColorHandler
if (eId == PROP_FILL_COLOR)
{
-// table style defines paragraph background color, use the
correct property name
auto pFillStyleProp =
std::find_if(rCellProperties.begin(), rCellProperties.end(),
[](const beans::PropertyValue& rProp) { return
rProp.Name == "FillStyle"; });
-if ( pFillStyleProp != rCellProperties.end() &&
- pFillStyleProp->Value ==
uno::Any(drawing::FillStyle_SOLID) )
-{
-sPropertyName = "ParaBackColor";
-}
-else
+if ( pFillStyleProp == rCellProperties.end() ||
+ pFillStyleProp->Value !=
uno::Any(drawing::FillStyle_SOLID) )
{
// FillStyle_NONE, skip table style usage for
paragraph background color
continue;
@@ -1165,15 +1160,11 @@ void
DomainMapperTableHandler::ApplyParagraphPropertiesFromTableStyle(TableParag
if ( bIsParaLevel && xParagraph->getString().getLength()
== 0 )
continue;
-if ( eId != PROP_FILL_COLOR )
-{
-// apply style setting when the paragraph doesn't
modify it
-
aProps.push_back(comphelper::makePropertyValue(sPropertyName,
pCellProp->Value));
-}
-else
+// apply style setting when the paragraph doesn't modify it
+
aProps.push_back(comphelper::makePropertyValue(sPropertyName,
pCellProp->Value));
+if (eId == PROP_FILL_COLOR)
{
// we need this for complete import of table-style
based paragraph background color
-
aProps.push_back(comphelper::makePropertyValue("FillColor", pCellProp->Value));
aProps.push_back(comphelper::makePropertyValue("FillStyle",
uno::Any(drawing::FillStyle_SOLID)));
}
}
[Libreoffice-commits] core.git: 2 commits - sc/source sfx2/source sw/inc sw/source
sc/source/ui/inc/output.hxx |2 +-
sc/source/ui/view/output2.cxx | 24 ++--
sfx2/source/dialog/templdlg.cxx |9 +++--
sfx2/source/inc/templdgi.hxx|2 +-
sw/inc/authfld.hxx |5 ++---
sw/source/core/fields/authfld.cxx |9 +++--
sw/source/core/txtnode/atrref.cxx |2 +-
sw/source/uibase/dialog/regionsw.cxx|3 +--
sw/source/uibase/fldui/fldmgr.cxx |2 +-
sw/source/uibase/inc/translatehelper.hxx|5 ++---
sw/source/uibase/shells/textfld.cxx |7 +++
sw/source/uibase/shells/textsh1.cxx |8
sw/source/uibase/shells/translatehelper.cxx | 20 +++-
13 files changed, 35 insertions(+), 63 deletions(-)
New commits:
commit 1a561775a486b5daf4b04b287dc3849b387ec388
Author: Noel Grandin
AuthorDate: Tue Jul 4 16:28:09 2023 +0200
Commit: Noel Grandin
CommitDate: Wed Jul 5 09:34:11 2023 +0200
loplugin:constantparam
Change-Id: I0b4b2854f5e82e78e63b01b78b949e27011630c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153982
Tested-by: Noel Grandin
Reviewed-by: Noel Grandin
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index 9aef5085cec6..6996f5090b68 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.hxx
@@ -221,10 +221,9 @@ public:
OUString GetAbsoluteURL() const;
/**
- * Returns full URI for the URL, relative if specified
- * \param bRelative whether the path should be relative (when dealing
with local files)
+ * Returns relative URI for the URL
*/
-OUString GetURI(bool bRelative) const;
+OUString GetRelativeURI() const;
void dumpAsXml(xmlTextWriterPtr pWriter) const override;
};
diff --git a/sw/source/core/fields/authfld.cxx
b/sw/source/core/fields/authfld.cxx
index 77b640739760..35ab9ca9c894 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -623,7 +623,7 @@ OUString SwAuthorityField::GetAuthority(const SwRootFrame*
pLayout, const SwForm
}
else if (AUTH_FIELD_URL == eField)
{
-aText += GetURI(true);
+aText += GetRelativeURI();
}
else
{
@@ -656,7 +656,7 @@ OUString SwAuthorityField::GetAbsoluteURL() const
INetURLObject::DecodeMechanism::WithCharset);
}
-OUString SwAuthorityField::GetURI(bool bRelative) const
+OUString SwAuthorityField::GetRelativeURI() const
{
OUString sTmp = GetFieldText(AUTH_FIELD_URL);
@@ -688,10 +688,7 @@ OUString SwAuthorityField::GetURI(bool bRelative) const
sTmp = xUriRef->getUriReference();
}
-// If the URI is not supposed to be relative, we return here the full URI
-if (!bRelative)
-return sTmp;
-
+// convert to relative
bool bSaveRelFSys =
officecfg::Office::Common::Save::URL::FileSystem::get();
if (xUriRef.is() && bSaveRelFSys && xUriRef->getScheme() == aBaseURIScheme)
{
diff --git a/sw/source/core/txtnode/atrref.cxx
b/sw/source/core/txtnode/atrref.cxx
index ffb4509aee70..d7beb0e83bd0 100644
--- a/sw/source/core/txtnode/atrref.cxx
+++ b/sw/source/core/txtnode/atrref.cxx
@@ -179,7 +179,7 @@ void SwTextRefMark::UpdateFieldContent(SwDoc* pDoc,
SwWrtShell& rWrtSh, OUString
// Paste HTML content.
SwPaM* pCursorPos = rWrtSh.GetCursor();
*pCursorPos = aPasteEnd;
-SwTranslateHelper::PasteHTMLToPaM(rWrtSh, pCursorPos,
aContent.toUtf8(), true);
+SwTranslateHelper::PasteHTMLToPaM(rWrtSh, pCursorPos,
aContent.toUtf8());
// Update the refmark to point to the new content.
sal_Int32 nOldStart = this->GetStart();
diff --git a/sw/source/uibase/dialog/regionsw.cxx
b/sw/source/uibase/dialog/regionsw.cxx
index 834f1b332bc5..9eaa64c89456 100644
--- a/sw/source/uibase/dialog/regionsw.cxx
+++ b/sw/source/uibase/dialog/regionsw.cxx
@@ -161,8 +161,7 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq)
SwPaM* pCursorPos = rSh.GetCursor();
pCursorPos->Move(fnMoveBackward, GoInContent);
// Paste HTML content.
-SwTranslateHelper::PasteHTMLToPaM(rSh, pCursorPos,
aSectionContent.toUtf8(),
- /*bSetSelection=*/true);
+SwTranslateHelper::PasteHTMLToPaM(rSh, pCursorPos,
aSectionContent.toUtf8());
if (pCursorPos->GetPoint()->GetContentIndex() == 0)
{
// The paste created a last empty text node, remove it.
diff --git a/sw/source/uibase/fldui/fldmgr.cxx
b/sw/source/uibase/fldui/fldmgr.cxx
index 1596b1094e89..b7c3e60e9a84 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -1086,7 +1086,7 @@ bool SwFieldMgr::InsertField(
// Paste
Junit test chart2 unoapi
Hello, With my change [1], Jenkins complains about a Junit test which failed: JunitTest_chart2_unoapi But I was not able to find where is this test. File chart2/qa/unoapi/sch.sce has no meaning for me. Where should I look? Regards, Laurent [1] https://gerrit.libreoffice.org/c/core/+/153859
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/svimpbox.hxx |2 -
vcl/source/bitmap/dibtools.cxx | 45 ---
vcl/source/treelist/iconviewimpl.cxx |7 +
vcl/source/treelist/iconviewimpl.hxx |2 -
vcl/source/treelist/svimpbox.cxx | 11 +++-
5 files changed, 24 insertions(+), 43 deletions(-)
New commits:
commit 23583706b51f4c1cde8ceb20557fe376691fad88
Author: Noel Grandin
AuthorDate: Tue Jul 4 20:27:38 2023 +0200
Commit: Noel Grandin
CommitDate: Wed Jul 5 09:33:41 2023 +0200
loplugin:constantparam
Change-Id: Ib7bba815fcd4d2d4092bdd96055517468f6c6b09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153983
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/inc/svimpbox.hxx b/vcl/inc/svimpbox.hxx
index 949a488ed816..61e103e12b1f 100644
--- a/vcl/inc/svimpbox.hxx
+++ b/vcl/inc/svimpbox.hxx
@@ -250,7 +250,7 @@ public:
voidResize();
voidGetFocus();
voidLoseFocus();
-virtual voidUpdateAll( bool bInvalidateCompleteView );
+virtual voidUpdateAll();
voidSetEntryHeight();
voidInvalidateEntry( SvTreeListEntry* );
voidRecalcFocusRect();
diff --git a/vcl/source/bitmap/dibtools.cxx b/vcl/source/bitmap/dibtools.cxx
index c95c21704dd9..d8fa61362635 100644
--- a/vcl/source/bitmap/dibtools.cxx
+++ b/vcl/source/bitmap/dibtools.cxx
@@ -330,7 +330,7 @@ bool ImplReadDIBPalette(SvStream& rIStm, BitmapPalette&
rPal, bool bQuad)
return rIStm.GetError() == ERRCODE_NONE;
}
-BitmapColor SanitizePaletteIndex(sal_uInt8 nIndex, BitmapPalette& rPalette,
bool bForceToMonoWhileReading)
+BitmapColor SanitizePaletteIndex(sal_uInt8 nIndex, BitmapPalette& rPalette)
{
const sal_uInt16 nPaletteEntryCount = rPalette.GetEntryCount();
if (nPaletteEntryCount && nIndex >= nPaletteEntryCount)
@@ -341,22 +341,9 @@ BitmapColor SanitizePaletteIndex(sal_uInt8 nIndex,
BitmapPalette& rPalette, bool
<< nPaletteEntryCount);
nIndex = nSanitizedIndex;
}
-
-if (nPaletteEntryCount && bForceToMonoWhileReading)
-{
-return
BitmapColor(static_cast(rPalette[nIndex].GetLuminance() >= 255));
-}
-
return BitmapColor(nIndex);
}
-BitmapColor SanitizeColor(const BitmapColor , bool
bForceToMonoWhileReading)
-{
-if (!bForceToMonoWhileReading)
-return rColor;
-return BitmapColor(static_cast(rColor.GetLuminance() >= 255));
-}
-
bool ImplDecodeRLE(sal_uInt8* pBuffer, DIBV5Header const & rHeader,
BitmapWriteAccess& rAcc, BitmapPalette& rPalette, bool bRLE4)
{
Scanline pRLE = pBuffer;
@@ -394,10 +381,10 @@ bool ImplDecodeRLE(sal_uInt8* pBuffer, DIBV5Header const
& rHeader, BitmapWriteA
cTmp = *pRLE++;
if( nX < nWidth )
-rAcc.SetPixelOnData(pScanline, nX++,
SanitizePaletteIndex(cTmp >> 4, rPalette, /*bForceToMonoWhileReading*/false));
+rAcc.SetPixelOnData(pScanline, nX++,
SanitizePaletteIndex(cTmp >> 4, rPalette));
if( nX < nWidth )
-rAcc.SetPixelOnData(pScanline, nX++,
SanitizePaletteIndex(cTmp & 0x0f, rPalette, /*bForceToMonoWhileReading*/false));
+rAcc.SetPixelOnData(pScanline, nX++,
SanitizePaletteIndex(cTmp & 0x0f, rPalette));
}
if( nRunByte & 1 )
@@ -406,7 +393,7 @@ bool ImplDecodeRLE(sal_uInt8* pBuffer, DIBV5Header const &
rHeader, BitmapWriteA
return false;
if( nX < nWidth )
-rAcc.SetPixelOnData(pScanline, nX++,
SanitizePaletteIndex(*pRLE >> 4, rPalette, /*bForceToMonoWhileReading*/false));
+rAcc.SetPixelOnData(pScanline, nX++,
SanitizePaletteIndex(*pRLE >> 4, rPalette));
pRLE++;
}
@@ -427,7 +414,7 @@ bool ImplDecodeRLE(sal_uInt8* pBuffer, DIBV5Header const &
rHeader, BitmapWriteA
return false;
if( nX < nWidth )
-rAcc.SetPixelOnData(pScanline, nX++,
SanitizePaletteIndex(*pRLE, rPalette, /*bForceToMonoWhileReading*/false));
+rAcc.SetPixelOnData(pScanline, nX++,
SanitizePaletteIndex(*pRLE, rPalette));
pRLE++;
}
@@ -474,18 +461,18 @@ bool ImplDecodeRLE(sal_uInt8* pBuffer, DIBV5Header const
& rHeader, BitmapWriteA
for (sal_uLong i = 0; i < nRunByte && nX < nWidth; ++i)
{
-rAcc.SetPixelOnData(pScanline, nX++,
SanitizePaletteIndex(cTmp >> 4, rPalette, /*bForceToMonoWhileReading*/false));
+rAcc.SetPixelOnData(pScanline, nX++,
SanitizePaletteIndex(cTmp >> 4, rPalette));
if( nX <
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - desktop/source
desktop/source/lib/init.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9676d121182ce8a2b395df01b75a9c3cb625fc50
Author: Aron Budea
AuthorDate: Mon Feb 13 14:59:04 2023 +0100
Commit: Andras Timar
CommitDate: Wed Jul 5 09:56:29 2023 +0200
Fix build [-Werror=unused-parameter]
desktop/source/lib/init.cxx:5430:51: error: unused parameter ‘pThis’
[-Werror=unused-parameter]
5430 | static char* getLanguages(LibreOfficeKitDocument* pThis, const
char* pCommand)
| ^
After 7fb089be113f3f95d9a13e3aafafc64107301d1d.
Change-Id: If4d9a751e4d32df4d8b854e197da5e8eb7e96d9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146906
Reviewed-by: Andras Timar
Tested-by: Jenkins CollaboraOffice
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 70d049feac51..8448209e87b5 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -5628,7 +5628,7 @@ static void addLocale(boost::property_tree::ptree&
rValues, css::lang::Locale co
rValues.push_back(std::make_pair("", aChild));
}
-static char* getLanguages(LibreOfficeKitDocument* pThis, const char* pCommand)
+static char* getLanguages(const char* pCommand)
{
css::uno::Sequence< css::lang::Locale > aLocales;
css::uno::Sequence< css::lang::Locale > aGrammarLocales;
@@ -6001,7 +6001,7 @@ static char* doc_getCommandValues(LibreOfficeKitDocument*
pThis, const char* pCo
if (!strcmp(pCommand, ".uno:LanguageStatus"))
{
-return getLanguages(pThis, pCommand);
+return getLanguages(pCommand);
}
else if (!strcmp(pCommand, ".uno:CharFontName"))
{
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sc/source
sc/source/ui/app/inputhdl.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 2bcfff3f43292b8c81dea32796a3e8c78ec16bc1 Author: Xisco Fauli AuthorDate: Tue Jul 4 17:46:26 2023 +0200 Commit: Michael Stahl CommitDate: Wed Jul 5 11:13:52 2023 +0200 sc: fix crash in ScInputHandler::ShowArgumentsTip See https://crashreport.libreoffice.org/stats/signature/ScInputHandler::ShowArgumentsTip(rtl::OUString%20&) Change-Id: I0fd61d5cca58121e77e102edd3c8e77c75baf800 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153976 Reviewed-by: Caolán McNamara Tested-by: Jenkins Reviewed-by: Xisco Fauli (cherry picked from commit c38c8e6574ccb4502fc6a6ffbc4d2f700b582366) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153999 Reviewed-by: Michael Stahl diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 1f9ae0c29eeb..e56d94f4c367 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -1137,6 +1137,9 @@ void ScInputHandler::ShowArgumentsTip( OUString& rSelText ) return; } +if ( !pActiveViewSh ) +return; + ScDocShell* pDocSh = pActiveViewSh->GetViewData().GetDocShell(); const sal_Unicode cSep = ScCompiler::GetNativeSymbolChar(ocSep); const sal_Unicode cSheetSep = pDocSh->GetDocument().GetSheetSeparator();
[Libreoffice-commits] core.git: external/frozen
external/frozen/UnpackedTarball_frozen.mk |1 +
external/frozen/cid1532449_use_move_ctor.0 | 29 +
2 files changed, 30 insertions(+)
New commits:
commit c5f726420ac7906d9c425bfa4958a5702d55bbd8
Author: Caolán McNamara
AuthorDate: Sun Jun 25 14:57:58 2023 +0100
Commit: Caolán McNamara
CommitDate: Wed Jul 5 11:20:45 2023 +0200
cid#1532449 Big parameter passed by value
Change-Id: Iad69437b2349bda6729395a4e2bd876a1a6c968e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153563
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/external/frozen/UnpackedTarball_frozen.mk
b/external/frozen/UnpackedTarball_frozen.mk
index 41ddb0fed85a..196cf1e00fdc 100644
--- a/external/frozen/UnpackedTarball_frozen.mk
+++ b/external/frozen/UnpackedTarball_frozen.mk
@@ -13,6 +13,7 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,frozen,$(FROZEN_TARBALL)))
$(eval $(call gb_UnpackedTarball_add_patches,frozen,\
external/frozen/defines_h_constexpr_string.patch.0 \
+ external/frozen/cid1532449_use_move_ctor.0 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/frozen/cid1532449_use_move_ctor.0
b/external/frozen/cid1532449_use_move_ctor.0
new file mode 100644
index ..cbee9e510b93
--- /dev/null
+++ b/external/frozen/cid1532449_use_move_ctor.0
@@ -0,0 +1,29 @@
+--- include/frozen/unordered_map.h 2023-06-25 14:47:35.486459668 +0100
include/frozen/unordered_map.h 2023-06-25 14:55:58.787858570 +0100
+@@ -78,14 +78,24 @@
+ public:
+ /* constructors */
+ unordered_map(unordered_map const &) = default;
+- constexpr unordered_map(container_type items,
++ constexpr unordered_map(container_type&& items,
++ Hash const , KeyEqual const )
++ : equal_{equal}
++ , items_(std::move(items))
++ , tables_{
++bits::make_pmh_tables(
++items_, hash, bits::GetKey{}, default_prg_t{})} {}
++ explicit constexpr unordered_map(container_type&& items)
++ : unordered_map{items, Hash{}, KeyEqual{}} {}
++
++ constexpr unordered_map(const container_type& items,
+ Hash const , KeyEqual const )
+ : equal_{equal}
+ , items_{items}
+ , tables_{
+ bits::make_pmh_tables(
+ items_, hash, bits::GetKey{}, default_prg_t{})} {}
+- explicit constexpr unordered_map(container_type items)
++ explicit constexpr unordered_map(const container_type& items)
+ : unordered_map{items, Hash{}, KeyEqual{}} {}
+
+ constexpr unordered_map(std::initializer_list items,
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - sfx2/source
sfx2/source/doc/iframe.cxx | 16 ++--
1 file changed, 10 insertions(+), 6 deletions(-)
New commits:
commit cdf4efb4ca8f4ad5d982e5acef3aaba2c8678010
Author: Caolán McNamara
AuthorDate: Tue Jun 20 10:20:36 2023 +0100
Commit: Christian Lohmaier
CommitDate: Wed Jul 5 13:50:46 2023 +0200
Resolves: tdf#155750 allow private:factory urls in floating frames
they create a new document so there isn't an associated location
which would trigger the prompt to allow it so just allow factory
urls
Change-Id: I7b693bcfe5ac04aaed06905637ab3c1eba43c51f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153289
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index 1db259994b50..507256aadf17 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -175,14 +175,18 @@ sal_Bool SAL_CALL IFrameObject::load(
uno::Reference xParentFrame =
xFrame->getCreator();
SfxObjectShell* pDoc = SfxMacroLoader::GetObjectShell(xParentFrame);
-bool bUpdateAllowed(true);
-if (pDoc)
+const bool bIsFactoryURL =
aTargetURL.Complete.startsWith("private:factory/");
+if (!bIsFactoryURL)
{
-comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer =
pDoc->getEmbeddedObjectContainer();
-bUpdateAllowed =
rEmbeddedObjectContainer.getUserAllowsLinkUpdate();
+bool bUpdateAllowed(true);
+if (pDoc)
+{
+comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer
= pDoc->getEmbeddedObjectContainer();
+bUpdateAllowed =
rEmbeddedObjectContainer.getUserAllowsLinkUpdate();
+}
+if (!bUpdateAllowed)
+return false;
}
-if (!bUpdateAllowed)
-return false;
OUString sReferer;
if (pDoc && pDoc->HasName())
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst external/poppler
download.lst |4 -
external/poppler/README |2
external/poppler/UnpackedTarball_poppler.mk |1
external/poppler/disable-freetype.patch.1| 18 ++---
external/poppler/disable-nss-and-gpgmepp.patch.1 | 76 +++
external/poppler/gcc7-EntityInfo.patch.1 | 43 +++--
external/poppler/inc/pch/precompiled_poppler.hxx | 30 -
external/poppler/poppler-config.patch.1 | 27 +---
8 files changed, 161 insertions(+), 40 deletions(-)
New commits:
commit 8a639c80ddb9ea2a40b63e6f0d97dfcb056183c0
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Wed Jun 14 09:58:15 2023 +0900
Commit: Christian Lohmaier
CommitDate: Wed Jul 5 13:59:38 2023 +0200
poppler: upgrade to release 23.06.0
Add external/poppler/disable-nss-and-gpgmepp.patch.1 to get rid of
some code that requires NSS or GPGMEPP.
Update external/poppler/inc/pch/precompiled_poppler.hxx.
Change-Id: I5e61371776c64962452022516446b5079c3840e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153097
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 27e1c198a504deb4634f5f6673a77b5944c9f8cc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153908
Reviewed-by: Christian Lohmaier
diff --git a/download.lst b/download.lst
index 0fa89e658822..9cba05cca51d 100644
--- a/download.lst
+++ b/download.lst
@@ -458,8 +458,8 @@ LIBTIFF_TARBALL := tiff-4.5.1.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-POPPLER_SHA256SUM :=
b04148bf849c1965ada7eff6be4685130e3a18a84e0cce73bf9bc472ec32f2b4
-POPPLER_TARBALL := poppler-23.03.0.tar.xz
+POPPLER_SHA256SUM :=
d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65
+POPPLER_TARBALL := poppler-23.06.0.tar.xz
POPPLER_DATA_SHA256SUM :=
c835b640a40ce357e1b83666aabd95edffa24d49b8daff63adb851cdab74
POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
# three static lines
diff --git a/external/poppler/README b/external/poppler/README
index 35a640264618..08d3612c3542 100644
--- a/external/poppler/README
+++ b/external/poppler/README
@@ -1 +1 @@
-From [http://poppler.freedesktop.org/]. Not modified. PDF rendering library
based on the xpdf-3.0 code base.
+From [https://poppler.freedesktop.org/]. Not modified. PDF rendering library
based on the xpdf-3.0 code base.
diff --git a/external/poppler/UnpackedTarball_poppler.mk
b/external/poppler/UnpackedTarball_poppler.mk
index 6cbed9e103ec..73265d8ec65b 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,poppler,0))
$(eval $(call gb_UnpackedTarball_add_patches,poppler,\
external/poppler/char_traits.patch \
external/poppler/disable-freetype.patch.1 \
+ external/poppler/disable-nss-and-gpgmepp.patch.1 \
external/poppler/gcc7-EntityInfo.patch.1 \
external/poppler/gcc7-GfxFont.patch.1 \
external/poppler/poppler-config.patch.1 \
diff --git a/external/poppler/disable-freetype.patch.1
b/external/poppler/disable-freetype.patch.1
index 710742206925..77c643de40f5 100644
--- a/external/poppler/disable-freetype.patch.1
+++ b/external/poppler/disable-freetype.patch.1
@@ -1,8 +1,8 @@
disable freetype dependent code
poppler/poppler/Form.cc.orig 2022-09-14 15:46:48.588316681 +0200
-+++ poppler/poppler/Form.cc2022-09-14 15:48:01.468274551 +0200
-@@ -46,7 +46,7 @@
+--- poppler/poppler/Form.cc.orig 2023-06-05 19:29:14.0 +0900
poppler/poppler/Form.cc2023-06-14 18:50:22.232312300 +0900
+@@ -48,7 +48,7 @@
#include
#include
#include
@@ -11,7 +11,7 @@ disable freetype dependent code
#include "goo/gmem.h"
#include "goo/gfile.h"
#include "goo/GooString.h"
-@@ -77,8 +77,8 @@
+@@ -78,8 +78,8 @@
#include "fofi/FoFiTrueType.h"
#include "fofi/FoFiIdentifier.h"
@@ -20,18 +20,18 @@ disable freetype dependent code
+//#include
+//#include FT_FREETYPE_H
- // return a newly allocated char* containing an UTF16BE string of size length
- char *pdfDocEncodingToUTF16(const std::string , int *length)
-@@ -2743,6 +2743,8 @@
+ // helper for using std::visit to get a dependent false for static_asserts
+ // to help get compile errors if one ever extends variants
+@@ -2760,6 +2760,8 @@
- Form::AddFontResult Form::addFontToDefaultResources(const std::string
, int faceIndex, const std::string , const std::string
)
+ Form::AddFontResult Form::addFontToDefaultResources(const std::string
, int faceIndex, const std::string , const std::string
, bool forceName)
{
+return {};
+#if 0
if (!GooString::endsWith(filepath, ".ttf") &&
!GooString::endsWith(filepath, ".ttc") && !GooString::endsWith(filepath,
".otf")) {
error(errIO, -1, "We only support embedding
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - 2 commits - desktop/source include/unotools lingucomponent/config lingucomponent/source postprocess/CustomTarget_registry.mk unotoo
desktop/source/lib/init.cxx| 62
+++---
include/unotools/lingucfg.hxx |2
lingucomponent/config/Linguistic-lingucomponent-grammarchecker.xcu | 30
lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx | 47
+++
postprocess/CustomTarget_registry.mk |1
unotools/source/config/lingucfg.cxx| 21 +++
6 files changed, 123 insertions(+), 40 deletions(-)
New commits:
commit e2bb227d0762a4200ce6f064f7b53911c6d16fdf
Author: Szymon Kłos
AuthorDate: Wed Feb 8 11:10:58 2023 +0100
Commit: Andras Timar
CommitDate: Wed Jul 5 09:12:22 2023 +0200
lok: LanguageTool provides list of languages
- it sends supported list to the LOK client
- disables Spell Checker for locales supported by LanguageTool
- duden protocol supports only german
- initialize language tool config before usage to fetch correct
list of supported languages
Change-Id: Id9de8519303774163721def8661fa408da449348
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146665
Reviewed-by: Henry Castro
Tested-by: Jenkins CollaboraOffice
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153960
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 5d957a9c89be..26b44a25b941 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -117,6 +117,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -5739,12 +5740,28 @@ static void doc_resetSelection(LibreOfficeKitDocument*
pThis)
pDoc->resetSelection();
}
+static void addLocale(boost::property_tree::ptree& rValues, css::lang::Locale
const & rLocale)
+{
+boost::property_tree::ptree aChild;
+OUString sLanguage;
+const LanguageTag aLanguageTag( rLocale );
+sLanguage =
SvtLanguageTable::GetLanguageString(aLanguageTag.getLanguageType());
+if (sLanguage.endsWith("}"))
+return;
+
+sLanguage += ";" + aLanguageTag.getBcp47(false);
+aChild.put("", sLanguage.toUtf8());
+rValues.push_back(std::make_pair("", aChild));
+}
+
static char* getLanguages(LibreOfficeKitDocument* pThis, const char* pCommand)
{
css::uno::Sequence< css::lang::Locale > aLocales;
+css::uno::Sequence< css::lang::Locale > aGrammarLocales;
if (xContext.is())
{
+// SpellChecker
css::uno::Reference xLangSrv
= css::linguistic2::LinguServiceManager::create(xContext);
if (xLangSrv.is())
{
@@ -5753,6 +5770,19 @@ static char* getLanguages(LibreOfficeKitDocument* pThis,
const char* pCommand)
aLocales = xSpell->getLocales();
}
+// LanguageTool
+SvxLanguageToolOptions& rLanguageOpts = SvxLanguageToolOptions::Get();
+if (rLanguageOpts.getEnabled())
+{
+uno::Reference< linguistic2::XProofreader > xGC(
+
xContext->getServiceManager()->createInstanceWithContext("org.openoffice.lingu.LanguageToolGrammarChecker",
xContext),
+uno::UNO_QUERY_THROW );
+uno::Reference< linguistic2::XSupportedLocales > xSuppLoc( xGC,
uno::UNO_QUERY_THROW );
+aGrammarLocales = xSuppLoc->getLocales();
+}
+
+// Fallback
+
/* FIXME: To obtain the document languages the spell checker can be
disabled,
so a future re-work of the getLanguages function is needed in favor
to use
getDocLanguages */
@@ -5767,19 +5797,10 @@ static char* getLanguages(LibreOfficeKitDocument*
pThis, const char* pCommand)
boost::property_tree::ptree aTree;
aTree.put("commandName", pCommand);
boost::property_tree::ptree aValues;
-boost::property_tree::ptree aChild;
-OUString sLanguage;
-for ( css::lang::Locale const & locale : std::as_const(aLocales) )
-{
-const LanguageTag aLanguageTag( locale );
-sLanguage =
SvtLanguageTable::GetLanguageString(aLanguageTag.getLanguageType());
-if (sLanguage.startsWith("{") && sLanguage.endsWith("}"))
-continue;
-
-sLanguage += ";" + aLanguageTag.getBcp47(false);
-aChild.put("", sLanguage.toUtf8());
-aValues.push_back(std::make_pair("", aChild));
-}
+for ( css::lang::Locale const & rLocale : std::as_const(aLocales) )
+addLocale(aValues, rLocale);
+for ( css::lang::Locale const & rLocale : std::as_const(aGrammarLocales) )
+addLocale(aValues, rLocale);
aTree.add_child("commandValues", aValues);
std::stringstream aStream;
boost::property_tree::write_json(aStream, aTree);
@@ -7243,6 +7264,8 @@ static void preLoadShortCutAccelerators()
batch->commit();
}
+void setLanguageToolConfig();
+
/// Used only by LibreOfficeKit when used by Online to pre-initialize
static void preloadData()
{
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - 2 commits - desktop/source lingucomponent/config
desktop/source/lib/init.cxx| 138
--
lingucomponent/config/Linguistic-lingucomponent-grammarchecker.xcu |2
2 files changed, 1 insertion(+), 139 deletions(-)
New commits:
commit 8f1bd965e797110e8c447d41e16ab1d47802da1f
Author: Szymon Kłos
AuthorDate: Fri Feb 10 14:56:06 2023 +0100
Commit: Andras Timar
CommitDate: Wed Jul 5 09:12:39 2023 +0200
lok: remove old hack for LanguageTool locales
Change-Id: I1098c51f03b4cdd4f21a635f7b6aae8e90fd9f9f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146779
Reviewed-by: Henry Castro
Tested-by: Jenkins CollaboraOffice
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153962
Reviewed-by: Andras Timar
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 26b44a25b941..70d049feac51 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -5597,132 +5597,6 @@ static void
doc_setGraphicSelection(LibreOfficeKitDocument* pThis, int nType, in
pDoc->setGraphicSelection(nType, nX, nY);
}
-static void getDocLanguages(LibreOfficeKitDocument* pThis,
uno::Sequence& rSeq)
-{
-SfxViewFrame* pViewFrame = SfxViewFrame::Current();
-if (!pViewFrame)
-return;
-
-SfxDispatcher* pDispatcher = pViewFrame->GetBindings().GetDispatcher();
-if (!pDispatcher)
-return;
-
-css::uno::Any aLangStatus;
-pDispatcher->QueryState(SID_LANGUAGE_STATUS, aLangStatus);
-
-OUString sCurrent;
-OUString sKeyboard;
-OUString sGuessText;
-SvtScriptType eScriptType = SvtScriptType::LATIN | SvtScriptType::ASIAN
-| SvtScriptType::COMPLEX;
-
-Sequence aSeqLang;
-if (aLangStatus >>= aSeqLang)
-{
-if (aSeqLang.getLength() == 4)
-{
-sCurrent = aSeqLang[0];
-eScriptType = static_cast(aSeqLang[1].toInt32());
-sKeyboard = aSeqLang[1];
-sGuessText = aSeqLang[2];
-}
-}
-else
-{
-aLangStatus >>= sCurrent;
-}
-
-LanguageType nLangType;
-std::set aLangItems;
-
-if (!sCurrent.isEmpty())
-{
-nLangType = SvtLanguageTable::GetLanguageType(sCurrent);
-if (nLangType != LANGUAGE_DONTKNOW)
-{
-aLangItems.insert(nLangType);
-}
-}
-
-const AllSettings& rAllSettings = Application::GetSettings();
-nLangType = rAllSettings.GetLanguageTag().getLanguageType();
-if (nLangType != LANGUAGE_DONTKNOW &&
-(eScriptType & SvtLanguageOptions::GetScriptTypeOfLanguage(nLangType)))
-{
-aLangItems.insert(nLangType);
-}
-
-nLangType = rAllSettings.GetUILanguageTag().getLanguageType();
-if (nLangType != LANGUAGE_DONTKNOW &&
-(eScriptType & SvtLanguageOptions::GetScriptTypeOfLanguage(nLangType)))
-{
-aLangItems.insert(nLangType);
-}
-
-if (!sKeyboard.isEmpty())
-{
-nLangType = SvtLanguageTable::GetLanguageType(sKeyboard);
-if (nLangType != LANGUAGE_DONTKNOW &&
-(eScriptType &
SvtLanguageOptions::GetScriptTypeOfLanguage(nLangType)))
-{
-aLangItems.insert(nLangType);
-}
-}
-
-if (!sGuessText.isEmpty())
-{
-Reference xLangGuesser;
-try
-{
-xLangGuesser = linguistic2::LanguageGuessing::create(xContext);
-}
-catch(...)
-{
-}
-
-if (xLangGuesser.is())
-{
-lang::Locale aLocale =
xLangGuesser->guessPrimaryLanguage(sGuessText, 0,
-
sGuessText.getLength());
-LanguageTag aLanguageTag(aLocale);
-nLangType = aLanguageTag.getLanguageType(false);
-if (nLangType != LANGUAGE_DONTKNOW &&
-(eScriptType &
SvtLanguageOptions::GetScriptTypeOfLanguage(nLangType)))
-{
-aLangItems.insert(nLangType);
-}
-}
-}
-
-LibLODocument_Impl* pDocument = static_cast(pThis);
-Reference
xDocumentLanguages(pDocument->mxComponent, UNO_QUERY);
-if (xDocumentLanguages.is())
-{
-const Sequence
aLocales(xDocumentLanguages->getDocumentLanguages(
-
static_cast(eScriptType), 64));
-
-for (const lang::Locale& aLocale : aLocales)
-{
-nLangType = SvtLanguageTable::GetLanguageType(aLocale.Language);
-if (nLangType != LANGUAGE_DONTKNOW &&
-(eScriptType &
SvtLanguageOptions::GetScriptTypeOfLanguage(nLangType)))
-{
-aLangItems.insert(nLangType);
-}
-}
-}
-
-int nLocale = 0;
-Sequence aLocales(aLangItems.size());
-auto pLocales = aLocales.getArray();
-for (const LanguageType& itLang : aLangItems)
-{
-pLocales[nLocale++] = LanguageTag::convertToLocale(itLang);
-}
-
-rSeq = aLocales;
-}
-
static
Re: Junit test chart2 unoapi
Hi Laurent, On Tue, Jul 04, 2023 at 07:46:28PM +0200, Laurent Balland wrote: > With my change [1], Jenkins complains about a Junit test which failed: > JunitTest_chart2_unoapi > > But I was not able to find where is this test. File chart2/qa/unoapi/sch.sce > has no meaning for me. Where should I look? These .sce files list UNO object implementations where a generic test framework will perform some testing on each and every line. The first step would be to track down which line causes the problem for you. Next, you can look at workdir/JunitTest/chart2_unoapi/done.log and try to find out what the test framework tries to do with your UNO object. In many cases it just sets all properties of the object to some value and then gets it back and asserts that the two values are the same, or something like that. Hopefully once the log is shorter (just contains test results for a single object), it's possible to read it from start to end and search for things like FAILED or KO to see which property is the problem. With that, you may have an idea how to adapt your change so that it passes the test again. (In some rare cases you want to modify the test instead, in case the API change is intentional.) Hope this helps, Miklos
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - readlicense_oo/license
readlicense_oo/license/license.xml |6 ++ 1 file changed, 6 insertions(+) New commits: commit 93900412adbb3efb8e1e1347e58d8b359d0f2231 Author: Taichi Haradaguchi <20001...@ymail.ne.jp> AuthorDate: Mon Jul 3 16:35:23 2023 +0900 Commit: Christian Lohmaier CommitDate: Wed Jul 5 13:52:06 2023 +0200 license: add frozen Change-Id: I3dc6dd34344c0afd6cfcc3d771990e07307d432b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153867 Tested-by: Jenkins Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp> (cherry picked from commit 3c4e299ce69d35b30ac4736f4b320ba8824ae6f4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153849 Reviewed-by: Christian Lohmaier diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml index b9071aa23837..637f85d7239c 100644 --- a/readlicense_oo/license/license.xml +++ b/readlicense_oo/license/license.xml @@ -390,6 +390,12 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +frozen +The following software may be included in this product: frozen. Use of any of this software is governed +by the terms of the license below: +Jump to Apache License Version 2.0 + GLM The following software may be included in this product: OpenGL Mathematics (GLM). Use of any of this
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - 2 commits - sc/source sw/CppunitTest_sw_core_text.mk sw/qa sw/source
sc/source/ui/app/inputhdl.cxx |3
sw/CppunitTest_sw_core_text.mk |1
sw/qa/core/text/data/floattable-negative-vert-offset-empty.docx |binary
sw/qa/core/text/itratr.cxx | 58
++
sw/source/core/inc/txtfrm.hxx |4
sw/source/core/text/frmform.cxx |9 +
sw/source/core/text/itratr.cxx | 41 +++
sw/source/core/text/porrst.cxx |7 +
sw/source/core/text/widorp.cxx | 25
9 files changed, 127 insertions(+), 21 deletions(-)
New commits:
commit 15d79db1c3cfff569d01d520389009ca025fa8b3
Author: Miklos Vajna
AuthorDate: Mon Jul 3 08:30:21 2023 +0200
Commit: Xisco Fauli
CommitDate: Wed Jul 5 09:05:11 2023 +0200
sw floattable: fix negative vert offset with on page boundary without anch
text
The bugdoc has 3 floating tables on page 1, and the anchor of the last
floating table goes to page 2. All anchors are empty (no text), apart
from serving as an anchor for the floating tables. The last floating
table goes to page 2 in Writer, but not in Word.
The problem is quite similar to what commit
2d0a4ef1d83b8de6cb133970c2c35ae706fb058e (sw floattable: fix negative
vertical offset handling on page boundary, 2023-06-20) fixed already,
but here the anchor of the floating table is empty, and there it had
some text, which is a different codepath.
Fix the problem by first requesting a frame split in
SwTextFrame::FormatAdjust() even for empty paragraphs with flys (so the
fly part can go to page 1 and the empty paragraph can go to page 2) and
second disabling the SwTextFrame::FormatEmpty() optimization that would
assume no split is needed, while a split is required for a correct
layout here.
With this, the DOCX version of the original bnc#816603 document finally
renders without overlaps (4 pages, 11 floating tables).
Change-Id: Ie64ce92bf19b3dee8059fa14294d7599b41cc53f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153866
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
(cherry picked from commit 16b5b21d36da87be9b50235acbbb8008ed23b8bb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153892
Reviewed-by: Xisco Fauli
diff --git a/sw/CppunitTest_sw_core_text.mk b/sw/CppunitTest_sw_core_text.mk
index 79ac4a0320bf..a04824e08e07 100644
--- a/sw/CppunitTest_sw_core_text.mk
+++ b/sw/CppunitTest_sw_core_text.mk
@@ -15,6 +15,7 @@ $(eval $(call
gb_CppunitTest_use_common_precompiled_header,sw_core_text))
$(eval $(call gb_CppunitTest_add_exception_objects,sw_core_text, \
sw/qa/core/text/frmform \
+sw/qa/core/text/itratr \
sw/qa/core/text/text \
))
diff --git a/sw/qa/core/text/data/floattable-negative-vert-offset-empty.docx
b/sw/qa/core/text/data/floattable-negative-vert-offset-empty.docx
new file mode 100644
index ..132fde553825
Binary files /dev/null and
b/sw/qa/core/text/data/floattable-negative-vert-offset-empty.docx differ
diff --git a/sw/qa/core/text/itratr.cxx b/sw/qa/core/text/itratr.cxx
new file mode 100644
index ..6913d0037dbd
--- /dev/null
+++ b/sw/qa/core/text/itratr.cxx
@@ -0,0 +1,58 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+namespace
+{
+/// Covers sw/source/core/text/itratr.cxx fixes.
+class Test : public SwModelTestBase
+{
+public:
+Test()
+: SwModelTestBase("/sw/qa/core/text/data/")
+{
+}
+};
+
+CPPUNIT_TEST_FIXTURE(Test, testFloattableNegativeVertOffsetEmptyAnchor)
+{
+// Given a document with 3 floating tables, all of them on page 1, but the
anchor of the last
+// floating table is on page 2, but that anchor has no own text:
+createSwDoc("floattable-negative-vert-offset-empty.docx");
+
+// When laying out that document:
+calcLayout();
+
+// Then make sure the that 3rd floating table is not shifted to page 2:
+SwDoc* pDoc = getSwDoc();
+SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
+auto pPage1 = dynamic_cast(pLayout->Lower());
+CPPUNIT_ASSERT(pPage1);
+CPPUNIT_ASSERT(pPage1->GetSortedObjs());
+const SwSortedObjs& rPage1Objs = *pPage1->GetSortedObjs();
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 3
+// - Actual : 2
+// i.e. the last floating table was shifted to page 2,
Re: Welcome Michael Weghorn, new Developer at TDF
Thanks for the warm welcome in my new role as part of the TDF team and the great time in the LibreOffice project so far and all the help I have received from many of you over all these years! I'm really looking forward to continue working together with all of you to further improve LibreOffice. OpenPGP_signature Description: OpenPGP digital signature
[Libreoffice-commits] core.git: sw/CppunitTest_sw_apitests.mk sw/qa
sw/CppunitTest_sw_apitests.mk |1
sw/qa/api/SwXFootnote.cxx | 123 ++
2 files changed, 124 insertions(+)
New commits:
commit 03ba4196865bd445208f39f31475ea82b39b9e17
Author: anfanite396
AuthorDate: Mon Jun 26 16:55:48 2023 +0530
Commit: Tomaž Vajngerl
CommitDate: Wed Jul 5 10:44:18 2023 +0200
Move SwXFootnote Java tests to C++
Change-Id: Id78be9ba0f42a7fcc4685b188de40dcfb4ccdbf7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153589
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sw/CppunitTest_sw_apitests.mk b/sw/CppunitTest_sw_apitests.mk
index 67aaf351ec39..b37b8cf0af7d 100644
--- a/sw/CppunitTest_sw_apitests.mk
+++ b/sw/CppunitTest_sw_apitests.mk
@@ -20,6 +20,7 @@ $(eval $(call
gb_CppunitTest_add_exception_objects,sw_apitests, \
sw/qa/api/SwXBookmark \
sw/qa/api/SwXDocumentIndex \
sw/qa/api/SwXDocumentSettings \
+sw/qa/api/SwXFootnote \
sw/qa/api/SwXFootnoteProperties \
sw/qa/api/SwXFootnoteText \
sw/qa/api/SwXFootnotes \
diff --git a/sw/qa/api/SwXFootnote.cxx b/sw/qa/api/SwXFootnote.cxx
new file mode 100644
index ..24e7db3844ce
--- /dev/null
+++ b/sw/qa/api/SwXFootnote.cxx
@@ -0,0 +1,123 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#include
+
+#include
+#include
+#include
+
+#include
+
+using namespace css;
+using namespace css::uno;
+
+namespace
+{
+/**
+ * Initial tests for SwXFootnote.
+ */
+class SwXFootnote final : public test::BootstrapFixture,
+ public unotest::MacrosTest,
+ public apitest::XComponent,
+ public apitest::XSimpleText,
+ public apitest::XTextRange,
+ public apitest::XTextContent,
+ public apitest::XText
+{
+public:
+virtual void setUp() override;
+void tearDown() override;
+
+Reference init() override;
+Reference getTextRange() override;
+Reference getTextContent() override;
+bool isAttachSupported() override { return true; }
+Reference getTextDocument() { return mxTextDocument; }
+void triggerDesktopTerminate() override {}
+
+CPPUNIT_TEST_SUITE(SwXFootnote);
+CPPUNIT_TEST(testDispose);
+CPPUNIT_TEST(testAddEventListener);
+CPPUNIT_TEST(testRemoveEventListener);
+CPPUNIT_TEST(testAttach);
+CPPUNIT_TEST(testGetAnchor);
+CPPUNIT_TEST(testCreateTextCursor);
+CPPUNIT_TEST(testCreateTextCursorByRange);
+CPPUNIT_TEST(testInsertString);
+CPPUNIT_TEST(testInsertControlCharacter);
+CPPUNIT_TEST(testGetEnd);
+CPPUNIT_TEST(testGetSetString);
+CPPUNIT_TEST(testGetStart);
+CPPUNIT_TEST(testGetText);
+// CPPUNIT_TEST(testInsertRemoveTextContent);
+CPPUNIT_TEST_SUITE_END();
+
+private:
+Reference mxTextDocument;
+Reference mxTextRange;
+Reference mxTextContent;
+};
+
+void SwXFootnote::setUp()
+{
+test::BootstrapFixture::setUp();
+
+mxDesktop.set(frame::Desktop::create(mxComponentContext));
+mxTextDocument = Reference(
+loadFromDesktop("private:factory/swriter",
"com.sun.star.text.TextDocument"),
+uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT(mxTextDocument.is());
+}
+
+void SwXFootnote::tearDown()
+{
+if (mxTextDocument.is())
+mxTextDocument->dispose();
+
+test::BootstrapFixture::tearDown();
+}
+
+Reference SwXFootnote::init()
+{
+Reference xMSF(mxTextDocument,
UNO_QUERY_THROW);
+
+Reference
xFootnote(xMSF->createInstance("com.sun.star.text.Footnote"),
+ UNO_QUERY_THROW);
+
+Reference xText = getTextDocument()->getText();
+Reference xCursor = xText->createTextCursor();
+
+xText->insertTextContent(xCursor, xFootnote, false);
+
+mxTextRange = Reference(xCursor, UNO_QUERY_THROW);
+mxTextContent = Reference(
+xMSF->createInstance("com.sun.star.text.Footnote"), UNO_QUERY_THROW);
+
+return Reference(xFootnote, UNO_QUERY_THROW);
+}
+
+Reference SwXFootnote::getTextRange() { return mxTextRange; }
+
+Reference SwXFootnote::getTextContent() { return
mxTextContent; }
+
+CPPUNIT_TEST_SUITE_REGISTRATION(SwXFootnote);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sd/source
sd/source/ui/inc/DrawViewShell.hxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 77f5cf7e360ecfcc199451faaa598a3885351e77 Author: Paris Oplopoios AuthorDate: Mon Jul 3 00:24:27 2023 +0300 Commit: Paris Oplopoios CommitDate: Wed Jul 5 10:02:27 2023 +0200 Delete DrawViewShell copy constructors DrawViewShell does not get copied so best to set these to deleted to highlight this. Change-Id: I3d35d3a47137b15346d54a08d3d7af480b0872bb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153864 Tested-by: Jenkins Reviewed-by: Paris Oplopoios (cherry picked from commit 7f1012806f5cf2cd53e52d8f2a95c09a2215efbc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153907 Tested-by: Jenkins CollaboraOffice diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index beb2bec08c0a..4e4482980a11 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -398,6 +398,9 @@ protected: voidGetMenuStateSel(SfxItemSet& rSet); private: +DrawViewShell(const DrawViewShell&) = delete; +DrawViewShell& operator=(const DrawViewShell&) = delete; + void Construct (DrawDocShell* pDocSh, PageKind ePageKind); /** Depending on the given request create a new page or duplicate an
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/filter/ww8/data/floattable-hidden-anchor.doc |binary
sw/qa/filter/ww8/ww8.cxx | 16
sw/source/filter/ww8/ww8par6.cxx | 16
3 files changed, 32 insertions(+)
New commits:
commit 79ddca4def81198e3eee42eca8aca42fef964c80
Author: Miklos Vajna
AuthorDate: Wed Jul 5 08:33:06 2023 +0200
Commit: Miklos Vajna
CommitDate: Wed Jul 5 11:56:01 2023 +0200
sw floattable: fix lost floating table right before a table from DOC
The bugdoc has a floating table, anchored in a paragraph that is hidden
via character formatting. The bugdoc also has a normal table. This leads
to 1 table in Writer, but 2 tables in Word.
We already have code that tries to make sure floating tables have a
suitable anchor, see the code in WW8TabDesc::CreateSwTable(), but that
checks for the case when the next node after a floating table would be
table (and not text), instead of the hidden character property.
Fix the problem by not creating the hidden char attribute in the first
place in SwWW8ImplReader::SetToggleAttr() in case the pool item would be
inserted at the paragraph start and we just inserted a floating table,
which makes the 2nd table visible in Writer as well.
This is for DOC, interesting when Word converts this document to DOCX,
then the hidden attribute is removed, so there this is not really needed.
Change-Id: I3a7411e6fcc318740bcbd4b0cde9f34134f384a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154017
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/qa/filter/ww8/data/floattable-hidden-anchor.doc
b/sw/qa/filter/ww8/data/floattable-hidden-anchor.doc
new file mode 100644
index ..3e8feb876964
Binary files /dev/null and b/sw/qa/filter/ww8/data/floattable-hidden-anchor.doc
differ
diff --git a/sw/qa/filter/ww8/ww8.cxx b/sw/qa/filter/ww8/ww8.cxx
index 253317c0deac..20c1b993caa8 100644
--- a/sw/qa/filter/ww8/ww8.cxx
+++ b/sw/qa/filter/ww8/ww8.cxx
@@ -342,6 +342,22 @@ CPPUNIT_TEST_FIXTURE(Test, testDOCfDontBreakWrappedTables)
// set.
CPPUNIT_ASSERT(bDontBreakWrappedTables);
}
+
+CPPUNIT_TEST_FIXTURE(Test, testDOCFloatingTableHiddenAnchor)
+{
+// Given a document with a normal table and a floating table with a hidden
anchor:
+createSwDoc("floattable-hidden-anchor.doc");
+
+// When laying out that document:
+xmlDocUniquePtr pLayout = parseLayoutDump();
+
+// Then make sure that both tables are visible:
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 2
+// - Actual : 1
+// i.e. the floating table was lost.
+assertXPath(pLayout, "//tab", 2);
+}
}
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index fbcf566a0897..6619d775bdb8 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -3371,6 +3371,22 @@ void SwWW8ImplReader::SetToggleAttr(sal_uInt8 nAttrId,
bool bOn)
: SvxCaseMap::NotMapped,
RES_CHRATR_CASEMAP ) );
break;
case 7:
+if (m_pPaM->GetPoint()->GetContentIndex() == 0 &&
m_xFormatOfJustInsertedApo)
+{
+// We just inserted a frame and we're at the next paragraph
start.
+SwFrameFormat* pFormat =
m_xFormatOfJustInsertedApo->GetFormat();
+if (pFormat)
+{
+SwNode* pAnchorNode = pFormat->GetAnchor().GetAnchorNode();
+if (pAnchorNode && *pAnchorNode ==
m_pPaM->GetPoint()->GetNode())
+{
+// The anchor paragraph would be hidden, leading to
hiding the frame as
+// well, prevent that.
+break;
+}
+}
+}
+
NewAttr(SvxCharHiddenItem(bOn, RES_CHRATR_HIDDEN));
break;
case 8:
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 05c3a3e12e6424d13a777f863921193ab7fe172e Author: Alain Romedenne AuthorDate: Wed Jul 5 12:23:10 2023 +0200 Commit: Gerrit Code Review CommitDate: Wed Jul 5 12:23:10 2023 +0200 Update git submodules * Update helpcontent2 from branch 'master' to cd0f9167653bee82301d8635ef5a6ea494739183 - SFDialogs help pages (final) - new methods: cloneControl, createDialog, OrderTabs - dialog creation on-the-fly Change-Id: I672f6ae27f59efca6a7e4118ce4538cf011cd72d Reviewed-on: https://gerrit.libreoffice.org/c/help/+/154005 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index ccaa099da1de..cd0f9167653b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ccaa099da1def9e89347af3f1759f48f9fa538ba +Subproject commit cd0f9167653bee82301d8635ef5a6ea494739183
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/03/sf_dialog.xhp| 135 +-
source/text/sbasic/shared/03/sf_dialogcontrol.xhp |4
2 files changed, 110 insertions(+), 29 deletions(-)
New commits:
commit cd0f9167653bee82301d8635ef5a6ea494739183
Author: Alain Romedenne
AuthorDate: Wed Jul 5 11:11:41 2023 +0200
Commit: Alain Romedenne
CommitDate: Wed Jul 5 12:23:10 2023 +0200
SFDialogs help pages (final)
- new methods: cloneControl, createDialog, OrderTabs
- dialog creation on-the-fly
Change-Id: I672f6ae27f59efca6a7e4118ce4538cf011cd72d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/154005
Tested-by: Jenkins
Reviewed-by: Alain Romedenne
diff --git a/source/text/sbasic/shared/03/sf_dialog.xhp
b/source/text/sbasic/shared/03/sf_dialog.xhp
index 96d1bd40dc..145a6fc6f0 100644
--- a/source/text/sbasic/shared/03/sf_dialog.xhp
+++ b/source/text/sbasic/shared/03/sf_dialog.xhp
@@ -34,7 +34,7 @@
Before using the
Dialog service the ScriptForge library
needs to be loaded or imported:
- The
Dialog service is invoked through the
CreateScriptService method. It requires three positional
arguments to specify the dialog box to activate:
+ The
Dialog service is invoked through the
CreateScriptService method. It requires three supplemental
positional arguments to specify the dialog box to activate:
Container: "GlobalScope"
for preinstalled libraries or a window name as defined by ScriptForge.UI
service. Empty string "" default value stands for the current
document.
Library: The case-sensitive name of a
library contained in the container. Default value is "Standard".
DialogName: A case-sensitive string
designating the dialog.
@@ -62,7 +62,26 @@
dlg.Terminate()
Use the string "GlobalScope" as the
container argument when the dialog is stored either in
My Macros Dialogs or in Application Macros
Dialogs.
- The dialog service
offers methods that create new controls dynamically in an existing dialog
predefined with the Dialog
Editor. A dialog is initialized with controls in the Dialog Editor and
new controls can be added at run-time before or after the dialog
Execute() statement.
+ The dialog service offers methods that
create new controls dynamically in an existing dialog predefined with the Dialog Editor. A dialog is
initialized with controls in the Dialog Editor and new controls can be added at
run-time before or after the dialog Execute()
statement.
+
+ The
Dialog service can equally be invoked - through the
CreateScriptService method - when creating dialogs
on-the-fly; It requires two supplemental positional arguments:
+ DialogName: A case-sensitive string
designating the dialog.
+ Library:
The case-sensitive name of the library where to store the dialog. Default value
is "Standard".
+
+Sub
newDialog()
+
Dim oDlg As Object
+
oDlg = CreateScriptService("NewDialog", "myDialog1", "myLib")
+ '
...
+End
Sub
+
+Or using
Python:
+
+def
newDialog():
+
dlg = CreateScriptService("NewDialog", "myDialog1") # "Standard" library is
used
+#
... Process controls and do what is needed
+
+ All properties and
methods applicable to predefined dialogs are available for such new dialogs. In
particular the series of CreateXXX() methods for the addition
+of new dialog controls.
Retrieving the Dialog instance that triggered
a dialog event
An
instance of the Dialog service can be retrieved via the
SFDialogs.DialogEvent service, provided that the dialog was
initiated with the Dialog service. In the example below,
oDlg contains the Dialog instance that
triggered the dialog event.
@@ -80,7 +99,8 @@
#
...
Note
that in the previous examples, the prefix "SFDialogs." may
be omitted when deemed appropriate.
- Handling exceptions in event handlers
+
+ Handling exceptions in event handlers
When creating an
event handler for dialog events it is good practice to handle errors inside the
subroutine itself. For instance, suppose the event handler below is called when
the mouse button is pressed in the dialog window.
Sub
OnMouseButtonPressed(ByRef oEvent As Object)
@@ -428,6 +448,7 @@
Activate
Center
Controls
+ CloneControl
CreateButton
CreateCheckBox
CreateComboBox
@@ -442,6 +463,7 @@
CreateFixedText
CreateFormattedField
CreateGroupBox
+ CreateHyperlink
CreateImageControl
CreateListBox
CreateNumericField
@@ -461,6 +483,7 @@
Execute
GetTextsFromL10N
Resize
+ OrderTabs
SetPageManager
Terminate
@@ -545,6 +568,30 @@
+
+ CloneControl
--
+
+
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/view/viewsh.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d2742b30968037a40eeb4679192c1706124965a5
Author: Andrea Gelmini
AuthorDate: Wed Jul 5 11:11:07 2023 +0200
Commit: Julien Nabet
CommitDate: Wed Jul 5 13:35:57 2023 +0200
Fix typo
Change-Id: I72e6b45ab5ddd974c8f93633c5df511ca7cfdaf8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154025
Tested-by: Julien Nabet
Reviewed-by: Julien Nabet
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 1a6cc15fc3fc..6965fc8d372f 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -2325,7 +2325,7 @@ vcl::Window* SfxViewShell::GetEditWindowForActiveOLEObj()
const
OUString SfxViewShell::GetColorConfigName() const
{
-SAL_WARN("sfx.view", "SfxViewShell::GetColorConfigName not overriden!");
+SAL_WARN("sfx.view", "SfxViewShell::GetColorConfigName not overridden!");
return {};
}
[Libreoffice-commits] core.git: include/sfx2 sc/source sd/source sfx2/source sw/inc sw/source
include/sfx2/viewsh.hxx |2 ++
sc/source/ui/inc/tabvwsh.hxx|2 ++
sc/source/ui/view/tabvwshc.cxx |5 +
sd/source/ui/inc/ViewShellBase.hxx |2 ++
sd/source/ui/view/ViewShellBase.cxx | 12
sfx2/source/appl/appserv.cxx| 20 ++--
sfx2/source/view/viewsh.cxx |6 ++
sw/inc/view.hxx |2 ++
sw/inc/viewopt.hxx |2 +-
sw/source/core/view/vnew.cxx| 17 -
sw/source/uibase/uiview/viewprt.cxx | 14 ++
11 files changed, 80 insertions(+), 4 deletions(-)
New commits:
commit 63d019c6780733018ffc0b157a235cb57893d6d4
Author: Paris Oplopoios
AuthorDate: Mon Jul 3 19:00:59 2023 +0300
Commit: Paris Oplopoios
CommitDate: Wed Jul 5 10:17:03 2023 +0200
Make sure views get new themes on .uno:ChangeTheme
It would be that sometimes .uno:ChangeTheme would not load the new
scheme because it was using EditableConfig::GetCurrentSchemeName which
uses a static name - normally great except for when you need different
views to have different color schemes in tiled rendering
Change-Id: I5b149bd1a4776337f76753c6de98d5386a899d34
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153939
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Paris Oplopoios
(cherry picked from commit 77f5b9259864798b6efc213f6dfa685cd440f71a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154001
Tested-by: Jenkins
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 08bc6cecc8cb..4adf62a196c4 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -431,6 +431,8 @@ public:
virtual vcl::Window* GetEditWindowForActiveOLEObj() const override;
/// Get a color config color from this view
virtual ::Color GetColorConfigColor(svtools::ColorConfigEntry nColorType)
const;
+/// Get the color scheme name of this view
+virtual OUString GetColorConfigName() const;
/// Set the LibreOfficeKit language of this view.
void SetLOKLanguageTag(const OUString& rBcp47LanguageTag);
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index d8434af53bc6..06e9f31e19cb 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -397,6 +397,8 @@ public:
void NotifyCursor(SfxViewShell* pViewShell) const override;
/// See SfxViewShell::GetColorConfigColor().
::Color GetColorConfigColor(svtools::ColorConfigEntry nColorType) const
override;
+/// See SfxViewShell::GetColorConfigName().
+OUString GetColorConfigName() const override;
/// Emits a LOK_CALLBACK_INVALIDATE_HEADER for all views whose current tab
is equal to nCurrentTabIndex
static void notifyAllViewsHeaderInvalidation(const SfxViewShell*
pForViewShell, HeaderType eHeaderType, SCTAB nCurrentTabIndex);
static bool isAnyEditViewInRange(const SfxViewShell* pForViewShell, bool
bColumns, SCCOLROW nStart, SCCOLROW nEnd);
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index 5397d9f4383e..997e710e18e9 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -511,6 +511,11 @@ void ScTabViewShell::NotifyCursor(SfxViewShell*
pOtherShell) const
}
}
+OUString ScTabViewShell::GetColorConfigName() const
+{
+return GetViewData().GetOptions().GetColorSchemeName();
+}
+
css::uno::Reference
ScTabViewShell::GetClipData(vcl::Window* pWin)
{
SfxViewFrame* pViewFrame = nullptr;
diff --git a/sd/source/ui/inc/ViewShellBase.hxx
b/sd/source/ui/inc/ViewShellBase.hxx
index e31429f6e41a..3f40123405f3 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -223,6 +223,8 @@ public:
void NotifyCursor(SfxViewShell* pViewShell) const override;
/// See SfxViewShell::GetColorConfigColor().
::Color GetColorConfigColor(svtools::ColorConfigEntry nColorType) const
override;
+/// See SfxViewShell::GetColorConfigName().
+OUString GetColorConfigName() const override;
void setLOKVisibleArea(const ::tools::Rectangle& rArea) { maLOKVisibleArea
= rArea; }
virtual ::tools::Rectangle getLOKVisibleArea() const override { return
maLOKVisibleArea; }
diff --git a/sd/source/ui/view/ViewShellBase.cxx
b/sd/source/ui/view/ViewShellBase.cxx
index 55ade0226213..460e102e7796 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -1084,6 +1084,18 @@ void ViewShellBase::NotifyCursor(SfxViewShell*
pOtherShell) const
return {};
}
+OUString ViewShellBase::GetColorConfigName() const
+{
+if (DrawViewShell* pCurrentDrawShell =
dynamic_cast(GetMainViewShell().get()))
+{
+const SdViewOptions& rViewOptions =
pCurrentDrawShell->GetViewOptions();
+return rViewOptions.msColorSchemeName;
+}
+
+SAL_WARN("sd", "dynamic_cast to DrawViewShell failed");
+return {};
+}
+
//=
[Libreoffice-commits] core.git: osx/soffice.xcodeproj
osx/soffice.xcodeproj/project.pbxproj | 2458 +++---
1 file changed, 278 insertions(+), 2180 deletions(-)
New commits:
commit d0790998da7b273d7acf83cb6dd81c1d46d9809f
Author: Khaled Hosny
AuthorDate: Wed Jul 5 10:08:35 2023 +0300
Commit: خالد حسني
CommitDate: Wed Jul 5 10:30:37 2023 +0200
Add all source directories as folder references to the Xcode project
Instead of tracking individual files, hopefully this way I will always
find the files I’m looking for while debugging.
Change-Id: Ic9da2c576aebde6901a5c3907d24db5b84c01065
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154019
Tested-by: Jenkins
Reviewed-by: خالد حسني
diff --git a/osx/soffice.xcodeproj/project.pbxproj
b/osx/soffice.xcodeproj/project.pbxproj
index 922034dbe64f..eb75e9124779 100644
--- a/osx/soffice.xcodeproj/project.pbxproj
+++ b/osx/soffice.xcodeproj/project.pbxproj
@@ -7,2193 +7,291 @@
objects = {
/* Begin PBXFileReference section */
- 2994E11E28C0079900FC71E5 /* inc */ = {isa = PBXFileReference;
lastKnownFileType = folder; name = inc; path = ../vcl/inc; sourceTree =
""; };
- 2994E11F28C0079900FC71E5 /* qt6 */ = {isa = PBXFileReference;
lastKnownFileType = folder; name = qt6; path = ../vcl/qt6; sourceTree =
""; };
- 2994E12028C0079900FC71E5 /* headless */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = headless; path =
../vcl/headless; sourceTree = ""; };
- 2994E12128C0079A00FC71E5 /* null */ = {isa = PBXFileReference;
lastKnownFileType = folder; name = null; path = ../vcl/null; sourceTree =
""; };
- 2994E12228C0079A00FC71E5 /* uiconfig */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = uiconfig; path =
../vcl/uiconfig; sourceTree = ""; };
- 2994E12328C0079A00FC71E5 /* skia */ = {isa = PBXFileReference;
lastKnownFileType = folder; name = skia; path = ../vcl/skia; sourceTree =
""; };
- 2994E12428C0079A00FC71E5 /* osx */ = {isa = PBXFileReference;
lastKnownFileType = folder; name = osx; path = ../vcl/osx; sourceTree =
""; };
- 2994E12528C0079A00FC71E5 /* quartz */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = quartz; path =
../vcl/quartz; sourceTree = ""; };
- 2994E12628C0079A00FC71E5 /* android */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = android; path =
../vcl/android; sourceTree = ""; };
- 2994E12728C0079A00FC71E5 /* backendtest */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = backendtest; path =
../vcl/backendtest; sourceTree = ""; };
- 2994E12828C0079A00FC71E5 /* source */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = source; path =
../vcl/source; sourceTree = ""; };
- 2994E12928C0079A00FC71E5 /* win */ = {isa = PBXFileReference;
lastKnownFileType = folder; name = win; path = ../vcl/win; sourceTree =
""; };
- 2994E12A28C0079A00FC71E5 /* qt5 */ = {isa = PBXFileReference;
lastKnownFileType = folder; name = qt5; path = ../vcl/qt5; sourceTree =
""; };
- 2994E12B28C0079A00FC71E5 /* unx */ = {isa = PBXFileReference;
lastKnownFileType = folder; name = unx; path = ../vcl/unx; sourceTree =
""; };
- 2994E12C28C0079A00FC71E5 /* ios */ = {isa = PBXFileReference;
lastKnownFileType = folder; name = ios; path = ../vcl/ios; sourceTree =
""; };
- 2994E12D28C0079A00FC71E5 /* jsdialog */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = jsdialog; path =
../vcl/jsdialog; sourceTree = ""; };
- 29FD821128BC548D00159078 /* text */ = {isa = PBXFileReference;
lastKnownFileType = folder; name = text; path = ../sw/source/core/text;
sourceTree = ""; };
- 29FD821228BC54AB00159078 /* txtnode */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = txtnode; path =
../sw/source/core/txtnode; sourceTree = ""; };
- 456E58CF277CB9C700FA12D2 /* unoshap2.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = unoshap2.cxx; path = ../svx/source/unodraw/unoshap2.cxx; sourceTree =
""; };
- 456E58D1277CC33E00FA12D2 /* unopage.cxx */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = unopage.cxx; path = ../svx/source/unodraw/unopage.cxx; sourceTree =
""; };
- BE017B8725AF2ABE00244ED8 /* autostyl.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = autostyl.cxx;
path = ../sc/source/ui/docshell/autostyl.cxx; sourceTree = ""; };
- BE017B8825AF2ABE00244ED8 /* servobj.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = servobj.cxx;
path = ../sc/source/ui/docshell/servobj.cxx; sourceTree = ""; };
- BE017B8925AF2ABE00244ED8 /* docsh4.cxx */ = {isa =
PBXFileReference;
Re: Junit test chart2 unoapi
On 04/07/2023 19:46, Laurent Balland wrote: Hello, With my change [1], Jenkins complains about a Junit test which failed: JunitTest_chart2_unoapi But I was not able to find where is this test. File chart2/qa/unoapi/sch.sce has no meaning for me. Where should I look? https://wiki.documentfoundation.org/Development/How_to_debug#Debugging_the_qadevOOo/unoapi_subsequent_tests
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 31 +--
1 file changed, 19 insertions(+), 12 deletions(-)
New commits:
commit 1ca926cd6eff2df195e673397d7b34e0a4fb569b
Author: Mike Kaganski
AuthorDate: Wed Jul 5 10:50:17 2023 +0300
Commit: Mike Kaganski
CommitDate: Wed Jul 5 11:53:14 2023 +0200
Optimize a bit
Do not create selection and calculate paragraph text string each time.
Change-Id: I6781695c05e3bb26c2656cf841c0a9093f260c8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154020
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 36add41691b0..2bd77f3f13ea 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -1089,13 +1089,14 @@ void
DomainMapperTableHandler::ApplyParagraphPropertiesFromTableStyle(TableParag
// 1. Collect all the table-style-defined properties, that aren't
overridden by the
//paragraph style or direct formatting
std::vector aProps;
+std::optional oParagraphText;
for( auto const& eId : aAllTableParaProperties )
{
// apply paragraph and character properties of the table style on
table paragraphs
// if there is no direct paragraph formatting
-bool bIsParaLevel = rParaProp.m_pPropertyMap->isSet(eId);
-if ( !bIsParaLevel || isCharacterProperty(eId) )
+bool bSetDirectlyInParaLevel = rParaProp.m_pPropertyMap->isSet(eId);
+if ( !bSetDirectlyInParaLevel || isCharacterProperty(eId) )
{
if ( (eId == PROP_PARA_LEFT_MARGIN || eId ==
PROP_PARA_FIRST_LINE_INDENT) &&
rParaProp.m_pPropertyMap->isSet(PROP_NUMBERING_RULES) )
@@ -,7 +1112,20 @@ void
DomainMapperTableHandler::ApplyParagraphPropertiesFromTableStyle(TableParag
// this cell applies the table style property
if (pCellProp != rCellProperties.end())
{
-bool bDocDefault;
+if (bSetDirectlyInParaLevel) // it is a character property set
directly in the paragraph
+{
+if (!oParagraphText) // do it only once
+{
+uno::Reference xParagraph(
+
rParaProp.m_rEndParagraph->getText()->createTextCursorByRange(rParaProp.m_rEndParagraph),
uno::UNO_QUERY_THROW );
+// select paragraph
+xParagraph->gotoStartOfParagraph( true );
+oParagraphText = xParagraph->getString();
+}
+// don't overwrite empty paragraph with table style, if it
has a direct paragraph formatting
+if (oParagraphText->isEmpty())
+continue;
+}
// handle paragraph background color defined in
CellColorHandler
if (eId == PROP_FILL_COLOR)
{
@@ -1127,6 +1141,7 @@ void
DomainMapperTableHandler::ApplyParagraphPropertiesFromTableStyle(TableParag
OUString sParaStyleName;
rParaProp.m_rPropertySet->getPropertyValue("ParaStyleName")
>>= sParaStyleName;
StyleSheetEntryPtr pEntry =
m_rDMapper_Impl.GetStyleSheetTable()->FindStyleSheetByConvertedStyleName(sParaStyleName);
+bool bDocDefault;
uno::Any aParaStyle =
m_rDMapper_Impl.GetPropertyFromStyleSheet(eId, pEntry, true, true,
);
// A very strange compatibility rule says that the DEFAULT
style's specified fontsize of 11 or 12
// or a specified left justify will always be overridden by
the table-style.
@@ -1150,16 +1165,8 @@ void
DomainMapperTableHandler::ApplyParagraphPropertiesFromTableStyle(TableParag
}
// use table style when no paragraph style setting or a
docDefault value is applied instead of it
-if ( aParaStyle == uno::Any() || bDocDefault ||
bCompatOverride ) try
+if (!aParaStyle.hasValue() || bDocDefault || bCompatOverride)
try
{
-uno::Reference xParagraph(
-
rParaProp.m_rEndParagraph->getText()->createTextCursorByRange(rParaProp.m_rEndParagraph),
uno::UNO_QUERY_THROW );
-// select paragraph
-xParagraph->gotoStartOfParagraph( true );
-// don't overwrite empty paragraph with table style, if it
has a direct paragraph formatting
-if ( bIsParaLevel && xParagraph->getString().getLength()
== 0 )
-continue;
-
// apply style setting when the paragraph doesn't modify it
aProps.push_back(comphelper::makePropertyValue(sPropertyName,
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - config_host/config_cairo_rgba.h.in config_host.mk.in configure.ac desktop/source distro-configs/CPLinux-LOKit.conf distro-configs/L
config_host.mk.in |1
config_host/config_cairo_rgba.h.in|6
configure.ac | 21 +++-
desktop/source/lib/init.cxx |5 +++
distro-configs/CPLinux-LOKit.conf |1
distro-configs/LibreOfficeOnline.conf |1
external/cairo/UnpackedTarball_cairo.mk |3 --
libreofficekit/qa/tilebench/tilebench.cxx | 38 --
vcl/headless/CairoCommon.cxx |2 -
vcl/inc/headless/CairoCommon.hxx | 16
10 files changed, 68 insertions(+), 26 deletions(-)
New commits:
commit ad65368380f49d8cfd111ea393243fa4d4888afb
Author: Caolán McNamara
AuthorDate: Mon Jun 26 16:56:21 2023 +0100
Commit: Michael Meeks
CommitDate: Wed Jul 5 12:56:03 2023 +0200
add an --enable-cairo-rgba to set the order of pixels for internal cairo
Change-Id: Ieab2ef59f63a7722bffea3273d2eeefadef47b56
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153633
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
diff --git a/config_host.mk.in b/config_host.mk.in
index addccaeeb44f..92c8a2f99c3b 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -142,6 +142,7 @@ export ENABLE_AVAHI=@ENABLE_AVAHI@
export ENABLE_BREAKPAD=@ENABLE_BREAKPAD@
export DEFAULT_CRASHDUMP_VALUE=@DEFAULT_CRASHDUMP_VALUE@
export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@
+export ENABLE_CAIRO_RGBA=@ENABLE_CAIRO_RGBA@
export ENABLE_CIPHER_OPENSSL_BACKEND=@ENABLE_CIPHER_OPENSSL_BACKEND@
export ENABLE_CLUCENE=@ENABLE_CLUCENE@
export ENABLE_LIBCMIS=@ENABLE_LIBCMIS@
diff --git a/config_host/config_cairo_rgba.h.in
b/config_host/config_cairo_rgba.h.in
new file mode 100644
index ..bdbecfbbc0e1
--- /dev/null
+++ b/config_host/config_cairo_rgba.h.in
@@ -0,0 +1,6 @@
+#ifndef CONFIG_CAIRO_RGBA_H
+#define CONFIG_CAIRO_RGBA_H
+
+#define ENABLE_CAIRO_RGBA 0
+
+#endif
diff --git a/configure.ac b/configure.ac
index 26ec32a1eb13..b8f596fafdcc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2472,6 +2472,10 @@ AC_ARG_WITH(system-hunspell,
[Use libhunspell already on system.]),,
[with_system_hunspell="$with_system_libs"])
+libo_FUZZ_ARG_ENABLE(cairo-rgba,
+AS_HELP_STRING([--enable-cairo-rgba],
+[Use RGBA order, instead of default BRGA. Not possible with
--with-system-cairo]))
+
libo_FUZZ_ARG_ENABLE(zxing,
AS_HELP_STRING([--disable-zxing],
[Disable use of zxing external library.]))
@@ -13520,6 +13524,20 @@ fi
AC_SUBST(USE_XINERAMA)
AC_SUBST(XINERAMA_LINK)
+AC_MSG_CHECKING([whether to use non-standard RGBA32 cairo pixel order])
+if test -z "$enable_cairo_rgba" -a "$_os" = "Android"; then
+enable_cairo_rgba=yes
+fi
+if test "$enable_cairo_rgba" = yes; then
+AC_DEFINE(ENABLE_CAIRO_RGBA)
+ENABLE_CAIRO_RGBA=TRUE
+AC_MSG_RESULT([yes])
+else
+ENABLE_CAIRO_RGBA=
+AC_MSG_RESULT([no])
+fi
+AC_SUBST(ENABLE_CAIRO_RGBA)
+
dnl ===
dnl Test whether to build cairo or rely on the system version
dnl ===
@@ -13528,7 +13546,7 @@ if test "$test_cairo" = "yes"; then
AC_MSG_CHECKING([whether to use the system cairo])
: ${with_system_cairo:=$with_system_libs}
-if test "$with_system_cairo" = "yes"; then
+if test "$with_system_cairo" = "yes" -a "$enable_cairo_rgba" != "yes"; then
SYSTEM_CAIRO=TRUE
AC_MSG_RESULT([yes])
@@ -14778,6 +14796,7 @@ AC_CONFIG_HEADERS([config_host/config_dconf.h])
AC_CONFIG_HEADERS([config_host/config_eot.h])
AC_CONFIG_HEADERS([config_host/config_extensions.h])
AC_CONFIG_HEADERS([config_host/config_cairo_canvas.h])
+AC_CONFIG_HEADERS([config_host/config_cairo_rgba.h])
AC_CONFIG_HEADERS([config_host/config_cxxabi.h])
AC_CONFIG_HEADERS([config_host/config_dbus.h])
AC_CONFIG_HEADERS([config_host/config_features.h])
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 8448209e87b5..e8586fb5af7e 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -9,6 +9,7 @@
#include "sfx2/lokhelper.hxx"
#include
+#include
#include
#include
@@ -4213,7 +4214,11 @@ static void doc_paintPartTile(LibreOfficeKitDocument*
pThis,
static int doc_getTileMode(SAL_UNUSED_PARAMETER LibreOfficeKitDocument*
/*pThis*/)
{
SetLastExceptionMsg();
+#if ENABLE_CAIRO_RGBA
+return LOK_TILEMODE_RGBA;
+#else
return LOK_TILEMODE_BGRA;
+#endif
}
static void doc_getDocumentSize(LibreOfficeKitDocument* pThis,
diff --git a/distro-configs/CPLinux-LOKit.conf
b/distro-configs/CPLinux-LOKit.conf
index 180a23d63d89..271c0f43173b 100644
--- a/distro-configs/CPLinux-LOKit.conf
+++ b/distro-configs/CPLinux-LOKit.conf
@@ -6,6 +6,7 @@
--with-myspell-dicts
--with-system-zlib
--disable-poppler
+--enable-cairo-rgba
--without-system-cairo
--without-system-fontconfig
[Libreoffice-commits] core.git: sw/source
sw/source/core/undo/docundo.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit ea030aeffd839f1078c137cb19cb1694d0581d42
Author: Szymon Kłos
AuthorDate: Thu Jun 22 16:46:22 2023 +0200
Commit: Szymon Kłos
CommitDate: Wed Jul 5 13:05:38 2023 +0200
lok: use correct shell when doing undo
When doing undo we save EditShell reference in the context object.
Later it is used to get cursor we want to move to the place
where modification was done (in sw/source/core/undo/unins.cxx:281).
In LOK case when 2 different sessions were used and undo was done
by user A - then user's B cursor was moved. This fixes that issue.
We use current shell instead of getting it indirectly through
SwDoc::GetEditShell()
Change-Id: I7a10ea98587f48818e8d0aaa9ad739d4eed514f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153461
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153986
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx
index a9efc248259a..57202fe3632a 100644
--- a/sw/source/core/undo/docundo.cxx
+++ b/sw/source/core/undo/docundo.cxx
@@ -30,6 +30,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -666,7 +667,10 @@ bool UndoManager::impl_DoUndoRedo(UndoOrRedoType
undoOrRedo, size_t nUndoOffset)
UnoActionContext c(& rDoc); // exception-safe StartAllAction/EndAllAction
-SwEditShell *const pEditShell(rDoc.GetEditShell());
+SwView* pViewShell = dynamic_cast(SfxViewShell::Current());
+SwEditShell *const pEditShell(
+comphelper::LibreOfficeKit::isActive() && pViewShell ?
pViewShell->GetWrtShellPtr()
+: rDoc.GetEditShell());
OSL_ENSURE(pEditShell, "sw::UndoManager needs a SwEditShell!");
if (!pEditShell)
{
[Libreoffice-commits] core.git: compilerplugins/clang include/registry vcl/inc vcl/source
compilerplugins/clang/unusedenumconstants.readonly.results | 1050 +- compilerplugins/clang/unusedenumconstants.untouched.results | 466 - compilerplugins/clang/unusedenumconstants.writeonly.results | 5324 +++- include/registry/regtype.h |9 vcl/inc/unx/sessioninhibitor.hxx|2 vcl/source/filter/graphicfilter2.cxx| 14 6 files changed, 4134 insertions(+), 2731 deletions(-) New commits: commit f98296117b2c27af73c093525ad828909fd8fb31 Author: Noel Grandin AuthorDate: Wed Jul 5 11:44:46 2023 +0200 Commit: Noel Grandin CommitDate: Wed Jul 5 14:21:51 2023 +0200 loplugin:unusedenumconstants Change-Id: I53817a6b017203d8694032320869d11412c57ee9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154027 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results b/compilerplugins/clang/unusedenumconstants.readonly.results index 02ec1e8a728f..6d82ee1cd1dd 100644 --- a/compilerplugins/clang/unusedenumconstants.readonly.results +++ b/compilerplugins/clang/unusedenumconstants.readonly.results @@ -1,55 +1,53 @@ -bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx:79 -enum (anonymous namespace)::x86_64_reg_class X86_64_SSEUP_CLASS -bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx:80 -enum (anonymous namespace)::x86_64_reg_class X86_64_X87_CLASS -bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx:81 -enum (anonymous namespace)::x86_64_reg_class X86_64_X87UP_CLASS +chart2/source/controller/main/DrawCommandDispatch.h:31 +enum DrawCommandID COMMAND_ID_DRAW_TEXT_VERTICAL +chart2/source/controller/main/DrawCommandDispatch.h:33 +enum DrawCommandID COMMAND_ID_DRAW_CAPTION_VERTICAL chart2/source/inc/CharacterProperties.hxx:120 -enum chart::CharacterProperties::(anonymous at /home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:41:5) FAST_PROPERTY_ID_END_CHAR_PROP -chart2/source/inc/TitleHelper.hxx:47 +enum chart::CharacterProperties::(unnamed at /home/noel/libo-plugin/chart2/source/inc/CharacterProperties.hxx:41:5) FAST_PROPERTY_ID_END_CHAR_PROP +chart2/source/inc/TitleHelper.hxx:49 enum chart::TitleHelper::eTitleType NORMAL_TITLE_END -chart2/source/view/inc/ShapeFactory.hxx:49 +chart2/source/view/inc/ShapeFactory.hxx:51 enum chart::SymbolEnum Symbol_Square -chart2/source/view/inc/ShapeFactory.hxx:50 +chart2/source/view/inc/ShapeFactory.hxx:52 enum chart::SymbolEnum Symbol_Diamond -chart2/source/view/inc/ShapeFactory.hxx:51 +chart2/source/view/inc/ShapeFactory.hxx:53 enum chart::SymbolEnum Symbol_DownArrow -chart2/source/view/inc/ShapeFactory.hxx:52 +chart2/source/view/inc/ShapeFactory.hxx:54 enum chart::SymbolEnum Symbol_UpArrow -chart2/source/view/inc/ShapeFactory.hxx:53 +chart2/source/view/inc/ShapeFactory.hxx:55 enum chart::SymbolEnum Symbol_RightArrow -chart2/source/view/inc/ShapeFactory.hxx:54 +chart2/source/view/inc/ShapeFactory.hxx:56 enum chart::SymbolEnum Symbol_LeftArrow -chart2/source/view/inc/ShapeFactory.hxx:55 +chart2/source/view/inc/ShapeFactory.hxx:57 enum chart::SymbolEnum Symbol_Bowtie -chart2/source/view/inc/ShapeFactory.hxx:56 +chart2/source/view/inc/ShapeFactory.hxx:58 enum chart::SymbolEnum Symbol_Sandglass -chart2/source/view/inc/ShapeFactory.hxx:57 +chart2/source/view/inc/ShapeFactory.hxx:59 enum chart::SymbolEnum Symbol_Circle -chart2/source/view/inc/ShapeFactory.hxx:58 +chart2/source/view/inc/ShapeFactory.hxx:60 enum chart::SymbolEnum Symbol_Star -chart2/source/view/inc/ShapeFactory.hxx:59 +chart2/source/view/inc/ShapeFactory.hxx:61 enum chart::SymbolEnum Symbol_X -chart2/source/view/inc/ShapeFactory.hxx:60 +chart2/source/view/inc/ShapeFactory.hxx:62 enum chart::SymbolEnum Symbol_Plus -chart2/source/view/inc/ShapeFactory.hxx:61 +chart2/source/view/inc/ShapeFactory.hxx:63 enum chart::SymbolEnum Symbol_Asterisk -chart2/source/view/inc/ShapeFactory.hxx:62 +chart2/source/view/inc/ShapeFactory.hxx:64 enum chart::SymbolEnum Symbol_HorizontalBar -chart2/source/view/inc/ShapeFactory.hxx:63 +chart2/source/view/inc/ShapeFactory.hxx:65 enum chart::SymbolEnum Symbol_VerticalBar configmgr/source/access.hxx:443 -enum configmgr::Access::(anonymous at /home/noel/libo2/configmgr/source/access.hxx:441:5) IS_GROUP_MEMBER +enum configmgr::Access::(unnamed at /home/noel/libo-plugin/configmgr/source/access.hxx:441:5) IS_GROUP_MEMBER configmgr/source/access.hxx:443 -enum configmgr::Access::(anonymous at /home/noel/libo2/configmgr/source/access.hxx:441:5) IS_SET_MEMBER +enum configmgr::Access::(unnamed at /home/noel/libo-plugin/configmgr/source/access.hxx:441:5) IS_SET_MEMBER configmgr/source/components.hxx:149 enum configmgr::Components::ModificationTarget Dconf configmgr/source/parsemanager.hxx:43 -enum configmgr::ParseManager::(anonymous at
[Libreoffice-commits] core.git: include/sfx2 include/vcl sc/source sfx2/source
include/sfx2/childwin.hxx |2 ++
include/vcl/toolkit/dialog.hxx |2 ++
sc/source/ui/dbgui/validate.cxx |6 ++
sc/source/ui/inc/validate.hxx |2 ++
sfx2/source/appl/childwin.cxx | 21 +++--
5 files changed, 27 insertions(+), 6 deletions(-)
New commits:
commit a5c61b143d53bb10430b8a486874856c16a2d86c
Author: Balazs Varga
AuthorDate: Mon Jul 3 19:56:43 2023 +0200
Commit: Balazs Varga
CommitDate: Wed Jul 5 14:30:14 2023 +0200
tdf#155708 Fix validity dialog closes when moving focus to another window
Do not close Validation window if click on another Calc sheet.
Change-Id: I75569cbb91ebd445ac57f7a52d914297c21349e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153930
Tested-by: Balazs Varga
Reviewed-by: Balazs Varga
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index 57c2369233ef..6e4b20037be0 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -156,6 +156,8 @@ public:
};
const int nCloseResponseToJustHide = -42;
+// sc.hrc --> SID_VALIDITY_REFERENCE: 26161
+const sal_uInt16 nScValidityWindowSlotID = 26161;
#define SFX_DECL_CHILDWINDOW(Class) \
public : \
diff --git a/include/vcl/toolkit/dialog.hxx b/include/vcl/toolkit/dialog.hxx
index 5e11d2f783b5..640204acfe60 100644
--- a/include/vcl/toolkit/dialog.hxx
+++ b/include/vcl/toolkit/dialog.hxx
@@ -58,6 +58,8 @@ private:
boolmbModalMode;
InitFlagmnInitFlag; // used for deferred init
+const int nCloseResponseToJustHide = -42;
+
VclPtr mpActionArea;
VclPtr mpContentArea;
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 4445f68245c8..f8565e964354 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -104,6 +104,12 @@ ScValidationDlg::ScValidationDlg(weld::Window* pParent,
const SfxItemSet* pArgSe
void ScValidationDlg::EndDialog(int nResponse)
{
+// tdf#155708 - do not close, just hide validation window if we click in
another sheet
+if (nResponse == nCloseResponseToJustHide && getDialog()->get_visible())
+{
+getDialog()->hide();
+return;
+}
// tdf#137215 ensure original modality of true is restored before dialog
loop ends
if (m_bOwnRefHdlr)
RemoveRefDlg(true);
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index c8ed4447c400..c58ae53bbf7f 100644
--- a/sc/source/ui/inc/validate.hxx
+++ b/sc/source/ui/inc/validate.hxx
@@ -154,6 +154,8 @@ class ScValidationDlg
boolm_bOwnRefHdlr:1;
boolm_bRefInputting:1;
+const int nCloseResponseToJustHide = -42;
+
std::unique_ptr m_xHBox;
boolEnterRefStatus();
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 1fe6c39a7a03..633c33bb35c9 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -522,12 +522,21 @@ void SfxChildWindow::Show( ShowFlags nFlags )
{
if (!xController->getDialog()->get_visible())
{
-weld::DialogController::runAsync(xController,
-[this](sal_Int32 nResult) {
-if (nResult == nCloseResponseToJustHide)
-return;
-xController->Close();
-});
+if (nScValidityWindowSlotID == GetType())
+{
+// tdf#155708 - do not run a new (Async) validation window,
+// because we already have one in sync mode, just show the
running one
+xController->getDialog()->show();
+}
+else
+{
+weld::DialogController::runAsync(xController,
+[this](sal_Int32 nResult) {
+if (nResult == nCloseResponseToJustHide)
+return;
+xController->Close();
+});
+}
}
}
else
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - sw/source
sw/source/core/unocore/unoobj2.cxx | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 042964e60a49d6959a6eb93fb9397e8b5ff9da56
Author: Xisco Fauli
AuthorDate: Tue Jul 4 15:53:39 2023 +0200
Commit: Xisco Fauli
CommitDate: Wed Jul 5 09:04:11 2023 +0200
sw: fix crash in CreateParentXText
See
https://crashreport.libreoffice.org/stats/signature/SfxObjectShell::GetBaseModel()
Change-Id: Idcfc8219b5765bca9c45819bde5f276ce68c45de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153971
Reviewed-by: Caolán McNamara
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
(cherry picked from commit a0669a1a4963b2611fb372c8394ea4530d2c9e96)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154002
diff --git a/sw/source/core/unocore/unoobj2.cxx
b/sw/source/core/unocore/unoobj2.cxx
index 210e62655a15..1b02cb5a0b27 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -1307,12 +1307,14 @@ CreateParentXText(SwDoc & rDoc, const SwPosition& rPos)
break;
default:
{
-// then it is the body text
-const uno::Reference xModel =
-rDoc.GetDocShell()->GetBaseModel();
-const uno::Reference< text::XTextDocument > xDoc(
-xModel, uno::UNO_QUERY);
-xParentText = xDoc->getText();
+if (SwDocShell *const pDocSh = rDoc.GetDocShell())
+{
+// then it is the body text
+const uno::Reference xModel =
pDocSh->GetBaseModel();
+const uno::Reference< text::XTextDocument > xDoc(
+xModel, uno::UNO_QUERY);
+xParentText = xDoc->getText();
+}
}
}
OSL_ENSURE(xParentText.is(), "no parent text?");
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - svtools/source
svtools/source/config/colorcfg.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 6417fbe4a71dc6bb7d5edac5ed3f01c4ab38ca9c
Author: Paris Oplopoios
AuthorDate: Wed Jul 5 11:41:07 2023 +0300
Commit: Paris Oplopoios
CommitDate: Wed Jul 5 10:46:20 2023 +0200
svtools::BASICEDITOR shouldn't exist in colorcfg
Was added from a backport from master but would need a different commit
to matter
Change-Id: Ibc458808bd8353cb056e8fc20ae9b90c46e9e1f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154024
Tested-by: Paris Oplopoios
Reviewed-by: Paris Oplopoios
diff --git a/svtools/source/config/colorcfg.cxx
b/svtools/source/config/colorcfg.cxx
index d382116d2a2d..e03e875f100a 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -405,7 +405,6 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
{ COL_BLACK,Color(0xEE) }, // CALCTEXT
{ COL_LIGHTGRAY,Color(0x1C1C1C) }, // CALCPROTECTEDBACKGROUND
{ COL_GRAY7,COL_GRAY7 }, // DRAWGRID
-{ COL_WHITE,Color(0x1C1C1C) }, // BASICEDITOR
{ COL_GREEN,Color(0xDDE8CB) }, // BASICIDENTIFIER
{ COL_GRAY, Color(0xEE) }, // BASICCOMMENT
{ COL_LIGHTRED, Color(0xFFA6A6) }, // BASICNUMBER
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sc/source
sc/source/ui/vba/vbaworksheet.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit a2427519315f07b6c79d8456b9b7c128371b7e74 Author: Xisco Fauli AuthorDate: Tue Jul 4 14:06:26 2023 +0200 Commit: Michael Stahl CommitDate: Wed Jul 5 11:24:37 2023 +0200 sc: fix crash in ScVbaWorksheet::Cells See https://crashreport.libreoffice.org/stats/signature/ScDocShell::GetDocument() Similar to 286a1c03fa10acf60f076a0af987112d24cb2ff5 "sc: check excel::getDocShell" Change-Id: I102e575b4992e175d4e780ef2b43f887d94bbd24 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153964 Reviewed-by: Caolán McNamara Tested-by: Jenkins Reviewed-by: Xisco Fauli (cherry picked from commit c7a8889302fd7e9e0665c3d21510e374cff3891e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153992 Reviewed-by: Michael Stahl diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index abd76c6023c6..53bdc893281a 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -681,8 +681,9 @@ ScVbaWorksheet::Cells( const ::uno::Any , const ::uno::Any ) // Use a common helper method instead of creating a new ScVbaRange object uno::Reference< table::XCellRange > xRange( getSheet(), uno::UNO_QUERY_THROW ); uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_SET_THROW ); -ScDocument& rDoc = excel::getDocShell( xModel )->GetDocument(); -return ScVbaRange::CellsHelper( rDoc, this, mxContext, xRange, nRow, nCol ); +if(ScDocShell* pShell = excel::getDocShell( xModel )) +return ScVbaRange::CellsHelper(pShell->GetDocument(), this, mxContext, xRange, nRow, nCol ); +throw uno::RuntimeException(); } uno::Reference< excel::XRange >
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sw/source
sw/source/core/unocore/unoobj2.cxx | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 98a3a5dc591e4317655895d2fd91b87890144332
Author: Xisco Fauli
AuthorDate: Tue Jul 4 15:53:39 2023 +0200
Commit: Michael Stahl
CommitDate: Wed Jul 5 11:24:54 2023 +0200
sw: fix crash in CreateParentXText
See
https://crashreport.libreoffice.org/stats/signature/SfxObjectShell::GetBaseModel()
Change-Id: Idcfc8219b5765bca9c45819bde5f276ce68c45de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153971
Reviewed-by: Caolán McNamara
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
(cherry picked from commit a0669a1a4963b2611fb372c8394ea4530d2c9e96)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154003
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/unocore/unoobj2.cxx
b/sw/source/core/unocore/unoobj2.cxx
index e5fefbc0e376..f1c5a7e3675a 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -1319,12 +1319,14 @@ CreateParentXText(SwDoc & rDoc, const SwPosition& rPos)
break;
default:
{
-// then it is the body text
-const uno::Reference xModel =
-rDoc.GetDocShell()->GetBaseModel();
-const uno::Reference< text::XTextDocument > xDoc(
-xModel, uno::UNO_QUERY);
-xParentText = xDoc->getText();
+if (SwDocShell *const pDocSh = rDoc.GetDocShell())
+{
+// then it is the body text
+const uno::Reference xModel =
pDocSh->GetBaseModel();
+const uno::Reference< text::XTextDocument > xDoc(
+xModel, uno::UNO_QUERY);
+xParentText = xDoc->getText();
+}
}
}
OSL_ENSURE(xParentText.is(), "no parent text?");
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sfx2/source
sfx2/source/view/viewprn.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 6737f3c00ce0752977f9159abd080f64640d449a
Author: Xisco Fauli
AuthorDate: Tue Jul 4 14:23:20 2023 +0200
Commit: Michael Stahl
CommitDate: Wed Jul 5 11:23:54 2023 +0200
sfx2: fix crash in SfxViewShell::StartPrint
See
https://crashreport.libreoffice.org/stats/signature/SfxViewShell::StartPrint(com::sun::star::uno::Sequence%3Ccom::sun::star::beans::PropertyValue%3E%20const%20&,bool,bool)
Change-Id: I3d10414d4cfd027bf80ceaf6692bb7f92269f6c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153965
Reviewed-by: Caolán McNamara
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
(cherry picked from commit 3502f5147b9102d37459c373ee07e052fd267db7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153990
Reviewed-by: Michael Stahl
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 9476dd22edec..885f1bb31346 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -609,8 +609,11 @@ void SfxViewShell::StartPrint( const uno::Sequence <
beans::PropertyValue >& rPr
css::beans::PropertyValue* pJobNameVal =
xNewController->getValue("JobName");
if (!pJobNameVal)
{
-xNewController->setValue("JobName",
Any(GetObjectShell()->GetTitle(1)));
-xNewController->setPrinterModified(mbPrinterSettingsModified);
+if (SfxObjectShell* pDoc = GetObjectShell())
+{
+xNewController->setValue("JobName", Any(pDoc->GetTitle(1)));
+xNewController->setPrinterModified(mbPrinterSettingsModified);
+}
}
}
[Libreoffice-commits] core.git: oox/source
oox/source/export/shapes.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 4567008914239b26533c1968820bf461d606f96d
Author: Xisco Fauli
AuthorDate: Wed Jul 5 09:55:18 2023 +0200
Commit: Xisco Fauli
CommitDate: Wed Jul 5 12:10:43 2023 +0200
oox: fix crash in lcl_GetGluePointId
See
https://crashreport.libreoffice.org/stats/signature/static%20long%20oox::drawingml::lcl_GetGluePointId(const%20class%20com::sun::star::uno::Reference%3Ccom::sun::star::drawing::XShape%3E%20&%20const,%20long)
Regression from b7c542b5085374f1d031183cb86ceeefcf24964d
"tdf#154363 sd: fix line connectors regression of mirrored shapes"
Change-Id: I926d32f5b68582df588c28a800b0ec10e7e3e19f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154021
Reviewed-by: Caolán McNamara
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index efde8de56f72..fc702c1c3a22 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -1675,7 +1675,8 @@ static sal_Int32 lcl_GetGluePointId(const
Reference& xShape, sal_Int32 n
bool bFlipH = false;
bool bFlipV = false;
Reference xShapeProps(xShape, UNO_QUERY);
-if
(xShapeProps->getPropertySetInfo()->hasPropertyByName("CustomShapeGeometry"))
+if (xShapeProps.is() && xShapeProps->getPropertySetInfo()
+&&
xShapeProps->getPropertySetInfo()->hasPropertyByName("CustomShapeGeometry"))
{
Sequence aGeometrySeq;
xShapeProps->getPropertyValue("CustomShapeGeometry") >>=
aGeometrySeq;
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst external/harfbuzz
download.lst |4 ++-- external/harfbuzz/README |6 +- 2 files changed, 7 insertions(+), 3 deletions(-) New commits: commit 0ae4def1b72bba636ca9b51a06fb190c28e7e360 Author: Taichi Haradaguchi <20001...@ymail.ne.jp> AuthorDate: Wed Jun 28 19:03:16 2023 +0900 Commit: Christian Lohmaier CommitDate: Wed Jul 5 13:52:40 2023 +0200 Upgrade Harfbuzz to 7.3.0 Release Notes: https://github.com/harfbuzz/harfbuzz/releases/tag/7.2.0 (v7.2.0) https://github.com/harfbuzz/harfbuzz/releases/tag/7.3.0 (v7.3.0) Change-Id: I4f57b7e829f2356b5e2b442ff00df555121c0e66 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153729 Tested-by: Taichi Haradaguchi <20001...@ymail.ne.jp> Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp> (cherry picked from commit 8492195582a546b607bb15bc61adb64dcd74b904) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153894 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/download.lst b/download.lst index b179b4ba7034..0fa89e658822 100644 --- a/download.lst +++ b/download.lst @@ -222,8 +222,8 @@ GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz # three static lines # so that git cherry-pick # will not run into conflicts -HARFBUZZ_SHA256SUM := f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b -HARFBUZZ_TARBALL := harfbuzz-7.1.0.tar.xz +HARFBUZZ_SHA256SUM := 20770789749ac9ba846df33983dbda22db836c70d9f5d050cb9aa5347094a8fb +HARFBUZZ_TARBALL := harfbuzz-7.3.0.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/harfbuzz/README b/external/harfbuzz/README index 149da5566ab9..557c0a724ce8 100644 --- a/external/harfbuzz/README +++ b/external/harfbuzz/README @@ -1 +1,5 @@ -HarfBuzz is an OpenType text shaping engine. From [https://harfbuzz.github.io/]. +HarfBuzz is an OpenType text shaping engine. + +From [https://harfbuzz.github.io/]. + +Release archives at [https://github.com/harfbuzz/harfbuzz/releases].
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - external/cairo
external/cairo/cairo/cairo.GL_RGBA.patch | 15 +-- 1 file changed, 13 insertions(+), 2 deletions(-) New commits: commit 9a20ef20c7c15a9899c7959aa1b6bafa707439b8 Author: Caolán McNamara AuthorDate: Wed Jul 5 21:26:34 2023 +0100 Commit: Caolán McNamara CommitDate: Wed Jul 5 22:56:31 2023 +0200 cairo RGBA needs to take account of custom RGB24_888 format Change-Id: I929d20f134c4fb7dedfd2c581263c303cae87eea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154043 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/external/cairo/cairo/cairo.GL_RGBA.patch b/external/cairo/cairo/cairo.GL_RGBA.patch index b1a05feb4a15..648448e9de92 100644 --- a/external/cairo/cairo/cairo.GL_RGBA.patch +++ b/external/cairo/cairo/cairo.GL_RGBA.patch @@ -14,15 +14,26 @@ return CAIRO_FORMAT_RGB24; case PIXMAN_a8: return CAIRO_FORMAT_A8; -@@ -117,7 +117,7 @@ +@@ -109,7 +109,7 @@ + return CAIRO_FORMAT_A1; + case PIXMAN_r5g6b5: + return CAIRO_FORMAT_RGB16_565; +- case PIXMAN_r8g8b8: ++ case PIXMAN_b8g8r8: //tweaked + return CAIRO_FORMAT_RGB24_888; + #if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,22,0) + case PIXMAN_r8g8b8a8: case PIXMAN_r8g8b8x8: +@@ -117,8 +117,8 @@ #if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,27,2) case PIXMAN_a8r8g8b8_sRGB: #endif - case PIXMAN_a8b8g8r8: case PIXMAN_x8b8g8r8: +-case PIXMAN_b8g8r8: case PIXMAN_b5g6r5: +case PIXMAN_a8r8g8b8: case PIXMAN_x8r8g8b8: //tweaked - case PIXMAN_b8g8r8: case PIXMAN_b5g6r5: ++case PIXMAN_r8g8b8: case PIXMAN_b5g6r5: case PIXMAN_a1r5g5b5: case PIXMAN_x1r5g5b5: case PIXMAN_a1b5g5r5: case PIXMAN_x1b5g5r5: case PIXMAN_a4r4g4b4: case PIXMAN_x4r4g4b4: + case PIXMAN_a4b4g4r4: case PIXMAN_x4b4g4r4: case PIXMAN_r3g3b2: @@ -320,7 +320,7 @@ ret = PIXMAN_a8; break;
[Libreoffice-commits] core.git: slideshow/source
slideshow/source/engine/shapes/drawshapesubsetting.cxx | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
New commits:
commit 5d2fa4ab6e75609c30351f0623dac63182be4c27
Author: Khaled Hosny
AuthorDate: Wed Jul 5 17:12:19 2023 +0300
Commit: خالد حسني
CommitDate: Wed Jul 5 23:21:24 2023 +0200
tdf#113290: Fix handling of grapheme clusters in slideshow animations
When doing animations by character cells (AKA grapheme clusters), we
were taking the first character of the cluster only and lumping the rest
with the next cluster, so a combining mark would appear at the start of
the next sequence instead of the end of the current one.
For surrogate pairs it was even more broken we were splitting in the
middle of the pair resulting in invalid Unicode sequence.
Change-Id: I9bbfe412e9b0a876b69e33c0916067bf75064122
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154066
Tested-by: Jenkins
Reviewed-by: خالد حسني
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index 264f8f3316b2..13ea0300fa63 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -579,16 +579,24 @@ namespace slideshow::internal
aLastWordStart = aNext;
[[fallthrough]];
case DrawShapeSubsetting::CLASS_CHARACTER_CELL_END:
+// tdf#113290
+// This is a special case since a character cell
+// (AKA grapheme cluster) can have multiple
+// characters, so if we passed nCurrCharCount to
+// io_rFunctor() it would stop at the first
+// character in the cluster, so we subtract one
+// so that it matches when we reach the start of
+// the next cluster.
if( !io_rFunctor(
DrawShapeSubsetting::CLASS_CHARACTER_CELL_END,
- nCurrCharCount,
+ nCurrCharCount - 1,
aLastCharStart,
- aNext ) )
+ aCurr ) )
{
return;
}
++nCurrCharCount;
-aLastCharStart = aNext;
+aLastCharStart = aCurr;
break;
}
[Libreoffice-commits] core.git: sd/source
sd/source/ui/func/futext.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 71358fa5ebbb086bac822ddbfcd3500dce09ae63
Author: Justin Luth
AuthorDate: Wed Jul 5 14:42:32 2023 -0400
Commit: Justin Luth
CommitDate: Wed Jul 5 23:26:52 2023 +0200
simplify sd: already asked if mxTextObj.get().is()
Change-Id: Ibb303cf53722684b0f98f0195ec6d55376bcfd1b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154073
Tested-by: Jenkins
Reviewed-by: Justin Luth
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 559846aeb5f0..5639d424b8b1 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -590,7 +590,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
if (rMarkList.GetMarkCount() == 1
&& ( rMarkList.GetMark(0)->GetMarkedSdrObj() ==
mxTextObj.get().get()) )
{
-if( mxTextObj.get().is() &&
!GetTextObj()->GetOutlinerParaObject() )
+if (!GetTextObj()->GetOutlinerParaObject() )
bEmptyTextObj = true;
else
bFirstObjCreated = true;
[Libreoffice-commits] core.git: include/svx sc/source sd/source svx/source sw/source
include/svx/unopool.hxx |8 +---
include/svx/unoprov.hxx |4 ++--
sc/source/ui/unoobj/drdefuno.cxx |3 ++-
sd/source/ui/unoidl/unopool.cxx |4 ++--
svx/source/unodraw/unopool.cxx | 21 ++---
sw/source/uibase/uno/unodefaults.cxx |2 +-
6 files changed, 10 insertions(+), 32 deletions(-)
New commits:
commit ef049c4d10023f866173ea344d13e5d99d485066
Author: Noel Grandin
AuthorDate: Wed Jul 5 14:37:02 2023 +0200
Commit: Noel Grandin
CommitDate: Wed Jul 5 22:42:38 2023 +0200
simplify SvxUnoDrawPool initialisation
Change-Id: Iaca5eec19935c50cc7cade4f3dab139a5232473a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154058
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svx/unopool.hxx b/include/svx/unopool.hxx
index 1f9431f8755d..9e86c957a27f 100644
--- a/include/svx/unopool.hxx
+++ b/include/svx/unopool.hxx
@@ -30,10 +30,6 @@
class SdrModel;
class SfxItemPool;
-enum class SvxUnoDrawPoolDefaults {
-Drawing, Writer
-};
-
/** This class implements the service com.sun.star.drawing.Defaults.
It works on the SfxItemPool from the given model and the global
draw object item pool.
@@ -46,10 +42,8 @@ class SVX_DLLPUBLIC SvxUnoDrawPool :public
::cppu::OWeakAggObject,
public comphelper::PropertySetHelper
{
public:
-SvxUnoDrawPool(SdrModel* pModel, SvxUnoDrawPoolDefaults nServiceId);
+SvxUnoDrawPool(SdrModel* pModel,
rtl::Reference const & xDefaults);
-/** deprecated */
-SvxUnoDrawPool(SdrModel* pModel);
virtual ~SvxUnoDrawPool() noexcept override;
/** This returns the item pool from the given model, or the default pool
if there is no model and bReadOnly is true.
diff --git a/include/svx/unoprov.hxx b/include/svx/unoprov.hxx
index fe03bb286dbc..382a8dbd38f1 100644
--- a/include/svx/unoprov.hxx
+++ b/include/svx/unoprov.hxx
@@ -99,8 +99,8 @@ namespace comphelper { class PropertySetInfo; }
namespace SvxPropertySetInfoPool
{
-UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC)
rtl::Reference const & getDrawingDefaults()
noexcept;
-UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC)
rtl::Reference const & getWriterDrawingDefaults()
noexcept;
+SVXCORE_DLLPUBLIC rtl::Reference const &
getDrawingDefaults() noexcept;
+SVXCORE_DLLPUBLIC rtl::Reference const &
getWriterDrawingDefaults() noexcept;
};
#endif
diff --git a/sc/source/ui/unoobj/drdefuno.cxx b/sc/source/ui/unoobj/drdefuno.cxx
index 7ad5dc28ecb7..fa2387d28bda 100644
--- a/sc/source/ui/unoobj/drdefuno.cxx
+++ b/sc/source/ui/unoobj/drdefuno.cxx
@@ -21,12 +21,13 @@
#include
#include
+#include
#include
using namespace ::com::sun::star;
ScDrawDefaultsObj::ScDrawDefaultsObj(ScDocShell* pDocSh) :
-SvxUnoDrawPool( nullptr ),
+SvxUnoDrawPool( nullptr, SvxPropertySetInfoPool::getDrawingDefaults() ),
pDocShell( pDocSh )
{
// SvxUnoDrawPool is initialized without model,
diff --git a/sd/source/ui/unoidl/unopool.cxx b/sd/source/ui/unoidl/unopool.cxx
index 7345dc45dfb7..5791aa6984ed 100644
--- a/sd/source/ui/unoidl/unopool.cxx
+++ b/sd/source/ui/unoidl/unopool.cxx
@@ -21,7 +21,7 @@
#include
#include
#include
-
+#include
#include
#include "unopool.hxx"
@@ -59,7 +59,7 @@ private:
}
SdUnoDrawPool::SdUnoDrawPool(SdDrawDocument* pModel)
-: SvxUnoDrawPool( pModel ), mpDrawModel( pModel )
+: SvxUnoDrawPool( pModel, SvxPropertySetInfoPool::getDrawingDefaults() ),
mpDrawModel( pModel )
{
}
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index e94ccb2d7450..eb897556eff9 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -39,25 +39,8 @@
using namespace ::com::sun::star;
using namespace ::cppu;
-static rtl::Reference const &
getDefaults(SvxUnoDrawPoolDefaults nServiceId)
-{
-switch (nServiceId)
-{
-case SvxUnoDrawPoolDefaults::Drawing: return
SvxPropertySetInfoPool::getDrawingDefaults();
-case SvxUnoDrawPoolDefaults::Writer: return
SvxPropertySetInfoPool::getWriterDrawingDefaults();
-default: std::abort();
-}
-}
-
-SvxUnoDrawPool::SvxUnoDrawPool(SdrModel* pModel, SvxUnoDrawPoolDefaults
nServiceId)
-: PropertySetHelper( getDefaults(nServiceId) ), mpModel( pModel )
-{
-init();
-}
-
-/* deprecated */
-SvxUnoDrawPool::SvxUnoDrawPool(SdrModel* pModel)
-: PropertySetHelper( SvxPropertySetInfoPool::getDrawingDefaults() ), mpModel(
pModel )
+SvxUnoDrawPool::SvxUnoDrawPool(SdrModel* pModel,
rtl::Reference const & xDefaults)
+: PropertySetHelper( xDefaults ), mpModel( pModel )
{
init();
}
diff --git a/sw/source/uibase/uno/unodefaults.cxx
b/sw/source/uibase/uno/unodefaults.cxx
index b8545c70954d..b12e804108e8 100644
--- a/sw/source/uibase/uno/unodefaults.cxx
+++ b/sw/source/uibase/uno/unodefaults.cxx
@@ -25,7 +25,7 @@
SwSvxUnoDrawPool::SwSvxUnoDrawPool(SwDoc& rDoc)
:
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sw/source
sw/source/uibase/config/usrpref.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit dff8d3af57ebb4c3dab205e4deb966f5ebda55cd Author: Mike Kaganski AuthorDate: Wed Jul 5 15:30:30 2023 +0300 Commit: Caolán McNamara CommitDate: Wed Jul 5 22:57:06 2023 +0200 tdf#155462: Re-enable ShowScrollBarTips expert config ... accidentally broken by commit 4ed26badfd6fd9190cb6e54078b41eb38cb37dca. Change-Id: I407e1eab47277dd8fa00c123b32596557fd5f2a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154038 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx index e2599f4092b3..055949ef4b93 100644 --- a/sw/source/uibase/config/usrpref.cxx +++ b/sw/source/uibase/config/usrpref.cxx @@ -388,7 +388,7 @@ void SwLayoutViewConfig::Load() case 16: m_rParent.SetViewLayoutBookMode(bSet); break;// "ViewLayout/BookMode", case 17: m_rParent.SetDefaultPageMode(bSet,true); break;// "Other/IsSquaredPageMode", case 18: m_rParent.SetApplyCharUnit(bSet, true); break;// "Other/ApplyUserChar" -case 29: m_rParent.SetShowScrollBarTips(bSet); break;// "Window/ShowScrollBarTips", +case 19: m_rParent.SetShowScrollBarTips(bSet); break;// "Window/ShowScrollBarTips", } } }
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - sw/source
sw/source/uibase/config/usrpref.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 04e969822ef93e9afbcb4953182f439b9c16c6fd Author: Mike Kaganski AuthorDate: Wed Jul 5 15:30:30 2023 +0300 Commit: Caolán McNamara CommitDate: Wed Jul 5 22:56:54 2023 +0200 tdf#155462: Re-enable ShowScrollBarTips expert config ... accidentally broken by commit 4ed26badfd6fd9190cb6e54078b41eb38cb37dca. Change-Id: I407e1eab47277dd8fa00c123b32596557fd5f2a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154036 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx index 181b863e130c..c04d775c3ac3 100644 --- a/sw/source/uibase/config/usrpref.cxx +++ b/sw/source/uibase/config/usrpref.cxx @@ -392,7 +392,7 @@ void SwLayoutViewConfig::Load() case 16: m_rParent.SetViewLayoutBookMode(bSet); break;// "ViewLayout/BookMode", case 17: m_rParent.SetDefaultPageMode(bSet,true); break;// "Other/IsSquaredPageMode", case 18: m_rParent.SetApplyCharUnit(bSet, true); break;// "Other/ApplyUserChar" -case 29: m_rParent.SetShowScrollBarTips(bSet); break;// "Window/ShowScrollBarTips", +case 19: m_rParent.SetShowScrollBarTips(bSet); break;// "Window/ShowScrollBarTips", } } }
[Libreoffice-commits] core.git: vcl/quartz
vcl/quartz/salbmp.cxx | 28 +++-
1 file changed, 27 insertions(+), 1 deletion(-)
New commits:
commit aa5c3d32d7c85b496fa86d8198478fb6dc157811
Author: Patrick Luby
AuthorDate: Wed Jul 5 15:51:32 2023 -0400
Commit: Patrick Luby
CommitDate: Thu Jul 6 00:46:54 2023 +0200
Fix failure to generate the correct color mask
OutputDevice::ImplDrawRotateText() draws black text but
that will generate gray pixels due to antialiasing so
count dark gray the same as black, light gray the same
as white, and the rest as medium gray.
The results are not smooth since LibreOffice appears to
redraw these semi-transparent masks repeatedly without
clearing the background so the semi-transparent pixels
will grow darker with repeatedly redraws due to
cumulative blending. But it is now better than before.
Change-Id: If64ff5ab52a6e441b587aa3c3c12b08137ecf34e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154079
Tested-by: Jenkins
Reviewed-by: Patrick Luby
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index afd65d863370..ab435c0acdfc 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -560,7 +560,33 @@ CGImageRef QuartzSalBitmap::CreateColorMask( int nX, int
nY, int nWidth,
sal_uInt32 x = nWidth;
while( x-- )
{
-*pDest++ = (pSourcePixels->readPixel() == 0) ? nColor : 0;
+// Fix failure to generate the correct color mask
+// OutputDevice::ImplDrawRotateText() draws black text but
+// that will generate gray pixels due to antialiasing so
+// count dark gray the same as black, light gray the same
+// as white, and the rest as medium gray.
+// The results are not smooth since LibreOffice appears to
+// redraw these semi-transparent masks repeatedly without
+// clearing the background so the semi-transparent pixels
+// will grow darker with repeatedly redraws due to
+// cumulative blending. But it is now better than before.
+sal_uInt8 nAlpha = 255 -
pSourcePixels->readPixel().GetRed();
+sal_uInt32 nPremultColor = nColor;
+if ( nAlpha < 192 )
+{
+if ( nAlpha < 64 )
+{
+nPremultColor = 0;
+}
+else
+{
+reinterpret_cast()[0] /=
2;
+reinterpret_cast()[1] /=
2;
+reinterpret_cast()[2] /=
2;
+reinterpret_cast()[3] /=
2;
+}
+}
+*pDest++ = nPremultColor;
}
pSource += mnBytesPerRow;
}
[Libreoffice-commits] core.git: svgio/inc svgio/source
svgio/inc/svgtoken.hxx|3 ---
svgio/source/svgreader/svgdocumenthandler.cxx |9 +
svgio/source/svgreader/svgtoken.cxx | 17 ++---
3 files changed, 3 insertions(+), 26 deletions(-)
New commits:
commit d378a44b4aa917d1f000f6ed2aa682009c544b6f
Author: Xisco Fauli
AuthorDate: Wed Jul 5 16:37:58 2023 +0200
Commit: Xisco Fauli
CommitDate: Wed Jul 5 22:46:42 2023 +0200
svgio: simplify code
Change-Id: Ieaf0430cd0e84d861f108ec33bf98ff2870ba2df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154067
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/svgio/inc/svgtoken.hxx b/svgio/inc/svgtoken.hxx
index 61abd28f11e8..cec89241903a 100644
--- a/svgio/inc/svgtoken.hxx
+++ b/svgio/inc/svgtoken.hxx
@@ -195,9 +195,6 @@ namespace svgio::svgreader
SVGToken StrToSVGToken(const OUString& rStr, bool bCaseIndependent);
OUString SVGTokenToStr(const SVGToken& rToken);
-OUString getStrTitle();
-OUString getStrDesc();
-
} // end of namespace svgio::svgreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svgdocumenthandler.cxx
b/svgio/source/svgreader/svgdocumenthandler.cxx
index 46d938a7c31e..99ca832a34f5 100644
--- a/svgio/source/svgreader/svgdocumenthandler.cxx
+++ b/svgio/source/svgreader/svgdocumenthandler.cxx
@@ -525,14 +525,7 @@ namespace
if(!aText.isEmpty())
{
-if(SVGToken::Title == aSVGToken)
-{
-mpTarget->parseAttribute(getStrTitle(), aSVGToken,
aText);
-}
-else // if(SVGTokenDesc == aSVGToken)
-{
-mpTarget->parseAttribute(getStrDesc(), aSVGToken,
aText);
-}
+mpTarget->parseAttribute(SVGTokenToStr(aSVGToken),
aSVGToken, aText);
}
}
diff --git a/svgio/source/svgreader/svgtoken.cxx
b/svgio/source/svgreader/svgtoken.cxx
index 6af6a1f5856e..1e2d3d7486da 100644
--- a/svgio/source/svgreader/svgtoken.cxx
+++ b/svgio/source/svgreader/svgtoken.cxx
@@ -25,9 +25,6 @@
namespace svgio::svgreader
{
-constexpr const std::u16string_view constToken_Title = u"title";
-constexpr const std::u16string_view constToken_Desc = u"desc";
-
constexpr frozen::unordered_map
aSVGTokenMapperList
{
{ u"width", SVGToken::Width },
@@ -110,8 +107,8 @@ constexpr frozen::unordered_map aSVGTokenMap
{ u"patternTransform", SVGToken::PatternTransform },
{ u"opacity", SVGToken::Opacity },
{ u"visibility", SVGToken::Visibility },
-{ constToken_Title, SVGToken::Title },
-{ constToken_Desc, SVGToken::Desc },
+{ u"title", SVGToken::Title },
+{ u"desc", SVGToken::Desc },
{ u"preserveAspectRatio", SVGToken::PreserveAspectRatio },
{ u"defer", SVGToken::Defer },
{ u"none", SVGToken::None },
@@ -262,16 +259,6 @@ OUString SVGTokenToStr(const SVGToken& rToken)
return OUString();
}
-OUString getStrTitle()
-{
-return OUString(constToken_Title);
-}
-
-OUString getStrDesc()
-{
-return OUString(constToken_Desc);
-}
-
} // end of namespace svgio
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - chart2/source cui/source cui/uiconfig include/cui include/svl include/svx offapi/com sc/source sd/source svx/source sw/inc sw/source xmloff/s
chart2/source/controller/main/ShapeController.cxx |5 +-
cui/source/dialogs/dlgname.cxx|6 ++
cui/source/factory/dlgfact.cxx|9 +++-
cui/source/factory/dlgfact.hxx|3 -
cui/uiconfig/ui/objecttitledescdialog.ui | 20
include/cui/dlgname.hxx |6 ++
include/svl/solar.hrc |2
include/svx/strings.hrc |1
include/svx/svdobj.hxx|2
include/svx/svdovirt.hxx |2
include/svx/svdundo.hxx | 16 +++
include/svx/svxdlg.hxx|3 -
include/svx/unoshprp.hxx |4 +
offapi/com/sun/star/drawing/Shape.idl |9
sc/source/ui/drawfunc/drawsh5.cxx |5 +-
sd/source/ui/view/drviews2.cxx|5 +-
svx/source/inc/svdobjplusdata.hxx |1
svx/source/sdr/contact/viewobjectcontact.cxx |2
svx/source/svdraw/svdobj.cxx | 34 +++
svx/source/svdraw/svdobjplusdata.cxx |1
svx/source/svdraw/svdovirt.cxx| 10
svx/source/svdraw/svdundo.cxx | 31 +
svx/source/unodraw/unoprov.cxx|7 +++
svx/source/unodraw/unoshape.cxx | 17 +++
sw/inc/doc.hxx|2
sw/inc/fesh.hxx |2
sw/inc/frmfmt.hxx |1
sw/inc/strings.hrc|1
sw/inc/swundo.hxx |1
sw/source/core/doc/docfly.cxx | 22 +
sw/source/core/frmedt/fefly1.cxx | 49 ++
sw/source/core/inc/undoflystrattr.hxx | 17 +++
sw/source/core/layout/atrfrm.cxx | 15 ++
sw/source/core/undo/undobj.cxx|3 +
sw/source/core/undo/undoflystrattr.cxx| 31 +
sw/source/uibase/shells/drwbassh.cxx |5 +-
sw/source/uibase/shells/frmsh.cxx |5 +-
xmloff/source/draw/sdpropls.cxx |2
38 files changed, 342 insertions(+), 15 deletions(-)
New commits:
commit 9c3475e1dc42b6992af58aeb585ebe58afbf8ea9
Author: Michael Stahl
AuthorDate: Wed Jul 5 14:04:17 2023 +0200
Commit: Michael Stahl
CommitDate: Thu Jul 6 00:15:57 2023 +0200
tdf#138504 svx,etc.: decorative flag on SdrObject shapes
* SdrObject new member m_IsDecorative
* new Undo SdrUndoObjDecorative
* surprising amount of changes in sw including additional
SwUndoFlyDecorative
* svx API SvxShape property "Decorative"
* UI checkbox "Decorative"
* ODF import/export as loext:decorative on style:graphic-properties
* PDF/UA export: ViewObjectContcat tag shapes with this flag as Artifact
Change-Id: I37f7a0597eab92c6c6aff94fad6c16c59b231c80
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154063
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 6efc72b99a08384e56c5a4da7918177be60b3b09)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154042
diff --git a/chart2/source/controller/main/ShapeController.cxx
b/chart2/source/controller/main/ShapeController.cxx
index 817df9ef414d..65a24ab1c22e 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -402,16 +402,19 @@ void
ShapeController::executeDispatch_ObjectTitleDescription()
OUString aTitle( pSelectedObj->GetTitle() );
OUString aDescription( pSelectedObj->GetDescription() );
+bool isDecorative(pSelectedObj->IsDecorative());
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
weld::Window* pChartWindow(m_pChartController->GetChartFrame());
ScopedVclPtr< AbstractSvxObjectTitleDescDialog > pDlg(
-pFact->CreateSvxObjectTitleDescDialog(pChartWindow, aTitle,
aDescription));
+pFact->CreateSvxObjectTitleDescDialog(pChartWindow, aTitle,
aDescription, isDecorative));
if ( pDlg->Execute() == RET_OK )
{
pDlg->GetTitle( aTitle );
pDlg->GetDescription( aDescription );
+pDlg->IsDecorative(isDecorative);
pSelectedObj->SetTitle( aTitle );
pSelectedObj->SetDescription( aDescription );
+pSelectedObj->SetDecorative(isDecorative);
}
}
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index da0a3f49..84f21a86d616 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -87,10 +87,12 @@ IMPL_LINK_NOARG(SvxObjectNameDialog, ModifyHdl,
weld::Entry&, void)
// Dialog for editing Object Title and Description
[Libreoffice-commits] core.git: cui/source include/svl svl/source
cui/source/options/optgdlg.cxx |4 ++--
include/svl/cjkoptions.hxx | 14 +-
svl/source/config/cjkoptions.cxx | 30 --
3 files changed, 11 insertions(+), 37 deletions(-)
New commits:
commit 082993c38e68089282b42fdb46179ac2574d61d5
Author: Noel Grandin
AuthorDate: Wed Jul 5 13:13:48 2023 +0200
Commit: Noel Grandin
CommitDate: Wed Jul 5 18:55:40 2023 +0200
SvtCJKOptions::EOption is unused
ever since
commit 5db72ef0b381671b7867bda759098a92909e06d8
Author: Noel Grandin
Date: Mon Jul 26 13:51:57 2021 +0200
drop SvtLanguageOptions class
Change-Id: I2d56b0c21510239ef1ee1d0b95748641d485580c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154053
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index ecd671ef2c31..64d11a62451b 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1165,7 +1165,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(weld::Container*
pPage, weld::DialogCon
m_bOldAsian = SvtCJKOptions::IsAnyEnabled();
m_xAsianSupportCB->set_active(m_bOldAsian);
m_xAsianSupportCB->save_state();
-bool bReadonly = SvtCJKOptions::IsReadOnly(SvtCJKOptions::E_ALL);
+bool bReadonly = SvtCJKOptions::IsAnyReadOnly();
m_xAsianSupportCB->set_sensitive(!bReadonly);
SupportHdl(*m_xAsianSupportCB);
@@ -1651,7 +1651,7 @@ IMPL_LINK_NOARG(OfaLanguagesTabPage, LocaleSettingHdl,
weld::ComboBox&, void)
}
// second check if CJK must be enabled
// #103299# - if CJK support is not readonly
-if(!SvtCJKOptions::IsReadOnly(SvtCJKOptions::E_ALL))
+if(!SvtCJKOptions::IsAnyReadOnly())
{
bool bIsCJKFixed = bool(nType & SvtScriptType::ASIAN);
lcl_checkLanguageCheckBox(*m_xAsianSupportCB, bIsCJKFixed,
m_bOldAsian);
diff --git a/include/svl/cjkoptions.hxx b/include/svl/cjkoptions.hxx
index 9ac227541b91..cec2f035b780 100644
--- a/include/svl/cjkoptions.hxx
+++ b/include/svl/cjkoptions.hxx
@@ -22,18 +22,6 @@
namespace SvtCJKOptions
{
-enum EOption
-{
-E_CJKFONT,
-E_VERTICALTEXT,
-E_ASIANTYPOGRAPHY,
-E_JAPANESEFIND,
-E_RUBY,
-E_CHANGECASEMAP,
-E_DOUBLELINES,
-E_ALL // special one for IsAnyEnabled()/SetAll() functionality
-};
-
SVL_DLLPUBLIC bool IsCJKFontEnabled();
SVL_DLLPUBLIC bool IsVerticalTextEnabled();
SVL_DLLPUBLIC bool IsAsianTypographyEnabled();
@@ -44,7 +32,7 @@ SVL_DLLPUBLIC bool IsDoubleLinesEnabled();
SVL_DLLPUBLIC void SetAll(bool bSet);
SVL_DLLPUBLIC bool IsAnyEnabled();
-SVL_DLLPUBLIC bool IsReadOnly(EOption eOption);
+SVL_DLLPUBLIC bool IsAnyReadOnly();
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx
index 72e5c8ea2a3d..e43d379f7e66 100644
--- a/svl/source/config/cjkoptions.cxx
+++ b/svl/source/config/cjkoptions.cxx
@@ -105,30 +105,16 @@ boolIsAnyEnabled()
IsRubyEnabled() || IsChangeCaseMapEnabled() ||
IsDoubleLinesEnabled() ;
}
-boolIsReadOnly(EOption eOption)
+boolIsAnyReadOnly()
{
SvtCJKOptions_Load();
-switch (eOption)
-{
-case E_CJKFONT: return
officecfg::Office::Common::I18N::CJK::CJKFont::isReadOnly();
-case E_VERTICALTEXT: return
officecfg::Office::Common::I18N::CJK::VerticalText::isReadOnly();
-case E_ASIANTYPOGRAPHY: return
officecfg::Office::Common::I18N::CJK::AsianTypography::isReadOnly();
-case E_JAPANESEFIND: return
officecfg::Office::Common::I18N::CJK::JapaneseFind::isReadOnly();
-case E_RUBY: return
officecfg::Office::Common::I18N::CJK::Ruby::isReadOnly();
-case E_CHANGECASEMAP: return
officecfg::Office::Common::I18N::CJK::ChangeCaseMap::isReadOnly();
-case E_DOUBLELINES: return
officecfg::Office::Common::I18N::CJK::DoubleLines::isReadOnly();
-case E_ALL:
-return officecfg::Office::Common::I18N::CJK::CJKFont::isReadOnly()
-||
officecfg::Office::Common::I18N::CJK::VerticalText::isReadOnly()
-||
officecfg::Office::Common::I18N::CJK::AsianTypography::isReadOnly()
-||
officecfg::Office::Common::I18N::CJK::JapaneseFind::isReadOnly()
-|| officecfg::Office::Common::I18N::CJK::Ruby::isReadOnly()
-||
officecfg::Office::Common::I18N::CJK::ChangeCaseMap::isReadOnly()
-||
officecfg::Office::Common::I18N::CJK::DoubleLines::isReadOnly();
-default:
-assert(false);
-}
-return false;
+return officecfg::Office::Common::I18N::CJK::CJKFont::isReadOnly()
+|| officecfg::Office::Common::I18N::CJK::VerticalText::isReadOnly()
+|| officecfg::Office::Common::I18N::CJK::AsianTypography::isReadOnly()
+|| officecfg::Office::Common::I18N::CJK::JapaneseFind::isReadOnly()
+||
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - svgio/inc svgio/source
svgio/inc/svgdocument.hxx |6 ++
svgio/source/svgreader/svgnode.cxx |9 ++---
2 files changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 132b4d1c7b8b9bb55e4e254a1a0b53f669c94975
Author: Caolán McNamara
AuthorDate: Wed Jul 5 09:31:58 2023 +0100
Commit: Xisco Fauli
CommitDate: Wed Jul 5 20:26:24 2023 +0200
ofz#60384 Direct-leak
since:
commit 13a41e7a12598c7896d6dc8d34aba6af5b80b83c
Date: Mon Jul 3 14:11:43 2023 +0200
tdf#150124: do nothing when parent is of unkown type
Change-Id: I58edf5f63d97e8afb1cd58c7e23452a9ea6a87eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154023
Reviewed-by: Xisco Fauli
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
(cherry picked from commit 0dfd8288a87b58e503bb3a41be6137485fbf3f68)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154039
diff --git a/svgio/inc/svgdocument.hxx b/svgio/inc/svgdocument.hxx
index 9f79342c0c55..77b4d3891179 100644
--- a/svgio/inc/svgdocument.hxx
+++ b/svgio/inc/svgdocument.hxx
@@ -34,6 +34,9 @@ namespace svgio::svgreader
/// the document hierarchy with all root nodes
SvgNodeVector maNodes;
+/// invalid nodes that have no parent
+SvgNodeVector maOrphanNodes;
+
/// the absolute path of the Svg file in progress (if available)
const OUString maAbsolutePath;
@@ -72,6 +75,9 @@ namespace svgio::svgreader
/// data read access
const SvgNodeVector& getSvgNodeVector() const { return maNodes; }
const OUString& getAbsolutePath() const { return maAbsolutePath; }
+
+/// invalid nodes that have no parent
+void addOrphanNode(SvgNode* pOrphan) {
maOrphanNodes.emplace_back(pOrphan); }
};
} // end of namespace svgio::svgreader
diff --git a/svgio/source/svgreader/svgnode.cxx
b/svgio/source/svgreader/svgnode.cxx
index bbf0f2342d22..4f82a16ebf1e 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -395,10 +395,13 @@ namespace {
mbDecomposing(false),
mbCssStyleVectorBuilt(false)
{
-// tdf#150124 ignore when parent is unknown
-if(pParent && pParent->getType() != SVGToken::Unknown)
+if (pParent)
{
-pParent->maChildren.emplace_back(this);
+// tdf#150124 ignore when parent is unknown
+if (pParent->getType() != SVGToken::Unknown)
+pParent->maChildren.emplace_back(this);
+else
+mrDocument.addOrphanNode(this);
}
}
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/filedlghelper.hxx |1 - sfx2/source/dialog/filedlghelper.cxx |2 -- 2 files changed, 3 deletions(-) New commits: commit d9dc0e4abbd6c06ee886302b2052e1f6814dfa76 Author: Noel Grandin AuthorDate: Wed Jul 5 12:32:15 2023 +0200 Commit: Noel Grandin CommitDate: Wed Jul 5 18:08:35 2023 +0200 WriterInsertDoc constant is unused ever since it was added in commit d157c1bd70d630a58db33910d550bb8dee9fe62e Author: Samuel Mehrbrodt Date: Thu Jul 8 05:50:25 2021 +0200 tdf#126665 Remember last used file picker directory Change-Id: I49764ab44d6ca37efeafaf9e02a25b6d7d9a8eb7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154050 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx index ea84a9450de6..c535a6b7bb55 100644 --- a/include/sfx2/filedlghelper.hxx +++ b/include/sfx2/filedlghelper.hxx @@ -123,7 +123,6 @@ public: SignatureLine, TemplateImport, WriterCreateAddressList, -WriterInsertDoc, WriterInsertImage, WriterInsertScript, WriterExport, diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 5b799bc4e169..49a8a5b9a08f 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -2536,8 +2536,6 @@ OUString FileDialogHelper::contextToString(Context context) return "WriterExport"; case WriterImportAutotext: return "WriterImportAutotext"; -case WriterInsertDoc: -return "WriterInsertDoc"; case WriterInsertHyperlink: return "WriterInsertHyperlink"; case WriterInsertImage:
Minutes from the UX/design meeting 2023-Jul-05
Present: Lupe, Bogdan, John, Rizal, Heiko Comments: Jean-Baptiste, Ady, Eyal, Hossein, Mike, Eike, Ilmari Tickets/Topics * default file names when printing workbook in PDF SUGGESTION : default file names when printing workbook in PDF + https://bugs.documentfoundation.org/show_bug.cgi?id=144207 + automatically suggest a PDF file name + the first words of a text document does not express generally the contains of the document, might be sensitive (Jean-Baptiste) + we name documents "Untitled" when saving (Heiko) => don't do + automatically create several PDF files according to the choice indicated + add a checkbox below and indented under All with "[ ] Split workbook and create individual PDFs for every sheet", or the like (Heiko) + no harm in it but shouldn't be the default (John) => do it * Hash marks that indicate "cell too narrow" should expand according to the cell width + https://bugs.documentfoundation.org/show_bug.cgi?id=155886 + agree with a _minimum_ of three # marks (Ady) + clutters the spreadsheet (Heiko) + filling with ##'s is better then having the arbitrary three #'s (Eyal, Hossein) + three hashes are easier to spot (Lupe) + unclear use case (John) => comment * Warning dialog shows only once for "Record changes" + https://bugs.documentfoundation.org/show_bug.cgi?id=147980 + not only about *protection* of the recording, but also about *controlling* (Mike) + add wording about the destructive nature of the action in the Calc case (Eike) + consider removing this checkbox entirely (Eyal) + unclear what is being destroyed (John) => investigate and suggest a text * "replace custom styles" option in AutoCorrect should be removed + https://bugs.documentfoundation.org/show_bug.cgi?id=140024 + agree (Stuart, Heiko) + totally unclear, "Custom Styles" could be Direct Formatting (Eyal) + removing it wouldn't be realized by many users anyway (John) + the lately introduced Spotlight feature shows styles clearly (Heiko) + use case is maybe on receiving a document from someone else all "alien" styles can be converted at once (Rizal) + rename the option maybe (Rizal) + perfectly clear (Heiko, John) + should be better switched off by default => forward to documentation with suggestion to add an example * proposal-option to remove whitespace characters (other than space) in "paste special", "clear direct formatting", Format->Text and in import dialog box + https://bugs.documentfoundation.org/show_bug.cgi?id=148544 + clean() and trim() work well (Ilmari) + objective easy to achieve with inbuilt functions (Ady) + Users could also mark the undesired character as separator in the import dialogue and also check Merge delimiters + unclear use case (Eyal) + typically not added intentionally and suggested option would be convenient (Stuart, Rizal) => suggest to keep ticket open and wait for supporters OpenPGP_0xA68C0CA5EEA5F466.asc Description: OpenPGP public key OpenPGP_signature Description: OpenPGP digital signature
[Libreoffice-commits] core.git: desktop/source include/svtools svtools/source
desktop/source/app/app.cxx |8
include/svtools/apearcfg.hxx | 14 --
svtools/source/config/apearcfg.cxx |8
3 files changed, 8 insertions(+), 22 deletions(-)
New commits:
commit ea0e9c0d4de19ac3f8fdfe91bdb085ad9e2b1757
Author: Noel Grandin
AuthorDate: Wed Jul 5 14:22:20 2023 +0200
Commit: Noel Grandin
CommitDate: Wed Jul 5 18:55:23 2023 +0200
these enums are unnecessary
Change-Id: I29bf28202e11db836764276f773b134356d93e0f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154057
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index c0b30c2ae2fd..e4058bfe8932 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1827,16 +1827,16 @@ void Desktop::OverrideSystemSettings( AllSettings&
rSettings )
DragFullOptions nDragFullOptions = hStyleSettings.GetDragFullOptions();
-DragMode nDragMode =
static_cast(officecfg::Office::Common::View::Window::Drag::get());
+sal_uInt16 nDragMode =
officecfg::Office::Common::View::Window::Drag::get();
switch ( nDragMode )
{
-case DragMode::FullWindow:
+case 0: //FullWindow:
nDragFullOptions |= DragFullOptions::All;
break;
-case DragMode::Frame:
+case 1: // Frame:
nDragFullOptions &= ~DragFullOptions::All;
break;
-case DragMode::SystemDep:
+case 2: // SystemDep
default:
break;
}
diff --git a/include/svtools/apearcfg.hxx b/include/svtools/apearcfg.hxx
index 85a521862ba7..fe2bc61df7de 100644
--- a/include/svtools/apearcfg.hxx
+++ b/include/svtools/apearcfg.hxx
@@ -21,20 +21,6 @@
#include
class Application;
-enum class MouseMiddleButtonAction;
-
-enum class SnapType {
-ToButton = 0,
-ToMiddle,
-NONE
-};
-
-enum class DragMode {
-FullWindow,
-Frame,
-SystemDep
-};
-
namespace SvtTabAppearanceCfg
{
diff --git a/svtools/source/config/apearcfg.cxx
b/svtools/source/config/apearcfg.cxx
index fec538b62a71..4e8a0215043b 100644
--- a/svtools/source/config/apearcfg.cxx
+++ b/svtools/source/config/apearcfg.cxx
@@ -64,16 +64,16 @@ void SvtTabAppearanceCfg::SetApplicationDefaults (
Application* pApp )
nMouseOptions &= ~
MouseSettingsOptions(MouseSettingsOptions::AutoCenterPos |
MouseSettingsOptions::AutoDefBtnPos);
-SnapType nSnapMode =
static_cast(officecfg::Office::Common::View::Dialog::MousePositioning::get());
+sal_uInt16 nSnapMode =
officecfg::Office::Common::View::Dialog::MousePositioning::get();
switch ( nSnapMode )
{
-case SnapType::ToButton:
+case 0: // ToButton
nMouseOptions |= MouseSettingsOptions::AutoDefBtnPos;
break;
-case SnapType::ToMiddle:
+case 1: // ToMiddle
nMouseOptions |= MouseSettingsOptions::AutoCenterPos;
break;
-case SnapType::NONE:
+case 2: // NONE
default:
break;
}
[Libreoffice-commits] core.git: chart2/source cui/source cui/uiconfig include/cui include/svl include/svx offapi/com sc/source sd/source svx/source sw/inc sw/source xmloff/source
chart2/source/controller/main/ShapeController.cxx |5 +-
cui/source/dialogs/dlgname.cxx|6 ++
cui/source/factory/dlgfact.cxx|9 +++-
cui/source/factory/dlgfact.hxx|3 -
cui/uiconfig/ui/objecttitledescdialog.ui | 20
include/cui/dlgname.hxx |6 ++
include/svl/solar.hrc |2
include/svx/strings.hrc |1
include/svx/svdobj.hxx|2
include/svx/svdovirt.hxx |2
include/svx/svdundo.hxx | 16 +++
include/svx/svxdlg.hxx|3 -
include/svx/unoshprp.hxx |4 +
offapi/com/sun/star/drawing/Shape.idl |9
sc/source/ui/drawfunc/drawsh5.cxx |5 +-
sd/source/ui/view/drviews2.cxx|5 +-
svx/source/inc/svdobjplusdata.hxx |1
svx/source/sdr/contact/viewobjectcontact.cxx |2
svx/source/svdraw/svdobj.cxx | 34 +++
svx/source/svdraw/svdobjplusdata.cxx |1
svx/source/svdraw/svdovirt.cxx| 10
svx/source/svdraw/svdundo.cxx | 31 +
svx/source/unodraw/unoprov.cxx|7 +++
svx/source/unodraw/unoshape.cxx | 17 +++
sw/inc/doc.hxx|2
sw/inc/fesh.hxx |2
sw/inc/frmfmt.hxx |1
sw/inc/strings.hrc|1
sw/inc/swundo.hxx |1
sw/source/core/doc/docfly.cxx | 22 +
sw/source/core/frmedt/fefly1.cxx | 49 ++
sw/source/core/inc/undoflystrattr.hxx | 17 +++
sw/source/core/layout/atrfrm.cxx | 15 ++
sw/source/core/undo/undobj.cxx|3 +
sw/source/core/undo/undoflystrattr.cxx| 31 +
sw/source/uibase/shells/drwbassh.cxx |5 +-
sw/source/uibase/shells/frmsh.cxx |5 +-
xmloff/source/draw/sdpropls.cxx |2
38 files changed, 342 insertions(+), 15 deletions(-)
New commits:
commit 6efc72b99a08384e56c5a4da7918177be60b3b09
Author: Michael Stahl
AuthorDate: Wed Jul 5 14:04:17 2023 +0200
Commit: Michael Stahl
CommitDate: Wed Jul 5 19:54:17 2023 +0200
tdf#138504 svx,etc.: decorative flag on SdrObject shapes
* SdrObject new member m_IsDecorative
* new Undo SdrUndoObjDecorative
* surprising amount of changes in sw including additional
SwUndoFlyDecorative
* svx API SvxShape property "Decorative"
* UI checkbox "Decorative"
* ODF import/export as loext:decorative on style:graphic-properties
* PDF/UA export: ViewObjectContcat tag shapes with this flag as Artifact
Change-Id: I37f7a0597eab92c6c6aff94fad6c16c59b231c80
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154063
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/chart2/source/controller/main/ShapeController.cxx
b/chart2/source/controller/main/ShapeController.cxx
index 423703e526f7..97715b07c295 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -401,16 +401,19 @@ void
ShapeController::executeDispatch_ObjectTitleDescription()
OUString aTitle( pSelectedObj->GetTitle() );
OUString aDescription( pSelectedObj->GetDescription() );
+bool isDecorative(pSelectedObj->IsDecorative());
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
weld::Window* pChartWindow(m_pChartController->GetChartFrame());
ScopedVclPtr< AbstractSvxObjectTitleDescDialog > pDlg(
-pFact->CreateSvxObjectTitleDescDialog(pChartWindow, aTitle,
aDescription));
+pFact->CreateSvxObjectTitleDescDialog(pChartWindow, aTitle,
aDescription, isDecorative));
if ( pDlg->Execute() == RET_OK )
{
pDlg->GetTitle( aTitle );
pDlg->GetDescription( aDescription );
+pDlg->IsDecorative(isDecorative);
pSelectedObj->SetTitle( aTitle );
pSelectedObj->SetDescription( aDescription );
+pSelectedObj->SetDecorative(isDecorative);
}
}
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index da0a3f49..84f21a86d616 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -87,10 +87,12 @@ IMPL_LINK_NOARG(SvxObjectNameDialog, ModifyHdl,
weld::Entry&, void)
// Dialog for editing Object Title and Description
SvxObjectTitleDescDialog::SvxObjectTitleDescDialog(weld::Window* pParent,
const OUString& rTitle,
-
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - offapi/com
offapi/com/sun/star/drawing/Shape.idl | 20 1 file changed, 20 insertions(+) New commits: commit 66bb8f8f0f11d4cb3db1933af0d25fbb85eb3028 Author: Michael Stahl AuthorDate: Wed Jul 5 13:06:15 2023 +0200 Commit: Michael Stahl CommitDate: Wed Jul 5 19:12:43 2023 +0200 offapi: add Title/Description properties from CWS aw038 (OOo 2.2) Change-Id: I2a851ef76b840d1fa5479dcb182a63590a2d4065 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154052 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit a67675e7e248e056637be8b70d620379cdfb682e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154040 diff --git a/offapi/com/sun/star/drawing/Shape.idl b/offapi/com/sun/star/drawing/Shape.idl index e2faa4fbec48..118031488426 100644 --- a/offapi/com/sun/star/drawing/Shape.idl +++ b/offapi/com/sun/star/drawing/Shape.idl @@ -182,6 +182,26 @@ published service Shape @since LibreOffice 4.3 */ [optional, property] short RelativeWidthRelation; + +/** contains short title for the object + +This short title is visible as an alternative tag in HTML format. +Accessibility tools can read this text. + +@since OOo 2.2 +*/ +[optional, property] string Title; + +/** contains description for the object + +The long description text can be entered to describe an object in +more detail to users with screen reader software. The description is +visible as an alternative tag for accessibility tools. + +@since OOo 2.2 +*/ +[optional, property] string Description; + };
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/config/usrpref.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e55e64a7b736df7dd902f88fcf0c889d43d2eed0 Author: Mike Kaganski AuthorDate: Wed Jul 5 15:30:30 2023 +0300 Commit: Mike Kaganski CommitDate: Wed Jul 5 21:36:16 2023 +0200 tdf#155462: Re-enable ShowScrollBarTips expert config ... accidentally broken by commit 4ed26badfd6fd9190cb6e54078b41eb38cb37dca. Change-Id: I407e1eab47277dd8fa00c123b32596557fd5f2a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154032 Reviewed-by: Caolán McNamara Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx index 181b863e130c..c04d775c3ac3 100644 --- a/sw/source/uibase/config/usrpref.cxx +++ b/sw/source/uibase/config/usrpref.cxx @@ -392,7 +392,7 @@ void SwLayoutViewConfig::Load() case 16: m_rParent.SetViewLayoutBookMode(bSet); break;// "ViewLayout/BookMode", case 17: m_rParent.SetDefaultPageMode(bSet,true); break;// "Other/IsSquaredPageMode", case 18: m_rParent.SetApplyCharUnit(bSet, true); break;// "Other/ApplyUserChar" -case 29: m_rParent.SetShowScrollBarTips(bSet); break;// "Window/ShowScrollBarTips", +case 19: m_rParent.SetShowScrollBarTips(bSet); break;// "Window/ShowScrollBarTips", } } }
[Libreoffice-commits] core.git: forms/source include/cui include/drawinglayer include/sfx2 include/xmloff sc/source svx/inc vcl/inc
forms/source/inc/property.hxx |2 +-
include/cui/dlgname.hxx|6 +++---
include/drawinglayer/processor2d/cairopixelprocessor2d.hxx |2 +-
include/sfx2/dinfdlg.hxx |2 +-
include/xmloff/GradientStyle.hxx |2 +-
sc/source/filter/inc/formulabuffer.hxx |2 +-
sc/source/filter/inc/formulaparser.hxx |2 +-
sc/source/ui/inc/DrawModelBroadcaster.hxx |2 +-
svx/inc/sdr/properties/cellproperties.hxx |4 ++--
svx/inc/shapecollection.hxx|2 +-
vcl/inc/headless/CairoCommon.hxx |2 +-
vcl/inc/headless/SvpGraphicsBackend.hxx|2 +-
vcl/inc/unx/cairotextrender.hxx|2 +-
vcl/inc/unx/freetype_glyphcache.hxx|2 +-
14 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 18446cdd6007679f227f192a606c86fe2eea1ef6
Author: Noel Grandin
AuthorDate: Wed Jul 5 16:06:46 2023 +0200
Commit: Noel Grandin
CommitDate: Wed Jul 5 21:39:51 2023 +0200
loplugin:finalclasses
Change-Id: I62b094a3bd9a4f630cebdf538c04391e2920ff2c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154064
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx
index 54d19a03d319..00b2075ccebd 100644
--- a/forms/source/inc/property.hxx
+++ b/forms/source/inc/property.hxx
@@ -326,7 +326,7 @@ private:
// a class implementing the comphelper::IPropertyInfoService
-class ConcreteInfoService : public ::comphelper::IPropertyInfoService
+class ConcreteInfoService final : public ::comphelper::IPropertyInfoService
{
public:
virtual ~ConcreteInfoService() {}
diff --git a/include/cui/dlgname.hxx b/include/cui/dlgname.hxx
index 04fc5610e937..2ca8a8a55e29 100644
--- a/include/cui/dlgname.hxx
+++ b/include/cui/dlgname.hxx
@@ -23,7 +23,7 @@
#include
/// Dialog for editing a name
-class CUI_DLLPUBLIC SvxNameDialog : public weld::GenericDialogController
+class CUI_DLLPUBLIC SvxNameDialog final : public weld::GenericDialogController
{
private:
std::unique_ptr m_xEdtName;
@@ -74,7 +74,7 @@ public:
/** #i68101#
Dialog for editing Object name
plus uniqueness-callback-linkHandler */
-class SvxObjectNameDialog : public weld::GenericDialogController
+class SvxObjectNameDialog final : public weld::GenericDialogController
{
private:
// name
@@ -101,7 +101,7 @@ public:
/** #i68101#
Dialog for editing Object Title and Description */
-class SvxObjectTitleDescDialog : public weld::GenericDialogController
+class SvxObjectTitleDescDialog final : public weld::GenericDialogController
{
private:
// title
diff --git a/include/drawinglayer/processor2d/cairopixelprocessor2d.hxx
b/include/drawinglayer/processor2d/cairopixelprocessor2d.hxx
index c940039abb66..2324b9f619e8 100644
--- a/include/drawinglayer/processor2d/cairopixelprocessor2d.hxx
+++ b/include/drawinglayer/processor2d/cairopixelprocessor2d.hxx
@@ -37,7 +37,7 @@ class SingleLinePrimitive2D;
namespace drawinglayer::processor2d
{
-class DRAWINGLAYER_DLLPUBLIC CairoPixelProcessor2D : public BaseProcessor2D
+class DRAWINGLAYER_DLLPUBLIC CairoPixelProcessor2D final : public
BaseProcessor2D
{
// the modifiedColorPrimitive stack
basegfx::BColorModifierStack maBColorModifierStack;
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 81692a2fc96f..2acbc93cffe9 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -276,7 +276,7 @@ public:
~CustomPropertiesTimeField();
};
-class DurationDialog_Impl : public weld::GenericDialogController
+class DurationDialog_Impl final : public weld::GenericDialogController
{
std::unique_ptr m_xNegativeCB;
std::unique_ptr m_xYearNF;
diff --git a/include/xmloff/GradientStyle.hxx b/include/xmloff/GradientStyle.hxx
index 58975644fb3d..37884d9bea42 100644
--- a/include/xmloff/GradientStyle.hxx
+++ b/include/xmloff/GradientStyle.hxx
@@ -48,7 +48,7 @@ public:
OUString& rStrName );
};
-class XMLOFF_DLLPUBLIC XMLGradientStopContext: public SvXMLImportContext
+class XMLOFF_DLLPUBLIC XMLGradientStopContext final : public SvXMLImportContext
{
public:
XMLGradientStopContext(
diff --git a/sc/source/filter/inc/formulabuffer.hxx
b/sc/source/filter/inc/formulabuffer.hxx
index 2266362718eb..512b1feb3c81 100644
--- a/sc/source/filter/inc/formulabuffer.hxx
+++ b/sc/source/filter/inc/formulabuffer.hxx
@@ -16,7 +16,7 @@
namespace oox::xls {
-class FormulaBuffer : public WorkbookHelper
+class FormulaBuffer final : public WorkbookHelper
{
public:
/**
diff --git a/sc/source/filter/inc/formulaparser.hxx
b/sc/source/filter/inc/formulaparser.hxx
index 32cab7caed3a..6b9c8fa8fa6c 100644
---
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - slideshow/source
slideshow/source/engine/shapes/drawshapesubsetting.cxx | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
New commits:
commit 08152c9771b4f7d48f1a6b6dd1289d454d4f6514
Author: Khaled Hosny
AuthorDate: Wed Jul 5 17:12:19 2023 +0300
Commit: خالد حسني
CommitDate: Thu Jul 6 07:22:11 2023 +0200
tdf#113290: Fix handling of grapheme clusters in slideshow animations
When doing animations by character cells (AKA grapheme clusters), we
were taking the first character of the cluster only and lumping the rest
with the next cluster, so a combining mark would appear at the start of
the next sequence instead of the end of the current one.
For surrogate pairs it was even more broken we were splitting in the
middle of the pair resulting in invalid Unicode sequence.
Change-Id: I9bbfe412e9b0a876b69e33c0916067bf75064122
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154066
Tested-by: Jenkins
Reviewed-by: خالد حسني
(cherry picked from commit f98870faa7ec645675c178c69321f9e846598112)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154044
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index 264f8f3316b2..13ea0300fa63 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -579,16 +579,24 @@ namespace slideshow::internal
aLastWordStart = aNext;
[[fallthrough]];
case DrawShapeSubsetting::CLASS_CHARACTER_CELL_END:
+// tdf#113290
+// This is a special case since a character cell
+// (AKA grapheme cluster) can have multiple
+// characters, so if we passed nCurrCharCount to
+// io_rFunctor() it would stop at the first
+// character in the cluster, so we subtract one
+// so that it matches when we reach the start of
+// the next cluster.
if( !io_rFunctor(
DrawShapeSubsetting::CLASS_CHARACTER_CELL_END,
- nCurrCharCount,
+ nCurrCharCount - 1,
aLastCharStart,
- aNext ) )
+ aCurr ) )
{
return;
}
++nCurrCharCount;
-aLastCharStart = aNext;
+aLastCharStart = aCurr;
break;
}
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/uiview/viewport.cxx |5 -
1 file changed, 5 deletions(-)
New commits:
commit ef32908467cc44d20b01c25757a6ad96c8ae9286
Author: Mike Kaganski
AuthorDate: Thu Jul 6 06:28:14 2023 +0200
Commit: Mike Kaganski
CommitDate: Thu Jul 6 07:33:46 2023 +0200
Drop commented out obsolete code
Change-Id: I869e9f20e30f69d8da713f2c69b10a038169891f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154045
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sw/source/uibase/uiview/viewport.cxx
b/sw/source/uibase/uiview/viewport.cxx
index 306f8844dda8..e12c6adeda51 100644
--- a/sw/source/uibase/uiview/viewport.cxx
+++ b/sw/source/uibase/uiview/viewport.cxx
@@ -695,11 +695,6 @@ IMPL_LINK(SwView, VertScrollHdl, weld::Scrollbar&,
rScrollbar, void)
OUString sDisplay;
if(m_pWrtShell->GetPageNumber( aPos.Y(), false, nPhNum, nVirtNum,
sDisplay ))
{
-// The end scrollhandler invalidate the FN_STAT_PAGE,
-// so we don't must do it again.
-// if(!GetViewFrame().GetFrame().IsInPlace())
-//S F X_BINDINGS().Update(FN_STAT_PAGE);
-
//QuickHelp:
if( m_pWrtShell->GetPageCnt() > 1 )
{
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/crsrsh.hxx| 11 ++-
sw/source/core/crsr/crstrvl.cxx | 13 +++--
sw/source/uibase/uiview/viewport.cxx |8 +++-
3 files changed, 20 insertions(+), 12 deletions(-)
New commits:
commit 7e997097eb0e36bbb6f1eb8519acfc4e8eb6337a
Author: Mike Kaganski
AuthorDate: Wed Jul 5 18:08:54 2023 +0300
Commit: Mike Kaganski
CommitDate: Thu Jul 6 06:05:34 2023 +0200
tdf#155462: fix the scrollbar tooltip text
Over the time when it was completely unused, it regressed in a couple
of aspects:
1. It got assembled in incorrect order: instead of appending chapter,
it got prepended in commit 832e5aadbff006ec24959162c29756fe2b1982be
(Related: fdo#38838 remove UniString::SearchAndReplaceAll, 2013-10-08);
2. It started to show chapters, only when the respective heading are
at the very top of screen, and show only page elsewhere, likely in
commit 835cd06a047717dfe5e0f117959f3c042e13b21b (tdf#38093 Writer
outline folding - outline visibility and on canvas ui, 2020-07-30),
where a call to SwNode::FindOutlineNodeOfLevel was replaced with
SwOutlineNodes::Seek_Entry in SwCursorShell::GetContentAtPos.
Change-Id: I3f427f7ecb3b6c58a441220c555b22e765a533c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154077
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index cfba5cb852c1..233edb71c240 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -88,15 +88,16 @@ enum class IsAttrAtPos
SmartTag = 0x0800,
FormControl = 0x1000,
TableRedline = 0x2000,
-TableColRedline = 0x4000
+TableColRedline = 0x4000,
#ifdef DBG_UTIL
-,CurrAttrs = 0x8000///< only for debugging
-,TableBoxValue = 0x1 ///< only for debugging
+CurrAttrs = 0x8000,///< only for debugging
+TableBoxValue = 0x1, ///< only for debugging
#endif
-, ContentControl = 0x2
+ContentControl = 0x2,
+AllowContaining = 0x4, // With Outline, finds an outline node for
non-outline position
};
namespace o3tl {
-template<> struct typed_flags : is_typed_flags {};
+template<> struct typed_flags : is_typed_flags {};
}
struct SwContentAtPos
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index a1656233cfc9..d5e430bb8711 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1466,8 +1466,17 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt,
&& !rNds.GetOutLineNds().empty() )
{
// only for nodes in outline nodes
-SwOutlineNodes::size_type nPos;
-if(rNds.GetOutLineNds().Seek_Entry(pTextNd, ))
+SwOutlineNodes::size_type nPos = 0;
+bool bFoundOutline = rNds.GetOutLineNds().Seek_Entry(pTextNd, );
+if (!bFoundOutline && nPos && (IsAttrAtPos::AllowContaining &
rContentAtPos.eContentAtPos))
+{
+// nPos points to the first found outline node not before pTextNd,
or to end();
+// when bFoundOutline is false, and nPos is not 0, it means that
there were
+// outline nodes before pTextNd, and nPos-1 points to the last of
those.
+pTextNd = rNds.GetOutLineNds()[nPos - 1]->GetTextNode();
+bFoundOutline = true;
+}
+if (bFoundOutline)
{
rContentAtPos.eContentAtPos = IsAttrAtPos::Outline;
rContentAtPos.sStr = sw::GetExpandTextMerged(GetLayout(),
*pTextNd, true, false, ExpandMode::ExpandFootnote);
diff --git a/sw/source/uibase/uiview/viewport.cxx
b/sw/source/uibase/uiview/viewport.cxx
index 415771aae940..306f8844dda8 100644
--- a/sw/source/uibase/uiview/viewport.cxx
+++ b/sw/source/uibase/uiview/viewport.cxx
@@ -714,16 +714,14 @@ IMPL_LINK(SwView, VertScrollHdl, weld::Scrollbar&,
rScrollbar, void)
aRect.SetBottom( aRect.Top() );
OUString sPageStr( GetPageStr( nPhNum, nVirtNum,
sDisplay ));
-SwContentAtPos aCnt( IsAttrAtPos::Outline );
+SwContentAtPos aCnt(IsAttrAtPos::Outline |
IsAttrAtPos::AllowContaining);
bool bSuccess = m_pWrtShell->GetContentAtPos(aPos,
aCnt);
if (bSuccess && !aCnt.sStr.isEmpty())
{
-sPageStr += " - ";
sal_Int32 nChunkLen =
std::min(aCnt.sStr.getLength(), 80);
std::u16string_view sChunk = aCnt.sStr.subView(0,
nChunkLen);
-sPageStr = sChunk + sPageStr;
-sPageStr = sPageStr.replace('\t', ' ');
-sPageStr = sPageStr.replace(0x0a, ' ');
+sPageStr = sPageStr + " - " + sChunk;
+sPageStr =
[Libreoffice-bugs] [Bug 145651] FILESAVE OOXML write error if using default colour for chart legend background from sidebar
https://bugs.documentfoundation.org/show_bug.cgi?id=145651 NISZ LibreOffice Team changed: What|Removed |Added Status|RESOLVED|VERIFIED --- Comment #6 from NISZ LibreOffice Team --- Version: 24.2.0.0.alpha0+ (X86_64) / LibreOffice Community Build ID: 30ee52e6c284be1095fdf278439b4c0a7c5982f0 CPU threads: 4; OS: Windows 10.0 Build 19044; UI render: Skia/Vulkan; VCL: win Locale: hu-HU (hu_HU); UI: en-US Calc: CL threaded -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 146932] CJK font-size in Writer default paragraph style is not the same as Western font
https://bugs.documentfoundation.org/show_bug.cgi?id=146932 --- Comment #6 from Volga --- I think this should be related to bug 115970. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 115970] Set default font size for CJK/Western text fonts as locale value
https://bugs.documentfoundation.org/show_bug.cgi?id=115970 --- Comment #32 from Volga --- Mr. Sung, I saw you have made a fix for bug 155947, so can you fix this bug as well? -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 154702] UI: Background Cell Color Resetting
https://bugs.documentfoundation.org/show_bug.cgi?id=154702 Maxim Monastirsky changed: What|Removed |Added CC||momonas...@gmail.com Status|NEEDINFO|RESOLVED Resolution|--- |WONTFIX --- Comment #2 from Maxim Monastirsky --- (In reply to hegquist from comment #0) > I have customized toolbar with multiple "Background Color" commands. They > default to yellow but I change them to an array of colors to keep my > spreadsheets organized. This never meant to be a supported workflow, and worked by accident. See many of the duplicates of Bug 154270 that ask for syncing the color of all visible buttons of the same kind. It's also essential for fixing bugs like Bug 34804 to have a single last used color. There is a supported workflow for several predefined formatting sets, which is styles (cell styles in this case), and I don't think we should maintain a competing DF-based solution (and esp. one that works only for colors but not for other formatting attributes). -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 156113] Calc, Writer
https://bugs.documentfoundation.org/show_bug.cgi?id=156113 m.a.riosv changed: What|Removed |Added Resolution|FIXED |WORKSFORME -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 156119] When scrolling, the contents of the page disappear in canvas
https://bugs.documentfoundation.org/show_bug.cgi?id=156119 Stéphane Guillou (stragu) changed: What|Removed |Added Keywords||bibisected, bisected, ||regression -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 156166] corrupt image for LibreOffice_7.5.4_MacOS_x86-64.dmg
https://bugs.documentfoundation.org/show_bug.cgi?id=156166 --- Comment #1 from Telesto --- LibreOffice 7.5 requires macOS 10.14 or newer to run. Due to Apple's policy regarding C++ standard library features, the minimum macOS version requirement will be raised in the future like so: release in Aug 2023 → 10.15 Catalina https://www.libreoffice.org/get-help/system-requirements/#Apple I guess LibreOffice 7.2 should still work, based on the release notes. Alternative would be upgrading the OS to some more recent version. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 156169] New: Trackpad scroll choppy on displaying formulas
https://bugs.documentfoundation.org/show_bug.cgi?id=156169 Bug ID: 156169 Summary: Trackpad scroll choppy on displaying formulas Product: LibreOffice Version: 7.1.0.0.alpha0+ Hardware: x86-64 (AMD64) OS: Linux (All) Status: UNCONFIRMED Keywords: bibisected, bisected, regression Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: stephane.guil...@libreoffice.org CC: arato.dan...@nisz.hu, banhegyi.attilai...@nisz.hu Blocks: 108075, 135859 Steps: 1. Open attachment 188162 1. Using trackpad scroll, scroll down 1 page and back to the top of the document, fast. Repeat many times. I see the canvas having hiccups on the top section's formulas since 7.1, but not in 7.0. Bibisected with linux-64-7.1 repository to first bad commit c391d02248a86bfc4a57448859eaf70403a365a7 which points to core commit: commit d336e6c26012255015d3fc0caf8e7fafe14bd8f2 author Daniel Arato (NISZ) Mon Aug 24 11:05:17 2020 +0200 committer László NémethFri Aug 28 13:13:58 2020 +0200 tdf#69647 sw layout: fix line spacing with inline pictures Line height is now based on (the biggest) font size in the line rather than on the size of the tallest object there, according to ODF and like MSO does. Note: handling of first paragraph line is still different. Co-authored-by: Attila Bánhegyi (NISZ) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101272 Daniel and Attila, can you please have a look? Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=108075 [Bug 108075] [META] Scrolling and Page up/down issues https://bugs.documentfoundation.org/show_bug.cgi?id=135859 [Bug 135859] [META] Formula-related issues -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 108075] [META] Scrolling and Page up/down issues
https://bugs.documentfoundation.org/show_bug.cgi?id=108075 Stéphane Guillou (stragu) changed: What|Removed |Added Depends on||156169 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=156169 [Bug 156169] Trackpad scroll choppy on displaying formulas -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 135859] [META] Formula-related issues
https://bugs.documentfoundation.org/show_bug.cgi?id=135859 Stéphane Guillou (stragu) changed: What|Removed |Added Depends on||156169 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=156169 [Bug 156169] Trackpad scroll choppy on displaying formulas -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 156169] Trackpad scroll choppy on displaying formulas
https://bugs.documentfoundation.org/show_bug.cgi?id=156169 Stéphane Guillou (stragu) changed: What|Removed |Added Ever confirmed|0 |1 Status|UNCONFIRMED |NEW --- Comment #1 from Stéphane Guillou (stragu) --- Using Ubuntu 20.04 with GNOME 3.36.8 + Wayland. Present in 7.1, 7.2, 7.3. Since 7.4, scrolling choppiness for this document got significantly worse for me. Still terribly sluggish in a recent master build: Version: 24.2.0.0.alpha0+ (X86_64) / LibreOffice Community Build ID: ec60d354359067f8c5c686ef2239ee705916de43 CPU threads: 8; OS: Linux 5.15; UI render: default; VCL: gtk3 Locale: en-AU (en_AU.UTF-8); UI: en-US Calc: threaded Marking as new based on bibisect. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 115970] Set default font size for CJK/Western text fonts as locale value
https://bugs.documentfoundation.org/show_bug.cgi?id=115970 DaeHyun Sung changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #33 from DaeHyun Sung --- (In reply to Volga from comment #32) > Mr. Sung, I saw you have made a fix for bug 155947, so can you fix this bug > as well? In LibreOffice Korean environments(both Windows and MacOS), https://bugs.documentfoundation.org/show_bug.cgi?id=155947 "Korean word default font size is 10pt." is fixed. Check English and Korean, default fonts(English and Korean) use 10pt. But, I'm not LibreOffice Chinese user, I don't know about Chinese(all environments, Mainland China, Taiwan, Hong kong)'s default font. (I checked only Korean environments in LibreOffice) -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-qa] ESC meeting agenda: 2023-07-06 16:00 CEST
Hi, The prototype agenda is below. Extra items are appreciated either in this document or as a reply to this mail: https://pad.documentfoundation.org/p/esc You can join using Jitsi here: https://jitsi.documentfoundation.org/esc Regards, Miklos --- * Present: + * Completed Action Items: * Pending Action Items: + give Jaume commit access (Cloph) + send the invite mail to Jaume (Caolan) * Release Engineering update (Cloph/Xisco) + 7.6 status: rc 1 this week? + 7.5 status: 7.5.5 rc2 next week? * Documentation (Olivier) + Bugzilla Documentation statistics 273(273) bugs open + Updates: BZ changes 1 week 1 month 3 months 12 months created 5(-2)28(-1) 82(-11)299(-9) commented 1(-26) 67(-6)197(-55) 1009(-31) resolved 0(-1) 5(-1) 31(-6) 165(-7) + top 10 contributors: Stéphane Guillou made 42 changes in 1 month, and 261 changes in 1 year Olivier Hallot made 24 changes in 1 month, and 477 changes in 1 year Seth Chaiklin made 12 changes in 1 month, and 302 changes in 1 year Kaganski, Mike made 7 changes in 1 month, and 104 changes in 1 year Nabet, Julien made 6 changes in 1 month, and 32 changes in 1 year Robert Großkopf made 4 changes in 1 month, and 14 changes in 1 year Heiko Tietze made 3 changes in 1 month, and 108 changes in 1 year Leroy made 3 changes in 1 month, and 3 changes in 1 year Eyal Rozenberg made 2 changes in 1 month, and 15 changes in 1 year Perdreau, Regis made 2 changes in 1 month, and 9 changes in 1 year * UX Update (Heiko) + Bugzilla (topicUI) statistics 273(273) (topicUI) bugs open, 68(68) (needsUXEval) needs to be evaluated by the UXteam + Updates: BZ changes 1 week 1 month3 months 12 months added 5(1) 18(3) 30(-1) 60(3) commented 46(6)207(-32) 825(-9)2449(6) removed 0(-1) 1(-1) 9(-2) 29(0) resolved 2(0) 21(-6)101(-3) 316(-2) + top 10 contributors: Heiko Tietze made 103 changes in 1 month, and 1482 changes in 1 year Stéphane Guillou made 53 changes in 1 month, and 394 changes in 1 year Eyal Rozenberg made 46 changes in 1 month, and 292 changes in 1 year Kaganski, Mike made 31 changes in 1 month, and 150 changes in 1 year ady made 30 changes in 1 month, and 74 changes in 1 year Justin Luth made 29 changes in 1 month, and 78 changes in 1 year Ilmari Lauhakangas made 24 changes in 1 month, and 224 changes in 1 year Vernon, Stuart Foote made 21 changes in 1 month, and 386 changes in 1 year Dieter made 14 changes in 1 month, and 258 changes in 1 year Hossein made 13 changes in 1 month, and 72 changes in 1 year * Crash Reporting (Caolan) + 61(+26) import failure, 30(+27) export failures + ??? coverity issues + Google / ossfuzz: ?? fuzzers active now * Crash Reporting (Xisco) + 7.5.1.223190(+669) + 7.5.2.216393(+699) + 7.5.3.213933(+1214) + 7.5.4.24081(+1565) * Mentoring (Hossein) committer... 1 week1 month3 months12 months open 71(4) 107(-3)169(-9) 179(-10) reviews 340(62) 1084(38) 3022(106) 10776(48) merged 321(36) 1267(86) 3317(100) 12397(30) abandoned 13(3) 57(3) 156(-2) 647(-9) own commits 179(17)740(29) 2331(-4)10206(17) review commits 64(18)220(15)727(28) 3007(16) contributor... 1 week1 month 3 months12 months open 22(-3) 40(1) 235(4) 240(4) reviews 866(82) 2964(178) 8172(166) 31728(108) merged 16(9) 50(-8) 367(-5) 2732(37) abandoned 3(-1) 10(2) 53(-2) 504(12) own commits 21(12) 65(-3) 236(5) 1012(8) review commits 0(0) 0(0)0(0) 0(0) + easyHack statistics: needsDevEval 8(8) needsUXEval 1(1) cleanup_comments 329(329) total 398(398) assigned 27(27) open 344(344) + top 10 contributors: Dipam Turkar made 6 patches in 1 month, and 9 patches in 1 year Dr. David Alan Gilbert made 6 patches in 1 month, and 18 patches in 1 year Luigi Iucci made 4 patches in 1 month, and 5 patches in 1 year Armin Le Grand (allotropia) made 4 patches in 1 month, and 71 patches in 1 year Colomban Wendling made 3 patches in 1 month, and 24 patches in 1 year Baole Fang made 3 patches in 1 month, and 24 patches in 1 year Juan C. Sanz made 2 patches in 1 month, and 6 patches in 1 year
[Libreoffice-bugs] [Bug 91688] VIEWING: Print Preview does not display comments
https://bugs.documentfoundation.org/show_bug.cgi?id=91688 Stéphane Guillou (stragu) changed: What|Removed |Added Hardware|Other |All --- Comment #32 from Stéphane Guillou (stragu) --- Repro in: Version: 24.2.0.0.alpha0+ (X86_64) / LibreOffice Community Build ID: d74344f6cae0cf1c12f08249c8f49be1374fb98f CPU threads: 8; OS: Linux 5.15; UI render: default; VCL: gtk3 Locale: en-AU (en_AU.UTF-8); UI: en-US Calc: threaded Same could be said about other settings in the Print > LibreOffice tab, e.g. "Images and other graphic objects". It makes sense to me that a "Print preview" follows the current print settings closely, but such settings should be more exposed and obvious in the Print Preview UI so we don't end up with reports like "why are pictures not shown in the print preview?". -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 115302] PRINTING: Preview in print dialog is empty if print is invoked from print preview and comment-in-margin mode
https://bugs.documentfoundation.org/show_bug.cgi?id=115302 Stéphane Guillou (stragu) changed: What|Removed |Added Blocks||106179 --- Comment #9 from Stéphane Guillou (stragu) --- Repro in: Version: 24.2.0.0.alpha0+ (X86_64) / LibreOffice Community Build ID: d74344f6cae0cf1c12f08249c8f49be1374fb98f CPU threads: 8; OS: Linux 5.15; UI render: default; VCL: gtk3 Locale: en-AU (en_AU.UTF-8); UI: en-US Calc: threaded Note that the printed document (tested Print to file) is also missing the comments. Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=106179 [Bug 106179] [META] Writer comment bugs and enhancements -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 106179] [META] Writer comment bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=106179 Stéphane Guillou (stragu) changed: What|Removed |Added Depends on||115302 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=115302 [Bug 115302] PRINTING: Preview in print dialog is empty if print is invoked from print preview and comment-in-margin mode -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 156119] When scrolling, the contents of the page disappear in canvas
https://bugs.documentfoundation.org/show_bug.cgi?id=156119 --- Comment #9 from Caolán McNamara --- With that commit reverted in a local trunk build the disappearing continues so not sure exactly what might be going on there -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 137553] Devanagari CTL script layout corruption with Annapurna SIL Graphite font
https://bugs.documentfoundation.org/show_bug.cgi?id=137553 خالد حسني changed: What|Removed |Added CC||kha...@libreoffice.org --- Comment #12 from خالد حسني --- I think this is related to the graphite tables in the font. The way Graphite handles glyph advances (at least in this font) seems to peculiar and is tripping our code maps glyph advances back to individual characters. If I remove the Graphite tables from the font, all the reported issues go away. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 156101] Thesaurus supposedly enabled, but grayed out in UI
https://bugs.documentfoundation.org/show_bug.cgi?id=156101 Stéphane Guillou (stragu) changed: What|Removed |Added Status|RESOLVED|VERIFIED --- Comment #14 from Stéphane Guillou (stragu) --- Verified as fixed in: Version: 24.2.0.0.alpha0+ (X86_64) / LibreOffice Community Build ID: d74344f6cae0cf1c12f08249c8f49be1374fb98f CPU threads: 8; OS: Linux 5.15; UI render: default; VCL: gtk3 Locale: en-AU (en_AU.UTF-8); UI: en-US Calc: threaded Thanks Caolán! (In reply to Eyal Rozenberg from comment #10) > Of course, you could ask me to open a separate bug about that. For the fallback issue, looking at https://cgit.freedesktop.org/libreoffice/dictionaries/tree/en/dictionaries.xcu and how variants are specified in the same way for hyphenation, thesaurus, and spelling, I think it is already covered by bug 83561. Once the fallback mechanism is implemented, we can see with each native language community which fallback works for them - if any. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 90262] Some animated GIF do not loop infinitely when inserted in presentation as image
https://bugs.documentfoundation.org/show_bug.cgi?id=90262 --- Comment #15 from FM --- Same issue on Impress 7.3.7.2 @Timur: what do you mean by "Insert Video" as workaround? I do not see the option to Insert gifs as videos. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 156156] Add Help button to sidebar
https://bugs.documentfoundation.org/show_bug.cgi?id=156156 --- Comment #2 from Stéphane Guillou (stragu) --- Thanks Stuart. Someone could do an initial commit to demonstrate the process for a single deck, and leaving this open as an easyHack. But I'm not too keen on having a lingering inconsistent UI waiting for contributors. (Just for the record, I marked as inherited because OOo 3.3 could open the Styles and Formatting help page by pressing F1 when the docked panel was focused, but it didn't have a button either. Same for the Tasks panel in Impress.) -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-ux-advise] [Bug 156156] Add Help button to sidebar
https://bugs.documentfoundation.org/show_bug.cgi?id=156156 --- Comment #2 from Stéphane Guillou (stragu) --- Thanks Stuart. Someone could do an initial commit to demonstrate the process for a single deck, and leaving this open as an easyHack. But I'm not too keen on having a lingering inconsistent UI waiting for contributors. (Just for the record, I marked as inherited because OOo 3.3 could open the Styles and Formatting help page by pressing F1 when the docked panel was focused, but it didn't have a button either. Same for the Tasks panel in Impress.) -- You are receiving this mail because: You are on the CC list for the bug.
[Libreoffice-bugs] [Bug 156169] Trackpad scroll choppy on displaying formulas
https://bugs.documentfoundation.org/show_bug.cgi?id=156169 Stéphane Guillou (stragu) changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=15 ||6125 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 156125] Slow scrolling of documents with many Math formulas
https://bugs.documentfoundation.org/show_bug.cgi?id=156125 Stéphane Guillou (stragu) changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=15 ||6169 --- Comment #11 from Stéphane Guillou (stragu) --- Thanks for checking. I've opened bug 156169 for my findings. Marking my comments here as off-topic. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 97445] move menu bar on window title
https://bugs.documentfoundation.org/show_bug.cgi?id=97445 --- Comment #3 from third='beedell', first='roke', second='julian lockhart' --- Why is this desirable anyway? I see that GNOME's CSD initiative links this (https://wiki.gnome.org/Initiatives/CSD#:~:text=Status-,libreoffice,-VCL%2BGTK3) but I genuinely don't see why this would be an improvement, at the least unless entirely optional. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-ux-advise] [Bug 97445] move menu bar on window title
https://bugs.documentfoundation.org/show_bug.cgi?id=97445 --- Comment #3 from third='beedell', first='roke', second='julian lockhart' --- Why is this desirable anyway? I see that GNOME's CSD initiative links this (https://wiki.gnome.org/Initiatives/CSD#:~:text=Status-,libreoffice,-VCL%2BGTK3) but I genuinely don't see why this would be an improvement, at the least unless entirely optional. -- You are receiving this mail because: You are on the CC list for the bug.
[Libreoffice-ux-advise] [Bug 156156] Add Help button to sidebar
https://bugs.documentfoundation.org/show_bug.cgi?id=156156 Heiko Tietze changed: What|Removed |Added Ever confirmed|0 |1 CC||andreas.heini...@yahoo.de, ||heiko.tietze@documentfounda ||tion.org Keywords|needsUXEval | Status|UNCONFIRMED |NEW --- Comment #3 from Heiko Tietze --- The deck title bar is handled in sfx2/source/sidebar/Deck.cxx for every deck. Adding another toolbutton in sfx2/uiconfig/ui/deck.ui is easy and maybe Jim or Andreas figures out how to connect help ids to the button. Maybe in sfx2/source/sidebar/SidebarController.cxx. -- You are receiving this mail because: You are on the CC list for the bug.
[Libreoffice-bugs] [Bug 156156] Add Help button to sidebar
https://bugs.documentfoundation.org/show_bug.cgi?id=156156 Heiko Tietze changed: What|Removed |Added Ever confirmed|0 |1 CC||andreas.heini...@yahoo.de, ||heiko.tietze@documentfounda ||tion.org Keywords|needsUXEval | Status|UNCONFIRMED |NEW --- Comment #3 from Heiko Tietze --- The deck title bar is handled in sfx2/source/sidebar/Deck.cxx for every deck. Adding another toolbutton in sfx2/uiconfig/ui/deck.ui is easy and maybe Jim or Andreas figures out how to connect help ids to the button. Maybe in sfx2/source/sidebar/SidebarController.cxx. -- You are receiving this mail because: You are the assignee for the bug.
