[Libreoffice-commits] core.git: vcl/win
vcl/win/app/salinst.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c112868f6cc6a3ba937778435dcca1fe986bf124
Author: Stephan Bergmann
AuthorDate: Fri Apr 30 08:04:40 2021 +0200
Commit: Stephan Bergmann
CommitDate: Fri Apr 30 08:43:46 2021 +0200
loplugin:stringadd (clang-cl)
Change-Id: I132643eb73129e1319af36b7c8aac36a516714b4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114896
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index 18605f2f17d4..1771120e42c8 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -908,7 +908,7 @@ OUString WinSalInstance::getOSVersion()
+ OUString::number(vi2.dwMinorVersion));
aVer.append(" ");
if (vi2.szCSDVersion[0])
-aVer.append(o3tl::toU(vi2.szCSDVersion)).append(" ");
+aVer.append(OUString::Concat(o3tl::toU(vi2.szCSDVersion))
+ " ");
aVer.append("Build " + OUString::number(vi2.dwBuildNumber));
bHaveVerFromRtlGetVersion = true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: download.lst external/xmlsec solenv/flatpak-manifest.in
download.lst
|4
external/xmlsec/0001-xmlSecX509DataGetNodeContent-don-t-return-0-for-non-.patch.1
| 68 --
external/xmlsec/UnpackedTarball_xmlsec.mk
|2
external/xmlsec/windows7.patch.1
| 25 ---
solenv/flatpak-manifest.in
|6
5 files changed, 5 insertions(+), 100 deletions(-)
New commits:
commit b5586bd42a35d294e014d665bc47c49ae4dfbde5
Author: Miklos Vajna
AuthorDate: Thu Apr 29 20:56:56 2021 +0200
Commit: Miklos Vajna
CommitDate: Fri Apr 30 09:04:19 2021 +0200
external: update libxmlsec to 1.2.32
And drop the 2 upstreamed patches.
Change-Id: Ia821023d9cc06df5e9e7aef82c070ad1c98b67e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114894
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/download.lst b/download.lst
index a09fd86cc0ca..e1560431b12c 100644
--- a/download.lst
+++ b/download.lst
@@ -164,8 +164,8 @@ export LIBNUMBERTEXT_SHA256SUM :=
17b8249cb89ae11ae15a85612d2665626c0e0e3e56b356
export LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.7.tar.xz
export LIBTOMMATH_SHA256SUM :=
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483
export LIBTOMMATH_TARBALL := ltm-1.0.zip
-export XMLSEC_SHA256SUM :=
9b10bc52cc31e4f76162e3975e50db26b71ab49c571d810b311ca626be5a0b26
-export XMLSEC_TARBALL := xmlsec1-1.2.31.tar.gz
+export XMLSEC_SHA256SUM :=
e383702853236004e5b08e424b8afe9b53fe9f31aaa7a5382f39d9533eb7c043
+export XMLSEC_TARBALL := xmlsec1-1.2.32.tar.gz
export LIBXML_SHA256SUM :=
aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f
export LIBXML_VERSION_MICRO := 10
export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.gz
diff --git
a/external/xmlsec/0001-xmlSecX509DataGetNodeContent-don-t-return-0-for-non-.patch.1
b/external/xmlsec/0001-xmlSecX509DataGetNodeContent-don-t-return-0-for-non-.patch.1
deleted file mode 100644
index 51607ca6ee73..
---
a/external/xmlsec/0001-xmlSecX509DataGetNodeContent-don-t-return-0-for-non-.patch.1
+++ /dev/null
@@ -1,68 +0,0 @@
-From a39b110cb2c25680259a38b2f397b350151bc6e7 Mon Sep 17 00:00:00 2001
-From: Michael Stahl
-Date: Wed, 7 Apr 2021 16:43:48 +0200
-Subject: [PATCH] xmlSecX509DataGetNodeContent(): don't return 0 for non-empty
- elements
-
-LibreOffice wants to write the content of KeyInfo itself and thus writes
-X509Certificate element with content.
-
-But then xmlSecMSCngKeyDataX509XmlWrite() writes a duplicate
-X509Certificate element, which then makes a new additional consistency
-check in LO unhappy.
-
-The duplicate is written because xmlSecX509DataGetNodeContent() returns
-0 because it only checks for empty nodes; if there are only non-empty
-nodes a fallback to XMLSEC_X509DATA_DEFAULT occurs in all backends.
-
-Change the return value to be non-0 without changing the signature of
-the function, as it is apparently public.
-
-This doesn't happen in LO in the NSS backend due to another accident,
-where the private key flag isn't set when the X509Certificate is read,
-but otherwise the code is the same.
- src/x509.c | 11 +++
- 1 file changed, 11 insertions(+)
-
-diff --git a/src/x509.c b/src/x509.c
-index ed8788ae..dac8bd2b 100644
a/src/x509.c
-+++ b/src/x509.c
-@@ -60,22 +60,33 @@ xmlSecX509DataGetNodeContent (xmlNodePtr node,
xmlSecKeyInfoCtxPtr keyInfoCtx) {
- if(xmlSecCheckNodeName(cur, xmlSecNodeX509Certificate, xmlSecDSigNs))
{
- if(xmlSecIsEmptyNode(cur) == 1) {
- content |= XMLSEC_X509DATA_CERTIFICATE_NODE;
-+} else {
-+/* ensure return value isn't 0 if there are non-empty
elements */
-+content |= (XMLSEC_X509DATA_CERTIFICATE_NODE << 16);
- }
- } else if(xmlSecCheckNodeName(cur, xmlSecNodeX509SubjectName,
xmlSecDSigNs)) {
- if(xmlSecIsEmptyNode(cur) == 1) {
- content |= XMLSEC_X509DATA_SUBJECTNAME_NODE;
-+} else {
-+content |= (XMLSEC_X509DATA_SUBJECTNAME_NODE << 16);
- }
- } else if(xmlSecCheckNodeName(cur, xmlSecNodeX509IssuerSerial,
xmlSecDSigNs)) {
- if(xmlSecIsEmptyNode(cur) == 1) {
- content |= XMLSEC_X509DATA_ISSUERSERIAL_NODE;
-+} else {
-+content |= (XMLSEC_X509DATA_ISSUERSERIAL_NODE << 16);
- }
- } else if(xmlSecCheckNodeName(cur, xmlSecNodeX509SKI, xmlSecDSigNs)) {
- if(xmlSecIsEmptyNode(cur) == 1) {
- content |= XMLSEC_X509DATA_SKI_NODE;
-+} else {
-+content |= (XMLSEC_X509DATA_SKI_NODE << 16);
- }
- } else if(xmlSecCheckNodeName(cur, xmlSecNodeX509CRL, xmlSecDSigNs)) {
- if(xmlSecIsEmptyNode(cur) == 1) {
-
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sysui/desktop
sysui/desktop/apparmor/program.oosplash |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 12c9b81927aae792743ce3dbc0b09fecdb15b33c
Author: Rico Tzschichholz
AuthorDate: Wed Apr 28 20:13:48 2021 +0200
Commit: Xisco Fauli
CommitDate: Fri Apr 30 09:11:24 2021 +0200
apparmor: Fix "oopslash" typo
Change-Id: I8b355bceadeebebc9e6fedbf92a35aa44a356e09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114819
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
(cherry picked from commit f616d96bd8ce8986e4cc204953db0467e6060b5c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114866
Reviewed-by: Xisco Fauli
diff --git a/sysui/desktop/apparmor/program.oosplash
b/sysui/desktop/apparmor/program.oosplash
index bcc06914d112..dd1136bc9b06 100644
--- a/sysui/desktop/apparmor/program.oosplash
+++ b/sysui/desktop/apparmor/program.oosplash
@@ -14,7 +14,7 @@
#include
-profile libreoffice-oopslash INSTDIR-program/oosplash {
+profile libreoffice-oosplash INSTDIR-program/oosplash {
#include
#include
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/dialog/weldeditview.cxx | 31 ++-
1 file changed, 30 insertions(+), 1 deletion(-)
New commits:
commit 5f89b8cc5521b683a519b93bbc3da739ed0fd795
Author: Caolán McNamara
AuthorDate: Thu Apr 29 20:33:04 2021 +0100
Commit: Caolán McNamara
CommitDate: Fri Apr 30 13:16:40 2021 +0200
extend the selection range so adjacent lines are considered one block
and so we get one border around multiple lines of an editview
selection
Change-Id: Ic641035da1c7d2b891cd6e6193b524e6b581e76f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114895
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/svx/source/dialog/weldeditview.cxx
b/svx/source/dialog/weldeditview.cxx
index d59aab1877a6..6e83d079c722 100644
--- a/svx/source/dialog/weldeditview.cxx
+++ b/svx/source/dialog/weldeditview.cxx
@@ -181,8 +181,37 @@ void WeldEditView::DoPaint(vcl::RenderContext&
rRenderContext, const tools::Rect
std::vector aLogicRanges;
aLogicRanges.reserve(aLogicRects.size());
+tools::Long nMinX(LONG_MAX), nMaxX(0), nMinY(LONG_MAX), nMaxY(0);
for (const auto& aRect : aLogicRects)
-
aLogicRanges.emplace_back(vcl::unotools::b2DRectangleFromRectangle(aRect));
+{
+nMinX = std::min(nMinX, aRect.Left());
+nMinY = std::min(nMinY, aRect.Top());
+nMaxX = std::max(nMaxX, aRect.Right());
+nMaxY = std::max(nMaxY, aRect.Bottom());
+}
+
+const Size aLogicPixel(rRenderContext.PixelToLogic(Size(1, 1)));
+for (const auto& aRect : aLogicRects)
+{
+// Extend each range by one pixel so multiple lines touch each
+// other if adjacent, so the whole set is drawn with a single
+// border around the lot. But keep the selection within the
+// original max extents.
+auto nTop = aRect.Top();
+if (nTop > nMinY)
+nTop -= aLogicPixel.Height();
+auto nBottom = aRect.Bottom();
+if (nBottom < nMaxY)
+nBottom += aLogicPixel.Height();
+auto nLeft = aRect.Left();
+if (nLeft > nMinX)
+nLeft -= aLogicPixel.Width();
+auto nRight = aRect.Right();
+if (nRight < nMaxX)
+nRight += aLogicPixel.Width();
+
+aLogicRanges.emplace_back(nLeft, nTop, nRight, nBottom);
+}
// get the system's highlight color
const SvtOptionsDrawinglayer aSvtOptionsDrawinglayer;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa sc/source
sc/qa/uitest/autofilter/tdf141946.py | 75 +++
sc/source/core/tool/dbdata.cxx | 10 ++--
2 files changed, 80 insertions(+), 5 deletions(-)
New commits:
commit 4b8459e86c7a411d8f02fc5480033cb031a941f2
Author: Tünde Tóth
AuthorDate: Thu Apr 29 14:46:25 2021 +0200
Commit: Balazs Varga
CommitDate: Fri Apr 30 15:08:34 2021 +0200
tdf#141946 sc: fix broken filter criteria when inserting column
The autofilter criteria weren't remain with the filtered column
when we inserted a column left of the filtered column.
Change-Id: If366d9de9518da3d13ec2ba6b1b36e4f98c76019
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114881
Tested-by: Jenkins
Reviewed-by: Balazs Varga
diff --git a/sc/qa/uitest/autofilter/tdf141946.py
b/sc/qa/uitest/autofilter/tdf141946.py
new file mode 100644
index ..4e45ecfb7d5a
--- /dev/null
+++ b/sc/qa/uitest/autofilter/tdf141946.py
@@ -0,0 +1,75 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# 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/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.calc import enter_text_to_cell
+from libreoffice.uno.propertyvalue import mkPropertyValues
+
+#Bug 141946 - EDITING Inserting column before autofiltered column empties
autofilter
+
+class tdf141946(UITestCase):
+def test_tdf141946_inserted_column(self):
+self.ui_test.create_doc_in_start_center("calc")
+document = self.ui_test.get_component()
+calcDoc = self.xUITest.getTopFocusWindow()
+gridwin = calcDoc.getChild("grid_window")
+document = self.ui_test.get_component()
+
+enter_text_to_cell(gridwin, "A1", "A")
+enter_text_to_cell(gridwin, "A2", "1")
+enter_text_to_cell(gridwin, "A3", "2")
+enter_text_to_cell(gridwin, "A4", "3")
+
+enter_text_to_cell(gridwin, "B1", "B")
+enter_text_to_cell(gridwin, "B2", "4")
+enter_text_to_cell(gridwin, "B3", "5")
+enter_text_to_cell(gridwin, "B4", "6")
+
+gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:B4"}))
+
+self.xUITest.executeCommand(".uno:DataFilterAutoFilter")
+
+gridwin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "",
"COL": "1", "ROW": "0"}))
+xFloatWindow = self.xUITest.getFloatWindow()
+xCheckListMenu = xFloatWindow.getChild("check_list_menu")
+xList = xCheckListMenu.getChild("check_list_box")
+xEntry = xList.getChild("1")
+xEntry.executeAction("CLICK", tuple())
+
+xOkButton = xFloatWindow.getChild("ok")
+xOkButton.executeAction("CLICK", tuple())
+
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B1"}))
+
+self.xUITest.executeCommand(".uno:InsertColumnsBefore")
+
+gridwin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "",
"COL": "0", "ROW": "0"}))
+xFloatWindow = self.xUITest.getFloatWindow()
+xCheckListMenu = xFloatWindow.getChild("check_list_menu")
+xList = xCheckListMenu.getChild("check_list_box")
+self.assertEqual(2, len(xList.getChildren()))
+xCloseBtn = xFloatWindow.getChild("cancel")
+xCloseBtn.executeAction("CLICK", tuple())
+
+gridwin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "",
"COL": "1", "ROW": "0"}))
+xFloatWindow = self.xUITest.getFloatWindow()
+xCheckListMenu = xFloatWindow.getChild("check_list_menu")
+xList = xCheckListMenu.getChild("check_list_box")
+self.assertEqual(1, len(xList.getChildren()))
+xCloseBtn = xFloatWindow.getChild("cancel")
+xCloseBtn.executeAction("CLICK", tuple())
+
+gridwin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "",
"COL": "2", "ROW": "0"}))
+xFloatWindow = self.xUITest.getFloatWindow()
+xCheckListMenu = xFloatWindow.getChild("check_list_menu")
+xList = xCheckListMenu.getChild("check_list_box")
+self.assertEqual(3, len(xList.getChildren()))
+xCloseBtn = xFloatWindow.getChild("cancel")
+xCloseBtn.executeAction("CLICK", tuple())
+
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index d7a8f4dd5297..ba68d1aa0d8a 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -366,8 +366,8 @@ void ScDBData::MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW n
ScQueryEntry& rEntry = mpQueryParam->GetEntry(i);
rEntry.nField += nDifX;
-// tdf#48025 update the column index of the filter criteria,
-// when the deleted columns are inside the data range
+// tdf#48025, tdf#141946: update the column index of
[Libreoffice-commits] core.git: include/svx svx/source sw/source
include/svx/weldeditview.hxx |4
svx/source/dialog/weldeditview.cxx |7 +++
sw/source/ui/dbui/mmaddressblockpage.hxx |2 --
3 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 1320afe376bc52bc64995ba976391ec21db6ccde
Author: Caolán McNamara
AuthorDate: Thu Apr 29 09:49:11 2021 +0100
Commit: Caolán McNamara
CommitDate: Fri Apr 30 13:41:08 2021 +0200
allow dnd into weldeditview
Change-Id: I42fafed01a3884279781642154656f0ee32ad431
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114846
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/svx/weldeditview.hxx b/include/svx/weldeditview.hxx
index 1f388cbabc73..c40a754a2fc8 100644
--- a/include/svx/weldeditview.hxx
+++ b/include/svx/weldeditview.hxx
@@ -49,6 +49,8 @@ public:
protected:
bool m_bAcceptsTab;
+// m_xDropTarget must outlive m_xEditView
+css::uno::Reference m_xDropTarget;
std::unique_ptr m_xEditEngine;
std::unique_ptr m_xEditView;
rtl::Reference m_xAccessible;
@@ -69,6 +71,8 @@ protected:
virtual void LoseFocus() override;
virtual void Resize() override;
+virtual css::uno::Reference
GetDropTarget() override;
+
// Whether Tab will result in entering a tab or not
bool GetAcceptsTab() const { return m_bAcceptsTab; }
diff --git a/svx/source/dialog/weldeditview.cxx
b/svx/source/dialog/weldeditview.cxx
index 6e83d079c722..83f24e8337d4 100644
--- a/svx/source/dialog/weldeditview.cxx
+++ b/svx/source/dialog/weldeditview.cxx
@@ -1603,6 +1603,13 @@ void WeldEditView::LoseFocus()
}
}
+css::uno::Reference
WeldEditView::GetDropTarget()
+{
+if (!m_xDropTarget)
+m_xDropTarget = weld::CustomWidgetController::GetDropTarget();
+return m_xDropTarget;
+}
+
namespace
{
class WeldEditViewUIObject final : public DrawingAreaUIObject
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx
b/sw/source/ui/dbui/mmaddressblockpage.hxx
index 8170b9193211..1ab100c9539b 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -140,8 +140,6 @@ class AddressMultiLineEdit : public WeldEditView
Link m_aModifyLink;
SwCustomizeAddressBlockDialog* m_pParentDialog;
-css::uno::Reference m_xDropTarget;
-
virtual void EditViewSelectionChange() override;
virtual css::uno::Reference
GetDropTarget() override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - officecfg/registry vcl/source
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 10 -- vcl/source/window/printdlg.cxx | 11 --- 2 files changed, 21 deletions(-) New commits: commit 1009228764ea37c613a9f4ea041013c0d8fc210c Author: Xisco Fauli AuthorDate: Thu Apr 29 12:02:06 2021 +0200 Commit: Michael Stahl CommitDate: Fri Apr 30 11:05:39 2021 +0200 vcl: print dialog: remove broken code This was introduced in 149807eb6100090e178505ba4a264bb38eba1e0c < Resolves tdf#127782 - Print dialog height > trying to fix the problem of the window size not being remembered after reopening the dialog, however, the problem is still reproducible in master with GEN, thus, remove this code Change-Id: I65f327fa692cd3e2b5597d04e9e15abc952fe6d9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114874 Tested-by: Jenkins Reviewed-by: Xisco Fauli Signed-off-by: Xisco Fauli Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114890 Reviewed-by: Michael Stahl diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index cf1695b2cc2a..9097c23c3c6a 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -3511,16 +3511,6 @@ false - - -Stores the width of the print dialog. - - - - -Stores the height of the print dialog. - - diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 6583e1891e52..d37c0ec068bc 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -683,15 +683,6 @@ PrintDialog::PrintDialog(weld::Window* i_pWindow, const std::shared_ptrget_preferred_size().Width() + mxScrolledWindow->get_vscroll_width(), 450); -// restore dialog size -std::optional aWidth = officecfg::Office::Common::Print::Dialog::Width::get(); -std::optional aHeight = officecfg::Office::Common::Print::Dialog::Height::get(); -WindowStateData aState; -if (aWidth) aState.SetWidth(*aWidth); else aWidth = -1; -if (aHeight) aState.SetHeight(*aHeight); else aHeight = -1; -aState.SetMask(WindowStateMask::Width | WindowStateMask::Height); -m_xDialog->set_window_state(aState.ToStr()); - m_xDialog->set_centered_on_parent(true); } @@ -700,8 +691,6 @@ PrintDialog::~PrintDialog() std::shared_ptr batch(comphelper::ConfigurationChanges::create()); officecfg::Office::Common::Print::Dialog::RangeSectionExpanded::set(mxRangeExpander->get_expanded(), batch); officecfg::Office::Common::Print::Dialog::LayoutSectionExpanded::set(mxLayoutExpander->get_expanded(), batch); - officecfg::Office::Common::Print::Dialog::Width::set(m_xDialog->get_size().getWidth(), batch); - officecfg::Office::Common::Print::Dialog::Height::set(m_xDialog->get_size().getHeight(), batch); batch->commit(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-0' - include/svl sc/inc sc/qa sc/source svl/source
include/svl/zforlist.hxx |7 --
sc/inc/cellform.hxx |2 -
sc/inc/column.hxx|5 +++-
sc/inc/queryentry.hxx|3 +-
sc/inc/table.hxx |2 -
sc/qa/uitest/autofilter/autofilter.py| 15 ++
sc/qa/uitest/data/autofilter/time_value.xlsx |binary
sc/source/core/data/column.cxx |3 +-
sc/source/core/data/column3.cxx |5 ++--
sc/source/core/data/documen3.cxx |2 -
sc/source/core/data/table3.cxx | 13 +++-
sc/source/core/tool/cellform.cxx |4 +--
sc/source/core/tool/queryentry.cxx |2 -
sc/source/ui/unoobj/datauno.cxx | 14 -
sc/source/ui/view/gridwin.cxx| 28 ---
svl/source/numbers/zforlist.cxx |6 +++--
16 files changed, 79 insertions(+), 32 deletions(-)
New commits:
commit 70845c616706601a3fe3fe35e1b16e2b0ac3df38
Author: Balazs Varga
AuthorDate: Thu Mar 11 14:44:49 2021 +0100
Commit: Gabor Kelemen
CommitDate: Fri Apr 30 11:42:44 2021 +0200
tdf#140968 tdf#140978 XLSX import: fix lost rounded filters
if the stored filter values are in the visible cell
format (e.g. rounded values) instead of the original
(editing) values.
Now AutoFilter popup window shows the items according
to the visible cell format (e.g. 1.0 instead of 1.01 or
0.99), but still grouping them based on the "editing
format" (e.g. not rounded values which visible during
editing), i.e. there could be repeated values in the
filtering conditions (e.g. two options "1.0" and "1.0"
for 1.01 and 0.99).
Note: Next step will be to group and filter based on the
actual cell format, like MSO does, to simplify filtering
of values rounded by the cell format (e.g. selecting
the single AutoFilter condition "1.0" to filter both
1.01 and 0.99).
Change-Id: I430da5e09794fc4ed8acf79b6485926f46b70277
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112343
Tested-by: Jenkins
Reviewed-by: László Németh
(cherry picked from commit 4fd1333ba4bb4f2311e9098291154772bd310429)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114864
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index 2cc857b5e6cb..f6e07a420552 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -560,9 +560,12 @@ public:
OUString& sOutString, Color** ppColor, bool
bUseStarFormat = false );
/** Format a number according to the standard default format matching
-the given format index */
+the given format index. rOutString will be the real cell string (e.g.
+a number rounded by the cell format, which rounded value is used
+in the filtering condition now), instead of the EditFormat string
+(e.g a not rounded value, which is visible during editing).*/
void GetInputLineString( const double& fOutNumber,
- sal_uInt32 nFIndex, OUString& rOutString );
+ sal_uInt32 nFIndex, OUString& rOutString, bool
bFiltering = false );
/** Format a number according to a format code string to be scanned.
@return
diff --git a/sc/inc/cellform.hxx b/sc/inc/cellform.hxx
index 5d7de17f8344..92d1f25c527f 100644
--- a/sc/inc/cellform.hxx
+++ b/sc/inc/cellform.hxx
@@ -45,7 +45,7 @@ public:
static void GetInputString(
const ScRefCellValue& rCell, sal_uInt32 nFormat, OUString& rString,
SvNumberFormatter& rFormatter,
-const ScDocument* pDoc );
+const ScDocument* pDoc, bool bFiltering = false );
static OUString GetOutputString(
ScDocument& rDoc, const ScAddress& rPos, const ScRefCellValue& rCell );
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 0eb2ad5f1c85..34625a40e64a 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -135,6 +135,8 @@ class ScColumn
SCCOL nCol;
SCTAB nTab;
+bool mbFiltering; // it is true if there is a filtering in the column
+
friend class ScDocument;// for FillInfo
friend class ScTable;
friend class ScValueIterator;
@@ -182,6 +184,7 @@ public:
ScDocument* GetDoc() const { return pAttrArray->GetDoc(); }
SCTAB GetTab() const { return nTab; }
SCCOL GetCol() const { return nCol; }
+bool HasFiltering() const { return mbFiltering; }
sc::CellStoreType& GetCellStore() { return maCells; }
const sc::CellStoreType& GetCellStore() const { return maCells; }
sc::CellTextAttrStoreType& GetCellAttrStore() { return maCellTextAttrs; }
@@ -534,7 +537,7 @@ public:
void GetFilterEntries(
sc::ColumnBlockConstPosition& rBlockPos, SCROW nStartRow, SCROW
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - vcl/source
vcl/source/window/window2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d38c5abbb0a34159fc13ef86269fbff3a93c3109
Author: Caolán McNamara
AuthorDate: Tue Apr 27 11:16:33 2021 +0100
Commit: Michael Stahl
CommitDate: Fri Apr 30 11:03:41 2021 +0200
tdf#141854 Resize called during dispose
Change-Id: Ie5eaafa95704f9567b8bb9881865571a39bb2f6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114708
Tested-by: Jenkins
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
(cherry picked from commit aea139c440d7c7a3683fcbbc48799bc79ba590e7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114860
Reviewed-by: Michael Stahl
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index a729f655a93d..75885cb43d98 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1348,7 +1348,7 @@ void Window::queue_resize(StateChangedType eReason)
}
}
-if (bSomeoneCares && !mpWindowImpl->mbInDispose)
+if (bSomeoneCares && !isDisposed())
{
//fdo#57090 force a resync of the borders of the borderwindow onto this
//window in case they have changed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/liborcus
external/liborcus/UnpackedTarball_liborcus.mk|4
external/liborcus/allow-utf-8-in-xml-names.patch | 301 +++
2 files changed, 305 insertions(+)
New commits:
commit 6b7c2fa65eb68be520ed4135cc245e33fa22e8bf
Author: Luboš Luňák
AuthorDate: Thu Apr 29 20:10:34 2021 +0200
Commit: Luboš Luňák
CommitDate: Fri Apr 30 11:23:36 2021 +0200
allow utf-8 in xml names (liborcus) (tdf#141672)
Change-Id: Ib150d55b588a572e4352396f18de2331983b2aae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114892
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk
b/external/liborcus/UnpackedTarball_liborcus.mk
index 113e8e25818d..3b54db0e49ce 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -23,6 +23,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/include.patch.0 \
))
+$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
+ external/liborcus/allow-utf-8-in-xml-names.patch \
+))
+
ifeq ($(OS),WNT)
$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/windows-constants-hack.patch \
diff --git a/external/liborcus/allow-utf-8-in-xml-names.patch
b/external/liborcus/allow-utf-8-in-xml-names.patch
new file mode 100644
index ..e3430881053d
--- /dev/null
+++ b/external/liborcus/allow-utf-8-in-xml-names.patch
@@ -0,0 +1,301 @@
+From fa9b6845ed583f5486372c6ffbc59e02a140d303 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?=
+Date: Thu, 29 Apr 2021 19:12:20 +0200
+Subject: [PATCH] allow utf-8 in xml names (#137)
+
+https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-NameStartChar
+has a list of all allowed characters.
+---
+ include/orcus/sax_parser_base.hpp | 3 +
+ src/orcus_test_xml.cpp| 1 +
+ src/parser/sax_parser_base.cpp| 201 --
+ test/xml/non-ascii/check.txt | 4 +
+ test/xml/non-ascii/input.xml | 4 +
+ 5 files changed, 201 insertions(+), 12 deletions(-)
+ create mode 100644 test/xml/non-ascii/check.txt
+ create mode 100644 test/xml/non-ascii/input.xml
+
+diff --git a/include/orcus/sax_parser_base.hpp
b/include/orcus/sax_parser_base.hpp
+index 9939e133..8394c07b 100644
+--- a/include/orcus/sax_parser_base.hpp
b/include/orcus/sax_parser_base.hpp
+@@ -218,6 +218,9 @@ protected:
+ void element_name(parser_element& elem, std::ptrdiff_t begin_pos);
+ void attribute_name(pstring& attr_ns, pstring& attr_name);
+ void characters_with_encoded_char(cell_buffer& buf);
++
++int is_name_char();
++int is_name_start_char();
+ };
+
+ }}
+diff --git a/src/orcus_test_xml.cpp b/src/orcus_test_xml.cpp
+index 8a864d68..35f3dea7 100644
+--- a/src/orcus_test_xml.cpp
b/src/orcus_test_xml.cpp
+@@ -77,6 +77,7 @@ const char* sax_parser_test_dirs[] = {
+ SRCDIR"/test/xml/no-decl-1/",
+ SRCDIR"/test/xml/underscore-identifier/",
+ SRCDIR"/test/xml/self-closing-root/",
++SRCDIR"/test/xml/non-ascii/",
+ };
+
+ const char* sax_parser_parse_only_test_dirs[] = {
+diff --git a/src/parser/sax_parser_base.cpp b/src/parser/sax_parser_base.cpp
+index 97aa34ec..db51ff94 100644
+--- a/src/parser/sax_parser_base.cpp
b/src/parser/sax_parser_base.cpp
+@@ -328,20 +328,182 @@ bool parser_base::value(pstring& str, bool decode)
+ return transient_stream();
+ }
+
++// https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-NameStartChar
++// Return length of the character in bytes, otherwise 0.
++template< bool only_start_name >
++static
++int is_name_char_helper(const char* mp_char, const char* mp_end)
++{
++const unsigned char first = mp_char[0];
++// Note that ':' technically is an allowed name character, but it is
handled separately
++// e.g. in element_name(), so here pretend it isn't.
++if (/*first == ':' ||*/ first == '_' || (first >= 'A' && first <= 'Z') ||
(first >= 'a' && first <= 'z'))
++return 1;
++if (!only_start_name && (first == '-' || first == '.' || (first >= '0' &&
first <= '9')))
++return 1;
++
++if (first < 0x7f) // other ascii characters are not allowed
++return 0;
++if (mp_end < mp_char + 1)
++return 0;
++const unsigned char second = mp_char[1];
++
++// 0xb7 = 0xc2 0xb7 utf-8
++if (!only_start_name && first == 0xc2 && second == 0xb7)
++return 2;
++
++// [#xC0-#xD6] | [#xD8-#xF6] | [#xF8-#x2FF]
++// 0xc0 = 0xc3 0x80 utf-8
++if (first < 0xc3)
++return 0;
++// xd7 = 0xc3 0x97 utf-8, 0xf7 = 0xc3 0xb7 utf-8
++if (first == 0xc3)
++return second >= 0x80 && second <= 0xff && second != 0x97 && second
!= 0xb7 ? 2 : 0;
++// 0x2ff = 0xcb 0xbf utf-8, 0x300 = 0xcc 0x80 utf-8
++if (first >= 0xc4 && first <= 0xcb)
++return 2;
++
++// [#x0300-#x036F]
++// 0x0300 = 0xcc 0x80 utf-8, 0x36f = 0xcd 0xaf utf-8
++if (!only_start_name
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-0' - sw/source
sw/source/ui/dbui/mmresultdialogs.cxx | 67 ++---
sw/source/uibase/dbui/mmconfigitem.cxx | 16 ---
sw/source/uibase/inc/mmconfigitem.hxx |8 +++
3 files changed, 47 insertions(+), 44 deletions(-)
New commits:
commit c4fe9369eeadf6b76156e697229a8af3b080acec
Author: Balazs Varga
AuthorDate: Mon Mar 22 13:34:37 2021 +0100
Commit: Gabor Kelemen
CommitDate: Fri Apr 30 11:53:52 2021 +0200
tdf#117212 sw mailmerge: merge only the selected range
All records were merged before saving or printing the
record range selected in “From 'X' To 'Y' of the
“Save Merged Documents” or “Print Merged Documents”
dialog windows (opened via the Mail merge toolbar).
This was a waste of time in the case of selecting
only a few records.
Change-Id: I52c47d3c5707b09ed7f9b05a1a0f4d20a5595b8d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112922
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit ec44f87d5b99a3299322d0b79abc4c6808877865)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114913
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx
b/sw/source/ui/dbui/mmresultdialogs.cxx
index 2702afde2b17..92a41b6333dc 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -528,6 +528,15 @@ IMPL_LINK_NOARG(SwMMResultSaveDialog, SaveOutputHdl_Impl,
weld::Button&, void)
SwView* pView = ::GetActiveView();
std::shared_ptr xConfigItem =
pView->GetMailMergeConfigItem();
assert(xConfigItem);
+
+sal_uInt32 nBegin = static_cast(m_xFromNF->get_value() - 1);
+sal_uInt32 nEnd = static_cast(m_xToNF->get_value());
+sal_uInt32 nMax = static_cast(m_xToNF->get_max());
+if (nEnd > nMax)
+nEnd = nMax;
+
+xConfigItem->SetBeginEnd(nBegin, nEnd);
+
if (!xConfigItem->GetTargetView())
SwDBManager::PerformMailMerge(pView);
@@ -571,18 +580,6 @@ IMPL_LINK_NOARG(SwMMResultSaveDialog, SaveOutputHdl_Impl,
weld::Button&, void)
}
else
{
-const sal_uInt32 nDocumentCount =
xConfigItem->GetMergedDocumentCount();
-sal_uInt32 nBegin = 0;
-sal_uInt32 nEnd = nDocumentCount;
-
-if (!m_xSaveIndividualRB->get_active())
-{
-nBegin = static_cast< sal_Int32 >(m_xFromNF->get_value() - 1);
-nEnd= static_cast< sal_Int32 >(m_xToNF->get_value());
-if(nEnd > nDocumentCount)
-nEnd = nDocumentCount;
-}
-
OUString sTargetTempURL = URIHelper::SmartRel2Abs(
INetURLObject(), utl::TempFile::CreateTempName(),
URIHelper::GetMaybeFileHdl());
@@ -626,7 +623,7 @@ IMPL_LINK_NOARG(SwMMResultSaveDialog, SaveOutputHdl_Impl,
weld::Button&, void)
xSaveMonitor.reset();
});
-for(sal_uInt32 nDoc = nBegin; nDoc < nEnd && !m_bCancelSaving; ++nDoc)
+for(sal_uInt32 nDoc = 0; nDoc < nEnd - nBegin && !m_bCancelSaving;
++nDoc)
{
INetURLObject aURL(sPath);
OUString sExtension = aURL.getExtension();
@@ -635,7 +632,7 @@ IMPL_LINK_NOARG(SwMMResultSaveDialog, SaveOutputHdl_Impl,
weld::Button&, void)
sExtension = pSfxFlt->GetWildcard().getGlob().getToken(1, '.');
sPath += "." + sExtension;
}
-OUString sStat = SwResId(STR_STATSTR_LETTER) + " " +
OUString::number( nDoc );
+OUString sStat = SwResId(STR_STATSTR_LETTER) + " " +
OUString::number(nBegin + nDoc);
xSaveMonitor->m_xPrintInfo->set_label(sStat);
//now extract a document from the target document
@@ -663,7 +660,7 @@ IMPL_LINK_NOARG(SwMMResultSaveDialog, SaveOutputHdl_Impl,
weld::Button&, void)
pTargetView->GetWrtShell().EndAction();
//then save it
OUString sOutPath =
aURL.GetMainURL(INetURLObject::DecodeMechanism::ToIUri);
-OUString sCounter = "_" + OUString::number(nDoc + 1);
+OUString sCounter = "_" + OUString::number(nBegin + nDoc + 1);
sOutPath = sOutPath.replaceAt( sOutPath.getLength() -
sExtension.getLength() - 1, 0, sCounter);
while(true)
@@ -752,24 +749,21 @@ IMPL_LINK_NOARG(SwMMResultPrintDialog, PrintHdl_Impl,
weld::Button&, void)
SwView* pView = ::GetActiveView();
std::shared_ptr xConfigItem =
pView->GetMailMergeConfigItem();
assert(xConfigItem);
+
+sal_uInt32 nBegin = static_cast(m_xFromNF->get_value() - 1);
+sal_uInt32 nEnd = static_cast(m_xToNF->get_value());
+sal_uInt32 nMax = static_cast(m_xToNF->get_max());
+if (nEnd > nMax)
+nEnd = nMax;
+
+xConfigItem->SetBeginEnd(nBegin, nEnd);
+
if(!xConfigItem->GetTargetView())
SwDBManager::PerformMailMerge(pView);
SwView* pTargetView = xConfigItem->GetTargetView();
assert(pTargetView);
-const
[Libreoffice-commits] core.git: include/sal
include/sal/types.h | 22 +-
1 file changed, 9 insertions(+), 13 deletions(-)
New commits:
commit ce5702d3c27e2a9de253ee29e02c7f494ba2a2b8
Author: Stephan Bergmann
AuthorDate: Thu Apr 29 10:44:09 2021 +0200
Commit: Stephan Bergmann
CommitDate: Fri Apr 30 09:19:14 2021 +0200
Reshuffle code a bit
Group the various SAL_THROW_EXTERN_C macro definitions more closely
together,
and the C++ SAL_THROW_EXTERN_C and COVERITY_NOEXCEPT_FLASE macro
definitions do
not need to be inside an extern "C" block.
Change-Id: I8c56f5c2efd287934cc75b20e79c27769e887e24
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114845
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/sal/types.h b/include/sal/types.h
index 4f6f1ba0e817..7733920f20be 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -319,13 +319,21 @@ typedef struct _sal_Sequence
#pragma pack(pop)
#endif
-#if defined __cplusplus
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
/** Nothrow specification for C functions.
This is a macro so it can expand to nothing in C code.
*/
+#if defined __cplusplus
#define SAL_THROW_EXTERN_C() throw ()
+#else
+#define SAL_THROW_EXTERN_C()
+#endif
+
+#ifdef __cplusplus
/** To markup destructors that coverity warns might throw exceptions
which won't throw in practice, or where std::terminate is
@@ -337,18 +345,6 @@ typedef struct _sal_Sequence
# define COVERITY_NOEXCEPT_FALSE
#endif
-#else
-
-#define SAL_THROW_EXTERN_C()
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#ifdef __cplusplus
-
enum __sal_NoAcquire
{
/** definition of a no acquire enum for ctors
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/edit.hxx|5 +
starmath/source/edit.cxx | 12
2 files changed, 1 insertion(+), 16 deletions(-)
New commits:
commit 23e99c75ee5e3b8d15e041cefab0e99e384442bd
Author: Caolán McNamara
AuthorDate: Thu Apr 29 09:51:26 2021 +0100
Commit: Caolán McNamara
CommitDate: Fri Apr 30 09:42:57 2021 +0200
drop DropTargetHelper from SmEditWindow
dnd into its child always worked while the inheritence from
DropTargetHelper began in
commit daf3e2909104fcb4c0a36d6e1fd6f44e1b61c980
Author: jp
Date: Thu Jul 5 09:58:51 2001 +
Changes for TFD636
but always returned DND_ACTION_NONE for the parent window
Change-Id: Ida1ae0f8e68ba04452ed952c4eca3ac66f240132
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114847
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index c89c23bd599e..536885794c06 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -83,7 +83,7 @@ public:
void StartCursorMove();
};
-class SmEditWindow final : public InterimItemWindow, public DropTargetHelper
+class SmEditWindow final : public InterimItemWindow
{
SmCmdBoxWindow& rCmdBox;
std::unique_ptr mxScrolledWindow;
@@ -93,9 +93,6 @@ class SmEditWindow final : public InterimItemWindow, public
DropTargetHelper
virtual void ApplySettings(vcl::RenderContext&) override;
virtual void DataChanged(const DataChangedEvent&) override;
-virtual sal_Int8 AcceptDrop(const AcceptDropEvent& rEvt) override;
-virtual sal_Int8 ExecuteDrop(const ExecuteDropEvent& rEvt) override;
-
DECL_LINK(ScrollHdl, weld::ScrolledWindow&, void);
void CreateEditView();
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 26359d774682..ae9b6b7c61da 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -123,7 +123,6 @@ void SmEditTextWindow::SetDrawingArea(weld::DrawingArea*
pDrawingArea)
SmEditWindow::SmEditWindow(SmCmdBoxWindow )
: InterimItemWindow(, "modules/smath/ui/editwindow.ui",
"EditWindow")
-, DropTargetHelper(this)
, rCmdBox(rMyCmdBoxWin)
, mxScrolledWindow(m_xBuilder->weld_scrolled_window("scrolledwindow",
true))
{
@@ -158,7 +157,6 @@ void SmEditWindow::dispose()
mxScrolledWindow.reset();
-DropTargetHelper::dispose();
InterimItemWindow::dispose();
}
@@ -733,16 +731,6 @@ static bool HasMark(const OUString& rText)
return rText.indexOf("") != -1;
}
-sal_Int8 SmEditWindow::AcceptDrop( const AcceptDropEvent& /*rEvt*/ )
-{
-return DND_ACTION_NONE;
-}
-
-sal_Int8 SmEditWindow::ExecuteDrop( const ExecuteDropEvent& /*rEvt*/ )
-{
-return DND_ACTION_NONE;
-}
-
ESelection SmEditWindow::GetSelection() const
{
if (mxTextControl)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0-6' - sysui/desktop
sysui/desktop/apparmor/program.oosplash |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b5bd1c65db2fcc4f31201b3b7938d524a627f2d8
Author: Rico Tzschichholz
AuthorDate: Wed Apr 28 20:13:48 2021 +0200
Commit: Xisco Fauli
CommitDate: Fri Apr 30 11:32:37 2021 +0200
apparmor: Fix "oopslash" typo
Change-Id: I8b355bceadeebebc9e6fedbf92a35aa44a356e09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114819
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
(cherry picked from commit f616d96bd8ce8986e4cc204953db0467e6060b5c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114866
Reviewed-by: Xisco Fauli
(cherry picked from commit 12c9b81927aae792743ce3dbc0b09fecdb15b33c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114870
Reviewed-by: Michael Stahl
(cherry picked from commit 169afb9fa1d6471becb4d53c010cfd004d5db7fb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114912
Tested-by: Xisco Fauli
diff --git a/sysui/desktop/apparmor/program.oosplash
b/sysui/desktop/apparmor/program.oosplash
index bcc06914d112..dd1136bc9b06 100644
--- a/sysui/desktop/apparmor/program.oosplash
+++ b/sysui/desktop/apparmor/program.oosplash
@@ -14,7 +14,7 @@
#include
-profile libreoffice-oopslash INSTDIR-program/oosplash {
+profile libreoffice-oosplash INSTDIR-program/oosplash {
#include
#include
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/ios vcl/Library_vclplug_osx.mk vcl/osx vcl/quartz
vcl/Library_vclplug_osx.mk |1
vcl/inc/quartz/salgdi.h| 445 +++
vcl/ios/dummies.cxx|5
vcl/ios/salios.cxx | 142 ++-
vcl/osx/salgdiutils.cxx| 101 +-
vcl/osx/salmacos.cxx | 130 +--
vcl/osx/salnativewidgets.cxx | 88 +-
vcl/quartz/AquaGraphicsBackend.cxx | 1355
vcl/quartz/salgdi.cxx | 106 --
vcl/quartz/salgdicommon.cxx| 1392 +
10 files changed, 1953 insertions(+), 1812 deletions(-)
New commits:
commit 560c9ec9e27e771d61f1396a1c87dd38e29099c1
Author: Tomaž Vajngerl
AuthorDate: Wed Apr 7 23:36:57 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Fri Apr 30 12:20:27 2021 +0200
vcl: iOS/macOS - move graphic render func. into AquaGraphicsBackend
This change moves graphic rendering function under AquaSalGraphics
into a new AquaGraphicsBackend, which inherits from SalGraphicsImpl.
This is part of the refactoring to make it mandatory that a
SalGraphics always has a SalGraphicsImpl associated, which will
make it possible to simplify the SalGraphics interface and enable
the posibility to implement alernative graphic backends (Skia).
Common variables and attributes are moved to AquaSharedAttributes
and are shared between SalGraphics and SalGraphicsImpl.
Change-Id: Ie48da87002ec8e4011ba92fdc9170f3a86761517
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114701
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/vcl/Library_vclplug_osx.mk b/vcl/Library_vclplug_osx.mk
index c80d3bc8d7f3..4b2b4a61b3f4 100644
--- a/vcl/Library_vclplug_osx.mk
+++ b/vcl/Library_vclplug_osx.mk
@@ -137,6 +137,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_osx,\
vcl/quartz/salgdicommon \
vcl/quartz/salvd \
vcl/quartz/utils \
+vcl/quartz/AquaGraphicsBackend \
))
$(eval $(call gb_Library_use_system_darwin_frameworks,vclplug_osx,\
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 80e6c66d1a00..e7559c5b9e7d 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -130,177 +130,326 @@ private:
std::unordered_map>
maFontContainer;
};
-class AquaSalGraphics : public SalGraphics
+namespace sal::aqua
{
+float getWindowScaling();
+}
+
+struct AquaSharedAttributes
+{
+/// path representing current clip region
+CGMutablePathRef mxClipPath;
+
+/// Drawing colors
+/// pen color RGBA
+RGBAColor maLineColor;
+
+/// brush color RGBA
+RGBAColor maFillColor;
+
+// Graphics types
+#ifdef MACOSX
+AquaSalFrame* mpFrame;
+/// is this a window graphics
+bool mbWindow;
+#else // IOS
+// mirror AquaSalVirtualDevice::mbForeignContext for SvpSalGraphics
objects related to such
+bool mbForeignContext;
+#endif
+/// is this a printer graphics
+bool mbPrinter;
+/// is this a virtual device graphics
+bool mbVirDev;
+
CGLayerHolder maLayer; // Quartz graphics layer
CGContextHolder maContextHolder; // Quartz drawing context
CGContextHolder maBGContextHolder; // Quartz drawing context for CGLayer
CGContextHolder maCSContextHolder; // Quartz drawing context considering
the color space
+int mnWidth;
+int mnHeight;
+int mnXorMode; // 0: off 1: on 2: invert only
+int mnBitmapDepth; // zero unless bitmap
std::unique_ptr mpXorEmulation;
-int mnXorMode; // 0: off 1: on 2:
invert only
-int mnWidth;
-int mnHeight;
-int mnBitmapDepth; // zero unless
bitmap
-/// device resolution of this graphics
-sal_Int32 mnRealDPIX;
-sal_Int32 mnRealDPIY;
-/// path representing current clip region
-CGMutablePathRefmxClipPath;
+AquaSharedAttributes()
+: mxClipPath(nullptr)
+, maLineColor(COL_WHITE)
+, maFillColor(COL_BLACK)
+#ifdef MACOSX
+, mpFrame(nullptr)
+, mbWindow(false)
+#else
+, mbForeignContext(false)
+#endif
+, mbPrinter(false)
+, mbVirDev(false)
+, mnWidth(0)
+, mnHeight(0)
+, mnXorMode(0)
+, mnBitmapDepth(0)
+{}
+
+void unsetClipPath()
+{
+if (mxClipPath)
+{
+CGPathRelease(mxClipPath);
+mxClipPath = nullptr;
+}
+}
+
+void unsetState()
+{
+unsetClipPath();
+}
+
+bool checkContext();
+void setState();
+
+bool isPenVisible() const
+{
+return maLineColor.IsVisible();
+}
+bool isBrushVisible() const
+{
+return maFillColor.IsVisible();
+}
+
+void refreshRect(float lX, float lY, float lWidth, float lHeight)
+{
[Libreoffice-commits] core.git: svgio/inc svgio/source
svgio/inc/svgtoken.hxx | 270 -
svgio/source/svgreader/svganode.cxx|8
svgio/source/svgreader/svgcharacternode.cxx| 16 -
svgio/source/svgreader/svgcirclenode.cxx | 12 -
svgio/source/svgreader/svgclippathnode.cxx |8
svgio/source/svgreader/svgdocumenthandler.cxx | 156 +++---
svgio/source/svgreader/svgellipsenode.cxx | 14 -
svgio/source/svgreader/svggnode.cxx| 12 -
svgio/source/svgreader/svggradientnode.cxx | 32 +-
svgio/source/svgreader/svggradientstopnode.cxx |6
svgio/source/svgreader/svgimagenode.cxx| 18 -
svgio/source/svgreader/svglinenode.cxx | 14 -
svgio/source/svgreader/svgmarkernode.cxx | 20 -
svgio/source/svgreader/svgmasknode.cxx | 18 -
svgio/source/svgreader/svgnode.cxx | 28 +-
svgio/source/svgreader/svgpathnode.cxx | 10
svgio/source/svgreader/svgpatternnode.cxx | 24 +-
svgio/source/svgreader/svgpolynode.cxx |8
svgio/source/svgreader/svgrectnode.cxx | 18 -
svgio/source/svgreader/svgstyleattributes.cxx | 118 +-
svgio/source/svgreader/svgstylenode.cxx|4
svgio/source/svgreader/svgsvgnode.cxx | 18 -
svgio/source/svgreader/svgsymbolnode.cxx |8
svgio/source/svgreader/svgtextnode.cxx | 18 -
svgio/source/svgreader/svgtextpathnode.cxx | 12 -
svgio/source/svgreader/svgtitledescnode.cxx|2
svgio/source/svgreader/svgtoken.cxx| 268
svgio/source/svgreader/svgtools.cxx| 26 +-
svgio/source/svgreader/svgtrefnode.cxx |6
svgio/source/svgreader/svgtspannode.cxx|4
svgio/source/svgreader/svgusenode.cxx | 18 -
svgio/source/svgreader/svgvisitor.cxx |6
32 files changed, 600 insertions(+), 600 deletions(-)
New commits:
commit 91daf2c6b1661f27df6ee41f7395ed0fcb677cf0
Author: Tomaž Vajngerl
AuthorDate: Wed Apr 28 13:08:07 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Fri Apr 30 12:20:52 2021 +0200
svgio: change SVGToken enum to enum class
Change-Id: Ic2618c91b1793463b7ce0a42ec1db100d11acfa4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114898
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/svgio/inc/svgtoken.hxx b/svgio/inc/svgtoken.hxx
index b1d55b4e2d17..fe5e67a630bb 100644
--- a/svgio/inc/svgtoken.hxx
+++ b/svgio/inc/svgtoken.hxx
@@ -25,159 +25,159 @@
namespace svgio::svgreader
{
// SVG token mapper with hashing
-enum SVGToken
+enum class SVGToken
{
-SVGTokenUnknown = 0,
+Unknown = 0,
// diverse attribute tokens
-SVGTokenWidth,
-SVGTokenHeight,
-SVGTokenViewBox,
-SVGTokenTransform,
-SVGTokenStyle,
-SVGTokenDisplay, // #i121656#
-SVGTokenD,
-SVGTokenX,
-SVGTokenY,
-SVGTokenXmlns,
-SVGTokenVersion,
-SVGTokenId,
-SVGTokenRx,
-SVGTokenRy,
-SVGTokenPoints,
-SVGTokenDx,
-SVGTokenDy,
-SVGTokenRotate,
-SVGTokenTextLength,
-SVGTokenLengthAdjust,
-SVGTokenFont,
-SVGTokenFontFamily,
-SVGTokenFontSize,
-SVGTokenFontSizeAdjust,
-SVGTokenFontStretch,
-SVGTokenFontStyle,
-SVGTokenFontVariant,
-SVGTokenFontWeight,
-SVGTokenDirection,
-SVGTokenLetterSpacing,
-SVGTokenTextDecoration,
-SVGTokenUnicodeBidi,
-SVGTokenWordSpacing,
-SVGTokenCharacter, // not in the hash, just for simple text
handling in SvgCharacterNode
-SVGTokenTspan,
-SVGTokenTref,
-SVGTokenTextPath,
-SVGTokenStartOffset,
-SVGTokenMethod,
-SVGTokenSpacing,
-SVGTokenTextAlign,
-SVGTokenPathLength,
-SVGTokenType,
-SVGTokenClass,
-SVGTokenTextAnchor,
-SVGTokenXmlSpace,
-SVGTokenColor,
-SVGTokenClipPathNode,
-SVGTokenClipPathProperty,
-SVGTokenMask,
-SVGTokenClipPathUnits,
-SVGTokenMaskUnits,
-SVGTokenMaskContentUnits,
-SVGTokenClipRule,
-SVGTokenMarker,
-SVGTokenMarkerStart,
-SVGTokenMarkerMid,
-SVGTokenMarkerEnd,
-SVGTokenRefX,
-SVGTokenRefY,
-SVGTokenMarkerUnits,
-SVGTokenMarkerWidth,
-SVGTokenMarkerHeight,
-SVGTokenOrient,
-SVGTokenPattern,
-SVGTokenPatternUnits,
-SVGTokenPatternContentUnits,
-SVGTokenPatternTransform,
-
[Libreoffice-commits] core.git: svgio/source
svgio/source/svgreader/svgtools.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 29016704108165371da9e2392d6ee28939ca46ce
Author: Tomaž Vajngerl
AuthorDate: Fri Apr 30 16:55:26 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Fri Apr 30 12:21:09 2021 +0200
svgio: change some OSL_ENSUREs to (std) assert
Change-Id: Ie7e7e6276e5a528fb99a6dfda00e9826c5245fb7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114899
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/svgio/source/svgreader/svgtools.cxx
b/svgio/source/svgreader/svgtools.cxx
index a4a7b897faa4..6a7f04f12055 100644
--- a/svgio/source/svgreader/svgtools.cxx
+++ b/svgio/source/svgreader/svgtools.cxx
@@ -180,14 +180,14 @@ namespace svgio::svgreader
}
default:
{
-OSL_ENSURE(false, "Do not use with percentage! ");
+assert(false && "Do not use with percentage!");
return 0.0;
}
}
}
/// not set
-OSL_ENSURE(false, "SvgNumber not set (!)");
+assert(false && "SvgNumber not set (!)");
return 0.0;
}
@@ -263,7 +263,7 @@ namespace svgio::svgreader
}
/// not set
-OSL_ENSURE(false, "SvgNumber not set (!)");
+assert(false && "SvgNumber not set (!)");
return 0.0;
}
@@ -1183,7 +1183,7 @@ namespace svgio::svgreader
if(nInitPos == nPos)
{
-OSL_ENSURE(false, "Could not interpret on current
position (!)");
+assert(false && "Could not interpret on current
position (!)");
nPos++;
}
}
@@ -1386,7 +1386,7 @@ namespace svgio::svgreader
if(nInitPos == nPos)
{
-OSL_ENSURE(false, "Could not interpret on current
position (!)");
+assert(false && "Could not interpret on current
position (!)");
nPos++;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Solved] Parameter for addShape for a child of a group in oox import
Hi Regina, On Thu, Apr 29, 2021 at 11:03:14AM +0200, Regina Henschel wrote: > Overnight, I found a much easier way. I only need to apply the rotation of > the child shape around its center after applying the parent transformation. > > Please excuse me for bothering you with this problem. Ah, great. :-) I was thinking about decomposing these various transforms to separate scale/translate/rotation and then applying them in the right order, or something like that. But if you figured it out already, that's even better. Regards, Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Drawing vertical text glyphs
On Mon, 2021-04-26 at 12:30 +0200, Luboš Luňák wrote: > CairoTextRender::DrawTextLayout() I've no great insight here, but the cairo one's purpose was to replace the older X11 text renderer and tried to match what that one did. I added qadevOOo/testdocs/vertical-testcase.odt at the time to test before/after for that cairo vertical text rendering vs its predecessor. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sysui/desktop
sysui/desktop/apparmor/program.oosplash |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 169afb9fa1d6471becb4d53c010cfd004d5db7fb
Author: Rico Tzschichholz
AuthorDate: Wed Apr 28 20:13:48 2021 +0200
Commit: Xisco Fauli
CommitDate: Fri Apr 30 11:31:07 2021 +0200
apparmor: Fix "oopslash" typo
Change-Id: I8b355bceadeebebc9e6fedbf92a35aa44a356e09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114819
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
(cherry picked from commit f616d96bd8ce8986e4cc204953db0467e6060b5c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114866
Reviewed-by: Xisco Fauli
(cherry picked from commit 12c9b81927aae792743ce3dbc0b09fecdb15b33c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114870
Reviewed-by: Michael Stahl
diff --git a/sysui/desktop/apparmor/program.oosplash
b/sysui/desktop/apparmor/program.oosplash
index bcc06914d112..dd1136bc9b06 100644
--- a/sysui/desktop/apparmor/program.oosplash
+++ b/sysui/desktop/apparmor/program.oosplash
@@ -14,7 +14,7 @@
#include
-profile libreoffice-oopslash INSTDIR-program/oosplash {
+profile libreoffice-oosplash INSTDIR-program/oosplash {
#include
#include
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-0' - sc/inc sc/qa sc/source
sc/inc/document.hxx |2
sc/qa/unit/uicalc/data/tdf99913.xlsx |binary
sc/qa/unit/uicalc/uicalc.cxx |9
sc/source/filter/oox/worksheethelper.cxx | 65 ++-
4 files changed, 66 insertions(+), 10 deletions(-)
New commits:
commit bbf341069078701abb22fa1598dbd186c1185e62
Author: Tünde Tóth
AuthorDate: Wed Mar 24 14:07:15 2021 +0100
Commit: Gabor Kelemen
CommitDate: Fri Apr 30 12:18:42 2021 +0200
tdf#99913 XLSX import: set filtered flag for rows
hidden by AutoFilter to support copying the
result of filtering. Unlike ODS and XLS,
XLSX doesn't differentiates filtered and
manually hidden rows, and without this fix,
copy of the unupdated data of the loaded
filtering contained the hidden rows, too.
Change-Id: I390d1a84b9bf275f3d3782756553b2f236487758
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113040
Tested-by: László Németh
Reviewed-by: László Németh
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113382
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
(cherry picked from commit adef1cc017517882f4630e31fa643102c21faad0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114914
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index fa13d9bae60e..f3af1b1be236 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1943,7 +1943,7 @@ public:
SC_DLLPUBLIC SCROW LastVisibleRow(SCROW nStartRow, SCROW nEndRow,
SCTAB nTab) const;
SCROW CountVisibleRows(SCROW nStartRow, SCROW
nEndRow, SCTAB nTab) const;
-boolRowFiltered(SCROW nRow, SCTAB nTab, SCROW*
pFirstRow = nullptr, SCROW* pLastRow = nullptr) const;
+SC_DLLPUBLIC bool RowFiltered(SCROW nRow, SCTAB nTab, SCROW*
pFirstRow = nullptr, SCROW* pLastRow = nullptr) const;
boolHasFilteredRows(SCROW nStartRow, SCROW
nEndRow, SCTAB nTab) const;
boolColFiltered(SCCOL nCol, SCTAB nTab) const;
SC_DLLPUBLIC void SetRowFiltered(SCROW nStartRow, SCROW nEndRow,
SCTAB nTab, bool bFiltered);
diff --git a/sc/qa/unit/uicalc/data/tdf99913.xlsx
b/sc/qa/unit/uicalc/data/tdf99913.xlsx
new file mode 100644
index ..3fd18a12984a
Binary files /dev/null and b/sc/qa/unit/uicalc/data/tdf99913.xlsx differ
diff --git a/sc/qa/unit/uicalc/uicalc.cxx b/sc/qa/unit/uicalc/uicalc.cxx
index d19103d0d261..6b774cfe988f 100644
--- a/sc/qa/unit/uicalc/uicalc.cxx
+++ b/sc/qa/unit/uicalc/uicalc.cxx
@@ -256,6 +256,15 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf123202)
CPPUNIT_ASSERT(pDoc->RowHidden(2, 0));
}
+CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf99913)
+{
+ScModelObj* pModelObj = createDoc("tdf99913.xlsx");
+ScDocument* pDoc = pModelObj->GetDocument();
+CPPUNIT_ASSERT(pDoc);
+
+CPPUNIT_ASSERT(pDoc->RowFiltered(2, 0));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/worksheethelper.cxx
b/sc/source/filter/oox/worksheethelper.cxx
index 5fc46ecbfd30..29c661537218 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -68,6 +68,8 @@
#include
#include
#include
+#include
+#include
#include
#include
@@ -340,9 +342,12 @@ private:
voidconvertColumns( OutlineLevelVec& orColLevels, const
ValueRange& rColRange, const ColumnModel& rModel );
/** Converts row properties for all rows in the sheet. */
-voidconvertRows();
+voidconvertRows(const std::vector& rSpans);
/** Converts row properties. */
-voidconvertRows( OutlineLevelVec& orRowLevels, const
ValueRange& rRowRange, const RowModel& rModel, double fDefHeight = -1.0 );
+voidconvertRows(OutlineLevelVec& orRowLevels, const
ValueRange& rRowRange,
+const RowModel& rModel,
+const std::vector& rSpans,
+double fDefHeight = -1.0);
/** Converts outline grouping for the passed column or row. */
voidconvertOutlines( OutlineLevelVec& orLevels, sal_Int32
nColRow, sal_Int32 nLevel, bool bCollapsed, bool bRows );
@@ -946,7 +951,37 @@ void WorksheetGlobals::finalizeWorksheetImport()
lclUpdateProgressBar( mxFinalProgress, 0.5 );
convertColumns();
-convertRows();
+
+// tdf#99913 rows hidden by filter need extra flag
+ScDocument& rDoc = getScDocument();
+std::vector aSpans;
+SCTAB nTab = getSheetIndex();
+ScDBData* pDBData = rDoc.GetAnonymousDBData(nTab);
+if (pDBData && pDBData->HasAutoFilter())
+{
+ScRange aRange;
+pDBData->GetArea(aRange);
+SCCOLROW nStartRow =
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-0' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 226f4103b58bc7e5bb93cceac5fdcfe35e6030dc Author: Gabor Kelemen AuthorDate: Fri Apr 30 12:31:26 2021 +0200 Commit: Gabor Kelemen CommitDate: Fri Apr 30 12:33:57 2021 +0200 Weekly version bump Change-Id: I3e9af12da3d928f99a7b6aeffd6b27b6946511e5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114902 Tested-by: Gabor Kelemen Reviewed-by: Gabor Kelemen diff --git a/configure.ac b/configure.ac index cb92c24354a6..a10d7c8ab41a 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[7.0.4.2.N4],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.0.4.2.N5],[],[],[http://documentfoundation.org/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source include/framework include/sfx2 offapi/com offapi/UnoApi_offapi.mk sc/qa sd/qa sfx2/source
framework/source/fwe/helper/titlehelper.cxx |7 -
framework/source/services/autorecovery.cxx | 14 +--
include/framework/titlehelper.hxx |4
include/sfx2/objsh.hxx |5 -
include/sfx2/sfxbasemodel.hxx |8 +
offapi/UnoApi_offapi.mk |1
offapi/com/sun/star/frame/XModel3.idl | 51
sc/qa/unit/copy_paste_test.cxx | 10 +-
sd/qa/unit/misc-tests.cxx |2
sfx2/source/doc/objmisc.cxx | 20 ++--
sfx2/source/doc/objxtor.cxx |4
sfx2/source/doc/sfxbasemodel.cxx| 116
sfx2/source/view/frame2.cxx |2
sfx2/source/view/sfxbasecontroller.cxx |3
14 files changed, 164 insertions(+), 83 deletions(-)
New commits:
commit 857caa5fc69b92e781457a1b67a89aa051c2d70f
Author: Noel Grandin
AuthorDate: Fri Apr 30 13:00:35 2021 +0200
Commit: Noel Grandin
CommitDate: Fri Apr 30 16:03:35 2021 +0200
tdf#79049 speed up OOXML workbook load
we spend a lot of time in ScAttrArray::GetLastVisibleAttr
which appears to be very expensive for this worksheet.
This is re-computed every time we enter SfxBaseModel::getArgs
Reduce the recomputation by introducing a new method which
only retrieves specific SfxBaseModel arguments.
This takes the load time from 5m9 to 1m9 for me.
Change-Id: I605fae0faa94760c7d6993877c9559ea5dc813cd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114905
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/framework/source/fwe/helper/titlehelper.cxx
b/framework/source/fwe/helper/titlehelper.cxx
index 24d1eb3bf898..ae9c1f348b0e 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
#include
#include
@@ -302,7 +303,7 @@ void TitleHelper::impl_sendTitleChangedEvent ()
void TitleHelper::impl_updateTitle (bool init)
{
-css::uno::Reference< css::frame::XModel > xModel;
+css::uno::Reference< css::frame::XModel3 > xModel;
css::uno::Reference< css::frame::XController > xController;
css::uno::Reference< css::frame::XFrame > xFrame;
// SYNCHRONIZED ->
@@ -329,7 +330,7 @@ void TitleHelper::impl_updateTitle (bool init)
}
}
-void TitleHelper::impl_updateTitleForModel (const css::uno::Reference<
css::frame::XModel >& xModel, bool init)
+void TitleHelper::impl_updateTitleForModel (const css::uno::Reference<
css::frame::XModel3 >& xModel, bool init)
{
css::uno::Reference< css::uno::XInterface > xOwner;
css::uno::Reference< css::frame::XUntitledNumbers > xNumbers;
@@ -363,7 +364,7 @@ void TitleHelper::impl_updateTitleForModel (const
css::uno::Reference< css::fram
if (xURLProvider.is())
sURL = xURLProvider->getLocation ();
-utl::MediaDescriptor aDescriptor(xModel->getArgs());
+utl::MediaDescriptor aDescriptor(xModel->getArgs2( {
utl::MediaDescriptor::PROP_SUGGESTEDSAVEASNAME() } ));
const OUString sSuggestedSaveAsName =
aDescriptor.getUnpackedValueOrDefault(
utl::MediaDescriptor::PROP_SUGGESTEDSAVEASNAME(), OUString());
diff --git a/framework/source/services/autorecovery.cxx
b/framework/source/services/autorecovery.cxx
index 085b627f5794..3fdf6c0af01c 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -34,7 +34,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -636,7 +636,7 @@ private:
@threadsafe
*/
-void implts_registerDocument(const css::uno::Reference< css::frame::XModel
>& xDocument);
+void implts_registerDocument(const css::uno::Reference<
css::frame::XModel3 >& xDocument);
/** @short remove the specified document from our internal document list.
@@ -1537,7 +1537,7 @@ void SAL_CALL AutoRecovery::removeStatusListener(const
css::uno::Reference< css:
void SAL_CALL AutoRecovery::documentEventOccured(const
css::document::DocumentEvent& aEvent)
{
-css::uno::Reference< css::frame::XModel > xDocument(aEvent.Source,
css::uno::UNO_QUERY);
+css::uno::Reference< css::frame::XModel3 > xDocument(aEvent.Source,
css::uno::UNO_QUERY);
// new document => put it into the internal list
if (
@@ -2361,7 +2361,7 @@ IMPL_LINK_NOARG(AutoRecovery, implts_asyncDispatch,
LinkParamNone*, void)
}
}
-void AutoRecovery::implts_registerDocument(const css::uno::Reference<
css::frame::XModel >& xDocument)
+void AutoRecovery::implts_registerDocument(const css::uno::Reference<
css::frame::XModel3 > & xDocument)
{
// ignore corrupted events, where no document is given ... Runtime Error ?!
if (!xDocument.is())
@@ -2386,7 +2386,7 @@ void AutoRecovery::implts_registerDocument(const
css::uno::Reference< css::frame
[Libreoffice-commits] core.git: svx/source
svx/source/tbxctrls/tbunosearchcontrollers.cxx |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit c90792cf4309557981d1f89febeff9157fd93b0c
Author: Caolán McNamara
AuthorDate: Fri Apr 30 12:29:45 2021 +0100
Commit: Caolán McNamara
CommitDate: Fri Apr 30 16:17:32 2021 +0200
Related: tdf#138281 move grab_focus to ActivateFind
and remove the explicit KeyInput callback handling of "KEY_RETURN" in
favor of the ActivateHdl callback which Entry emits from its built-in
KeyInput handler
Change-Id: Ie6ddc8d73345400586418f2495958b14ab61c7d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114907
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index c75c3edb03ef..c247e313452a 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -298,11 +298,10 @@ IMPL_LINK(FindTextFieldControl, KeyInputHdl, const
KeyEvent&, rKeyEvent, bool)
else if ( bMod1 && nCode == KEY_F )
m_xWidget->select_entry_region(0, -1);
-// Execute the search when Return, Ctrl-G or F3 pressed
-else if ( KEY_RETURN == nCode || (bMod1 && (KEY_G == nCode)) || (KEY_F3 ==
nCode) )
+// Execute the search when Ctrl-G or F3 pressed (in addition to
ActivateHdl conditions)
+else if ( (bMod1 && (KEY_G == nCode)) || (KEY_F3 == nCode) )
{
ActivateFind(bShift);
-m_xWidget->grab_focus();
bRet = true;
}
else
@@ -324,8 +323,11 @@ void FindTextFieldControl::ActivateFind(bool bShift)
ToolBox* pToolBox = static_cast(pWindow);
impl_executeSearch(m_xContext, m_xFrame, pToolBox, bShift);
+
+m_xWidget->grab_focus();
}
+// Execute the search when activated, typically due to "Return"
IMPL_LINK_NOARG(FindTextFieldControl, ActivateHdl, weld::ComboBox&, bool)
{
if (isDisposed())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/wasm' - desktop/inc desktop/source postprocess/Rdb_services.mk Repository.mk
Repository.mk |2 +-
desktop/inc/app.hxx|2 ++
desktop/source/app/app.cxx | 15 ++-
desktop/source/app/cmdlineargs.cxx | 20
postprocess/Rdb_services.mk|2 +-
5 files changed, 38 insertions(+), 3 deletions(-)
New commits:
commit f38dca150d583b51019b9b7219fc3f7251968b28
Author: Armin Le Grand (Allotropia)
AuthorDate: Fri Apr 30 17:26:41 2021 +0200
Commit: Armin Le Grand (Allotropia)
CommitDate: Fri Apr 30 17:26:41 2021 +0200
SplashScreen and Startup
SplashScreens spl.lib removed, services no longer register
to UNO services (services.rdb)
Startup uses hard-coded flags "-nolockcheck -norestore -nologo
-writer"
Change-Id: I276f8775176e750e56f76b66aece2169bada3652
diff --git a/Repository.mk b/Repository.mk
index 3c9a242c663b..3541cf2854f0 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -417,7 +417,7 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
slideshow \
sot \
spell \
- $(if $(DISABLE_GUI),,spl) \
+ $(if $(DISABLE_GUI) || $(ENABLE_WASM_STRIP),,spl) \
storagefd \
$(call gb_Helper_optional,SCRIPTING,stringresource) \
svgio \
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index e2ecf5920aa0..ba9d6eafaa63 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -142,8 +142,10 @@ class Desktop final : public Application
static OUString CreateErrorMsgString(
utl::Bootstrap::FailureCode nFailureCode,
const OUString& aFileURL
);
+#ifndef ENABLE_WASM_STRIP
css::uno::Reference m_rSplashScreen;
voidOpenSplashScreen();
+#endif
voidCloseSplashScreen();
DECL_STATIC_LINK( Desktop, ImplInitFilterHdl, ::ConvertData&, bool );
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index b0c4fac53e10..a76e6f80cb1b 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1153,8 +1153,10 @@ void Desktop::Exception(ExceptionCategory nCategory)
osl_removeSignalHandler( pSignalHandler );
restartOnMac(false);
+#ifndef ENABLE_WASM_STRIP
if ( m_rSplashScreen.is() )
m_rSplashScreen->reset();
+#endif
_exit( EXITHELPER_CRASH_WITH_RESTART );
}
@@ -1257,7 +1259,9 @@ int Desktop::Main()
Translate::SetReadStringHook(ReplaceStringHookProc);
// Startup screen
+#ifndef ENABLE_WASM_STRIP
OpenSplashScreen();
+#endif
SetSplashScreenProgress(10);
@@ -1697,8 +1701,10 @@ int Desktop::doShutdown()
if ( bRR )
{
restartOnMac(true);
+#ifndef ENABLE_WASM_STRIP
if ( m_rSplashScreen.is() )
m_rSplashScreen->reset();
+#endif
return EXITHELPER_NORMAL_RESTART;
}
@@ -2377,6 +2383,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent&
rAppEvent )
}
}
+#ifndef ENABLE_WASM_STRIP
void Desktop::OpenSplashScreen()
{
const CommandLineArgs = GetCommandLineArgs();
@@ -2426,33 +2433,39 @@ void Desktop::OpenSplashScreen()
if(m_rSplashScreen.is())
m_rSplashScreen->start("SplashScreen", 100);
-
}
+#endif
void Desktop::SetSplashScreenProgress(sal_Int32 iProgress)
{
+#ifndef ENABLE_WASM_STRIP
if(m_rSplashScreen.is())
{
m_rSplashScreen->setValue(iProgress);
}
+#endif
}
void Desktop::SetSplashScreenText( const OUString& rText )
{
+#ifndef ENABLE_WASM_STRIP
if( m_rSplashScreen.is() )
{
m_rSplashScreen->setText( rText );
}
+#endif
}
void Desktop::CloseSplashScreen()
{
+#ifndef ENABLE_WASM_STRIP
if(m_rSplashScreen.is())
{
SolarMutexGuard ensureSolarMutex;
m_rSplashScreen->end();
m_rSplashScreen = nullptr;
}
+#endif
}
diff --git a/desktop/source/app/cmdlineargs.cxx
b/desktop/source/app/cmdlineargs.cxx
index 4d5a3bb78396..6c64502e9d38 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -275,6 +275,26 @@ CommandLineArgs::CommandLineArgs( Supplier& supplier )
void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
{
+#ifdef ENABLE_WASM_STRIP
+// use hard-coded init-params for wasm '-nolockcheck -norestore -nologo
-writer'
+// no restore tries
+m_norestore = true;
+// no logo needed
+m_nologo = true;
+#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT
+// no lock-checks needed
+m_nolockcheck = true;
+#endif
+// start with writer only
+m_writer = true;
+m_bDocumentArgs = true;
+
+m_bEmpty = false;
+
+// return to avoid #elif
+return;
+#endif
+
m_cwdUrl = supplier.getCwdUrl();
CommandLineEvent eCurrentEvent = CommandLineEvent::Open;
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 447cd97941b8..c083034daf29 100644
---
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - external/serf
external/serf/StaticLibrary_serf.mk |1 + 1 file changed, 1 insertion(+) New commits: commit e42ac6f07066dc8f8a9fb70082600a63cfd358d1 Author: Andras Timar AuthorDate: Fri Apr 30 15:44:58 2021 +0200 Commit: Andras Timar CommitDate: Fri Apr 30 15:47:19 2021 +0200 serf should use bundled openssl headers, not system openssl headers Change-Id: I4431e5141a80394950f5711051065df42fe85f8d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114918 Tested-by: Andras Timar Reviewed-by: Andras Timar diff --git a/external/serf/StaticLibrary_serf.mk b/external/serf/StaticLibrary_serf.mk index e04eef72da44..b6bef228a009 100644 --- a/external/serf/StaticLibrary_serf.mk +++ b/external/serf/StaticLibrary_serf.mk @@ -16,6 +16,7 @@ $(eval $(call gb_StaticLibrary_use_unpacked,serf,serf)) $(eval $(call gb_StaticLibrary_use_externals,serf,\ apr \ openssl \ +openssl_headers \ zlib \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sc/qa
sc/qa/uitest/data/tdf137945.ods|binary
sc/qa/uitest/validity/tdf137945.py | 38 +
2 files changed, 38 insertions(+)
New commits:
commit c0380b0f52e4ad03f98745cbc24395d33bc2d305
Author: Xisco Fauli
AuthorDate: Fri Apr 30 10:49:28 2021 +0200
Commit: Xisco Fauli
CommitDate: Fri Apr 30 16:01:19 2021 +0200
tdf#137945: sc: Add UItest
Change-Id: I6fa935d0c77556113ae087a67c2932ddcee12a1e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114871
Tested-by: Xisco Fauli
Reviewed-by: Xisco Fauli
diff --git a/sc/qa/uitest/data/tdf137945.ods b/sc/qa/uitest/data/tdf137945.ods
new file mode 100644
index ..ddda28140b1a
Binary files /dev/null and b/sc/qa/uitest/data/tdf137945.ods differ
diff --git a/sc/qa/uitest/validity/tdf137945.py
b/sc/qa/uitest/validity/tdf137945.py
new file mode 100644
index ..1feb12cd7ebe
--- /dev/null
+++ b/sc/qa/uitest/validity/tdf137945.py
@@ -0,0 +1,38 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# 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/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import select_pos
+from uitest.uihelper.common import get_state_as_dict
+import org.libreoffice.unotest
+import pathlib
+
+def get_url_for_data_file(file_name):
+return
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
+
+class Tdf137945(UITestCase):
+
+def test_tdf137945(self):
+calc_doc =
self.ui_test.load_file(get_url_for_data_file("tdf137945.ods"))
+
+self.ui_test.execute_dialog_through_command(".uno:Validation")
+xDialog = self.xUITest.getTopFocusWindow()
+xTabs = xDialog.getChild("tabcontrol")
+select_pos(xTabs, "1")
+xInput = xDialog.getChild("inputhelp")
+xTitle = xDialog.getChild("title")
+
+self.assertEqual("test", get_state_as_dict(xTitle)['Text'])
+# Without the fix in place, this test would have failed with
+# '1 2 3 4510 end' != '1 2 3 4 5
10 end'
+self.assertEqual("1 2 3 4510 end",
get_state_as_dict(xInput)['Text'])
+
+xOKBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/serf
external/serf/StaticLibrary_serf.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 0acf7e55df1098a406316d03de4725c16a27d138 Author: Andras Timar AuthorDate: Fri Apr 30 15:44:58 2021 +0200 Commit: Miklos Vajna CommitDate: Fri Apr 30 17:12:53 2021 +0200 serf should use bundled openssl headers, not system openssl headers Change-Id: I4431e5141a80394950f5711051065df42fe85f8d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114934 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/external/serf/StaticLibrary_serf.mk b/external/serf/StaticLibrary_serf.mk index e04eef72da44..b6bef228a009 100644 --- a/external/serf/StaticLibrary_serf.mk +++ b/external/serf/StaticLibrary_serf.mk @@ -16,6 +16,7 @@ $(eval $(call gb_StaticLibrary_use_unpacked,serf,serf)) $(eval $(call gb_StaticLibrary_use_externals,serf,\ apr \ openssl \ +openssl_headers \ zlib \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/utlui/content.cxx | 46 +++--
1 file changed, 34 insertions(+), 12 deletions(-)
New commits:
commit d813620196646bebecd91536d47da67b725fdb95
Author: Jim Raykowski
AuthorDate: Thu Apr 29 23:52:02 2021 -0800
Commit: Jim Raykowski
CommitDate: Fri Apr 30 16:50:42 2021 +0200
reinterpret_cast to SwPostItContent when field type is postit
Change-Id: I4ed914479c07c786fdc3401c56f7d793777df751
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114897
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index d6486712d8f8..747d99eac8a5 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3383,21 +3383,43 @@ void SwContentTree::UpdateTracking()
m_xTreeView->expand_row(*xIter); // assure content type entry is
expanded
while (m_xTreeView->iter_next(*xIter) && lcl_IsContent(*xIter,
*m_xTreeView))
{
-SwTextFieldContent* pCnt =
reinterpret_cast(m_xTreeView->get_id(*xIter).toInt64());
-if (pCnt && pField == pCnt->GetFormatField()->GetField())
+if (pField->GetTypeId() == SwFieldTypesEnum::Postit)
{
-// get first selected for comparison
-std::unique_ptr
xFirstSelected(m_xTreeView->make_iterator());
-if (!m_xTreeView->get_selected(xFirstSelected.get()))
-xFirstSelected.reset();
-if (m_xTreeView->count_selected_rows() != 1 ||
-m_xTreeView->iter_compare(*xIter, *xFirstSelected)
!= 0)
+SwPostItContent* pCnt =
reinterpret_cast(m_xTreeView->get_id(*xIter).toInt64());
+if (pCnt && pField == pCnt->GetPostIt()->GetField())
{
-// unselect all entries and make passed entry visible
and selected
-m_xTreeView->set_cursor(*xIter);
-Select();
+// get first selected for comparison
+std::unique_ptr
xFirstSelected(m_xTreeView->make_iterator());
+if (!m_xTreeView->get_selected(xFirstSelected.get()))
+xFirstSelected.reset();
+if (m_xTreeView->count_selected_rows() != 1 ||
+m_xTreeView->iter_compare(*xIter,
*xFirstSelected) != 0)
+{
+// unselect all entries and make passed entry
visible and selected
+m_xTreeView->set_cursor(*xIter);
+Select();
+}
+break;
+}
+}
+else
+{
+SwTextFieldContent* pCnt =
reinterpret_cast(m_xTreeView->get_id(*xIter).toInt64());
+if (pCnt && pField == pCnt->GetFormatField()->GetField())
+{
+// get first selected for comparison
+std::unique_ptr
xFirstSelected(m_xTreeView->make_iterator());
+if (!m_xTreeView->get_selected(xFirstSelected.get()))
+xFirstSelected.reset();
+if (m_xTreeView->count_selected_rows() != 1 ||
+m_xTreeView->iter_compare(*xIter,
*xFirstSelected) != 0)
+{
+// unselect all entries and make passed entry
visible and selected
+m_xTreeView->set_cursor(*xIter);
+Select();
+}
+break;
}
-break;
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/porfly.cxx | 20
sw/source/core/text/porfly.hxx |5 -
sw/source/core/text/porlay.cxx | 35 +++
3 files changed, 59 insertions(+), 1 deletion(-)
New commits:
commit d845b91bcc6eb885c55494d4d4fab4ec09577e1d
Author: László Németh
AuthorDate: Fri Apr 30 12:27:43 2021 +0200
Commit: László Németh
CommitDate: Fri Apr 30 15:45:22 2021 +0200
tdf#78864 sw track changes: cross out deleted images
Show Changes mode shows deleted images with crossing
out to allow differentiate deleted and inserted images
during change tracking.
See also commit d6322bcedc197a654abc7d64bfea8cf570f123bf
(tdf#59463 track changes: record deletion of images).
Change-Id: If9bc2252c6cdd06cbe267fe130023c416aa53ce7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114906
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx
index 212de1db0288..422e2ef36ee3 100644
--- a/sw/source/core/text/porfly.cxx
+++ b/sw/source/core/text/porfly.cxx
@@ -38,6 +38,7 @@
#include "inftxt.hxx"
#include
+#include
/**
* class SwFlyPortion => we expect a frame-locale SwRect!
@@ -222,6 +223,25 @@ void sw::FlyContentPortion::Paint(const SwTextPaintInfo&
rInf) const
{
SwLayoutModeModifier aLayoutModeModifier(*rInf.GetOut());
m_pFly->PaintSwFrame(const_cast(*rInf.GetOut()),
aRect);
+
+// track changes: cross out the image, if it is deleted
+const SwFrame *pFrame = m_pFly->Lower();
+if ( IsDeleted() && pFrame )
+{
+SwRect aPaintRect( pFrame->GetPaintArea() );
+
+const AntialiasingFlags nFormerAntialiasing(
rInf.GetOut()->GetAntialiasing() );
+const bool bIsAntiAliasing =
officecfg::Office::Common::Drawinglayer::AntiAliasing::get();
+if ( bIsAntiAliasing )
+
const_cast(*rInf.GetOut()).SetAntialiasing(AntialiasingFlags::Enable);
+tools::Long startX = aPaintRect.Left( ), endX =
aPaintRect.Right();
+tools::Long startY = aPaintRect.Top( ), endY =
aPaintRect.Bottom();
+
const_cast(*rInf.GetOut()).SetLineColor(NON_PRINTING_CHARACTER_COLOR);
+
const_cast(*rInf.GetOut()).DrawLine(Point(startX, startY),
Point(endX, endY));
+
const_cast(*rInf.GetOut()).DrawLine(Point(startX, endY),
Point(endX, startY));
+if ( bIsAntiAliasing )
+
const_cast(*rInf.GetOut()).SetAntialiasing(nFormerAntialiasing);
+}
}
const_cast(rInf).GetRefDev()->SetLayoutMode(rInf.GetOut()->GetLayoutMode());
diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx
index 480492f7a829..fdd974050513 100644
--- a/sw/source/core/text/porfly.hxx
+++ b/sw/source/core/text/porfly.hxx
@@ -44,7 +44,8 @@ public:
class SwFlyCntPortion : public SwLinePortion
{
Point m_aRef; // Relatively to this point we calculate the AbsPos
-bool m_bMax; // Line adjustment and height == line height
+bool m_bMax; // Line adjustment and height == line height
+bool m_bDeleted; // Part of tracked deletion: it needs strikethrough
sw::LineAlign m_eAlign;
virtual SdrObject* GetSdrObj(const SwTextFrame&) =0;
@@ -53,9 +54,11 @@ public:
SwFlyCntPortion();
const Point& GetRefPoint() const { return m_aRef; }
bool IsMax() const { return m_bMax; }
+bool IsDeleted() const { return m_bDeleted; }
sw::LineAlign GetAlign() const { return m_eAlign; }
void SetAlign(sw::LineAlign eAlign) { m_eAlign = eAlign; }
void SetMax(bool bMax) { m_bMax = bMax; }
+void SetDeleted(bool bDeleted) { m_bDeleted = bDeleted; }
void SetBase(const SwTextFrame& rFrame, const Point& rBase, tools::Long
nLnAscent, tools::Long nLnDescent, tools::Long nFlyAscent, tools::Long
nFlyDescent, AsCharFlags nFlags);
virtual bool Format(SwTextFormatInfo& rInf) override;
};
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 225fd2081c3c..f4dc4bd46661 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -359,6 +359,7 @@ void SwLineLayout::CalcLine( SwTextFormatter ,
SwTextFormatInfo )
bool bHasBlankPortion = false;
bool bHasOnlyBlankPortions = true;
+bool bHasFlyContentPortion = false;
if( mpNextPortion )
{
@@ -445,6 +446,8 @@ void SwLineLayout::CalcLine( SwTextFormatter ,
SwTextFormatInfo )
SetHanging(true);
rInf.GetParaPortion()->SetMargin();
}
+else if( !bHasFlyContentPortion && pPos->IsFlyCntPortion() )
+ bHasFlyContentPortion = true;
// To prevent that a paragraph-end-character does not change
// the line height through a Descent and thus causing the line
@@ -623,6 +626,38 @@ void
[Libreoffice-commits] core.git: sc/qa
sc/qa/uitest/data/tdf137945.ods|binary
sc/qa/uitest/validity/tdf137945.py | 33 +
2 files changed, 33 insertions(+)
New commits:
commit b9097800f4f997de2325bc9e588e6caea7a563c7
Author: Xisco Fauli
AuthorDate: Fri Apr 30 10:49:28 2021 +0200
Commit: Xisco Fauli
CommitDate: Fri Apr 30 16:00:02 2021 +0200
tdf#137945: sc: Add UItest
Change-Id: I6fa935d0c77556113ae087a67c2932ddcee12a1e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114900
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sc/qa/uitest/data/tdf137945.ods b/sc/qa/uitest/data/tdf137945.ods
new file mode 100644
index ..ddda28140b1a
Binary files /dev/null and b/sc/qa/uitest/data/tdf137945.ods differ
diff --git a/sc/qa/uitest/validity/tdf137945.py
b/sc/qa/uitest/validity/tdf137945.py
new file mode 100644
index ..65f433de5931
--- /dev/null
+++ b/sc/qa/uitest/validity/tdf137945.py
@@ -0,0 +1,33 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# 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/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import select_pos
+from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
+
+class Tdf137945(UITestCase):
+
+def test_tdf137945(self):
+calc_doc =
self.ui_test.load_file(get_url_for_data_file("tdf137945.ods"))
+
+self.ui_test.execute_dialog_through_command(".uno:Validation")
+xDialog = self.xUITest.getTopFocusWindow()
+xTabs = xDialog.getChild("tabcontrol")
+select_pos(xTabs, "1")
+xInput = xDialog.getChild("inputhelp")
+xTitle = xDialog.getChild("title")
+
+self.assertEqual("test", get_state_as_dict(xTitle)['Text'])
+# Without the fix in place, this test would have failed with
+# '1 2 3 4510 end' != '1 2 3 4 5
10 end'
+self.assertEqual("1 2 3 4510 end",
get_state_as_dict(xInput)['Text'])
+
+xOKBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Parameter for addShape for a child of a group in oox import
Hi Miklos, Miklos Vajna schrieb am 30.04.2021 um 10:19: Hi Regina, On Thu, Apr 29, 2021 at 11:03:14AM +0200, Regina Henschel wrote: Overnight, I found a much easier way. I only need to apply the rotation of the child shape around its center after applying the parent transformation. Please excuse me for bothering you with this problem. Ah, great. :-) I was thinking about decomposing these various transforms to separate scale/translate/rotation and then applying them in the right order, or something like that. But if you figured it out already, that's even better. For "normal" cases it works indeed if the shape rotation is applied after the group rotation. But I have found now, that it does not work, for shapes with rotation in 45..135 or 225..315 deg, see bug 141953. In that case I need the xfrm values from the group as individual values. But because of aChildTransformation *= aTransformation; in (#406) Shape::addChildren() it is not possible to recreate them by decomposing the aParentTransformation parameter in Shape::createAndInsert(). I have applied a test document and the manually calculation in a spreadsheet to the bug, for the case you are interested, how I think the resulting shape can be calculated. So I still need a way to transport the values from the group to its children. Besides my first idea to put all group infos into a struct and use that instead of the aTransformation parameter, I can also think to put them into the grabbag of each child. Such transport of information from group to child is also needed, if e.g. 3D transformations are not made on the individual shapes but on the group. MSOffice allows to apply attributes to the group and writes it that way to file, but LibreOffice has no attributes on groups. I'm still interested in you opinion how to design it. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/vector/vector-7.0' - sw/qa sw/source
sw/qa/extras/htmlexport/data/reqif-objdata-presentationdatasize.odt |binary
sw/qa/extras/htmlexport/htmlexport.cxx | 35
++
sw/source/filter/html/htmlreqifreader.cxx |4 -
3 files changed, 37 insertions(+), 2 deletions(-)
New commits:
commit d3ab4fc0ba8e62d4f25caf5d759eb54d3f7ecd94
Author: Miklos Vajna
AuthorDate: Thu Apr 29 17:21:54 2021 +0200
Commit: Miklos Vajna
CommitDate: Fri Apr 30 17:37:22 2021 +0200
sw html/reqif export: fix size of presentation data for "real" OLE2
embedding
InsertOLE1Header() can either take its OLE1 presentation data (preview)
from OLE2 or from RTF (SwOLENode). The presentation data size we wrote
was incorrect in the OLE2 case case: nPresentationData is the RTF size,
nBytes is the actual buffer size.
In practice this made the embedded object non-editable in Word (when
trying to edit the RTF fragment).
This went wrong in commit 0d027abbc5609b096d2a954e77aa7354a55928ab (sw
reqif-xhtml export, embedded objects: take OLE1 pres data from rtf if
needed, 2020-09-02).
(cherry picked from commit 58607e1c410ee89ddfd47dcd128abfa00e0ac839)
Change-Id: I89019202c9a8b40c1b9a21f611f1190fd50073a5
diff --git
a/sw/qa/extras/htmlexport/data/reqif-objdata-presentationdatasize.odt
b/sw/qa/extras/htmlexport/data/reqif-objdata-presentationdatasize.odt
new file mode 100644
index ..231a7c572a3a
Binary files /dev/null and
b/sw/qa/extras/htmlexport/data/reqif-objdata-presentationdatasize.odt differ
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 08a21b6b7dd3..3746c3e7e786 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -255,6 +255,8 @@ public:
OUString GetOlePath();
/// Parse the ole1 data out of an RTF fragment URL.
void ParseOle1FromRtfUrl(const OUString& rRtfUrl, SvMemoryStream& rOle1);
+/// Export using the C++ HTML export filter, with xhtmlns=reqif-xhtml.
+void ExportToReqif();
};
OUString SwHtmlDomExportTest::GetOlePath()
@@ -283,6 +285,16 @@ void SwHtmlDomExportTest::ParseOle1FromRtfUrl(const
OUString& rRtfUrl, SvMemoryS
CPPUNIT_ASSERT(rOle1.Tell());
}
+void SwHtmlDomExportTest::ExportToReqif()
+{
+uno::Reference xStorable(mxComponent, uno::UNO_QUERY);
+uno::Sequence aStoreProperties = {
+comphelper::makePropertyValue("FilterName", OUString("HTML
(StarWriter)")),
+comphelper::makePropertyValue("FilterOptions",
OUString("xhtmlns=reqif-xhtml")),
+};
+xStorable->storeToURL(maTempFile.GetURL(), aStoreProperties);
+}
+
char const DATA_DIRECTORY[] = "/sw/qa/extras/htmlexport/data/";
DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(testFdo81276, "fdo81276.html")
@@ -1354,6 +1366,29 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest,
testReqifAscharObjsize)
CPPUNIT_ASSERT_EQUAL(static_cast(4116), xReader->GetObjh());
}
+CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testReqifObjdataPresentationDataSize)
+{
+// Given a document with an OLE2 embedded object, containing a preview:
+OUString aURL
+= m_directories.getURLFromSrc(DATA_DIRECTORY) +
"reqif-objdata-presentationdatasize.odt";
+mxComponent = loadFromDesktop(aURL, "com.sun.star.text.TextDocument", {});
+
+// When exporting to ReqIF:
+ExportToReqif();
+
+// Then make sure that the PresentationDataSize in the RTF's objdata blob
is correct:
+OUString aRtfUrl = GetOlePath();
+SvMemoryStream aOle1;
+ParseOle1FromRtfUrl(aRtfUrl, aOle1);
+OLE1Reader aOle1Reader(aOle1);
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 565994
+// - Actual : 330240 (Linux)
+// - Actual : 566034 (Windows, when Word is installed)
+// because PresentationData was taken from the OLE2 stream but its size
was taken from RTF.
+CPPUNIT_ASSERT_EQUAL(static_cast(565994),
aOle1Reader.m_nPresentationDataSize);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmlreqifreader.cxx
b/sw/source/filter/html/htmlreqifreader.cxx
index a59f56ee40ee..47cf2341e1e5 100644
--- a/sw/source/filter/html/htmlreqifreader.cxx
+++ b/sw/source/filter/html/htmlreqifreader.cxx
@@ -341,8 +341,8 @@ OString InsertOLE1Header(SvStream& rOle2, SvStream& rOle1,
sal_uInt32& nWidth, s
rOle1.WriteUInt32(nWidth);
// Height.
rOle1.WriteUInt32(nHeight * -1);
-// PresentationDataSize
-rOle1.WriteUInt32(8 + nPresentationData);
+// PresentationDataSize: size of (reserved fields + pBytes).
+rOle1.WriteUInt32(8 + nBytes);
// Reserved1-4.
rOle1.WriteUInt16(0x0008);
rOle1.WriteUInt16(0x31b1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sc/qa
sc/qa/uitest/calc_tests/data/tdf137945.ods |binary
sc/qa/uitest/validity/tdf137945.py | 38 +
2 files changed, 38 insertions(+)
New commits:
commit c976a18758b77ab989f3cc1a34623ff403651801
Author: Xisco Fauli
AuthorDate: Fri Apr 30 10:49:28 2021 +0200
Commit: Xisco Fauli
CommitDate: Fri Apr 30 17:58:49 2021 +0200
tdf#137945: sc: Add UItest
Change-Id: I6fa935d0c77556113ae087a67c2932ddcee12a1e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114871
Tested-by: Xisco Fauli
Reviewed-by: Xisco Fauli
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114935
Tested-by: Jenkins
diff --git a/sc/qa/uitest/calc_tests/data/tdf137945.ods
b/sc/qa/uitest/calc_tests/data/tdf137945.ods
new file mode 100644
index ..ddda28140b1a
Binary files /dev/null and b/sc/qa/uitest/calc_tests/data/tdf137945.ods differ
diff --git a/sc/qa/uitest/validity/tdf137945.py
b/sc/qa/uitest/validity/tdf137945.py
new file mode 100644
index ..1feb12cd7ebe
--- /dev/null
+++ b/sc/qa/uitest/validity/tdf137945.py
@@ -0,0 +1,38 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# 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/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import select_pos
+from uitest.uihelper.common import get_state_as_dict
+import org.libreoffice.unotest
+import pathlib
+
+def get_url_for_data_file(file_name):
+return
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
+
+class Tdf137945(UITestCase):
+
+def test_tdf137945(self):
+calc_doc =
self.ui_test.load_file(get_url_for_data_file("tdf137945.ods"))
+
+self.ui_test.execute_dialog_through_command(".uno:Validation")
+xDialog = self.xUITest.getTopFocusWindow()
+xTabs = xDialog.getChild("tabcontrol")
+select_pos(xTabs, "1")
+xInput = xDialog.getChild("inputhelp")
+xTitle = xDialog.getChild("title")
+
+self.assertEqual("test", get_state_as_dict(xTitle)['Text'])
+# Without the fix in place, this test would have failed with
+# '1 2 3 4510 end' != '1 2 3 4 5
10 end'
+self.assertEqual("1 2 3 4510 end",
get_state_as_dict(xInput)['Text'])
+
+xOKBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/txtnode/txtedt.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit 4184569b963877c2a488ff05766654b9db194798
Author: Michael Stahl
AuthorDate: Fri Apr 30 15:31:54 2021 +0200
Commit: Michael Stahl
CommitDate: Fri Apr 30 19:09:29 2021 +0200
sw: speed up DoIdleJobs(WORD_COUNT)
SwTextNode::CountWords() has early returns that don't clear the
WordCountDirty flag, for nodes that don't contain any plain text.
This speeds things up considerably for tdf135116-1.odt, which didn't
finish the idle jobs after 5 minutes in an optimized 7.1 build, because
the time slice tends to expire iterating nodes in word-count before it
can make progress.
With this it does ~25 WORD_COUNT pages and then ~90 AUTOCOMPLETE_WORDS
pages per idle, sending OnLayoutFinished after 13-14 seconds.
jmux just pointed me to commit 0fedac18214a6025401c4c426466a5166553e8ec
which is not in 7.1 today and may have improved the performance here.
Change-Id: I5e9651da3a173649c49fc36edefb23298dfd6bc4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114936
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/txtnode/txtedt.cxx
b/sw/source/core/txtnode/txtedt.cxx
index e734e471060b..853632d30771 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -2023,6 +2023,10 @@ bool SwTextNode::CountWords( SwDocStat& rStat,
if( nStt == nEnd && !bCountNumbering)
{ // unnumbered empty node or empty selection
+if (bCountAll)
+{
+SetWordCountDirty( false ); // reset flag to speed up DoIdleJob
+}
return false;
}
@@ -2051,6 +2055,10 @@ bool SwTextNode::CountWords( SwDocStat& rStat,
if (aExpandText.isEmpty() && !bCountNumbering)
{
+if (bCountAll)
+{
+SetWordCountDirty( false ); // reset flag to speed up DoIdleJob
+}
return false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/convwatch.py sw/source
bin/convwatch.py |2 ++
sw/source/core/layout/layact.cxx |6 ++
2 files changed, 8 insertions(+)
New commits:
commit c926974ec1a4dbb72f273927fed0bc2f5e19c374
Author: Michael Stahl
AuthorDate: Fri Apr 30 17:06:59 2021 +0200
Commit: Michael Stahl
CommitDate: Fri Apr 30 19:29:30 2021 +0200
sw: add some SAL_INFO on DoIdleJob interrupt
Change-Id: I44df06ab4bad1a5e0aaf5409590f5d7869f33482
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114937
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/bin/convwatch.py b/bin/convwatch.py
index d88d43d64a6f..93082186f319 100644
--- a/bin/convwatch.py
+++ b/bin/convwatch.py
@@ -280,6 +280,7 @@ def loadFromURL(xContext, url):
xDoc = None
try:
xDoc = xDesktop.loadComponentFromURL(url, "_blank", 0, loadProps)
+log("...loadComponentFromURL done")
if xDoc is None:
raise Exception("No document loaded?")
time_ = 0
@@ -328,6 +329,7 @@ class LoadPrintFileTest:
else:
url = "file://" + quote(self.file)
xDoc = loadFromURL(xContext, url)
+log("loadFromURL in: " + str(datetime.datetime.now() - start))
printDoc(xContext, xDoc, url + self.prtsuffix)
finally:
if xDoc:
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 422b8aee0c46..4a811e171ddc 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -2088,7 +2088,10 @@ bool SwLayIdle::DoIdleJob( IdleJobType eJob, bool
bVisAreaOnly )
while( pCnt && pPage->IsAnLower( pCnt ) )
{
if ( DoIdleJob_( pCnt, eJob ) )
+{
+SAL_INFO("sw.idle", "DoIdleJob " << eJob << " interrupted on
page " << pPage->GetPhyPageNum());
return true;
+}
pCnt = pCnt->GetNextContentFrame();
}
if ( pPage->GetSortedObjs() )
@@ -2105,7 +2108,10 @@ bool SwLayIdle::DoIdleJob( IdleJobType eJob, bool
bVisAreaOnly )
if ( pC->IsTextFrame() )
{
if ( DoIdleJob_( pC, eJob ) )
+{
+SAL_INFO("sw.idle", "DoIdleJob " << eJob << "
interrupted on page " << pPage->GetPhyPageNum());
return true;
+}
}
pC = pC->GetNextContentFrame();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - external/liborcus
external/liborcus/UnpackedTarball_liborcus.mk|4
external/liborcus/allow-utf-8-in-xml-names.patch | 301 +++
2 files changed, 305 insertions(+)
New commits:
commit 54c54fc1eb1a14e513fcbc59f122a3e15bd2f3a3
Author: Luboš Luňák
AuthorDate: Thu Apr 29 20:10:34 2021 +0200
Commit: Andras Timar
CommitDate: Fri Apr 30 20:51:41 2021 +0200
allow utf-8 in xml names (liborcus) (tdf#141672)
Change-Id: Ib150d55b588a572e4352396f18de2331983b2aae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114892
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
(cherry picked from commit 6b7c2fa65eb68be520ed4135cc245e33fa22e8bf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114916
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk
b/external/liborcus/UnpackedTarball_liborcus.mk
index 113e8e25818d..3b54db0e49ce 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -23,6 +23,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/include.patch.0 \
))
+$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
+ external/liborcus/allow-utf-8-in-xml-names.patch \
+))
+
ifeq ($(OS),WNT)
$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/windows-constants-hack.patch \
diff --git a/external/liborcus/allow-utf-8-in-xml-names.patch
b/external/liborcus/allow-utf-8-in-xml-names.patch
new file mode 100644
index ..e3430881053d
--- /dev/null
+++ b/external/liborcus/allow-utf-8-in-xml-names.patch
@@ -0,0 +1,301 @@
+From fa9b6845ed583f5486372c6ffbc59e02a140d303 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?=
+Date: Thu, 29 Apr 2021 19:12:20 +0200
+Subject: [PATCH] allow utf-8 in xml names (#137)
+
+https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-NameStartChar
+has a list of all allowed characters.
+---
+ include/orcus/sax_parser_base.hpp | 3 +
+ src/orcus_test_xml.cpp| 1 +
+ src/parser/sax_parser_base.cpp| 201 --
+ test/xml/non-ascii/check.txt | 4 +
+ test/xml/non-ascii/input.xml | 4 +
+ 5 files changed, 201 insertions(+), 12 deletions(-)
+ create mode 100644 test/xml/non-ascii/check.txt
+ create mode 100644 test/xml/non-ascii/input.xml
+
+diff --git a/include/orcus/sax_parser_base.hpp
b/include/orcus/sax_parser_base.hpp
+index 9939e133..8394c07b 100644
+--- a/include/orcus/sax_parser_base.hpp
b/include/orcus/sax_parser_base.hpp
+@@ -218,6 +218,9 @@ protected:
+ void element_name(parser_element& elem, std::ptrdiff_t begin_pos);
+ void attribute_name(pstring& attr_ns, pstring& attr_name);
+ void characters_with_encoded_char(cell_buffer& buf);
++
++int is_name_char();
++int is_name_start_char();
+ };
+
+ }}
+diff --git a/src/orcus_test_xml.cpp b/src/orcus_test_xml.cpp
+index 8a864d68..35f3dea7 100644
+--- a/src/orcus_test_xml.cpp
b/src/orcus_test_xml.cpp
+@@ -77,6 +77,7 @@ const char* sax_parser_test_dirs[] = {
+ SRCDIR"/test/xml/no-decl-1/",
+ SRCDIR"/test/xml/underscore-identifier/",
+ SRCDIR"/test/xml/self-closing-root/",
++SRCDIR"/test/xml/non-ascii/",
+ };
+
+ const char* sax_parser_parse_only_test_dirs[] = {
+diff --git a/src/parser/sax_parser_base.cpp b/src/parser/sax_parser_base.cpp
+index 97aa34ec..db51ff94 100644
+--- a/src/parser/sax_parser_base.cpp
b/src/parser/sax_parser_base.cpp
+@@ -328,20 +328,182 @@ bool parser_base::value(pstring& str, bool decode)
+ return transient_stream();
+ }
+
++// https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-NameStartChar
++// Return length of the character in bytes, otherwise 0.
++template< bool only_start_name >
++static
++int is_name_char_helper(const char* mp_char, const char* mp_end)
++{
++const unsigned char first = mp_char[0];
++// Note that ':' technically is an allowed name character, but it is
handled separately
++// e.g. in element_name(), so here pretend it isn't.
++if (/*first == ':' ||*/ first == '_' || (first >= 'A' && first <= 'Z') ||
(first >= 'a' && first <= 'z'))
++return 1;
++if (!only_start_name && (first == '-' || first == '.' || (first >= '0' &&
first <= '9')))
++return 1;
++
++if (first < 0x7f) // other ascii characters are not allowed
++return 0;
++if (mp_end < mp_char + 1)
++return 0;
++const unsigned char second = mp_char[1];
++
++// 0xb7 = 0xc2 0xb7 utf-8
++if (!only_start_name && first == 0xc2 && second == 0xb7)
++return 2;
++
++// [#xC0-#xD6] | [#xD8-#xF6] | [#xF8-#x2FF]
++// 0xc0 = 0xc3 0x80 utf-8
++if (first < 0xc3)
++return 0;
++// xd7 = 0xc3 0x97 utf-8, 0xf7 = 0xc3 0xb7 utf-8
++if (first == 0xc3)
++return second >= 0x80 && second <= 0xff && second != 0x97 && second
!= 0xb7 ? 2 : 0;
++// 0x2ff = 0xcb
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - external/liborcus
external/liborcus/UnpackedTarball_liborcus.mk|4
external/liborcus/allow-utf-8-in-xml-names.patch | 301 +++
2 files changed, 305 insertions(+)
New commits:
commit cd7160420a1a73ff72c8995b425ec336778dfe47
Author: Luboš Luňák
AuthorDate: Thu Apr 29 20:10:34 2021 +0200
Commit: Andras Timar
CommitDate: Fri Apr 30 20:51:22 2021 +0200
allow utf-8 in xml names (liborcus) (tdf#141672)
Change-Id: Ib150d55b588a572e4352396f18de2331983b2aae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114892
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
(cherry picked from commit 6b7c2fa65eb68be520ed4135cc245e33fa22e8bf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114915
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk
b/external/liborcus/UnpackedTarball_liborcus.mk
index 113e8e25818d..3b54db0e49ce 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -23,6 +23,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/include.patch.0 \
))
+$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
+ external/liborcus/allow-utf-8-in-xml-names.patch \
+))
+
ifeq ($(OS),WNT)
$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/windows-constants-hack.patch \
diff --git a/external/liborcus/allow-utf-8-in-xml-names.patch
b/external/liborcus/allow-utf-8-in-xml-names.patch
new file mode 100644
index ..e3430881053d
--- /dev/null
+++ b/external/liborcus/allow-utf-8-in-xml-names.patch
@@ -0,0 +1,301 @@
+From fa9b6845ed583f5486372c6ffbc59e02a140d303 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?=
+Date: Thu, 29 Apr 2021 19:12:20 +0200
+Subject: [PATCH] allow utf-8 in xml names (#137)
+
+https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-NameStartChar
+has a list of all allowed characters.
+---
+ include/orcus/sax_parser_base.hpp | 3 +
+ src/orcus_test_xml.cpp| 1 +
+ src/parser/sax_parser_base.cpp| 201 --
+ test/xml/non-ascii/check.txt | 4 +
+ test/xml/non-ascii/input.xml | 4 +
+ 5 files changed, 201 insertions(+), 12 deletions(-)
+ create mode 100644 test/xml/non-ascii/check.txt
+ create mode 100644 test/xml/non-ascii/input.xml
+
+diff --git a/include/orcus/sax_parser_base.hpp
b/include/orcus/sax_parser_base.hpp
+index 9939e133..8394c07b 100644
+--- a/include/orcus/sax_parser_base.hpp
b/include/orcus/sax_parser_base.hpp
+@@ -218,6 +218,9 @@ protected:
+ void element_name(parser_element& elem, std::ptrdiff_t begin_pos);
+ void attribute_name(pstring& attr_ns, pstring& attr_name);
+ void characters_with_encoded_char(cell_buffer& buf);
++
++int is_name_char();
++int is_name_start_char();
+ };
+
+ }}
+diff --git a/src/orcus_test_xml.cpp b/src/orcus_test_xml.cpp
+index 8a864d68..35f3dea7 100644
+--- a/src/orcus_test_xml.cpp
b/src/orcus_test_xml.cpp
+@@ -77,6 +77,7 @@ const char* sax_parser_test_dirs[] = {
+ SRCDIR"/test/xml/no-decl-1/",
+ SRCDIR"/test/xml/underscore-identifier/",
+ SRCDIR"/test/xml/self-closing-root/",
++SRCDIR"/test/xml/non-ascii/",
+ };
+
+ const char* sax_parser_parse_only_test_dirs[] = {
+diff --git a/src/parser/sax_parser_base.cpp b/src/parser/sax_parser_base.cpp
+index 97aa34ec..db51ff94 100644
+--- a/src/parser/sax_parser_base.cpp
b/src/parser/sax_parser_base.cpp
+@@ -328,20 +328,182 @@ bool parser_base::value(pstring& str, bool decode)
+ return transient_stream();
+ }
+
++// https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-NameStartChar
++// Return length of the character in bytes, otherwise 0.
++template< bool only_start_name >
++static
++int is_name_char_helper(const char* mp_char, const char* mp_end)
++{
++const unsigned char first = mp_char[0];
++// Note that ':' technically is an allowed name character, but it is
handled separately
++// e.g. in element_name(), so here pretend it isn't.
++if (/*first == ':' ||*/ first == '_' || (first >= 'A' && first <= 'Z') ||
(first >= 'a' && first <= 'z'))
++return 1;
++if (!only_start_name && (first == '-' || first == '.' || (first >= '0' &&
first <= '9')))
++return 1;
++
++if (first < 0x7f) // other ascii characters are not allowed
++return 0;
++if (mp_end < mp_char + 1)
++return 0;
++const unsigned char second = mp_char[1];
++
++// 0xb7 = 0xc2 0xb7 utf-8
++if (!only_start_name && first == 0xc2 && second == 0xb7)
++return 2;
++
++// [#xC0-#xD6] | [#xD8-#xF6] | [#xF8-#x2FF]
++// 0xc0 = 0xc3 0x80 utf-8
++if (first < 0xc3)
++return 0;
++// xd7 = 0xc3 0x97 utf-8, 0xf7 = 0xc3 0xb7 utf-8
++if (first == 0xc3)
++return second >= 0x80 && second <= 0xff && second != 0x97 && second
!= 0xb7 ? 2 : 0;
++// 0x2ff = 0xcb
[Libreoffice-commits] core.git: sc/source
sc/source/core/inc/interpre.hxx |2 -
sc/source/core/tool/interpr3.cxx | 41 +++
2 files changed, 21 insertions(+), 22 deletions(-)
New commits:
commit 4283fb9d4a6152643364bfe1f98ee1f36aabbb78
Author: dante
AuthorDate: Wed Apr 28 19:37:21 2021 +0200
Commit: Mike Kaganski
CommitDate: Fri Apr 30 23:29:59 2021 +0200
tdf#137679 Use kahan summation for ScInterpreter::CalculateSkew
Change-Id: Ib9e34fd14d9968a5a8c79805da4f12d9a3422de8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114818
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index bdde25a12c24..c7b93798bc58 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -835,7 +835,7 @@ private:
void ScSumX2DY2();
void ScSumXMY2();
void ScGrowth();
-bool CalculateSkew(double& fSum,double& fCount,double&
vSum,std::vector& values);
+bool CalculateSkew(KahanSum& fSum, double& fCount, std::vector&
values);
void CalculateSkewOrSkewp( bool bSkewp );
void CalculateSlopeIntercept(bool bSlope);
void CalculateSmallLarge(bool bSmall);
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 7adee328c37a..d41f4f98b475 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -2872,9 +2872,10 @@ void ScInterpreter::ScChiTest()
void ScInterpreter::ScKurt()
{
-double fSum,fCount,vSum;
+KahanSum fSum;
+double fCount;
std::vector values;
-if ( !CalculateSkew(fSum,fCount,vSum,values) )
+if ( !CalculateSkew(fSum, fCount, values) )
return;
// ODF 1.2 constraints: # of numbers >= 4
@@ -2885,31 +2886,30 @@ void ScInterpreter::ScKurt()
return;
}
-double fMean = fSum / fCount;
-
+KahanSum vSum;
+double fMean = fSum.get() / fCount;
for (double v : values)
vSum += (v - fMean) * (v - fMean);
-double fStdDev = sqrt(vSum / (fCount - 1.0));
-double xpower4 = 0.0;
-
+double fStdDev = sqrt(vSum.get() / (fCount - 1.0));
if (fStdDev == 0.0)
{
PushError( FormulaError::DivisionByZero);
return;
}
+KahanSum xpower4 = 0.0;
for (double v : values)
{
double dx = (v - fMean) / fStdDev;
-xpower4 = xpower4 + (dx * dx * dx * dx);
+xpower4 += (dx * dx) * (dx * dx);
}
double k_d = (fCount - 2.0) * (fCount - 3.0);
double k_l = fCount * (fCount + 1.0) / ((fCount - 1.0) * k_d);
double k_t = 3.0 * (fCount - 1.0) * (fCount - 1.0) / k_d;
-PushDouble(xpower4 * k_l - k_t);
+PushDouble(xpower4.get() * k_l - k_t);
}
void ScInterpreter::ScHarMean()
@@ -3220,7 +3220,7 @@ void ScInterpreter::ScStandard()
PushDouble((x-mue)/sigma);
}
}
-bool ScInterpreter::CalculateSkew(double& fSum,double& fCount,double&
vSum,std::vector& values)
+bool ScInterpreter::CalculateSkew(KahanSum& fSum, double& fCount,
std::vector& values)
{
short nParamCount = GetByte();
if ( !MustHaveParamCountMin( nParamCount, 1 ) )
@@ -3228,7 +3228,6 @@ bool ScInterpreter::CalculateSkew(double& fSum,double&
fCount,double& vSum,std::
fSum = 0.0;
fCount = 0.0;
-vSum = 0.0;
double fVal = 0.0;
ScAddress aAdr;
ScRange aRange;
@@ -3328,9 +3327,10 @@ bool ScInterpreter::CalculateSkew(double& fSum,double&
fCount,double& vSum,std::
void ScInterpreter::CalculateSkewOrSkewp( bool bSkewp )
{
-double fSum, fCount, vSum;
+KahanSum fSum;
+double fCount;
std::vector values;
-if (!CalculateSkew( fSum, fCount, vSum, values))
+if (!CalculateSkew( fSum, fCount, values))
return;
// SKEW/SKEWP's constraints: they require at least three numbers
if (fCount < 3.0)
@@ -3340,30 +3340,29 @@ void ScInterpreter::CalculateSkewOrSkewp( bool bSkewp )
return;
}
-double fMean = fSum / fCount;
-
+KahanSum vSum;
+double fMean = fSum.get() / fCount;
for (double v : values)
vSum += (v - fMean) * (v - fMean);
-double fStdDev = sqrt( vSum / (bSkewp ? fCount : (fCount - 1.0)));
-double xcube = 0.0;
-
+double fStdDev = sqrt( vSum.get() / (bSkewp ? fCount : (fCount - 1.0)));
if (fStdDev == 0)
{
PushIllegalArgument();
return;
}
+KahanSum xcube = 0.0;
for (double v : values)
{
double dx = (v - fMean) / fStdDev;
-xcube = xcube + (dx * dx * dx);
+xcube += dx * dx * dx;
}
if (bSkewp)
-PushDouble( xcube / fCount );
+PushDouble( xcube.get() / fCount );
else
-PushDouble( ((xcube * fCount) / (fCount - 1.0)) / (fCount - 2.0) );
+PushDouble( ((xcube.get() * fCount) / (fCount - 1.0)) / (fCount - 2.0)
);
}
void ScInterpreter::ScSkew()
___
Libreoffice-commits mailing list
[Libreoffice-commits] core.git: svgio/inc svgio/source
svgio/inc/svgtools.hxx| 62 +--
svgio/source/svgreader/svgcharacternode.cxx | 16 +--
svgio/source/svgreader/svgcirclenode.cxx |4
svgio/source/svgreader/svgclippathnode.cxx|8 -
svgio/source/svgreader/svgellipsenode.cxx |8 -
svgio/source/svgreader/svggradientnode.cxx| 22 ++--
svgio/source/svgreader/svgimagenode.cxx |8 -
svgio/source/svgreader/svglinenode.cxx|8 -
svgio/source/svgreader/svgmasknode.cxx| 40 +++
svgio/source/svgreader/svgnode.cxx|4
svgio/source/svgreader/svgpatternnode.cxx | 30 ++---
svgio/source/svgreader/svgrectnode.cxx| 12 +-
svgio/source/svgreader/svgstyleattributes.cxx | 80 +++
svgio/source/svgreader/svgsvgnode.cxx | 36 +++---
svgio/source/svgreader/svgtextpathnode.cxx|2
svgio/source/svgreader/svgtools.cxx | 138 +-
svgio/source/svgreader/svgusenode.cxx |4
17 files changed, 241 insertions(+), 241 deletions(-)
New commits:
commit bd0c965b1ba9a15497f92102d5d11c84df091b2f
Author: Tomaž Vajngerl
AuthorDate: Fri Apr 30 22:47:30 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Sat May 1 04:29:31 2021 +0200
convert enums to enum classes in svgtools.hxx
converted SvgUnits, NumberType, SvgUnit, SvgAlign
Change-Id: I703b1d9396f42b3af1a36c683628e90161f2717d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114952
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/svgio/inc/svgtools.hxx b/svgio/inc/svgtools.hxx
index 82d58cc2e472..c4a88d89d05f 100644
--- a/svgio/inc/svgtools.hxx
+++ b/svgio/inc/svgtools.hxx
@@ -44,13 +44,13 @@ namespace svgio::svgreader
static constexpr OUStringLiteral aStrEvenOdd = u"evenodd";
};
-enum SvgUnits
+enum class SvgUnits
{
userSpaceOnUse,
objectBoundingBox
};
-enum NumberType
+enum class NumberType
{
xcoordinate,
ycoordinate,
@@ -68,20 +68,20 @@ namespace svgio::svgreader
virtual double getCurrentXHeightInherited() const = 0;
};
-enum SvgUnit
+enum class SvgUnit
{
-Unit_em = 0,// relative to current font size
-Unit_ex,// relative to current x-height
-
-Unit_px,// 'user unit'
-Unit_pt,// points, 1.25 px
-Unit_pc,// 15.0 px
-Unit_cm,// 35.43307 px
-Unit_mm,// 3.543307 px
-Unit_in,// 90 px
-
-Unit_percent, // relative to range
-Unit_none // for stroke-miterlimit, which has no unit
+em = 0,// relative to current font size
+ex,// relative to current x-height
+
+px,// 'user unit'
+pt,// points, 1.25 px
+pc,// 15.0 px
+cm,// 35.43307 px
+mm,// 3.543307 px
+in,// 90 px
+
+percent, // relative to range
+none // for stroke-miterlimit, which has no unit
};
class SvgNumber
@@ -95,12 +95,12 @@ namespace svgio::svgreader
public:
SvgNumber()
: mfNumber(0.0),
-meUnit(Unit_px),
+meUnit(SvgUnit::px),
mbSet(false)
{
}
-SvgNumber(double fNum, SvgUnit aSvgUnit = Unit_px, bool bSet =
true)
+SvgNumber(double fNum, SvgUnit aSvgUnit = SvgUnit::px, bool bSet =
true)
: mfNumber(fNum),
meUnit(aSvgUnit),
mbSet(bSet)
@@ -124,28 +124,28 @@ namespace svgio::svgreader
bool isPositive() const;
-// Only usable in cases, when the unit is not Unit_percent,
otherwise use method solve
+// Only usable in cases, when the unit is not SvgUnit::percent,
otherwise use method solve
double solveNonPercentage(const InfoProvider& rInfoProvider) const;
-double solve(const InfoProvider& rInfoProvider, NumberType
aNumberType = length) const;
+double solve(const InfoProvider& rInfoProvider, NumberType
aNumberType = NumberType::length) const;
};
typedef ::std::vector< SvgNumber > SvgNumberVector;
-enum SvgAlign
+enum class SvgAlign
{
-Align_none,
-Align_xMinYMin,
-Align_xMidYMin,
-Align_xMaxYMin,
-Align_xMinYMid,
-Align_xMidYMid, // default
-Align_xMaxYMid,
-Align_xMinYMax,
-Align_xMidYMax,
-Align_xMaxYMax
+none,
+xMinYMin,
+xMidYMin,
+xMaxYMin,
+xMinYMid,
+
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f4880d0804478ba1edcb9f676278b77bd2bd7343 Author: Alain Romedenne AuthorDate: Fri Apr 30 22:14:29 2021 +0200 Commit: Gerrit Code Review CommitDate: Fri Apr 30 22:14:29 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 6b24e1b46b633ccbbf65159f858c9a496479e426 - sf_basic.xhp pt. 2 Change-Id: Icb81fca7bdea283d3da6c113d1305d47c5bc6ff3 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/114867 Tested-by: Jenkins Reviewed-by: Rafael Lima diff --git a/helpcontent2 b/helpcontent2 index 4ee2f0f82f99..6b24e1b46b63 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 4ee2f0f82f99a865e765309eda367d5fc016674b +Subproject commit 6b24e1b46b633ccbbf65159f858c9a496479e426 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: codemaker/source include/sal
codemaker/source/cppumaker/cpputype.cxx |2 +-
include/sal/types.h | 16
2 files changed, 17 insertions(+), 1 deletion(-)
New commits:
commit 6a113a4f14808ac7f4bbdb4a5baff9383541d49a
Author: Stephan Bergmann
AuthorDate: Fri Apr 30 13:23:07 2021 +0200
Commit: Stephan Bergmann
CommitDate: Fri Apr 30 22:46:39 2021 +0200
throw() -> noexcept, part 1/3: Manual scaffolding
The legacy `throw()` dynamic exception specification is gone for good from
C++20
(even if compilers typically still accept it, but e.g. Clang has
-Wdeprecated-dynamic-exception-spec to at least warn about it).
Introduce SAL_NOEXCEPT for use in URE interface include files. (For both
the
existing SAL_THROW_EXTERN_C and the new SAL_NOEXCEPT, base usage of
`noexept`
not on LIBO_INTERNAL_ONLY, but on the actual compiler C++ version, so that
e.g.
building CppunitTest_cppu_any-external, which uses
gb_CppunitTest_set_external_code but not gb_CXX03FLAGS, will not potentially
complain about those macros expanding to the legacy `throw()`, like when
building with Clang -Wdeprecated-dynamic-exception-spec manually enabled.)
Change-Id: I7e5c7f8d5f0fd622cfc9987d656b1f68541375aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114908
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/codemaker/source/cppumaker/cpputype.cxx
b/codemaker/source/cppumaker/cpputype.cxx
index 1ab587040b82..be1b2c2b5cc2 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -1173,7 +1173,7 @@ void InterfaceType::dumpDeclaration(FileStream & out)
out << "protected:\n";
inc();
out << indent() << "~" << id_
-<< ("() throw () {} // avoid warnings about virtual members and"
+<< ("() SAL_NOEXCEPT {} // avoid warnings about virtual members and"
" non-virtual dtor\n");
dec();
out << "};\n\n";
diff --git a/include/sal/types.h b/include/sal/types.h
index 7733920f20be..5fac8e8f9d3b 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -328,7 +328,11 @@ typedef struct _sal_Sequence
This is a macro so it can expand to nothing in C code.
*/
#if defined __cplusplus
+#if __cplusplus >= 201103L
+#define SAL_THROW_EXTERN_C() noexcept
+#else
#define SAL_THROW_EXTERN_C() throw ()
+#endif
#else
#define SAL_THROW_EXTERN_C()
#endif
@@ -400,6 +404,18 @@ namespace css = ::com::sun::star;
#define SAL_CONSTEXPR
#endif
+/** Macro for C++11 "noexcept" vs. "throw ()" exception specification.
+
+The latter has has been removed completely from C++20.
+
+@since LibreOffice 7.2
+ */
+#if __cplusplus >= 201103L
+#define SAL_NOEXCEPT noexcept
+#else
+#define SAL_NOEXCEPT throw ()
+#endif
+
#endif /* __cplusplus */
#ifdef __cplusplus
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/native-code.py | 41 ++---
1 file changed, 38 insertions(+), 3 deletions(-)
New commits:
commit a52590d76b89dc75be2aa87f4287624c89f1e82f
Author: Tomaž Vajngerl
AuthorDate: Fri Apr 30 22:01:24 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Sat May 1 03:03:16 2021 +0200
update native-code.py with services for vba scripts in Calc
Change-Id: I54eb60d3be2717c17daa6b7634ccee3e099cbb7d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114932
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 7238055883dd..0cbb5cc9cc8d 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -26,6 +26,9 @@ core_factory_list = [
]
core_constructor_list = [
+# basic/util/sb.component
+("com_sun_star_comp_sfx2_DialogLibraryContainer_get_implementation","#if
HAVE_FEATURE_SCRIPTING"),
+("com_sun_star_comp_sfx2_ScriptLibraryContainer_get_implementation", "#if
HAVE_FEATURE_SCRIPTING"),
# UnoControls/util/ctl.component
"stardiv_UnoControls_FrameControl_get_implementation",
"stardiv_UnoControls_ProgressBar_get_implementation",
@@ -272,6 +275,19 @@ core_constructor_list = [
("i18npool_NumToTextUpper_zh_TW_get_implementation", "#if WITH_LOCALE_ALL
|| WITH_LOCALE_zh"),
# i18nsearch/sourceh/search/i18nsearch.component
"i18npool_TextSearch_get_implementation",
+# io/source/io.component
+"io_Pump_get_implementation",
+"io_ODataInputStream_get_implementation",
+"io_ODataOutputStream_get_implementation",
+"io_OMarkableInputStream_get_implementation",
+"io_OMarkableOutputStream_get_implementation",
+"io_OObjectInputStream_get_implementation",
+"io_OObjectOutputStream_get_implementation",
+"io_OPipeImpl_get_implementation",
+"io_OAcceptor_get_implementation",
+"io_OConnector_get_implementation",
+"io_OTextInputStream_get_implementation",
+"io_OTextOutputStream_get_implementation",
# linguistic/source/lng.component
"linguistic_ConvDicList_get_implementation",
"linguistic_DicList_get_implementation",
@@ -296,6 +312,13 @@ core_constructor_list = [
"com_sun_star_comp_extensions_xml_sax_FastParser_get_implementation",
"com_sun_star_comp_extensions_xml_sax_ParserExpat_get_implementation",
"com_sun_star_extensions_xml_sax_Writer_get_implementation",
+# scripting/util/scriptframe.component
+("scripting_BrowseNodeFactoryImpl_get_implementation", "#if
HAVE_FEATURE_SCRIPTING"),
+("scripting_MasterScriptProvider_get_implementation", "#if
HAVE_FEATURE_SCRIPTING"),
+("scripting_MasterScriptProviderFactory_get_implementation", "#if
HAVE_FEATURE_SCRIPTING"),
+("scripting_ScriptingFrameworkURIHelper_get_implementation", "#if
HAVE_FEATURE_SCRIPTING"),
+# scripting/source/basprov/basprov.component
+("scripting_BasicProviderImpl_get_implementation", "#if
HAVE_FEATURE_SCRIPTING"),
# sfx2/util/sfx.component
"SfxDocumentMetaData_get_implementation",
"com_sun_star_comp_office_FrameLoader_get_implementation",
@@ -406,6 +429,8 @@ core_constructor_list = [
# ucb/source/ucp/ucphier1.component
"ucb_HierarchyContentProvider_get_implementation",
"ucb_HierarchyDataSource_get_implementation",
+# ucb/source/ucp/package/ucppkg1
+"ucb_package_ContentProvider_get_implementation",
# unotools/util/utl.component
"unotools_ServiceDocument_get_implementation",
"unotools_OTempFileService_get_implementation",
@@ -590,6 +615,16 @@ calc_constructor_list = [
# sc/util/scfilt.component
"com_sun_star_comp_oox_xls_ExcelFilter_get_implementation",
"com_sun_star_comp_oox_xls_FormulaParser_get_implementation",
+# sc/util/vbaobj.component
+("Calc_ScVbaApplication_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+("ScVbaEventsHelper_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+("ScVbaGlobals_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+("Calc_ScVbaHyperlink_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+("ScVbaTextFrame_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+("Calc_ScVbaWindow_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+("Calc_ScVbaWorkbook_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+("Calc_ScVbaWorksheet_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
+("Calc_ScVbaRange_get_implementation", "#if HAVE_FEATURE_SCRIPTING"),
# scaddins/source/analysis/analysis.component
"scaddins_AnalysisAddIn_get_implementation",
# scaddins/source/datefunc/date.component
@@ -601,6 +636,9 @@ calc_constructor_list = [
# svl/util/svl.component
"com_sun_star_uno_util_numbers_SvNumberFormatsSupplierServiceObject_get_implementation",
"com_sun_star_uno_util_numbers_SvNumberFormatterServiceObject_get_implementation",
+# scripting/source/vbaevents/vbaevents.component
+("ooo_vba_VBAToOOEventDesc_get_implementation", "#if
HAVE_FEATURE_SCRIPTING"),
+
[Libreoffice-commits] core.git: drawinglayer/source
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 91 -
1 file changed, 59 insertions(+), 32 deletions(-)
New commits:
commit 565824df07913f47851804daed9efa28a4a95e9d
Author: Luboš Luňák
AuthorDate: Fri Apr 30 16:41:19 2021 +0200
Commit: Luboš Luňák
CommitDate: Sat May 1 00:17:46 2021 +0200
fix dashed line info conversion for metafile (tdf#136957)
My previous change had two problems:
- It didn't handle correctly the case when something repeated,
such as dash-dot-dot.
- The rounding when setting lengths was a left-over from my first
attempt when LineInfo used integers and not floats.
Change-Id: I914241590b1ddec22df04c05dfe65e76e921ee52
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114940
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 0dc0904015f0..8837354fc706 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1591,40 +1591,67 @@ void
VclMetafileProcessor2D::processPolygonStrokePrimitive2D(
{
aHairLinePolyPolygon.append(rBasePolygon);
}
-else if (rStroke.getDotDashArray().size() == 2)
-{
-aHairLinePolyPolygon.append(rBasePolygon);
-// This will be used by setupStrokeAttributes() in cppcanvas.
-aLineInfo.SetStyle(LineStyle::Dash);
-aLineInfo.SetDashCount(1);
-aLineInfo.SetDashLen(
-
basegfx::fround(getTransformedLineWidth(rStroke.getDotDashArray()[0])));
-aLineInfo.SetDistance(
-
basegfx::fround(getTransformedLineWidth(rStroke.getDotDashArray()[1])));
-}
-else if (rStroke.getDotDashArray().size() == 4
- && rStroke.getDotDashArray()[1] ==
rStroke.getDotDashArray()[3])
-{
-aHairLinePolyPolygon.append(rBasePolygon);
-// This will be used by setupStrokeAttributes() in cppcanvas.
-aLineInfo.SetStyle(LineStyle::Dash);
-aLineInfo.SetDashCount(1);
-aLineInfo.SetDashLen(
-
basegfx::fround(getTransformedLineWidth(rStroke.getDotDashArray()[0])));
-aLineInfo.SetDistance(
-
basegfx::fround(getTransformedLineWidth(rStroke.getDotDashArray()[1])));
-aLineInfo.SetDotCount(1);
-aLineInfo.SetDotLen(
-
basegfx::fround(getTransformedLineWidth(rStroke.getDotDashArray()[2])));
-}
else
{
-// LineInfo can hold only limited info about dashing, apply
dashing manually
-// if LineInfo cannot describe it. That should not happen
though.
-SAL_WARN("drawinglayer", "dotdash array cannot be converted to
LineInfo");
-basegfx::utils::applyLineDashing(rBasePolygon,
rStroke.getDotDashArray(),
- ,
nullptr,
- rStroke.getFullDotDashLen());
+bool done = false;
+const std::vector& array = rStroke.getDotDashArray();
+// The dotdash array should generally have the form
+// ( )+ ( )*
+// (where (,),+ and * have their regex meaning).
+// Find out what the lengths and their counts are.
+if (!array.empty() && array.size() % 2 == 0)
+{
+double dashLen = array[0];
+double distance = array[1];
+int dashCount = 1;
+double dotLen = 0;
+int dotCount = 0;
+size_t pos = 2;
+while (pos + 2 <= array.size())
+{
+if (array[pos] != dashLen || array[pos + 1] !=
distance)
+break;
+++dashCount;
+pos += 2;
+}
+if (pos + 2 <= array.size() && array[pos + 1] == distance)
+{
+dotLen = array[pos];
+++dotCount;
+pos += 2;
+while (pos + 2 <= array.size())
+{
+if (array[pos] != dotLen || array[pos + 1] !=
distance)
+break;
+++dotCount;
+pos += 2;
+}
+}
+if (array.size() == pos)
+{
+aHairLinePolyPolygon.append(rBasePolygon);
+
[Libreoffice-commits] help.git: AllLangHelp_sbasic.mk source/text
AllLangHelp_sbasic.mk|1
source/text/sbasic/shared/03/lib_ScriptForge.xhp | 31 ++-
2 files changed, 21 insertions(+), 11 deletions(-)
New commits:
commit 6b24e1b46b633ccbbf65159f858c9a496479e426
Author: Alain Romedenne
AuthorDate: Thu Apr 29 18:17:27 2021 +0200
Commit: Rafael Lima
CommitDate: Fri Apr 30 22:14:29 2021 +0200
sf_basic.xhp pt. 2
Change-Id: Icb81fca7bdea283d3da6c113d1305d47c5bc6ff3
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/114867
Tested-by: Jenkins
Reviewed-by: Rafael Lima
diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk
index 84f2b3859..0f7e60542 100644
--- a/AllLangHelp_sbasic.mk
+++ b/AllLangHelp_sbasic.mk
@@ -80,6 +80,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\
helpcontent2/source/text/sbasic/shared/03/lib_ScriptForge \
helpcontent2/source/text/sbasic/shared/03/sf_array \
helpcontent2/source/text/sbasic/shared/03/sf_base \
+helpcontent2/source/text/sbasic/shared/03/sf_basic \
helpcontent2/source/text/sbasic/shared/03/sf_calc \
helpcontent2/source/text/sbasic/shared/03/sf_database \
helpcontent2/source/text/sbasic/shared/03/sf_dialog \
diff --git a/source/text/sbasic/shared/03/lib_ScriptForge.xhp
b/source/text/sbasic/shared/03/lib_ScriptForge.xhp
index dc3c9674f..f3aa899f2 100644
--- a/source/text/sbasic/shared/03/lib_ScriptForge.xhp
+++ b/source/text/sbasic/shared/03/lib_ScriptForge.xhp
@@ -15,22 +15,28 @@
-The ScriptForge
Library
+The ScriptForge
Library
BASIC ScriptForge library
-
-GlobalScope.BasicLibraries.LoadLibrary("ScriptForge")
-The described
modules and classes are invoked from user scripts as "Services". A generic
constructor of those services has been designed for that purpose:
+ScriptForge
libraries build up an extensible collection of macro scripting resources for
%PRODUCTNAME to be invoked from Basic macros or Python scripts.
+ Basic macros
require to load ScriptForge library using the following
statement:
GlobalScope.BasicLibraries.LoadLibrary("ScriptForge")
Python scripts require an import from scriptforge
module:
+ from scriptforge import CreateScriptService
+
+The described
modules and classes are invoked from user scripts as "Services". A generic
constructor of those services has been designed for that purpose for each
language:
- CreateScriptService("servicename"[, arg0, Arg1,
...])
+ GlobalScope.BasicLibraries.LoadLibrary("ScriptForge")
+ Set oSvc = CreateScriptService("servicename"[, arg0,
arg1, ...])
-Services from
external libraries can be registered with the
RegisterScriptServices(...) method in order to extend the
set of available services.
-The ScriptForge Basic
library is available from %PRODUCTNAME 7.1 onwards.
-
+
+ from scriptforge import CreateScriptService
+ svc
= CreateScriptService('servicename'[, arg0, arg1, ...])
+
+
+The ScriptForge Basic
library is available from %PRODUCTNAME 7.1 onwards.Python
scriptforge module is available from %PRODUCTNAME 7.2
onwards.
Services provided by the ScriptForge
library
@@ -70,13 +76,14 @@
Base
+ Basic
Calc
Database
- Document
+ Document
Form
FormControl
@@ -116,13 +123,15 @@
-
+
+
+
@@ -183,4 +192,4 @@
All ScriptForge
Basic routines or identifiers that are prefixed with an underscore character
"_" are reserved for internal use. They are not meant be used in Basic
macros.
-
+
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
New Defects reported by Coverity Scan for LibreOffice
Hi,
Please find the latest report on new defect(s) introduced to LibreOffice found
with Coverity Scan.
1 new defect(s) introduced to LibreOffice found with Coverity Scan.
1 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent
build analyzed by Coverity Scan.
New defect(s) Reported-by: Coverity Scan
Showing 1 of 1 defect(s)
** CID 1478001: Null pointer dereferences (REVERSE_INULL)
/vcl/unx/generic/gdi/salvd.cxx: 130 in
X11SalVirtualDevice::X11SalVirtualDevice(const SalGraphics *, long &, long &,
DeviceFormat, const SystemGraphicsData *, std::unique_ptr>)()
*** CID 1478001: Null pointer dereferences (REVERSE_INULL)
/vcl/unx/generic/gdi/salvd.cxx: 130 in
X11SalVirtualDevice::X11SalVirtualDevice(const SalGraphics *, long &, long &,
DeviceFormat, const SystemGraphicsData *, std::unique_ptr>)()
124 bExternPixmap_ = true;
125 }
126 else
127 {
128 nDX_ = nDX;
129 nDY_ = nDY;
>>> CID 1478001: Null pointer dereferences (REVERSE_INULL)
>>> Null-checking "pGraphics" suggests that it may be null, but it has
>>> already been dereferenced on all paths leading to the check.
130 m_nXScreen = pGraphics ? static_cast(pGraphics)->GetScreenNumber() :
131
vcl_sal::getSalDisplay(GetGenericUnixSalData())->GetDefaultXScreen();
132 hDrawable_ = limitXCreatePixmap( GetXDisplay(),
133 pDisplay_->GetDrawable(
m_nXScreen ),
134 nDX_, nDY_,
135 GetDepth() );
To view the defects in Coverity Scan visit,
https://u15810271.ct.sendgrid.net/ls/click?upn=HRESupC-2F2Czv4BOaCWWCy7my0P0qcxCbhZ31OYv50ypSs1kiFPuCn2xFdlMIFBirii0zZ9j2-2F9F2XPBcBm2BNgi9duPy3v-2FzgFDd2LJ-2BDKI-3Dv0j9_OTq2XUZbbipYjyLSo6GRo-2FpVxQ9OzkDINu9UTS-2FQhSdO0F0jQniitrGlNxDIzPJiR9y3GSOtackX7-2FbTMWD53A1TjnpzgoighLs7brjfqYXwDAz8HCw7-2BObBObXVrXvvMVALA1qzXXBJ-2FcCzQZ-2FkTx9Cohnbie4C5Z5NmGiLT6u01pSdpvDP2B3a1lZZbHpgQjEmQ21iB55owHL5tusebfQ0fZFXUOJfiJJVGz-2Bx0XQ-3D
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svgio/inc svgio/source
svgio/inc/svgnode.hxx | 46 +++
svgio/source/svgreader/svganode.cxx |2 -
svgio/source/svgreader/svgcharacternode.cxx |2 -
svgio/source/svgreader/svgclippathnode.cxx |2 -
svgio/source/svgreader/svggnode.cxx |2 -
svgio/source/svgreader/svgimagenode.cxx |2 -
svgio/source/svgreader/svgmarkernode.cxx|2 -
svgio/source/svgreader/svgmasknode.cxx |2 -
svgio/source/svgreader/svgnode.cxx | 56 ++--
svgio/source/svgreader/svgpatternnode.cxx |2 -
svgio/source/svgreader/svgusenode.cxx |2 -
svgio/source/svguno/xsvgparser.cxx |4 +-
12 files changed, 62 insertions(+), 62 deletions(-)
New commits:
commit 83ff99bae3034e6ae029475dd0cf0ecc64756f6a
Author: Tomaž Vajngerl
AuthorDate: Fri Apr 30 23:01:57 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Sat May 1 05:05:27 2021 +0200
convert enums to enum classes in svgnode.hxx
converted XmlSpace, Display
Change-Id: I4aced2d7c2f6fcb4adc59949a6ac22d4ddd375a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114953
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/svgio/inc/svgnode.hxx b/svgio/inc/svgnode.hxx
index 95d3a03be1d1..fcf31f296ba7 100644
--- a/svgio/inc/svgnode.hxx
+++ b/svgio/inc/svgnode.hxx
@@ -40,34 +40,34 @@ namespace svgio::svgreader
namespace svgio::svgreader
{
-enum XmlSpace
+enum class XmlSpace
{
-XmlSpace_notset,
-XmlSpace_default,
-XmlSpace_preserve
+NotSet,
+Default,
+Preserve
};
// display property (see SVG 1.1. 11.5), not inheritable
-enum Display // #i121656#
+enum class Display // #i121656#
{
-Display_inline, // the default
-Display_block,
-Display_list_item,
-Display_run_in,
-Display_compact,
-Display_marker,
-Display_table,
-Display_inline_table,
-Display_table_row_group,
-Display_table_header_group,
-Display_table_footer_group,
-Display_table_row,
-Display_table_column_group,
-Display_table_column,
-Display_table_cell,
-Display_table_caption,
-Display_none,
-Display_inherit
+Inline, // the default
+Block,
+ListItem,
+RunIn,
+Compact,
+Marker,
+Table,
+InlineTable,
+TableRowGroup,
+TableHeaderGroup,
+TableFooterGroup,
+TableRow,
+TableColumnGroup,
+TableColumn,
+TableCell,
+TableCaption,
+None,
+Inherit
};
// helper to convert a string associated with a token of type
SVGTokenDisplay
diff --git a/svgio/source/svgreader/svganode.cxx
b/svgio/source/svgreader/svganode.cxx
index ad4483423100..6065ed498e42 100644
--- a/svgio/source/svgreader/svganode.cxx
+++ b/svgio/source/svgreader/svganode.cxx
@@ -84,7 +84,7 @@ namespace svgio::svgreader
const double fOpacity(pStyle->getOpacity().getNumber());
-if(fOpacity > 0.0 && Display_none != getDisplay())
+if (fOpacity > 0.0 && Display::None != getDisplay())
{
drawinglayer::primitive2d::Primitive2DContainer aContent;
diff --git a/svgio/source/svgreader/svgcharacternode.cxx
b/svgio/source/svgreader/svgcharacternode.cxx
index ff30730cf1eb..e0b66c6f8ee2 100644
--- a/svgio/source/svgreader/svgcharacternode.cxx
+++ b/svgio/source/svgreader/svgcharacternode.cxx
@@ -524,7 +524,7 @@ namespace svgio::svgreader
void SvgCharacterNode::whiteSpaceHandling()
{
-if(XmlSpace_default == getXmlSpace())
+if (XmlSpace::Default == getXmlSpace())
{
maText = whiteSpaceHandlingDefault(maText);
}
diff --git a/svgio/source/svgreader/svgclippathnode.cxx
b/svgio/source/svgreader/svgclippathnode.cxx
index a90d6adb8c2b..1a8269684095 100644
--- a/svgio/source/svgreader/svgclippathnode.cxx
+++ b/svgio/source/svgreader/svgclippathnode.cxx
@@ -125,7 +125,7 @@ namespace svgio::svgreader
drawinglayer::primitive2d::Primitive2DContainer& rContent,
const basegfx::B2DHomMatrix* pTransform) const
{
-if(rContent.empty() || Display_none == getDisplay())
+if (rContent.empty() || Display::None == getDisplay())
return;
const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
diff --git a/svgio/source/svgreader/svggnode.cxx
b/svgio/source/svgreader/svggnode.cxx
index 1d32de448517..e186387a80ba 100644
--- a/svgio/source/svgreader/svggnode.cxx
+++ b/svgio/source/svgreader/svggnode.cxx
[Libreoffice-commits] core.git: sc/source
sc/source/filter/inc/sheetdatabuffer.hxx |6 -
sc/source/filter/oox/sheetdatabuffer.cxx | 153 +--
2 files changed, 90 insertions(+), 69 deletions(-)
New commits:
commit deac5c84732c3491a0ef5bf7f8c1552e6def4fc0
Author: Noel Grandin
AuthorDate: Fri Apr 30 18:24:12 2021 +0200
Commit: Noel Grandin
CommitDate: Fri Apr 30 21:39:51 2021 +0200
tdf#79049 speed up OOXML workbook load (2)
the allocation of memory and pointer chasing was
slowing things down in the styles conversion.
So switch to more cache-dense data structure,
and re-arrange the loops to be more cache friendly.
The takes the time from 1m9 to 40s for me.
Change-Id: I876580adc7823313b0cdb067f2f6b3e61c39ecf8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114941
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx
b/sc/source/filter/inc/sheetdatabuffer.hxx
index c49e33280a10..17add16e6234 100644
--- a/sc/source/filter/inc/sheetdatabuffer.hxx
+++ b/sc/source/filter/inc/sheetdatabuffer.hxx
@@ -22,6 +22,7 @@
#include
#include
#include
+#include
#include "richstring.hxx"
#include "worksheethelper.hxx"
@@ -165,7 +166,8 @@ private:
/** Writes all cell formatting attributes to the passed cell range list.
(depreciates writeXfIdRangeProperties) */
voidapplyCellMerging( const ScRange& rRange );
-voidaddColXfStyle( sal_Int32 nXfId, sal_Int32 nFormatId,
const ScRange& rAddress, bool bProcessRowRange = false );
+voidaddColXfStyles();
+voidaddColXfStyleProcessRowRanges();
private:
/** Stores cell range address and formula token array of an array formula.
*/
typedef std::pair< ScRange, ApiTokenSequence > ArrayFormula;
@@ -200,7 +202,7 @@ private:
return lhs.mnEndRow RowStyles;
+typedef ::o3tl::sorted_vector< RowRangeStyle, StyleRowRangeComp >
RowStyles;
typedef ::std::map< sal_Int32, RowStyles > ColStyles;
/** Stores information about a merged cell range. */
struct MergedRange
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx
b/sc/source/filter/oox/sheetdatabuffer.cxx
index de1d2c76f3c9..c9c688c2ca17 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -346,57 +346,99 @@ static void addIfNotInMyMap( const StylesBuffer& rStyles,
std::map< FormatKeyPai
rMap[ FormatKeyPair( nXfId, nFormatId ) ] = rRangeList;
}
-void SheetDataBuffer::addColXfStyle( sal_Int32 nXfId, sal_Int32 nFormatId,
const ScRange& rAddress, bool bProcessRowRange )
-{
-RowRangeStyle aStyleRows;
-aStyleRows.mnNumFmt.first = nXfId;
-aStyleRows.mnNumFmt.second = nFormatId;
-aStyleRows.mnStartRow = rAddress.aStart.Row();
-aStyleRows.mnEndRow = rAddress.aEnd.Row();
-for ( sal_Int32 nCol = rAddress.aStart.Col(); nCol <= rAddress.aEnd.Col();
++nCol )
+void SheetDataBuffer::addColXfStyles()
+{
+std::map< FormatKeyPair, ScRangeList > rangeStyleListMap;
+for( const auto& [rFormatKeyPair, rRangeList] : maXfIdRangeLists )
+{
+addIfNotInMyMap( getStyles(), rangeStyleListMap, rFormatKeyPair.first,
rFormatKeyPair.second, rRangeList );
+}
+// gather all ranges that have the same style and apply them in bulk
+for ( const auto& [rFormatKeyPair, rRanges] : rangeStyleListMap )
{
-if ( !bProcessRowRange )
-maStylesPerColumn[ nCol ].insert( aStyleRows );
-else
+for (const ScRange & rAddress : rRanges)
{
-RowStyles& rRowStyles = maStylesPerColumn[ nCol ];
-// Reset row range for each column
+RowRangeStyle aStyleRows;
+aStyleRows.mnNumFmt.first = rFormatKeyPair.first;
+aStyleRows.mnNumFmt.second = rFormatKeyPair.second;
aStyleRows.mnStartRow = rAddress.aStart.Row();
aStyleRows.mnEndRow = rAddress.aEnd.Row();
+for ( sal_Int32 nCol = rAddress.aStart.Col(); nCol <=
rAddress.aEnd.Col(); ++nCol )
+ maStylesPerColumn[ nCol ].insert( aStyleRows );
+}
+}
+}
-// If aStyleRows includes rows already allocated to a style
-// in rRowStyles, then we need to split it into parts.
-// ( to occupy only rows that have no style definition)
-
-// Start iterating at the first element that is not completely
before aStyleRows
-RowStyles::iterator rows_it = rRowStyles.lower_bound(aStyleRows);
-RowStyles::iterator rows_end = rRowStyles.end();
-bool bAddRange = true;
-for ( ; rows_it != rows_end; ++rows_it )
+void SheetDataBuffer::addColXfStyleProcessRowRanges()
+{
+// count the number of row-range-styles we have
+AddressConverter& rAddrConv = getAddressConverter();
+int cnt = 0;
+for ( const auto& [nXfId, rRowRangeList] : maXfIdRowRangeList )
+{
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/attarray.cxx | 12
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 61386aa03cd166473a58dbb4be0dd5e0ce82195c
Author: Noel Grandin
AuthorDate: Fri Apr 30 18:27:31 2021 +0200
Commit: Noel Grandin
CommitDate: Fri Apr 30 21:41:13 2021 +0200
tdf#79049 speed up OOXML workbook load (3)
Exit this loop early if we aren't going to make progress
anyhow.
This takes the load time from 40s to 34s for me.
Change-Id: I31887442cde6e3fc05f1fce10bb3dde9c2b88bf2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114942
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index da8490b72f99..d7683b601435 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -1959,17 +1959,21 @@ bool ScAttrArray::GetLastVisibleAttr( SCROW& rLastRow,
SCROW nLastData ) const
Search( nLastData, nPos );
while ( nPos < mvData.size() )
{
+SCROW nAttrStartRow = ( nPos > 0 ) ? ( mvData[nPos-1].nEndRow + 1 ) :
0;
+if ( nAttrStartRow <= nLastData )
+nAttrStartRow = nLastData + 1;
// find range of visually equal formats
SCSIZE nEndPos = nPos;
while ( nEndPos < mvData.size()-1 &&
mvData[nEndPos].pPattern->IsVisibleEqual(
*mvData[nEndPos+1].pPattern))
+{
+if ( (mvData[nEndPos].nEndRow + 1 - nAttrStartRow) >=
SC_VISATTR_STOP )
+return false; // ignore this range and below
++nEndPos;
-SCROW nAttrStartRow = ( nPos > 0 ) ? ( mvData[nPos-1].nEndRow + 1 ) :
0;
-if ( nAttrStartRow <= nLastData )
-nAttrStartRow = nLastData + 1;
+}
SCROW nAttrSize = mvData[nEndPos].nEndRow + 1 - nAttrStartRow;
if ( nAttrSize >= SC_VISATTR_STOP )
-break; // while, ignore this range and below
+return false; // ignore this range and below
else if ( mvData[nEndPos].pPattern->IsVisible() )
{
rLastRow = mvData[nEndPos].nEndRow;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/source
include/vcl/wall.hxx| 25 ++--
vcl/inc/wall2.hxx | 50 -
vcl/source/control/combobox.cxx |2
vcl/source/gdi/wall.cxx | 204 +++-
4 files changed, 73 insertions(+), 208 deletions(-)
New commits:
commit 25b0f8787946b1627ea6ac0324d871a70cc5d9dd
Author: Noel Grandin
AuthorDate: Fri Apr 30 15:32:32 2021 +0200
Commit: Noel Grandin
CommitDate: Fri Apr 30 21:42:31 2021 +0200
simplify Wallpaper
All of it's member fields are already COW types, so it doesn't need the
complication
Change-Id: I44e402e8e80fe96462fc4e1aa06b9ec6815e3cd0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114933
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/vcl/wall.hxx b/include/vcl/wall.hxx
index 6a8c179d2e01..53c8efb7080c 100644
--- a/include/vcl/wall.hxx
+++ b/include/vcl/wall.hxx
@@ -22,8 +22,10 @@
#include
#include
+#include
+#include
#include
-#include
+#include
class Gradient;
class BitmapEx;
@@ -50,15 +52,11 @@ enum class WallpaperStyle
class VCL_DLLPUBLIC Wallpaper
{
public:
-typedef o3tl::cow_wrapper ImplType;
-
SAL_DLLPRIVATE void ImplSetCachedBitmap( BitmapEx& rBmp )
const;
SAL_DLLPRIVATE const BitmapEx* ImplGetCachedBitmap() const;
SAL_DLLPRIVATE void ImplReleaseCachedBitmap() const;
private:
-ImplType mpImplWallpaper;
-
SAL_DLLPRIVATE static Gradient ImplGetApplicationGradient();
public:
@@ -70,21 +68,21 @@ public:
~Wallpaper();
voidSetColor( const Color& rColor );
-const Color&GetColor() const;
+const Color&GetColor() const { return maColor; }
voidSetStyle( WallpaperStyle eStyle );
-WallpaperStyle GetStyle() const;
+WallpaperStyle GetStyle() const { return meStyle; }
voidSetBitmap( const BitmapEx& rBitmap );
-BitmapExGetBitmap() const;
+const BitmapEx & GetBitmap() const;
boolIsBitmap() const;
voidSetGradient( const Gradient& rGradient );
GradientGetGradient() const;
boolIsGradient() const;
-voidSetRect( const tools::Rectangle& rRect );
-tools::Rectangle GetRect() const;
+voidSetRect( const tools::Rectangle& rRect ) { maRect = rRect;
}
+const tools::Rectangle & GetRect() const { return maRect; }
boolIsRect() const;
boolIsFixed() const;
@@ -105,6 +103,13 @@ public:
friend SvStream& ReadWallpaper( SvStream& rIStm, Wallpaper& rWallpaper );
friend SvStream& WriteWallpaper( SvStream& rOStm, const Wallpaper&
rWallpaper );
+private:
+tools::RectanglemaRect;
+BitmapExmaBitmap;
+mutable BitmapExmaCache;
+std::optional mpGradient;
+Color maColor;
+WallpaperStyle meStyle;
};
#endif // INCLUDED_VCL_WALL_HXX
diff --git a/vcl/inc/wall2.hxx b/vcl/inc/wall2.hxx
deleted file mode 100644
index 401593b3ff8b..
--- a/vcl/inc/wall2.hxx
+++ /dev/null
@@ -1,50 +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 .
- */
-
-#ifndef INCLUDED_VCL_INC_WALL2_HXX
-#define INCLUDED_VCL_INC_WALL2_HXX
-
-#include
-
-class ImplWallpaper
-{
-friend class Wallpaper;
-
-private:
-std::optional mpRect;
-std::unique_ptr mpBitmap;
-std::unique_ptr mpGradient;
-std::unique_ptr mpCache;
-Color maColor;
-WallpaperStyle meStyle;
-
-public:
-ImplWallpaper();
-ImplWallpaper( const ImplWallpaper& rImplWallpaper );
-~ImplWallpaper();
-
-bool operator==( const ImplWallpaper& rImplWallpaper ) const = delete;
-
-friend SvStream& ReadImplWallpaper( SvStream& rIStm, ImplWallpaper&
rImplWallpaper );
-friend SvStream& WriteImplWallpaper( SvStream& rOStm, const ImplWallpaper&
rImplWallpaper );
-};
-
-#endif // INCLUDED_VCL_INC_WALL2_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff
[Libreoffice-commits] core.git: vcl/source
vcl/source/app/salvtables.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 0527539a8d228daadcd30428553bff7d96bf8434
Author: Caolán McNamara
AuthorDate: Fri Apr 30 16:15:33 2021 +0100
Commit: Caolán McNamara
CommitDate: Fri Apr 30 21:52:50 2021 +0200
don't grab focus if we already have focus
for cases like the combobox of tdf#138281 so we don't end up
selecting the content if we already had focus
Change-Id: I2294b2d17d56e5282d7d84859eb9002ebb3b9ada
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114938
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index f482d4ee7145..e3541057da60 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -271,7 +271,12 @@ void SalInstanceWidget::set_can_focus(bool bCanFocus)
m_xWidget->SetStyle(nStyle);
}
-void SalInstanceWidget::grab_focus() { m_xWidget->GrabFocus(); }
+void SalInstanceWidget::grab_focus()
+{
+if (has_focus())
+return;
+m_xWidget->GrabFocus();
+}
bool SalInstanceWidget::has_focus() const { return m_xWidget->HasFocus(); }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa sc/source
sc/qa/uitest/statistics/anova.py |4 +--
sc/source/core/tool/interpr5.cxx | 48 ---
2 files changed, 17 insertions(+), 35 deletions(-)
New commits:
commit 296367e0a91d0e6169da280d6a5efa83ae56de5d
Author: dante
AuthorDate: Thu Apr 29 16:56:41 2021 +0200
Commit: Mike Kaganski
CommitDate: Fri Apr 30 22:10:51 2021 +0200
tdf#137679 Use kahan summation for ScInterpreter::SumProduct
Change-Id: Id0ef5b30a01054337f0ad3afd8c71311e6b2b469
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114888
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sc/qa/uitest/statistics/anova.py b/sc/qa/uitest/statistics/anova.py
index 50237ef928f9..579b9d29014d 100644
--- a/sc/qa/uitest/statistics/anova.py
+++ b/sc/qa/uitest/statistics/anova.py
@@ -98,7 +98,7 @@ class anova(UITestCase):
self.assertEqual(get_cell_by_position(document, 0, 6, 5).getValue(),
10)
self.assertEqual(get_cell_by_position(document, 0, 6, 6).getValue(),
10)
self.assertEqual(get_cell_by_position(document, 0, 6, 8).getString(),
"SS")
-self.assertEqual(round(get_cell_by_position(document, 0, 6,
9).getValue(),11), 1876.56832844573)
+self.assertEqual(round(get_cell_by_position(document, 0, 6,
9).getValue(),11), 1876.56832844575)
self.assertEqual(round(get_cell_by_position(document, 0, 6,
10).getValue(),10), 6025.1090909091)
#bug 80583
self.assertEqual(round(get_cell_by_position(document, 0, 6,
11).getValue(),11), 7901.67741935484)
@@ -128,7 +128,7 @@ class anova(UITestCase):
self.assertEqual(round(get_cell_by_position(document, 0, 9,
9).getValue(),13), 4.3604117704492)
self.assertEqual(get_cell_by_position(document, 0, 10, 8).getString(),
"P-value")
-self.assertEqual(round(get_cell_by_position(document, 0, 10,
9).getValue(),14), 0.02246149518799)
+self.assertEqual(round(get_cell_by_position(document, 0, 10,
9).getValue(),14), 0.02246149518798)
self.assertEqual(get_cell_by_position(document, 0, 11, 8).getString(),
"F critical")
self.assertEqual(round(get_cell_by_position(document, 0, 11,
9).getValue(),13), 3.3403855582378)
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index 0fe64d647bfe..4f10bb8961d2 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -1715,37 +1715,6 @@ void ScInterpreter::ScPow()
}
}
-namespace {
-
-class SumValues
-{
-double mfSum;
-bool mbError;
-public:
-SumValues() : mfSum(0.0), mbError(false) {}
-
-void operator() (double f)
-{
-if (mbError)
-return;
-
-FormulaError nErr = GetDoubleErrorValue(f);
-if (nErr == FormulaError::NONE)
-mfSum += f;
-else if (nErr != FormulaError::ElementNaN)
-{
-// Propagate the first error encountered, ignore "this is not a
-// number" elements.
-mfSum = f;
-mbError = true;
-}
-}
-
-double getValue() const { return mfSum; }
-};
-
-}
-
void ScInterpreter::ScSumProduct()
{
short nParamCount = GetByte();
@@ -1790,8 +1759,21 @@ void ScInterpreter::ScSumProduct()
pMat->MergeDoubleArrayMultiply(aResArray);
}
-double fSum = std::for_each(aResArray.begin(), aResArray.end(),
SumValues()).getValue();
-PushDouble(fSum);
+KahanSum fSum = 0.0;
+for( double fPosArray : aResArray )
+{
+FormulaError nErr = GetDoubleErrorValue(fPosArray);
+if (nErr == FormulaError::NONE)
+fSum += fPosArray;
+else if (nErr != FormulaError::ElementNaN)
+{
+// Propagate the first error encountered, ignore "this is not a
number" elements.
+PushDouble(fPosArray);
+return;
+}
+}
+
+PushDouble(fSum.get());
}
void ScInterpreter::ScSumX2MY2()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 141984] New: LibreOffice Writer crashed when trying to input Special Character 'Paragraph' symbol from tool bar widget.
https://bugs.documentfoundation.org/show_bug.cgi?id=141984 Bug ID: 141984 Summary: LibreOffice Writer crashed when trying to input Special Character 'Paragraph' symbol from tool bar widget. Product: LibreOffice Version: 7.1.2.2 release Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: vincent.ni...@gmail.com Description: Reported and Mike Kaganski commented: It looks like a bug, and also I remember fixing similar problem (tdf#135997) in one of earlier versions. It was related to the recent used characters list that is shown in the widget on the toolbar; and an easy solution was to reset user profile, which removed every user setting including the recent used list. However, for the proper fix, I suggest you to send a crash report (if it is suggested to you after the crash), and mention its address in the mentioned tdf#135997. Steps to Reproduce: 1.Opened a new document as a test after numerous tests. Pressed the key to enter the Input Special Character (horseshoe icon, widget? 3. Immediteate crash Actual Results: Immediately crashed Understand from 'Mike Maganski' that was in earlier versions I was asked to quote tdf#135997 Expected Results: Expected to special symbol area to open and be able to choose 'Paragraph symbol. (Shaped like a "q" inverted and filled in. Reproducible: Always User Profile Reset: No Additional Info: I am on the latest Libre version on desktop windows 10 Version: 7.1.2.2 (x64) / LibreOffice Community Build ID: 8a45595d069ef5570103caea1b71cc9d82b2aae4 CPU threads: 4; OS: Windows 10.0 Build 19042; UI render: Skia/Raster; VCL: win Locale: en-AU (en_AU); UI: en-GB Calc: CL Note: Does not occur if access from Inset > -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 141983] Worldmap
https://bugs.documentfoundation.org/show_bug.cgi?id=141983 himajin100...@gmail.com changed: What|Removed |Added Resolution|--- |INVALID Product|cppunit |LibreOffice Component|General |deletionRequest Status|UNCONFIRMED |RESOLVED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 141983] Worldmap
https://bugs.documentfoundation.org/show_bug.cgi?id=141983 himajin100...@gmail.com changed: What|Removed |Added URL|http://blankworldmap.net/ | -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 140560] Application crash after selecting Option "Online Update" while computer was offline
https://bugs.documentfoundation.org/show_bug.cgi?id=140560 --- Comment #19 from Ulrich Windl --- (In reply to Ming Hua from comment #17) Actually I'm not sure whether I had selected the online update component as my DSL at home is rather slow. How can I check it? -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 125909] Change tracking: add a notification when it's hidden
https://bugs.documentfoundation.org/show_bug.cgi?id=125909 --- Comment #5 from Mike Kaganski --- Just to mention a case that I just came across, that shows where this is important: https://ask.libreoffice.org/en/question/306943 > I uploaded a small section of a paper I wrote to ask.libreoffice.org, to do > with a technical problem I am having with Writer. But I forgot that I had > track changes on (I was not showing the changes), so the entire document was > uploaded. Now I need to submit it for school, but plagiarism checkers are > finding it. ... -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 108770] [META] DOCX (OOXML) bullet and numbering list-related issues
https://bugs.documentfoundation.org/show_bug.cgi?id=108770 --- Comment #1 from Justin L --- Despite all of the fixes seen here, it seems like at the most fundamental levels, numbering is improperly implemented. (examples: no listLevel inheritance in styles, body listLevel(9) not recognized...) I have started a compatibility document on the wiki to try to capture high-level knowledge about the differences between MS Word and LO numbering. https://wiki.documentfoundation.org/Documentation/Numbering -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 107742] [META] Form control bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=107742 Dieter changed: What|Removed |Added Depends on||141255 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=141255 [Bug 141255] Writer forms: Can't limit carriage returns (scrollbar is not disabled despite it should be) -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 141255] Writer forms: Can't limit carriage returns (scrollbar is not disabled despite it should be)
https://bugs.documentfoundation.org/show_bug.cgi?id=141255 Dieter changed: What|Removed |Added Blocks||107742 CC||dgp-m...@gmx.de Whiteboard| QA:needsComment| --- Comment #1 from Dieter --- I tried the following steps 1. Display "Form Control" tolbar 2. Insert TextBox and make sure, that setting for scrollbar in general properties dialog is "None" 3. Exit Design Mode 4. Enter several paragraphs in TextBox (so that it doesn't fit with the height of the TextBox 5. Export to PDF Actual Result: PDF has a scrollbar Expected result: PDF has no scrollbar Rafael, I don't understand, why you expect a limit of CR. I won't expect this. Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=107742 [Bug 107742] [META] Form control bugs and enhancements -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 140101] Spacing between certain characters changing (which depends on zoom level) when moving a paragraph up. But not happing if it's the first paragraph
https://bugs.documentfoundation.org/show_bug.cgi?id=140101 Dieter changed: What|Removed |Added CC||dgp-m...@gmx.de Whiteboard| QA:needsComment| --- Comment #9 from Dieter --- Tested with Version: 7.2.0.0.alpha0+ (x64) / LibreOffice Community Build ID: 15a9bee9ef26ce13ed1e26319306a88b6d886158 CPU threads: 4; OS: Windows 10.0 Build 19042; UI render: Skia/Raster; VCL: win Locale: de-DE (de_DE); UI: en-GB Calc: CL and zoom-level 200%, but I can't see any change -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 141203] Typesetting and inter-letter-distances are inconsistent
https://bugs.documentfoundation.org/show_bug.cgi?id=141203 Dieter changed: What|Removed |Added CC||dgp-m...@gmx.de Ever confirmed|0 |1 Status|UNCONFIRMED |NEEDINFO Whiteboard| QA:needsComment| --- Comment #1 from Dieter --- Thank you for reporting the bug. Screencast makes it ver clear. But could you please attach a sample document, as this makes it easier for us to verify the bug? (Please note that the attachment will be public, remove any sensitive information before attaching it) => NEEDINFO -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 129940] FILEOPEN: Cell content in ODS exported by Excel with Asian phonetic guide is displayed as empty
https://bugs.documentfoundation.org/show_bug.cgi?id=129940 Xisco Faulí changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #18 from Xisco Faulí --- (In reply to Naruhiko Ogasawara from comment #17) > As the original reporter, we can close this as RESOLVED/FIXED. > (but I'm not familiar with BZ, so I leave the status for now.) Let's close it as VERIFIED FIXED. Thank you all for your work!! -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 113195] [META] Japanese language-specific CJK issues
https://bugs.documentfoundation.org/show_bug.cgi?id=113195 Bug 113195 depends on bug 129940, which changed state. Bug 129940 Summary: FILEOPEN: Cell content in ODS exported by Excel with Asian phonetic guide is displayed as empty https://bugs.documentfoundation.org/show_bug.cgi?id=129940 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 83066] [META] CJK (Chinese, Japanese, Korean, and Vietnamese) language issues
https://bugs.documentfoundation.org/show_bug.cgi?id=83066 Bug 83066 depends on bug 129940, which changed state. Bug 129940 Summary: FILEOPEN: Cell content in ODS exported by Excel with Asian phonetic guide is displayed as empty https://bugs.documentfoundation.org/show_bug.cgi?id=129940 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 141017] Error Printing Landscape
https://bugs.documentfoundation.org/show_bug.cgi?id=141017 --- Comment #9 from Dimitri Junker --- For some time I had no Problem, but yesterday it happend again. So I started thinking what was different. It was originaly an old sxw File from 2003. So maybe the real Problem starts with the sxm import. It contains a Cover for a DVD which I changed a little bit and than printed it. New ones with the same Layout work fine. The same error ocures when I print it with pdfcreator. I'll add the sxw, odt and pdf as Attachments -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 139676] Crashes when "Export Directly to PDF" selected. Tabbed UI, Unmaximized Window
https://bugs.documentfoundation.org/show_bug.cgi?id=139676 --- Comment #9 from Telesto --- No crash for me Version: 7.2.0.0.alpha0+ (x64) / LibreOffice Community Build ID: f616d96bd8ce8986e4cc204953db0467e6060b5c CPU threads: 4; OS: Windows 6.3 Build 9600; UI render: Skia/Raster; VCL: win Locale: nl-NL (nl_NL); UI: en-US Calc: CL The dialog keeps expanded state after export (would assume clicking 'PDF') closes the expand button but that's my expectation. It doesn't hang/or crash -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 124481] Page numbers in frame with relative position from (sectioned header) DOCX shown left instead or right
https://bugs.documentfoundation.org/show_bug.cgi?id=124481 Timur changed: What|Removed |Added Summary|Page numbers in frame from |Page numbers in frame with |sectioned header DOCX shown |relative position from |left instead or right |(sectioned header) DOCX ||shown left instead or right -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 141988] Online help pages don't indicate their context/hierarchy position
https://bugs.documentfoundation.org/show_bug.cgi?id=141988 Olivier Hallot changed: What|Removed |Added Resolution|--- |NOTABUG Status|UNCONFIRMED |RESOLVED --- Comment #1 from Olivier Hallot --- This page is an auxiliary page for embedding contents in other pages is called by scalc/main0205.xhp: simpress/main0203.xhp: swriter/main0220.xhp: or, in built help online https://help.libreoffice.org/7.2/en-US/text/swriter/main0220.html https://help.libreoffice.org/7.2/en-US/text/scalc/main0205.html?DbPAR=CALC https://help.libreoffice.org/7.2/en-US/text/simpress/main0203.html?DbPAR=IMPRESS The icon is displayed in the Text Object Toolbar, when CTL/Asiatic languages are enabled. Setting "not a bug". Reopen if you want to add precision on the page contents by supplying in this ticket the text you want to read in the page. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 141352] Wrong page format on first print
https://bugs.documentfoundation.org/show_bug.cgi?id=141352 Timur changed: What|Removed |Added Resolution|--- |DUPLICATE Status|UNCONFIRMED |RESOLVED --- Comment #5 from Timur --- *** This bug has been marked as a duplicate of bug 141425 *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 141991] libreoffice cause windows 10 crash APC_INDEX MISMATCH due probably to .lock file corrupted
https://bugs.documentfoundation.org/show_bug.cgi?id=141991 --- Comment #2 from pier andre --- I think the importance/severity of this bug should be chenged to critical or major -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 122206] FILEOPEN: Opening XML file with XSLT filter opens with plain text import dialogue
https://bugs.documentfoundation.org/show_bug.cgi?id=122206 --- Comment #21 from Timur --- (In reply to Steve Edmonds from comment #0) > Description: > Opening a XML file with File>Open and select my filter and then the XML file > I get the text import dialogue and not a correct import. > A XML file will open correctly with Tools>XML Filter Settings, select filter > and click "Test XSLTs..." > Problem occurs on Calc 6.1.3.2 and not on Calc 6.0.5.2. > > Steps to Reproduce: > 1. "Install XSLT XML filter" "Tools>Macros>XML filter settings." - in Calc "Select your filter" - which one? "and click Test XSLT and browse your XML file." - I guess Import? > 2. "Go File>Open" - in Calc? > 3. "Select XML filter above" - where do you select it exactly? > 4. Select XML file > > Actual Results: Text import dialogue opens > Expected Results: File opens in Calc Please be precise for those who don't use it, do not assume obvious. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 141993] New: Parent component doesn't include the size of the child components while custom setup
https://bugs.documentfoundation.org/show_bug.cgi?id=141993 Bug ID: 141993 Summary: Parent component doesn't include the size of the child components while custom setup Product: LibreOffice Version: 7.1.2.2 release Hardware: x86-64 (AMD64) OS: Windows (All) Status: UNCONFIRMED Severity: minor Priority: medium Component: Installation Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: vikentiev.va...@gmail.com Description: Parent component doesn't include the size of the child components while custom setup Steps to Reproduce: 1. Run LibreOffice_7.1.2_Win_x64.msi 2. Click "Next" button 3. Select "Custom" setup and click "Next" button 4. Select "Optional Components" or "Dictionaries" or "User Interface Languages" Actual Results: "Optional Components", "Dictionaries" and "User Interface Languages" doesn't show the size of the components that are included. Expected Results: "Optional Components", "Dictionaries" and "User Interface Languages" show the size of the components that are included. Reproducible: Always User Profile Reset: No Additional Info: It's installation testing. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 141425] Crazy paper sizes.
https://bugs.documentfoundation.org/show_bug.cgi?id=141425 --- Comment #9 from Timur --- I see a lot of similar bugs, but they'd better be grouped or they are lost. Please see if a duplicate of bug 134646 and bug 141017. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 138492] [Docx] Missing Picture on second page
https://bugs.documentfoundation.org/show_bug.cgi?id=138492 NISZ LibreOffice Team changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=14 ||0824 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 125469] FILEOPEN DOCX Inline images separated by line-break overlap
https://bugs.documentfoundation.org/show_bug.cgi?id=125469 NISZ LibreOffice Team changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=14 ||0824 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 140824] Fileopen DOCX with 4 same images
https://bugs.documentfoundation.org/show_bug.cgi?id=140824 NISZ LibreOffice Team changed: What|Removed |Added Component|Printing and PDF export |Writer See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=12 ||5469, ||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=13 ||8492 --- Comment #8 from NISZ LibreOffice Team --- All images are anchored as character. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 141930] libreoffice math does not ask to save changes when closing
https://bugs.documentfoundation.org/show_bug.cgi?id=141930 Gerald Pfeifer changed: What|Removed |Added Ever confirmed|0 |1 Status|UNCONFIRMED |NEW Keywords||bibisectRequest, regression CC||ger...@pfeifer.com --- Comment #1 from Gerald Pfeifer --- I does not reproduce in all situations, but many, and deterministically. Here is a concrete reproducer: 1. Open Math Formula editor. 2. Select +[ ] symbol (unary plus) from the list. 3. Enter "abc" and click outside symbol + string (leaving edit mode). 4. + - "Save changes" message box pops up. 5. Click at the string "abc" (entering edit mode again). 5. + exits Math Formula editor without question. NOT reproduced with Version: 7.1.1.2 / LibreOffice Community Build ID: 10(Build:2) CPU threads: 8; OS: Linux 5.11; UI render: default; VCL: gtk3 Locale: en-US (en_US.UTF-8); UI: en-US REPRODUCED with Version: 7.1.3.0.0+ / LibreOffice Community Build ID: 66319fd36564f55feb9669b3f117176f4ef4c939 CPU threads: 8; OS: Linux 5.11; UI render: default; VCL: gtk3 Locale: en-US (en_US.UTF-8); UI: en-US TinderBox: Linux-rpm_deb-x86_64@86-TDF, Branch:libreoffice-7-1, Time: 2021-03-20_11:15:06 NOT reproduced with Version: 7.2.0.0.alpha0+ / LibreOffice Community Build ID: 0dc9da5df470b9c345e78dbe9553d81b9e4a7435 CPU threads: 8; OS: Linux 5.11; UI render: default; VCL: gtk3 Locale: en-US (en_US.UTF-8); UI: en-US TinderBox: Linux-rpm_deb-x86_64@86-TDF, Branch:master, Time: 2021-04-29_15:55:29 So this looks like a regression on the 7.1 release branch between 7.1.1.2 and 7.1.3.0.0+ as of March 20. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 141988] Online help pages don't indicate their context/hierarchy position
https://bugs.documentfoundation.org/show_bug.cgi?id=141988 --- Comment #2 from Eyal Rozenberg --- (In reply to Olivier Hallot from comment #1) > This page is an auxiliary page for embedding contents in other pages Then why does it exist, and is viewable, on its own? > Reopen if you want to add precision on the page contents by supplying in > this ticket the text you want to read in the page. Not exactly, I was using it just as an example. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 141991] libreoffice cause windows 10 crash APC_INDEX MISMATCH due probably to .lock file corrupted
https://bugs.documentfoundation.org/show_bug.cgi?id=141991 --- Comment #1 from pier andre --- Created attachment 171527 --> https://bugs.documentfoundation.org/attachment.cgi?id=171527=edit windows crash screen -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 141990] LO Help search results shouldn't direct you to context-less subpages
https://bugs.documentfoundation.org/show_bug.cgi?id=141990 Olivier Hallot changed: What|Removed |Added Status|UNCONFIRMED |NEW Blocks||97629 Ever confirmed|0 |1 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=97629 [Bug 97629] [META] Help Content Modernization -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 97629] [META] Help Content Modernization
https://bugs.documentfoundation.org/show_bug.cgi?id=97629 Olivier Hallot changed: What|Removed |Added Depends on||141990 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=141990 [Bug 141990] LO Help search results shouldn't direct you to context-less subpages -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 141950] bad cropped pictures in Impress
https://bugs.documentfoundation.org/show_bug.cgi?id=141950 --- Comment #5 from Hamel --- Created attachment 171531 --> https://bugs.documentfoundation.org/attachment.cgi?id=171531=edit page 3 page 3 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 141980] Writer 'smooth scroll' choppy with Skia/Vulkan Intel HD Graphics 630 and 0.402.1274 driver
https://bugs.documentfoundation.org/show_bug.cgi?id=141980 Luboš Luňák changed: What|Removed |Added Ever confirmed|0 |1 Status|UNCONFIRMED |NEEDINFO --- Comment #2 from Luboš Luňák --- I'm not sure I understand the issue. Are you saying that the problem exists with the 630 but not the Iris card? -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 141017] Error Printing Landscape
https://bugs.documentfoundation.org/show_bug.cgi?id=141017 --- Comment #8 from Dimitri Junker --- Created attachment 171524 --> https://bugs.documentfoundation.org/attachment.cgi?id=171524=edit from sxw converted File with new changes I loaded an old sxw file, made same changes and saved it as odt. When I try to print it only the left 20cm are printed -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 141017] Error Printing Landscape
https://bugs.documentfoundation.org/show_bug.cgi?id=141017 --- Comment #10 from Dimitri Junker --- Created attachment 171525 --> https://bugs.documentfoundation.org/attachment.cgi?id=171525=edit Here the pdf This pdf was created using pdfcreator printing the odt-file -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 141017] Error Printing Landscape
https://bugs.documentfoundation.org/show_bug.cgi?id=141017 --- Comment #11 from Dimitri Junker --- Created attachment 171526 --> https://bugs.documentfoundation.org/attachment.cgi?id=171526=edit The sxw file And finaly the original sxw File -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 141930] libreoffice math does not ask to save changes when closing
https://bugs.documentfoundation.org/show_bug.cgi?id=141930 --- Comment #2 from Gerald Pfeifer --- Still reproduces with current 7.1 branch, i.e., Version: 7.1.4.0.0+ / LibreOffice Community Build ID: e5b8477a1270a8b572b3815cfb318110eb19d0f2 CPU threads: 8; OS: Linux 5.11; UI render: default; VCL: gtk3 Locale: en-US (en_US.UTF-8); UI: en-US TinderBox: Linux-rpm_deb-x86_64@86-TDF, Branch:libreoffice-7-1, Time: 2021-04-28_11:37:37 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 141991] New: libreoffice cause windows 10 crash APC_INDEX MISMATCH due probably to .lock file corrupted
https://bugs.documentfoundation.org/show_bug.cgi?id=141991 Bug ID: 141991 Summary: libreoffice cause windows 10 crash APC_INDEX MISMATCH due probably to .lock file corrupted Product: LibreOffice Version: 7.1.2.2 release Hardware: x86-64 (AMD64) OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: LibreOffice Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: pier_andr...@yahoo.it Description: On my laptop clicking on a libreoffice (version 7.1) file cause a windows 10 crash with this informations: Codice di interruzione: APC_INDEX MISMATCH (in english is interruption code) Elemento che ha causato il problema: win32full.sys (in english is Element that caused the problem) this happens both in local files and in files in AFS network storage, also if I open a working libreoffice file, libreoffice works but when I click on the-non-working-file windows 10 crash, I checked that there aren't errors in the disks. In a previous post in: http://document-foundation-mail-archive.969070.n3.nabble.com/libreoffice-crash-on-windows-10-related-to-a-lock-file-td4298039.html I attributed this crash to a corrupted .lock file (the first times windows said this). Now it (the advice that a .lock file is corrupted) doesn't happen and windows 10 crash brutally. I also reset twice my Libreoffice user profile 1) The first solution I found has been to: 1.1) copy the "libreoffice-that-crash-windows file" in an USB stick; 1.2) open it in a linux laptop to see if it works; 1.3) change the filename; 1.4) copy the "libreoffice-that-crash-windows-new-name file" in the windows 10 laptop; 1.5) delete the old "libreoffice-that-crash-windows-old-name file"; 1.6) delete the ".lock file" in the folder where the "libreoffice-that-crash-windows file" was and the ".lock file" in C:\Users\\AppData\Roaming\libreoffice\4; 1.7) reboot windows; and it works. (I tried also to delete only the .lock files but it didn't works) 2) I also copyed the "libreoffice-that-crash-windows-old-name file" and the ".lock-in-the-folde-where-the-file-was file" in a linux laptop, try to open the "libreoffice-that-crash-windows file" and an advice popup saying: "Document file 'libreoffice-that-crash-windows' is locked for editing by: LAPTOP-NH65QF38/username-in-windows10(date and time) Open document read-only or open a copy of the document for editing. You may also ignore the file locking and open the document for editing." and four buttons "Open Read Only" "Open Copy" "Open" "Cancel" If I click "Open Read Only" it works If I click "Open Copy" it works If I click "Open" it works but delete the ".lock-in-the-folde-where-the-file-was file" Yesterday with libreoffice (version 7.1.2.2) it happened again and I tried the same solution on windows 10 instead of linux; following the same steps as in 1) copying in an USB stick included I don't know if the bug is in windows 10 or libreoffice but this doesn't allow to use libreoffice easily in windows 10, it never happened in windows 7 neither in linux, and it's not good that libreoffice cause windows crashes :-). is there a way to solve in a better way tha the one I used? manythanks, ciao Steps to Reproduce: 1.click on a libreoffice file 2. 3. Actual Results: windows 10 crashes Expected Results: no crash Reproducible: Sometimes User Profile Reset: Yes Additional Info: happens only in windows 10 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 141991] libreoffice cause windows 10 crash APC_INDEX MISMATCH due probably to .lock file corrupted
https://bugs.documentfoundation.org/show_bug.cgi?id=141991 Mike Kaganski changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE --- Comment #3 from Mike Kaganski --- *** This bug has been marked as a duplicate of bug 140952 *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 141982] [EMF] SetWorldTransform/ModifyWorldTransform support for non-0 m12/m21
https://bugs.documentfoundation.org/show_bug.cgi?id=141982 --- Comment #9 from Bartosz --- @Xisco Are you sure the regression was introduced by this commit? Could you please attach screenshots of EMF files imported by LibreOffice 4.1? -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 141993] Parent component doesn't include the size of the child components while custom setup
https://bugs.documentfoundation.org/show_bug.cgi?id=141993 --- Comment #1 from Vadym --- Created attachment 171528 --> https://bugs.documentfoundation.org/attachment.cgi?id=171528=edit Parent component doesn't include the size of the child components while custom setup -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 141926] FILEOPEN PPTX Dash – Dot style line loses some dots in presentation mode
https://bugs.documentfoundation.org/show_bug.cgi?id=141926 --- Comment #4 from Gabor Kelemen --- Created attachment 171529 --> https://bugs.documentfoundation.org/attachment.cgi?id=171529=edit The example file in Impress slideshow mode Looks more consistent in a fresh build after this commit: https://bugs.documentfoundation.org/show_bug.cgi?id=136957#c17 Version: 7.2.0.0.alpha0+ Build ID: 6b7c2fa65eb68be520ed4135cc245e33fa22e8bf CPU threads: 8; OS: Linux 5.4; UI render: default; VCL: gtk3 Locale: hu-HU (hu_HU.UTF-8); UI: en-US Calc: threaded -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 96061] Text background/highlighting color doesn't reopen well in LO when exporting as PPTX (OK in MSO), doesn't open from PPT because exist not in MSO (save into LO namespace?)
https://bugs.documentfoundation.org/show_bug.cgi?id=96061 --- Comment #22 from Gerald Pfeifer --- (In reply to Timur from comment #16) > Bug 134117 is fileopen of PPTX created in MSO, so somewhat different from > this bug which is RT fileopen of PPTX created in LO. But may be resolved > here. > MSO PPTX attachment 162174 [details] with highlighted text compared in > screenshot attachment 166234 [details]. I did a number of experiments, in the LibreOffice PPTX export filter appears fine (i.e., things show properly in Office 365). The LibreOffice PPTX import filter appears to be the issue (i.e., documents exported from Office 365 *and* LibreOffice exhibit the problem). I ran into this twice myself, nearly resulting in rather unhappy situations both times, and will see that SUSE sponsors a fix. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 141989] Calc VLOOKUP from DATA VALIDATION cell returns N/A for two of the validated values
https://bugs.documentfoundation.org/show_bug.cgi?id=141989 Mike Kaganski changed: What|Removed |Added Resolution|--- |NOTABUG Status|UNCONFIRMED |RESOLVED --- Comment #2 from Mike Kaganski --- Formula in B8 is > =VLOOKUP(A4;Sales;B5) which uses sorted range lookup [1]. It requires that the search column be sorted ascending, which is obviously not the case. Your data is not sorted, and thus you need 0 as the fourth argument. This is not a bug. [1] https://help.libreoffice.org/latest/en-US/text/scalc/01/04060109.html?DbPAR=CALC#bm_id3153152 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 124481] Page numbers in frame from sectioned header DOCX shown left instead or right
https://bugs.documentfoundation.org/show_bug.cgi?id=124481 Timur changed: What|Removed |Added Summary|Page numbers in MS Word |Page numbers in frame from |document not rendering |sectioned header DOCX shown |correctly with LibreOffice. |left instead or right Version|3.3.0 release |Inherited From OOo --- Comment #5 from Timur --- Page numbers are in sectioned header but being in frame seems to be the issue. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 124481] Page numbers in frame from sectioned header DOCX shown left instead or right
https://bugs.documentfoundation.org/show_bug.cgi?id=124481 Timur changed: What|Removed |Added CC||rhys.yo...@d2l.com --- Comment #6 from Timur --- *** Bug 137129 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 104461] [META] DOCX (OOXML) frame-related issues
https://bugs.documentfoundation.org/show_bug.cgi?id=104461 Bug 104461 depends on bug 137129, which changed state. Bug 137129 Summary: FILEOPEN DOCX: Frame (with position right relative to margin) appearing on wrong side (left) https://bugs.documentfoundation.org/show_bug.cgi?id=137129 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 137129] FILEOPEN DOCX: Frame (with position right relative to margin) appearing on wrong side (left)
https://bugs.documentfoundation.org/show_bug.cgi?id=137129 Timur changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #6 from Timur --- Looks duplicate. *** This bug has been marked as a duplicate of bug 124481 *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 129180] UI Print dialog shows incorrect paper size by default
https://bugs.documentfoundation.org/show_bug.cgi?id=129180 Timur changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=13 ||4646 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
