[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/filter/SvmReader.hxx|1 +
include/vcl/metaact.hxx |3 +++
vcl/source/filter/svm/SvmReader.cxx | 19 ++-
3 files changed, 22 insertions(+), 1 deletion(-)
New commits:
commit 882f8a34f6829bcdc113ccc96da66c376e38b437
Author: panoskorovesis
AuthorDate: Fri Jul 2 11:45:26 2021 +0300
Commit: Tomaž Vajngerl
CommitDate: Mon Jul 5 08:56:04 2021 +0200
Add Handler for MetaFillColor Read
The handler seperates the read method from MetaAct.hxx
Required set methods are added.
Change-Id: I93bb581c6ea6b4e6171da30cfff572406e822f40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118275
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/vcl/filter/SvmReader.hxx b/include/vcl/filter/SvmReader.hxx
index 0c2b01d79ee1..c8ece1c5043c 100644
--- a/include/vcl/filter/SvmReader.hxx
+++ b/include/vcl/filter/SvmReader.hxx
@@ -38,6 +38,7 @@ public:
SvStream& Read(GDIMetaFile& rMetaFile, ImplMetaReadData* pData = nullptr);
rtl::Reference MetaActionHandler(ImplMetaReadData* pData);
rtl::Reference LineColorHandler();
+rtl::Reference FillColorHandler();
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index 1829340e63db..657a06c9227a 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -1252,6 +1252,9 @@ public:
const Color&GetColor() const { return maColor; }
boolIsSetting() const { return mbSet; }
+voidSetSetting(bool rSet) { mbSet = rSet; }
+voidSetColor(Color& rColor) { maColor = rColor; }
+
};
class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaTextColorAction final : public
MetaAction
diff --git a/vcl/source/filter/svm/SvmReader.cxx
b/vcl/source/filter/svm/SvmReader.cxx
index a8b55b3eab46..e30984148517 100644
--- a/vcl/source/filter/svm/SvmReader.cxx
+++ b/vcl/source/filter/svm/SvmReader.cxx
@@ -264,7 +264,7 @@ rtl::Reference
SvmReader::MetaActionHandler(ImplMetaReadData* pData)
return LineColorHandler();
break;
case MetaActionType::FILLCOLOR:
-pAction = new MetaFillColorAction;
+return FillColorHandler();
break;
case MetaActionType::TEXTCOLOR:
pAction = new MetaTextColorAction;
@@ -353,4 +353,21 @@ rtl::Reference SvmReader::LineColorHandler()
return pAction;
}
+
+rtl::Reference SvmReader::FillColorHandler()
+{
+auto pAction = new MetaFillColorAction();
+
+VersionCompatRead aCompat(mrStream);
+
+Color aColor;
+ReadColor(aColor);
+bool aBool;
+mrStream.ReadCharAsBool(aBool);
+
+pAction->SetColor(aColor);
+pAction->SetSetting(aBool);
+
+return pAction;
+}
/* 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: include/vcl vcl/source
include/vcl/filter/SvmReader.hxx|4
include/vcl/metaact.hxx |2 ++
vcl/source/filter/svm/SvmReader.cxx | 24 +++-
3 files changed, 29 insertions(+), 1 deletion(-)
New commits:
commit 0779fd344afee8c8ea182e3f97c971663bef3632
Author: panoskorovesis
AuthorDate: Thu Jul 1 13:07:58 2021 +0300
Commit: Tomaž Vajngerl
CommitDate: Mon Jul 5 08:55:46 2021 +0200
Add Handler for MetaLineColor Read
The handler seperates the read method from MetaAct.hxx
Required set methods are added.
Change-Id: I070af28711c111d60b3af3ae23fd8d6e93429cf7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118217
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/vcl/filter/SvmReader.hxx b/include/vcl/filter/SvmReader.hxx
index 229fb3ca1d36..0c2b01d79ee1 100644
--- a/include/vcl/filter/SvmReader.hxx
+++ b/include/vcl/filter/SvmReader.hxx
@@ -29,11 +29,15 @@ class VCL_DLLPUBLIC SvmReader
private:
SvStream& mrStream;
+protected:
+void ReadColor(::Color& rColor);
+
public:
SvmReader(SvStream& rIStm);
SvStream& Read(GDIMetaFile& rMetaFile, ImplMetaReadData* pData = nullptr);
rtl::Reference MetaActionHandler(ImplMetaReadData* pData);
+rtl::Reference LineColorHandler();
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index c37b7ab98aa2..1829340e63db 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -1223,6 +1223,8 @@ public:
const Color&GetColor() const { return maColor; }
boolIsSetting() const { return mbSet; }
+voidSetColor(Color& rColor) { maColor = rColor; }
+voidSetSetting(bool rSet) { mbSet = rSet; }
};
class VCL_DLLPUBLIC MetaFillColorAction final : public MetaAction
diff --git a/vcl/source/filter/svm/SvmReader.cxx
b/vcl/source/filter/svm/SvmReader.cxx
index e8455ea4de33..a8b55b3eab46 100644
--- a/vcl/source/filter/svm/SvmReader.cxx
+++ b/vcl/source/filter/svm/SvmReader.cxx
@@ -261,7 +261,7 @@ rtl::Reference
SvmReader::MetaActionHandler(ImplMetaReadData* pData)
pAction = new MetaMoveClipRegionAction;
break;
case MetaActionType::LINECOLOR:
-pAction = new MetaLineColorAction;
+return LineColorHandler();
break;
case MetaActionType::FILLCOLOR:
pAction = new MetaFillColorAction;
@@ -331,4 +331,26 @@ rtl::Reference
SvmReader::MetaActionHandler(ImplMetaReadData* pData)
return pAction;
}
+void SvmReader::ReadColor(Color& rColor)
+{
+sal_uInt32 nTmp;
+mrStream.ReadUInt32(nTmp);
+rColor = ::Color(ColorTransparency, nTmp);
+}
+
+rtl::Reference SvmReader::LineColorHandler()
+{
+auto pAction = new MetaLineColorAction();
+
+VersionCompatRead aCompat(mrStream);
+Color aColor;
+ReadColor(aColor);
+bool aBool;
+mrStream.ReadCharAsBool(aBool);
+
+pAction->SetSetting(aBool);
+pAction->SetColor(aColor);
+
+return pAction;
+}
/* 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: Branch 'distro/collabora/cp-6.4' - svx/source sw/source
svx/source/svdraw/svdmrkv.cxx |2 +-
sw/source/core/crsr/crsrsh.cxx |7 +--
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 935563fddce9e0cb8a7fccc6f1901150dab31a00
Author: Dennis Francis
AuthorDate: Thu Jun 24 12:38:45 2021 +0530
Commit: Miklos Vajna
CommitDate: Mon Jul 5 08:55:39 2021 +0200
lok: fix incorrect multi-view table selection updates
Use the correct writer shell to fetch selected table info, else the
active view's table selection data is sent to all views which is
incorrect.
Also avoid interference from draw empty table updates in
SdrMarkView::SetMarkHandlesForLOKit() if we are in writer.
Change-Id: Iff8181a7d43712e3c9a23cee43a8b6b98ba032d6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118000
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 61f7d472ecd6..738faec6175f 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -1108,7 +1108,7 @@ void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle
const & rRect, SfxView
boost::property_tree::write_json(aStream, aTableJsonTree);
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_TABLE_SELECTED,
aStream.str().c_str());
}
-else
+else if (!getSdrModelFromSdrView().IsWriter())
{
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_TABLE_SELECTED, "{}");
}
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 7d3b70dbf363..7a3c3ec421b8 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -72,6 +72,7 @@
#include
#include
#include
+#include
#include
using namespace com::sun::star;
@@ -2033,10 +2034,12 @@ void SwCursorShell::UpdateCursor( sal_uInt16 eFlags,
bool bIdleEnd )
void SwCursorShell::sendLOKCursorUpdates()
{
-SwWrtShell* pShell = GetDoc()->GetDocShell()->GetWrtShell();
-if (!pShell)
+SwView* pView = static_cast(GetSfxViewShell());
+if (!pView)
return;
+SwWrtShell* pShell = &pView->GetWrtShell();
+
SwFrame* pCurrentFrame = GetCurrFrame();
SelectionType eType = pShell->GetSelectionType();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/Library_vcl.mk vcl/qa vcl/source
include/vcl/filter/SvmReader.hxx| 39
vcl/Library_vcl.mk |1
vcl/qa/cppunit/svm/svmtest.cxx |5
vcl/source/filter/svm/SvmReader.cxx | 334
4 files changed, 378 insertions(+), 1 deletion(-)
New commits:
commit 960d8c227bf39c66b5366f6024635ee317c6b314
Author: panoskorovesis
AuthorDate: Wed Jun 30 09:57:27 2021 +0300
Commit: Tomaž Vajngerl
CommitDate: Mon Jul 5 08:55:09 2021 +0200
Create Separate SvmReader class
Add a new class to handle MetaAcion.Read() at
vcl/source/filter/svm/
Modified svmtest.cxx to use the new Read() method.
Change-Id: I617cb8fe14704e1303c866261ceb695238f04234
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118143
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/vcl/filter/SvmReader.hxx b/include/vcl/filter/SvmReader.hxx
new file mode 100644
index ..229fb3ca1d36
--- /dev/null
+++ b/include/vcl/filter/SvmReader.hxx
@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include
+#include
+
+class SvStream;
+
+class VCL_DLLPUBLIC SvmReader
+{
+private:
+SvStream& mrStream;
+
+public:
+SvmReader(SvStream& rIStm);
+
+SvStream& Read(GDIMetaFile& rMetaFile, ImplMetaReadData* pData = nullptr);
+rtl::Reference MetaActionHandler(ImplMetaReadData* pData);
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 65b6cd8cc96e..d3f1adcd9b37 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -454,6 +454,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/filter/jpeg/JpegReader \
vcl/source/filter/jpeg/JpegWriter \
vcl/source/filter/jpeg/JpegTransform \
+vcl/source/filter/svm/SvmReader \
vcl/source/filter/wmf/emfwr \
vcl/source/filter/wmf/wmf \
vcl/source/filter/wmf/wmfexternal \
diff --git a/vcl/qa/cppunit/svm/svmtest.cxx b/vcl/qa/cppunit/svm/svmtest.cxx
index 0f2523ea3c46..7a1f4b8f0dba 100644
--- a/vcl/qa/cppunit/svm/svmtest.cxx
+++ b/vcl/qa/cppunit/svm/svmtest.cxx
@@ -22,6 +22,7 @@
#include
#include
#include
+#include
#include
#include
@@ -328,7 +329,9 @@ GDIMetaFile SvmTest::writeAndReadStream(GDIMetaFile&
rMetaFile, std::u16string_v
aStream.Seek(STREAM_SEEK_TO_BEGIN);
GDIMetaFile aResultMetafile;
-aResultMetafile.Read(aStream);
+SvmReader aReader(aStream);
+aResultMetafile.Clear();
+aReader.Read(aResultMetafile);
return aResultMetafile;
}
diff --git a/vcl/source/filter/svm/SvmReader.cxx
b/vcl/source/filter/svm/SvmReader.cxx
new file mode 100644
index ..e8455ea4de33
--- /dev/null
+++ b/vcl/source/filter/svm/SvmReader.cxx
@@ -0,0 +1,334 @@
+/* -*- 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 .
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+namespace
+{
+class DepthGuard
+{
+private:
+ImplMetaReadData& m_rData;
+rtl_TextEncoding m_eOrigCharSet;
+
+public:
+DepthGuard(ImplMetaReadData& rData, SvStream const& rIStm)
+: m_rData(rData)
+, m_eOrigCharSet(m_rData.meActualCharSet)
+{
+++m_rData.mnParseDepth;
+m_rData.meAct
GSoC - Weekly Report - #4 - Table styles
Dear Community! Last week, I have finished two things I was working on previously. Finally been able to fix the bug, that caused to lose the table style setting when drag&dropping or copying&pasting a table. You can see the patch here: https://gerrit.libreoffice.org/c/core/+/118336 I still work on the ui test, but it will be done this week too. Furthermore I have been able to build and run the feature/table-style branch from 2013. I had many difficulties with the build.: The main problem was that, my gcc version was too new, and apparantely the gcc versions are not really comaptible backward. I wanted to have the gcc 4.8.5, because it was released around 2013, but didn't found in any Focal Fossa repository. Started to build the compiler from source, but I had no success with it. Finally the solution was to install an Ubuntu 18.04 on a virtual machine, which still had the 4.8.5 gcc in its repos, and been able to install it. With the actual build itself had many other problems too, like "dot graph is too large", which was solved by the flag "--disable-odk", or I needed to use an older JDK version, because of some dependency issues. Finally the build was successful, but for some reason one of the unit tests was failing (due to some Java problems). Couldn't solve the root cause, so I builded with "make build-nocheck". Finally the build was complete, but still couldn't start LO. Needed to make the dev-install, but the install process wanted to check the build, so wanted to build the problematic unit test too. With the help of my mentor, I edited the Makefile, so the install process didn't try to build, but only make the native install. Still couldn't start LO because of some Java problems, but with the "SAL_USE_VCLPLUGIN=gen" macro, finally been able to start the client. This week I will finish the unit test of my latest patch, start to research, what xml this branch, which in theory implemented real table styles, really produce. Finish some measurements about the optimization of docx import and start working on it too. If you have any questions, ideas, thoughts or suggestions, please share with me! Regards, Balázs Sántha, santhab ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: extras/source
extras/source/autocorr/lang/ca/DocumentList.xml |1 - extras/source/autocorr/lang/cs/DocumentList.xml |1 - extras/source/autocorr/lang/da/DocumentList.xml |1 - extras/source/autocorr/lang/de/DocumentList.xml |1 - extras/source/autocorr/lang/el/DocumentList.xml |1 - extras/source/autocorr/lang/en-AU/DocumentList.xml |1 - extras/source/autocorr/lang/en-GB/DocumentList.xml |1 - extras/source/autocorr/lang/en-US/DocumentList.xml |1 - extras/source/autocorr/lang/es/DocumentList.xml |2 -- extras/source/autocorr/lang/fi/DocumentList.xml |1 - extras/source/autocorr/lang/fr/DocumentList.xml |2 -- extras/source/autocorr/lang/hu/DocumentList.xml |1 - extras/source/autocorr/lang/it/DocumentList.xml |1 - extras/source/autocorr/lang/lb-LU/DocumentList.xml |1 - extras/source/autocorr/lang/lt/DocumentList.xml |1 - extras/source/autocorr/lang/mn/DocumentList.xml |1 - extras/source/autocorr/lang/nl-BE/DocumentList.xml |1 - extras/source/autocorr/lang/nl/DocumentList.xml |1 - extras/source/autocorr/lang/pl/DocumentList.xml |1 - extras/source/autocorr/lang/pt-BR/DocumentList.xml |1 - extras/source/autocorr/lang/pt-PT/DocumentList.xml |1 - extras/source/autocorr/lang/pt/DocumentList.xml |1 - extras/source/autocorr/lang/ru/DocumentList.xml |1 - extras/source/autocorr/lang/sk/DocumentList.xml |1 - extras/source/autocorr/lang/sr-CS/DocumentList.xml |1 - extras/source/autocorr/lang/sr-Latn-CS/DocumentList.xml |1 - extras/source/autocorr/lang/sr-Latn-ME/DocumentList.xml |1 - extras/source/autocorr/lang/sr-Latn-RS/DocumentList.xml |1 - extras/source/autocorr/lang/sr-ME/DocumentList.xml |1 - extras/source/autocorr/lang/sr-RS/DocumentList.xml |1 - extras/source/autocorr/lang/sv/DocumentList.xml |1 - extras/source/autocorr/lang/vi/DocumentList.xml |1 - 32 files changed, 34 deletions(-) New commits: commit 7c1bad415ae48635dc67041c413bb7b76a530c22 Author: Heiko Tietze AuthorDate: Mon Jun 21 14:25:41 2021 +0200 Commit: Heiko Tietze CommitDate: Mon Jul 5 08:34:57 2021 +0200 Resolves tdf#142938 - Clarify option to replace dashes Change-Id: I0ebc183e27a48d3c0d73a4b7954d35bae62eba61 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117585 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/extras/source/autocorr/lang/ca/DocumentList.xml b/extras/source/autocorr/lang/ca/DocumentList.xml index 3a579b7264ea..fa3ef04a07cc 100644 --- a/extras/source/autocorr/lang/ca/DocumentList.xml +++ b/extras/source/autocorr/lang/ca/DocumentList.xml @@ -253,7 +253,6 @@ - diff --git a/extras/source/autocorr/lang/cs/DocumentList.xml b/extras/source/autocorr/lang/cs/DocumentList.xml index 7d2350c2f94a..962d59303d90 100644 --- a/extras/source/autocorr/lang/cs/DocumentList.xml +++ b/extras/source/autocorr/lang/cs/DocumentList.xml @@ -1,6 +1,5 @@ http://openoffice.org/2001/block-list";> - diff --git a/extras/source/autocorr/lang/da/DocumentList.xml b/extras/source/autocorr/lang/da/DocumentList.xml index beb758897a6c..258cce958513 100644 --- a/extras/source/autocorr/lang/da/DocumentList.xml +++ b/extras/source/autocorr/lang/da/DocumentList.xml @@ -1,6 +1,5 @@ http://openoffice.org/2001/block-list";> - diff --git a/extras/source/autocorr/lang/de/DocumentList.xml b/extras/source/autocorr/lang/de/DocumentList.xml index e93742484c86..eceb23985ec5 100644 --- a/extras/source/autocorr/lang/de/DocumentList.xml +++ b/extras/source/autocorr/lang/de/DocumentList.xml @@ -1,6 +1,5 @@ http://openoffice.org/2001/block-list";> - diff --git a/extras/source/autocorr/lang/el/DocumentList.xml b/extras/source/autocorr/lang/el/DocumentList.xml index f7764893faaa..1cc23c2b3132 100644 --- a/extras/source/autocorr/lang/el/DocumentList.xml +++ b/extras/source/autocorr/lang/el/DocumentList.xml @@ -1,7 +1,6 @@ http://openoffice.org/2001/block-list";> - diff --git a/extras/source/autocorr/lang/en-AU/DocumentList.xml b/extras/source/autocorr/lang/en-AU/DocumentList.xml index 572e7e057cf5..aff92a72b3e7 100644 --- a/extras/source/autocorr/lang/en-AU/DocumentList.xml +++ b/extras/source/autocorr/lang/en-AU/DocumentList.xml @@ -1,6 +1,5 @@ http://openoffice.org/2001/block-list";> - diff --git a/extras/source/autocorr/lang/en-GB/DocumentList.xml b/extras/source/autocorr/lang/en-GB/DocumentList.xml index c41fbdd24cf9..92896299691a 100644 --- a/extras/source/autocorr/lang/en-GB/DocumentList.xml +++ b/extras/source/autocorr/lang/en-GB/DocumentList.xml @@ -1,6 +1,5 @@ http://openoffice.org/2001/block-list";> - diff --git a/extras/source/autocorr/lang/en-US/DocumentLis
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/shells/textsh1.cxx | 23 +--
1 file changed, 21 insertions(+), 2 deletions(-)
New commits:
commit 3f6797c29e9672eba354400f24a669244fd746c0
Author: Justin Luth
AuthorDate: Mon Jun 21 16:56:04 2021 +0200
Commit: Justin Luth
CommitDate: Mon Jul 5 08:33:42 2021 +0200
tdf#132776 sw UI: make unique names for custom hatch and gradient
This has already been done in sd, so just copy the idea
and adapt it to fit in the sw environment.
This fixes LO 6.3.4 regression from 7.0
commit 53c474633c4e658f096669fb0225d751a5701aaf.
This reason for this is noted in one of those commits:
> However tdf#99908 shows that ODF import doesn't like anonymous
> gradients. This is a bug in xmloff style import and should eventually
> be fixed there. Here we implement the same band-aid solution
> tdf#99908 implements for Impress sidebar
Change-Id: I4437ac97b6aa97f2cd27a10c3d593dc97d24e9c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117594
Tested-by: Jenkins
Reviewed-by: Justin Luth
diff --git a/sw/source/uibase/shells/textsh1.cxx
b/sw/source/uibase/shells/textsh1.cxx
index f500f618c48a..8ea51fd6de1a 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -48,6 +48,8 @@
#include
#include
#include
+#include
+#include
#include
#include
#include
@@ -999,7 +1001,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
// create needed items for XPropertyList entries from the
DrawModel so that
// the Area TabPage can access them
// Do this after GetCurAttr, this resets the ItemSet content again
-const SwDrawModel* pDrawModel =
GetView().GetDocShell()->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel();
+SwDrawModel* pDrawModel =
GetView().GetDocShell()->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel();
aCoreSet.Put(SvxColorListItem(pDrawModel->GetColorList(),
SID_COLOR_TABLE));
aCoreSet.Put(SvxGradientListItem(pDrawModel->GetGradientList(),
SID_GRADIENT_LIST));
@@ -1074,7 +1076,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
rReq.Ignore(); // the 'old' request is not relevant any more
auto vCursors = CopyPaMRing(*pPaM); // tdf#134439 make a copy
to use at later apply
-pDlg->StartExecuteAsync([pDlg, &rWrtSh, pRequest, nDefDist,
vCursors](sal_Int32 nResult){
+pDlg->StartExecuteAsync([pDlg, &rWrtSh, pDrawModel, pRequest,
nDefDist, vCursors](sal_Int32 nResult){
if (nResult == RET_OK)
{
// Apply defaults if necessary.
@@ -1104,6 +1106,23 @@ void SwTextShell::Execute(SfxRequest &rReq)
pSet->Put(SfxStringItem(FN_DROP_CHAR_STYLE_NAME,
sCharStyleName));
}
+const XFillGradientItem* pTempGradItem =
pSet->GetItem(XATTR_FILLGRADIENT);
+if (pTempGradItem &&
pTempGradItem->GetName().isEmpty())
+{
+// MigrateItemSet guarantees unique gradient names
+SfxItemSet aMigrateSet(rWrtSh.GetView().GetPool(),
svl::Items{});
+aMigrateSet.Put(XFillGradientItem("gradient",
pTempGradItem->GetGradientValue()));
+SdrModel::MigrateItemSet(&aMigrateSet, pSet,
pDrawModel);
+}
+
+const XFillHatchItem* pTempHatchItem =
pSet->GetItem(XATTR_FILLHATCH);
+if (pTempHatchItem &&
pTempHatchItem->GetName().isEmpty())
+{
+SfxItemSet aMigrateSet(rWrtSh.GetView().GetPool(),
svl::Items{});
+aMigrateSet.Put(XFillHatchItem("hatch",
pTempHatchItem->GetHatchValue()));
+SdrModel::MigrateItemSet(&aMigrateSet, pSet,
pDrawModel);
+}
+
sw_ParagraphDialogResult(pSet, rWrtSh, *pRequest,
vCursors->front().get());
}
pDlg->disposeOnce();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sfx2/source
sfx2/source/doc/objstor.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 2a37b1a8b7c614fde66894c891f0ae57162a44a1
Author: Samuel Mehrbrodt
AuthorDate: Tue Feb 4 10:36:09 2020 +0100
Commit: Michael Weghorn
CommitDate: Mon Jul 5 08:32:06 2021 +0200
Allow opt-out from document events check
Commit b3edf85e0fe6ca03dc26e1bf531be82193bc9627 added a warning on load
when a document binds events to a macro.
This adds an option to restore the old behavior, so that the warning only
appears when a document actually has Macros.
Change-Id: I5ad398d3d503a0954a746f4cba150f68630b820c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87961
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit c161478ed50f6ee8878335db113f8850a136615b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118147
Tested-by: Michael Weghorn
Reviewed-by: Michael Weghorn
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index ab3dee35e5c2..b232a286900d 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -3623,7 +3623,9 @@ void SfxObjectShell::SetMacroCallsSeenWhileLoading()
bool SfxObjectShell::GetMacroCallsSeenWhileLoading() const
{
-return pImpl->m_bMacroCallsSeenWhileLoading;
+if
(officecfg::Office::Common::Security::Scripting::CheckDocumentEvents::get())
+return pImpl->m_bMacroCallsSeenWhileLoading;
+return false;
}
bool SfxObjectShell::QuerySaveSizeExceededModules_Impl( const uno::Reference<
task::XInteractionHandler >& xHandler )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ww8export/data/tdf104239_chapterNumberingLevels.doc |binary
sw/qa/extras/ww8export/data/tdf104239_numbering.doc |binary
sw/qa/extras/ww8export/ww8export3.cxx| 21
sw/source/filter/ww8/ww8par.cxx | 26
--
4 files changed, 33 insertions(+), 14 deletions(-)
New commits:
commit 17bc5794d6acd38304653dc78b95f9f772893ca7
Author: Justin Luth
AuthorDate: Sat Jul 3 08:23:48 2021 +0200
Commit: Justin Luth
CommitDate: Mon Jul 5 06:05:29 2021 +0200
tdf#104239 doc import CN: don't skip no-style levels
The Chapter Numbering "Outline" style must copy
the entire range of levels, not just those that have
a paragraph style associated with them.
Change-Id: I25578129e9cdbd8eb3dab710a2b26dd2764752e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118343
Tested-by: Jenkins
Reviewed-by: Justin Luth
diff --git a/sw/qa/extras/ww8export/data/tdf104239_chapterNumberingLevels.doc
b/sw/qa/extras/ww8export/data/tdf104239_chapterNumberingLevels.doc
new file mode 100644
index ..8a7583c3253c
Binary files /dev/null and
b/sw/qa/extras/ww8export/data/tdf104239_chapterNumberingLevels.doc differ
diff --git a/sw/qa/extras/ww8export/data/tdf104239_numbering.doc
b/sw/qa/extras/ww8export/data/tdf104239_numbering.doc
new file mode 100644
index ..ee8ad09e4b14
Binary files /dev/null and
b/sw/qa/extras/ww8export/data/tdf104239_numbering.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export3.cxx
b/sw/qa/extras/ww8export/ww8export3.cxx
index 58e226506ccf..797b7f103dd6 100644
--- a/sw/qa/extras/ww8export/ww8export3.cxx
+++ b/sw/qa/extras/ww8export/ww8export3.cxx
@@ -851,6 +851,27 @@
DECLARE_WW8EXPORT_TEST(testTdf75748_inheritChapterNumberingC, "tdf75748_inheritC
CPPUNIT_ASSERT_EQUAL(OUString("II.B.1."), getProperty(xPara,
"ListLabelString"));
}
+DECLARE_WW8EXPORT_TEST(testTdf104239_numbering, "tdf104239_numbering.doc")
+{
+// The paragraph starts with "paraksta Pieņemšanas". [Roundtrip by Word
2016 avoids the problem.]
+uno::Reference xPara(getParagraph(51),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("3.3.1."), getProperty(xPara,
"ListLabelString"));
+}
+
+DECLARE_WW8EXPORT_TEST(testTdf104239_chapterNumberingLevels,
"tdf104239_chapterNumberingLevels.doc")
+{
+uno::Reference xPara(getParagraph(1, "Heading 1"),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("Article I."), getProperty(xPara,
"ListLabelString"));
+xPara.set(getParagraph(2, "Heading 2"), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("1"), getProperty(xPara,
"ListLabelString"));
+xPara.set(getParagraph(3, "Heading 3"), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("First"), getProperty(xPara,
"ListLabelString"));
+xPara.set(getParagraph(4, "Heading 4"), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString(""), getProperty(xPara,
"ListLabelString"));
+xPara.set(getParagraph(8, "Heading 9"), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("1.1.1.1.1.1.1.1.1."),
getProperty(xPara, "ListLabelString"));
+}
+
DECLARE_WW8EXPORT_TEST(testTdf104239_chapterNumberTortureTest,
"tdf104239_chapterNumberTortureTest.doc")
{
// There is no point in identifying what the wrong values where in this
test,
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 8034adfa68ba..04b65f3e6eac 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -6018,7 +6018,17 @@ void SwWW8ImplReader::SetOutlineStyles()
// assigned directly and
// its default outline level is applied.
SwNumRule aOutlineRule(*m_rDoc.GetOutlineNumRule());
-bool bAppliedChangedOutlineStyle = false;
+if (m_pChosenWW8OutlineStyle)
+{
+for (int i = 0; i < WW8ListManager::nMaxLevel; ++i)
+{
+// Don't clobber existing outline levels.
+const sal_uInt16 nLevel = 1 << i;
+if (!(nOutlineStyleListLevelWithAssignment & nLevel))
+aOutlineRule.Set(i, m_pChosenWW8OutlineStyle->Get(i));
+}
+}
+
for (const SwWW8StyInf* pStyleInf : aWW8BuiltInHeadingStyles)
{
const sal_uInt16 nOutlineStyleListLevelOfWW8BuiltInHeadingStyle
@@ -6029,18 +6039,6 @@ void SwWW8ImplReader::SetOutlineStyles()
continue;
}
-const sal_uInt8 nLvl = pStyleInf->m_nListLevel == MAXLEVEL ? 0 :
pStyleInf->m_nListLevel;
-if (m_pChosenWW8OutlineStyle != nullptr
-&& pStyleInf->mnWW8OutlineLevel < WW8ListManager::nMaxLevel
-&& pStyleInf->mnWW8OutlineLevel == nLvl)
-{
-// LibreOffice's Chapter Numbering only works when outlineLevel ==
listLevel
-const SwNumFormat& rRule
-= m_pChosenWW8OutlineStyle->Get(pStyleInf->mnWW8OutlineLevel);
-aOutlineRule.Set(pStyleInf->mnWW8OutlineLevel, rRule);
-bAppliedChange
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/localedata/data/ko_KR.xml |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0afa7e64d547a8f2a48402660acf5c95a468a0ab
Author: DaeHyun Sung
AuthorDate: Mon Jun 28 23:04:10 2021 +0900
Commit: Eike Rathke
CommitDate: Mon Jul 5 01:51:57 2021 +0200
Fix Line break rule in Korean
I found the bug, Line break rule in Korea don't work
using `" -U+0022: Quotation Mark` & `' - U+0027: Apostrophe`
So I fixed the bug in xml file.
`'` to `' - U+0027: Apostrophe`
`"` to `" - U+0022: Quotation Mark`
Because, `'` and `"` are still displayed in several other line break rules.
such as, zh_CN.xml and zh_TW.xml, etc.
Reference1: HWP Guide - 금칙문자(Forbidden Characters)
http://help.hancom.com/hoffice/webhelp/9.0/ko_kr/hshow/tool/forbid.htm
Reference2: OOXML ISO/IEC 29500–1:2016(E)
Korean
* Cannot start a line: !%),.:;?]}¢°'"′″℃〉》」』】〕！％），．：；？］｝￠
(Unicode character values: U+0021, U+0025, U+0029, U+002C, U+002E, U+003A,
U+003B, U+003F, U+005D, U+007D, U+00A2, U+00B0, U+2019, U+201D, U+2032, U+2033,
U+2103, U+3009, U+300B, U+300D, U+300F, U+3011, U+3015, U+FF01, U+FF05, U+FF09,
U+FF0C, U+FF0E, U+FF1A, U+FF1B, U+FF1F, U+FF3D, U+FF5D and U+FFE0, respectively)
* Cannot end a line: $([\{£¥'"〈《「『【〔＄（［｛￡￥￦
(Unicode character values: U+0024, U+0028, U+005B, U+005C, U+007B, U+00A3,
U+00A5, U+2018, U+201C, U+3008, U+300A, U+300C, U+300E, U+3010, U+3014, U+FF04,
U+FF08, U+FF3B, U+FF5B, U+FFE1, U+FFE5, and U+FFE6, respectively)
Change-Id: I07f6afc60d0a83508a8ba971f31d2ca66846cd23
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118027
Tested-by: Eike Rathke
Reviewed-by: Eike Rathke
diff --git a/i18npool/source/localedata/data/ko_KR.xml
b/i18npool/source/localedata/data/ko_KR.xml
index a3e6121ba832..fcb92702923e 100644
--- a/i18npool/source/localedata/data/ko_KR.xml
+++ b/i18npool/source/localedata/data/ko_KR.xml
@@ -723,8 +723,8 @@
-
!%),.:;?]}¢￠'"′″℃>〉＞》」』】〕！％），．：；？］｝｡｣､･
ﾞﾟ、。’”°
-
$(¥£[\{￡￥'"<＜《「『【〔＄（［｛₩￦｢‘“〈
+ !%),.:;?]}¢￠'"′″℃>〉＞》」』】〕！％），．：；？］｝｡｣､･
ﾞﾟ、。’”°
+
$(¥£[\{￡￥'"<＜《「『【〔＄（［｛₩￦｢‘“〈
!,.:;?、。！，．：；？
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - i18npool/source
i18npool/source/localedata/data/fr_FR.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 7c7f113723ec5e908957cd4ae43ef0f3ec643504 Author: Julien Nabet AuthorDate: Sat Jul 3 23:51:11 2021 +0200 Commit: Eike Rathke CommitDate: Mon Jul 5 01:21:28 2021 +0200 tdf#143173: fix wrong French abbr for Alphabetical Index-Grouped entries Change-Id: If478fc1127f957e05cdf7bc247881f0c59146896 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118366 Tested-by: Jenkins Reviewed-by: Julien Nabet (cherry picked from commit 0151a178d4e26b4546f7b27d569f0d94420caa9d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118307 Reviewed-by: Eike Rathke diff --git a/i18npool/source/localedata/data/fr_FR.xml b/i18npool/source/localedata/data/fr_FR.xml index ac7e17710cf9..b2b3abb329bb 100644 --- a/i18npool/source/localedata/data/fr_FR.xml +++ b/i18npool/source/localedata/data/fr_FR.xml @@ -212,8 +212,8 @@ A-Z 0 1 - sv - sv + sq. + sqq. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - i18npool/source svl/qa
i18npool/source/localedata/data/en_US.xml |2 +-
svl/qa/unit/svl.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit af6f3aaddaa0b83a73dca073008e360ece998110
Author: Eike Rathke
AuthorDate: Sat Jul 3 21:50:29 2021 +0200
Commit: Eike Rathke
CommitDate: Mon Jul 5 01:08:09 2021 +0200
Related: tdf#125035 en_US formatindex="19" DATE_SYSTEM_LONG with D not DD
Otherwise CppunitTest_sw_odfimport testDateFormFormats fails with
- Expected: Wednesday, March 4, 2020
- Actual : Wednesday, March 04, 2020
if DateFormatter uses number formatter.
This is also what
https://www.localeplanet.com/icu/en-US/index.html
lists for Date.0 and formatindex="30" has as well.
This makes adapting CppunitTest_svl_qa_cppunit testNumberFormat
necessary.
Change-Id: I1c8cfd954f34f742b0397b8f922d22eb11ae19f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118361
Reviewed-by: Eike Rathke
Tested-by: Jenkins
(cherry picked from commit 57bd9a60757a5a5d222d6e992e7f38cb3cea4bf6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118308
diff --git a/i18npool/source/localedata/data/en_US.xml
b/i18npool/source/localedata/data/en_US.xml
index bed196f3cee7..a96750aab17d 100644
--- a/i18npool/source/localedata/data/en_US.xml
+++ b/i18npool/source/localedata/data/en_US.xml
@@ -120,7 +120,7 @@
M/D/YY
- DD,
+ D,
MM/DD/YY
diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index 553ae8b7e8c1..ba3b6a34a805 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -182,7 +182,7 @@ void Test::testNumberFormat()
const char* pDate[] = {
"M/D/YY",
-" DD, ",
+" D, ",
"MM/DD/YY",
"MM/DD/",
"MMM D, YY",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - i18npool/source sw/qa
i18npool/source/localedata/data/da_DK.xml |2 +- i18npool/source/localedata/data/en_CA.xml |2 +- i18npool/source/localedata/data/en_DK.xml |2 +- i18npool/source/localedata/data/en_GB.xml |2 +- i18npool/source/localedata/data/en_GH.xml |2 +- i18npool/source/localedata/data/en_NA.xml |2 +- i18npool/source/localedata/data/en_ZA.xml |2 +- i18npool/source/localedata/data/eo.xml |2 +- i18npool/source/localedata/data/fi_FI.xml |2 +- i18npool/source/localedata/data/fo_FO.xml |2 +- i18npool/source/localedata/data/fr_CA.xml |2 +- i18npool/source/localedata/data/gd_GB.xml |2 +- i18npool/source/localedata/data/hu_HU.xml |2 +- i18npool/source/localedata/data/id_ID.xml |2 +- i18npool/source/localedata/data/is_IS.xml |2 +- i18npool/source/localedata/data/kl_GL.xml |2 +- i18npool/source/localedata/data/lg_UG.xml |2 +- i18npool/source/localedata/data/sv_FI.xml |2 +- i18npool/source/localedata/data/sv_SE.xml |2 +- i18npool/source/localedata/data/zh_HK.xml |2 +- sw/qa/uitest/writer_tests5/DateFormFieldPropertiesDialog.py | 11 +-- 21 files changed, 29 insertions(+), 22 deletions(-) New commits: commit 1f229309a0e5bed816cb58613335e06b009542b0 Author: Eike Rathke AuthorDate: Fri Jul 2 23:29:28 2021 +0200 Commit: Eike Rathke CommitDate: Mon Jul 5 01:07:46 2021 +0200 Related: tdf#125035 Include day of week in formatindex="19" DATE_SYSTEM_LONG Used programmatically with number formatter's NF_DATE_SYSTEM_LONG but quite some locales were lacking the day of week; maybe legacy because duplicated formats sometimes were avoided, which nowadays are suppressed in the number format dialog. Made the format code a copy of formatindex="30" explicit DATE_SYS_D. Didn't know what to do about lt_LT so kept that as is. This made it necessary to adapt a dreaded UITest_writer_tests5 test that checks for listbox content, test_date_field_with_custom_format, which depends on actual locale data. See comment there. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118335 Reviewed-by: Eike Rathke Tested-by: Jenkins (cherry picked from commit 56ae948b08010ed1b61be9857c8c6ae4e97e86b2) Conflicts: sw/qa/uitest/writer_tests5/DateFormFieldPropertiesDialog.py Change-Id: Ifc26a4a5be6bed3fb8d9cedc1afcba1225751635 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118389 Reviewed-by: Eike Rathke Tested-by: Jenkins diff --git a/i18npool/source/localedata/data/da_DK.xml b/i18npool/source/localedata/data/da_DK.xml index 540e2ca7365d..6b659a0381e9 100644 --- a/i18npool/source/localedata/data/da_DK.xml +++ b/i18npool/source/localedata/data/da_DK.xml @@ -108,7 +108,7 @@ DD-MM-YY - D. + D. DD-MM-YY diff --git a/i18npool/source/localedata/data/en_CA.xml b/i18npool/source/localedata/data/en_CA.xml index 9e637a7530d0..d3eb8804bd02 100644 --- a/i18npool/source/localedata/data/en_CA.xml +++ b/i18npool/source/localedata/data/en_CA.xml @@ -116,7 +116,7 @@ YY-M-D - D, + D, YY-MM-DD diff --git a/i18npool/source/localedata/data/en_DK.xml b/i18npool/source/localedata/data/en_DK.xml index f8ac52e25f06..041ce09a73ae 100644 --- a/i18npool/source/localedata/data/en_DK.xml +++ b/i18npool/source/localedata/data/en_DK.xml @@ -120,7 +120,7 @@ YY-MM-DD - DD + D. YY-MM-DD diff --git a/i18npool/source/localedata/data/en_GB.xml b/i18npool/source/localedata/data/en_GB.xml index 2928b62529da..ac82153508fa 100644 --- a/i18npool/source/localedata/data/en_GB.xml +++ b/i18npool/source/localedata/data/en_GB.xml @@ -79,7 +79,7 @@ DD/MM/YY - DD + D D MMM YY diff --git a/i18npool/source/localedata/data/en_GH.xml b/i18npool/source/localedata/data/en_GH.xml index ccda3d203d24..0a6ea83eec08 100644 --- a/i18npool/source/localedata/data/en_GH.xml +++ b/i18npool/source/localedata/data/en_GH.xml @@ -114,7 +114,7 @@ YY/MM/DD - DD + D YY/MM/DD diff --git a/i18npool/source/localedata/data/en_NA.xml b/i18npool/source/localedata/data/en_NA.xml index 4322f2bb5afa..09d481e413d7 100644 --- a/i18npool/source/localedata/data/en_NA.xml +++ b/i18npool/source/localedata/data/en_NA.xml @@ -114,7 +114,7 @@ YY/MM/DD - DD Y
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/localedata/data/lt_LT.xml |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 57e0b8637a0c6f53a43c987df51a00a5a0f3909f
Author: Eike Rathke
AuthorDate: Sun Jul 4 23:24:43 2021 +0200
Commit: Eike Rathke
CommitDate: Mon Jul 5 01:05:49 2021 +0200
Related: tdf#125035 Include day of week in formatindex="19" DATE_SYSTEM_LONG
Change-Id: I3cbbda7592fede575b766f0631c5f4b42a19e03e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118387
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/i18npool/source/localedata/data/lt_LT.xml
b/i18npool/source/localedata/data/lt_LT.xml
index 914e51614e01..87446545ec12 100644
--- a/i18npool/source/localedata/data/lt_LT.xml
+++ b/i18npool/source/localedata/data/lt_LT.xml
@@ -109,7 +109,7 @@
ISO 8601
- "m." DD "d."
+ "m." DD "d." NNN
"metų" "mėnesio" D "diena"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2ea55e2a5b5f9cb8745f3f122e92684da8476ef5 Author: Johnny_M AuthorDate: Mon Jul 5 00:42:36 2021 +0200 Commit: Gerrit Code Review CommitDate: Mon Jul 5 00:42:36 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 763f9602c61ed20a748e888c5b297b7f9c0bf86e - tdf#132643 Translate German section IDs Change-Id: Ia6765abde226b958db7b17a50abf286545e86c87 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118349 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index dabedfd9faa5..763f9602c61e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit dabedfd9faa58db0ee3b5e22274b20f401753e12 +Subproject commit 763f9602c61ed20a748e888c5b297b7f9c0bf86e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/main0205.xhp |2 +- source/text/shared/00/0004.xhp |2 +- source/text/shared/01/05110700.xhp |2 +- source/text/swriter/main0220.xhp |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 763f9602c61ed20a748e888c5b297b7f9c0bf86e Author: Johnny_M AuthorDate: Sat Jul 3 15:00:23 2021 +0200 Commit: Olivier Hallot CommitDate: Mon Jul 5 00:42:36 2021 +0200 tdf#132643 Translate German section IDs Change-Id: Ia6765abde226b958db7b17a50abf286545e86c87 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118349 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/main0205.xhp b/source/text/scalc/main0205.xhp index 227bc78ec..ca538ea04 100644 --- a/source/text/scalc/main0205.xhp +++ b/source/text/scalc/main0205.xhp @@ -71,7 +71,7 @@ Superscript - + Subscript diff --git a/source/text/shared/00/0004.xhp b/source/text/shared/00/0004.xhp index a5361b85a..6a50f3291 100644 --- a/source/text/shared/00/0004.xhp +++ b/source/text/shared/00/0004.xhp @@ -94,7 +94,7 @@ - + diff --git a/source/text/shared/01/05110700.xhp b/source/text/shared/01/05110700.xhp index 6e61b67e6..4f984f536 100644 --- a/source/text/shared/01/05110700.xhp +++ b/source/text/shared/01/05110700.xhp @@ -37,6 +37,6 @@ - + diff --git a/source/text/swriter/main0220.xhp b/source/text/swriter/main0220.xhp index 6350eaa51..acc4fd6e9 100644 --- a/source/text/swriter/main0220.xhp +++ b/source/text/swriter/main0220.xhp @@ -47,7 +47,7 @@ Superscript - + Subscript ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 63c5a0761f6780fe49f3558e1d1b566778d0c46a Author: Johnny_M AuthorDate: Mon Jul 5 00:41:53 2021 +0200 Commit: Gerrit Code Review CommitDate: Mon Jul 5 00:41:53 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to dabedfd9faa58db0ee3b5e22274b20f401753e12 - tdf#132643 Translate German section IDs Change-Id: I47ac902ced473a37f1787484101d9f881ddb9228 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118350 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 33cc5ce335d5..dabedfd9faa5 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 33cc5ce335d52ea47179331cd16465842c97e1e8 +Subproject commit dabedfd9faa58db0ee3b5e22274b20f401753e12 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/main0205.xhp |2 +- source/text/shared/00/0004.xhp |2 +- source/text/shared/01/05110800.xhp |2 +- source/text/swriter/main0220.xhp |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) New commits: commit dabedfd9faa58db0ee3b5e22274b20f401753e12 Author: Johnny_M AuthorDate: Sat Jul 3 15:03:19 2021 +0200 Commit: Olivier Hallot CommitDate: Mon Jul 5 00:41:53 2021 +0200 tdf#132643 Translate German section IDs Change-Id: I47ac902ced473a37f1787484101d9f881ddb9228 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118350 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/main0205.xhp b/source/text/scalc/main0205.xhp index 365069b65..227bc78ec 100644 --- a/source/text/scalc/main0205.xhp +++ b/source/text/scalc/main0205.xhp @@ -74,7 +74,7 @@ Subscript - + Character diff --git a/source/text/shared/00/0004.xhp b/source/text/shared/00/0004.xhp index 0c5fd669a..a5361b85a 100644 --- a/source/text/shared/00/0004.xhp +++ b/source/text/shared/00/0004.xhp @@ -109,7 +109,7 @@ - + diff --git a/source/text/shared/01/05110800.xhp b/source/text/shared/01/05110800.xhp index 30ae340f6..0a162b880 100644 --- a/source/text/shared/01/05110800.xhp +++ b/source/text/shared/01/05110800.xhp @@ -37,6 +37,6 @@ - + diff --git a/source/text/swriter/main0220.xhp b/source/text/swriter/main0220.xhp index ee9684e73..6350eaa51 100644 --- a/source/text/swriter/main0220.xhp +++ b/source/text/swriter/main0220.xhp @@ -50,7 +50,7 @@ Subscript - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 211deccb2008eb1f7486529e88a3b165b9a83660 Author: Johnny_M AuthorDate: Mon Jul 5 00:41:14 2021 +0200 Commit: Gerrit Code Review CommitDate: Mon Jul 5 00:41:14 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 33cc5ce335d52ea47179331cd16465842c97e1e8 - tdf#132643 Translate German section IDs Change-Id: I04f58a66d8e2e1e47fa4b5298857aa5188ca3a03 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118348 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 86d4cff58878..33cc5ce335d5 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 86d4cff5887833253bcfe95ecdb1689ef810315c +Subproject commit 33cc5ce335d52ea47179331cd16465842c97e1e8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/main0202.xhp |2 +- source/text/scalc/main0205.xhp |2 +- source/text/shared/00/0004.xhp | 17 + source/text/simpress/main0203.xhp |2 +- source/text/swriter/main0202.xhp |2 +- 5 files changed, 5 insertions(+), 20 deletions(-) New commits: commit 33cc5ce335d52ea47179331cd16465842c97e1e8 Author: Johnny_M AuthorDate: Sat Jul 3 14:57:32 2021 +0200 Commit: Olivier Hallot CommitDate: Mon Jul 5 00:41:14 2021 +0200 tdf#132643 Translate German section IDs Change-Id: I04f58a66d8e2e1e47fa4b5298857aa5188ca3a03 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/118348 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/main0202.xhp b/source/text/scalc/main0202.xhp index a444ad8ac..8c62ca692 100644 --- a/source/text/scalc/main0202.xhp +++ b/source/text/scalc/main0202.xhp @@ -46,7 +46,7 @@ Font Color - + Align Left diff --git a/source/text/scalc/main0205.xhp b/source/text/scalc/main0205.xhp index 686786bfa..365069b65 100644 --- a/source/text/scalc/main0205.xhp +++ b/source/text/scalc/main0205.xhp @@ -47,7 +47,7 @@ Font Color - + Line Spacing: 1 diff --git a/source/text/shared/00/0004.xhp b/source/text/shared/00/0004.xhp index 58b8c842a..0c5fd669a 100644 --- a/source/text/shared/00/0004.xhp +++ b/source/text/shared/00/0004.xhp @@ -34,7 +34,7 @@ Open file with example: - + @@ -48,21 +48,6 @@ - - - - - - -Icon - - - -Font Color - - - - diff --git a/source/text/simpress/main0203.xhp b/source/text/simpress/main0203.xhp index 37e3b3bf2..6eda91af3 100644 --- a/source/text/simpress/main0203.xhp +++ b/source/text/simpress/main0203.xhp @@ -43,7 +43,7 @@ Font Color - + diff --git a/source/text/swriter/main0202.xhp b/source/text/swriter/main0202.xhp index 9fedc17c4..b674dc9bc 100644 --- a/source/text/swriter/main0202.xhp +++ b/source/text/swriter/main0202.xhp @@ -63,7 +63,7 @@ Font Color - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/SwNodeNum.hxx |2 +-
sw/inc/SwNumberTree.hxx |2 +-
sw/source/core/SwNumberTree/SwNodeNum.cxx| 20
sw/source/core/SwNumberTree/SwNumberTree.cxx |2 +-
sw/source/core/txtnode/ndtxt.cxx |2 +-
5 files changed, 16 insertions(+), 12 deletions(-)
New commits:
commit 0dc7b1cbb995d5befea9ee44280b4e725f260796
Author: Caolán McNamara
AuthorDate: Sun Jul 4 20:02:01 2021 +0100
Commit: Caolán McNamara
CommitDate: Sun Jul 4 21:47:07 2021 +0200
ofz#35787 Timeout
1m14.061s -> 0m3.975s
Change-Id: I96e6f2c60017ba57062bd56c2e80604e117b3b99
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118381
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/inc/SwNodeNum.hxx b/sw/inc/SwNodeNum.hxx
index 7ad85271c9fa..2aff25d306ba 100644
--- a/sw/inc/SwNodeNum.hxx
+++ b/sw/inc/SwNodeNum.hxx
@@ -39,7 +39,7 @@ public:
void ChangeNumRule(SwNumRule& rNumRule);
SwTextNode* GetTextNode() const { return mpTextNode; }
-virtual bool IsNotificationEnabled() const override;
+virtual bool IsNotificationEnabled(const SwDoc& rDoc) const override;
virtual bool IsContinuous() const override;
diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx
index 39575e8aa46d..f9e3a2745bb9 100644
--- a/sw/inc/SwNumberTree.hxx
+++ b/sw/inc/SwNumberTree.hxx
@@ -354,7 +354,7 @@ protected:
@retval true Notification enabled in general.
@retval false else
*/
-virtual bool IsNotificationEnabled() const = 0;
+virtual bool IsNotificationEnabled(const SwDoc& rDoc) const = 0;
// #i64010# - made pure virtual
virtual bool HasCountedChildren() const = 0;
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx
b/sw/source/core/SwNumberTree/SwNodeNum.cxx
index c83b29f086b7..9c160d3c0fc2 100644
--- a/sw/source/core/SwNumberTree/SwNodeNum.cxx
+++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx
@@ -122,22 +122,26 @@ void SwNodeNum::PostRemove()
}
}
-bool SwNodeNum::IsNotifiable(const SwDoc& /*rDoc*/) const
+bool SwNodeNum::IsNotifiable(const SwDoc& rDoc) const
{
-bool aResult = true;
+bool aResult;
-if ( GetTextNode() )
-aResult = GetTextNode()->IsNotifiable();
+if (const SwTextNode* pTextNode = GetTextNode())
+aResult = pTextNode->IsNotifiable();
+else
+aResult = IsNotificationEnabled(rDoc);
return aResult;
}
-bool SwNodeNum::IsNotificationEnabled() const
+bool SwNodeNum::IsNotificationEnabled(const SwDoc& rDoc) const
{
-bool aResult = true;
+bool aResult;
-if ( GetTextNode() )
-aResult = GetTextNode()->IsNotificationEnabled();
+if (const SwTextNode* pTextNode = GetTextNode())
+aResult = pTextNode->IsNotificationEnabled();
+else
+aResult = !rDoc.IsInReading() && !rDoc.IsInDtor();
return aResult;
}
diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx
b/sw/source/core/SwNumberTree/SwNumberTree.cxx
index e695df5622be..bc24899b235b 100644
--- a/sw/source/core/SwNumberTree/SwNumberTree.cxx
+++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx
@@ -487,7 +487,7 @@ void SwNumberTreeNode::AddChild(SwNumberTreeNode* pChild,
if (aResult.second)
{
pChild->mpParent = this;
-bool bNotification = pChild->IsNotificationEnabled();
+bool bNotification = pChild->IsNotificationEnabled(rDoc);
tSwNumberTreeChildren::iterator aInsertedIt = aResult.first;
if (aInsertedIt != mChildren.begin())
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index e75a8f42b682..3d7e081f1e4c 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -4204,7 +4204,7 @@ bool SwTextNode::IsNotifiable() const
bool SwTextNode::IsNotificationEnabled() const
{
const SwDoc& rDoc = GetDoc();
-return !(rDoc.IsInReading() || rDoc.IsInDtor());
+return !rDoc.IsInReading() && !rDoc.IsInDtor();
}
void SwTextNode::SetCountedInList( bool bCounted )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/SwNodeNum.hxx |2 -
sw/inc/SwNumberTree.hxx | 21 +--
sw/inc/list.hxx | 12 +++---
sw/inc/numrule.hxx|2 -
sw/source/core/SwNumberTree/SwNodeNum.cxx |2 -
sw/source/core/SwNumberTree/SwNumberTree.cxx | 49 +-
sw/source/core/doc/DocumentSettingManager.cxx |2 -
sw/source/core/doc/docnum.cxx |2 -
sw/source/core/doc/list.cxx | 16
sw/source/core/doc/number.cxx |4 +-
sw/source/core/txtnode/ndtxt.cxx | 30 +--
sw/source/core/unocore/unosett.cxx|4 +-
12 files changed, 78 insertions(+), 68 deletions(-)
New commits:
commit 34fcf3b6e0f32f9327c905e2e2507427e7ef4f91
Author: Caolán McNamara
AuthorDate: Sun Jul 4 16:35:24 2021 +0100
Commit: Caolán McNamara
CommitDate: Sun Jul 4 21:46:34 2021 +0200
add a const SwDoc& arg for a follow up optimization
Change-Id: Ib18e6c93e35fc3021a874f4313cf38fbb99d696a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118380
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/inc/SwNodeNum.hxx b/sw/inc/SwNodeNum.hxx
index 81809630d3b8..7ad85271c9fa 100644
--- a/sw/inc/SwNodeNum.hxx
+++ b/sw/inc/SwNodeNum.hxx
@@ -91,7 +91,7 @@ private:
virtual bool IsCountPhantoms() const override;
-virtual bool IsNotifiable() const override;
+virtual bool IsNotifiable(const SwDoc& rDoc) const override;
virtual void NotifyNode() override;
};
diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx
index ad45fae21910..39575e8aa46d 100644
--- a/sw/inc/SwNumberTree.hxx
+++ b/sw/inc/SwNumberTree.hxx
@@ -23,6 +23,7 @@
#include
#include "SwNumberTreeTypes.hxx"
+class SwDoc;
class SwNumberTreeNode;
bool SwNumberTreeNodeLessThan(const SwNumberTreeNode* pA, const
SwNumberTreeNode* pB);
@@ -125,19 +126,19 @@ public:
@param pChild child to add
@param nDepth depth in which to add the child
*/
-void AddChild(SwNumberTreeNode* pChild, const int nDepth);
+void AddChild(SwNumberTreeNode* pChild, const int nDepth, const SwDoc&
rDoc);
/**
Remove a child.
@param pChild child to be removed
*/
-void RemoveChild(SwNumberTreeNode* pChild);
+void RemoveChild(SwNumberTreeNode* pChild, const SwDoc& rDoc);
/**
Remove this child from the tree.
*/
-void RemoveMe();
+void RemoveMe(const SwDoc& rDoc);
/**
Returns the parent of this node.
@@ -222,7 +223,7 @@ public:
precondition: node is already member of a list tree
*/
-void SetLevelInListTree(const int nLevel);
+void SetLevelInListTree(const int nLevel, const SwDoc& rDoc);
/**
Return level of this node.
@@ -261,7 +262,7 @@ public:
Notifies all invalid children of this node.
#i83479# - made public
*/
-void NotifyInvalidChildren();
+void NotifyInvalidChildren(const SwDoc& rDoc);
/**
Notifies the node.
@@ -278,7 +279,7 @@ public:
void ValidateMe();
/** Notifies all invalid siblings of this node. */
-void NotifyInvalidSiblings();
+void NotifyInvalidSiblings(const SwDoc& rDoc);
/** notification of all nodes in the list tree on certain list level */
void NotifyNodesOnListLevel(const int nListLevel);
@@ -289,12 +290,12 @@ public:
Usage: on state change it's needed to invalidate the
complete numbering tree due to wide influence of this change.
*/
-void InvalidateAndNotifyTree()
+void InvalidateAndNotifyTree(const SwDoc& rDoc)
{
if (GetRoot())
{
GetRoot()->InvalidateTree();
-GetRoot()->Notify();
+GetRoot()->Notify(rDoc);
}
}
@@ -452,7 +453,7 @@ protected:
@retval true This node is notifiable.
@retval false else
*/
-virtual bool IsNotifiable() const = 0;
+virtual bool IsNotifiable(const SwDoc& rDoc) const = 0;
/**
Notifies the node.
@@ -462,7 +463,7 @@ protected:
virtual void NotifyNode() = 0;
/** Notifies this node (NotifyNode) and all descendants.*/
-void Notify();
+void Notify(const SwDoc& rDoc);
/** notification of children nodes on certain depth */
void NotifyChildrenOnDepth(const int nDepth);
diff --git a/sw/inc/list.hxx b/sw/inc/list.hxx
index ddde0bb299e1..a329165c1da2 100644
--- a/sw/inc/list.hxx
+++ b/sw/inc/list.hxx
@@ -28,6 +28,7 @@
#include "swdllapi.h"
+class SwDoc;
class SwNumRule;
class SwNodes;
@@ -45,13 +46,14 @@ class SwList
void SetDefaultListStyleName(OUString const&);
-void InsertListItem( SwNodeNum& rNodeNum,
- bool isHiddenRedlines,
- const int nLevel );
-static void RemoveListIt
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e1d3c8438ade045aab4452dd59000d27f810ca91 Author: Andrzej Hunt AuthorDate: Sun Jul 4 14:54:43 2021 +0200 Commit: Caolán McNamara CommitDate: Sun Jul 4 20:35:03 2021 +0200 Fix LIB_FUZZING_ENGINE not-empty check Switch to '-z $LIB_FUZZING_ENGINE' to check if LIB_FUZZING_ENGINE is set. The previous version evaluates to false when LIB_FUZZING_ENGINE is not set, meaning you would not be warned at configure time when using -enable_fuzzers without setting LIB_FUZZING_ENGINE. Original broken version landed in: 44b36a0602b04342566362bce3f6bed7d2b096e4 ( https://gerrit.libreoffice.org/c/core/+/111691 ) Change-Id: Ic2174777ebf724e471cd605ba54b245e4e804705 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118372 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/configure.ac b/configure.ac index 7a9eaf39b24b..b2ca6f8d4edd 100644 --- a/configure.ac +++ b/configure.ac @@ -10637,7 +10637,7 @@ AC_MSG_CHECKING([whether to enable fuzzers]) if test "$enable_fuzzers" != yes; then AC_MSG_RESULT([no]) else -if test $LIB_FUZZING_ENGINE == ""; then +if test -z $LIB_FUZZING_ENGINE; then AC_MSG_ERROR(['LIB_FUZZING_ENGINE' must be set when using --enable-fuzzers. Examples include '-fsanitize=fuzzer'.]) fi AC_MSG_RESULT([yes]) ___ 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/filter/html/htmlcss1.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit c551e34018d7392f44ff8d7216dda4a480c6eea7 Author: Caolán McNamara AuthorDate: Sat Jul 3 21:20:18 2021 +0100 Commit: Caolán McNamara CommitDate: Sun Jul 4 17:46:14 2021 +0200 ofz#33258 don't set a replacement font if the current one is the same 5.602s->4.022s Change-Id: I5983d4f51bda7249f7b37d642dd970f01b70d3aa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118365 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index f241b396dfce..267996f4ea01 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -2286,6 +2286,8 @@ static void lcl_swcss1_setEncoding( SwFormat& rFormat, rtl_TextEncoding eEnc ) const SvxFontItem& rFont = *static_cast(pItem); if (RTL_TEXTENCODING_SYMBOL == rFont.GetCharSet()) continue; +if (eEnc == rFont.GetCharSet()) +continue; SvxFontItem aFont(rFont.GetFamily(), rFont.GetFamilyName(), rFont.GetStyleName(), rFont.GetPitch(), eEnc, i); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-6.4-43'
Tag 'cp-6.4-43' created by Andras Timar at 2021-07-04 15:33 + cp-6.4-43 Changes since cp-6.4-42-7: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.4-43'
Tag 'cp-6.4-43' created by Andras Timar at 2021-07-04 15:33 + cp-6.4-43 Changes since cp-6.4-40: Andras Timar (1): Calc l10n update, especially new CSV Import dialog in fr, it, de, es, pt-BR --- source/ar/sc/messages.po | 137 +--- source/as/sc/messages.po | 73 -- source/ast/sc/messages.po | 93 + source/bg/sc/messages.po | 74 -- source/bn-IN/sc/messages.po | 72 -- source/br/sc/messages.po | 72 -- source/ca-valencia/sc/messages.po | 74 -- source/ca/sc/messages.po | 74 -- source/cs/sc/messages.po | 74 -- source/cy/sc/messages.po | 74 -- source/da/sc/messages.po | 74 -- source/de/sc/messages.po | 72 -- source/en-GB/sc/messages.po | 74 -- source/es/sc/messages.po | 71 -- source/et/sc/messages.po | 74 -- source/eu/sc/messages.po | 74 -- source/fi/sc/messages.po | 76 --- source/fr/sc/messages.po | 72 -- source/ga/sc/messages.po | 72 -- source/gd/sc/messages.po | 72 -- source/gl/sc/messages.po | 74 -- source/gu/sc/messages.po | 75 -- source/he/sc/messages.po | 73 -- source/hi/sc/messages.po | 73 -- source/hr/sc/messages.po | 72 -- source/hu/sc/messages.po | 74 -- source/id/sc/messages.po | 74 -- source/is/sc/messages.po | 72 -- source/it/sc/messages.po | 72 -- source/ja/sc/messages.po | 260 ++ source/km/sc/messages.po | 75 -- source/kn/sc/messages.po | 73 -- source/ko/sc/messages.po | 74 -- source/lt/sc/messages.po | 76 --- source/lv/sc/messages.po | 76 --- source/ml/sc/messages.po | 73 -- source/mr/sc/messages.po | 73 -- source/nb/sc/messages.po | 74 -- source/nl/sc/messages.po | 74 -- source/nn/sc/messages.po | 74 -- source/oc/sc/messages.po | 110 +++- source/or/sc/messages.po | 73 -- source/pa-IN/sc/messages.po | 79 --- source/pl/sc/messages.po | 74 -- source/pt-BR/sc/messages.po | 72 -- source/pt/sc/messages.po | 74 -- source/ro/sc/messages.po | 72 -- source/ru/sc/messages.po | 74 -- source/sk/sc/messages.po | 74 -- source/sr-Latn/sc/messages.po | 72 -- source/sr/sc/messages.po | 78 --- source/sv/sc/messages.po | 74 -- source/ta/sc/messages.po | 72 -- source/te/sc/messages.po | 73 -- source/tr/sc/messages.po | 192 +--- source/uk/sc/messages.po | 74 -- source/vi/sc/messages.po | 75 -- source/zh-CN/sc/messages.po | 74 -- source/zh-TW/sc/messages.po | 74 -- 59 files changed, 2075 insertions(+), 2694 deletions(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-6.4-43'
Tag 'cp-6.4-43' created by Andras Timar at 2021-07-04 15:33 + cp-6.4-43 Changes since cp-6.4-branch-point-11: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-6.4-43'
Tag 'cp-6.4-43' created by Andras Timar at 2021-07-04 15:33 + cp-6.4-43 Changes since co-6.4-20: Andras Timar (1): update Danish dictionary --- da_DK/README_da_DK.txt |4 da_DK/da_DK.aff| 3401 da_DK/da_DK.dic|288016 +++-- da_DK/description.xml |9 4 files changed, 139245 insertions(+), 152185 deletions(-) --- ___ 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' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6fc051b9f3ffdcb2bdd9f26bceb56d753d3f1e90 Author: Andras Timar AuthorDate: Sun Jul 4 17:33:03 2021 +0200 Commit: Andras Timar CommitDate: Sun Jul 4 17:33:18 2021 +0200 Bump version to 6.4-43 Change-Id: I4167b402c13065f0af06285f11bd795e3de2f046 diff --git a/configure.ac b/configure.ac index ac5919570259..645cd0d62ff8 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([Collabora Office],[6.4.10.42],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[6.4.10.43],[],[],[https://collaboraoffice.com/]) 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: Branch 'distro/collabora/cp-6.4' - vcl/inc vcl/jsdialog vcl/Library_vcl.mk vcl/source
vcl/Library_vcl.mk|1
vcl/inc/jsdialog/enabled.hxx | 20 +++
vcl/jsdialog/enabled.cxx | 72 ++
vcl/source/window/builder.cxx | 53 ++
4 files changed, 97 insertions(+), 49 deletions(-)
New commits:
commit 5c53392470c6817473724b02d50a89c10169f100
Author: Szymon Kłos
AuthorDate: Wed May 12 08:53:16 2021 +0200
Commit: Andras Timar
CommitDate: Sun Jul 4 17:30:10 2021 +0200
jsdialog: move list of enabled dialogs to separate file
Change-Id: I98c92b336fbf76f3dc94265a408c9b3b46fcea08
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115453
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 15a083df19a6..082cc64dcef4 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -473,6 +473,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/backendtest/outputdevice/polyline \
vcl/backendtest/outputdevice/polyline_b2d \
vcl/backendtest/outputdevice/rectangle \
+vcl/jsdialog/enabled \
vcl/jsdialog/jsdialogbuilder \
vcl/jsdialog/executor \
))
diff --git a/vcl/inc/jsdialog/enabled.hxx b/vcl/inc/jsdialog/enabled.hxx
new file mode 100644
index ..34116b41c009
--- /dev/null
+++ b/vcl/inc/jsdialog/enabled.hxx
@@ -0,0 +1,20 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include
+
+namespace jsdialog
+{
+bool isBuilderEnabled(const OUString& rUIFile, bool bMobile);
+bool isInterimBuilderEnabledForNotebookbar(const OUString& rUIFile);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
new file mode 100644
index ..a82f75ea6e30
--- /dev/null
+++ b/vcl/jsdialog/enabled.cxx
@@ -0,0 +1,72 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+
+namespace jsdialog
+{
+bool isBuilderEnabled(const OUString& rUIFile, bool bMobile)
+{
+if (bMobile)
+{
+if (rUIFile == "modules/swriter/ui/wordcount-mobile.ui"
+|| rUIFile == "svx/ui/findreplacedialog-mobile.ui"
+|| rUIFile == "modules/swriter/ui/watermarkdialog.ui"
+|| rUIFile == "modules/scalc/ui/validationdialog.ui"
+|| rUIFile == "modules/scalc/ui/validationcriteriapage.ui"
+|| rUIFile == "modules/scalc/ui/validationhelptabpage-mobile.ui"
+|| rUIFile == "modules/scalc/ui/erroralerttabpage-mobile.ui"
+|| rUIFile == "modules/scalc/ui/validationdialog.ui")
+{
+return true;
+}
+}
+
+if (rUIFile == "modules/scalc/ui/pivottablelayoutdialog.ui"
+|| rUIFile == "modules/scalc/ui/selectsource.ui"
+|| rUIFile == "modules/scalc/ui/managenamesdialog.ui"
+|| rUIFile == "modules/scalc/ui/definename.ui"
+|| rUIFile == "modules/scalc/ui/correlationdialog.ui"
+|| rUIFile == "modules/scalc/ui/samplingdialog.ui"
+|| rUIFile == "modules/scalc/ui/descriptivestatisticsdialog.ui"
+|| rUIFile == "modules/scalc/ui/analysisofvariancedialog.ui"
+|| rUIFile == "modules/scalc/ui/covariancedialog.ui"
+|| rUIFile == "modules/scalc/ui/exponentialsmoothingdialog.ui"
+|| rUIFile == "modules/scalc/ui/movingaveragedialog.ui"
+|| rUIFile == "modules/scalc/ui/regressiondialog.ui"
+|| rUIFile == "modules/scalc/ui/ttestdialog.ui"
+|| rUIFile == "modules/scalc/ui/ttestdialog.ui"
+|| rUIFile == "modules/scalc/ui/ztestdialog.ui"
+|| rUIFile == "modules/scalc/ui/chisquaretestdialog.ui"
+|| rUIFile == "modules/scalc/ui/fourieranalysisdialog.ui"
+|| rUIFile == "modules/scalc/ui/datafielddialog.ui"
+|| rUIFile == "modules/scalc/ui/pivotfielddialog.ui"
+|| rUIFile == "modules/scalc/ui/datafieldoptionsdialog.ui"
+|| rUIFile == "svx/ui/fontworkgallerydialog.ui"
+|| rUIFile == "cui/ui/macroselectordialog.ui" || rUIFile ==
"uui/ui/macrowarnmedium.ui"
+|| rUIFile == "modules/scalc/ui/textimportcsv.ui")
+{
+return true;
+}
+
+return false;
+}
+
+bool isInterimBuilderEnabledForNotebookbar(const OUString& rUIFile)
+{
+if (rUIFile == "svx/ui/stylespreview.ui" || rUIFi
[Libreoffice-commits] core.git: sw/source
sw/source/filter/html/htmlcss1.cxx | 26 --
1 file changed, 12 insertions(+), 14 deletions(-)
New commits:
commit f244961d1ff2df1e50980e116f95c312089bc8ce
Author: Caolán McNamara
AuthorDate: Sat Jul 3 21:19:24 2021 +0100
Commit: Caolán McNamara
CommitDate: Sun Jul 4 16:52:14 2021 +0200
tidy lcl_swcss1_setEncoding a little
no logic change intended
Change-Id: Id82fb83d0947a838f2c2970a073712d221e5ed92
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118364
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/filter/html/htmlcss1.cxx
b/sw/source/filter/html/htmlcss1.cxx
index b33ee8bdd3e0..f241b396dfce 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -2277,21 +2277,19 @@ static void lcl_swcss1_setEncoding( SwFormat& rFormat,
rtl_TextEncoding eEnc )
const SfxItemSet& rItemSet = rFormat.GetAttrSet();
static const sal_uInt16 aWhichIds[3] = { RES_CHRATR_FONT,
RES_CHRATR_CJK_FONT,
- RES_CHRATR_CTL_FONT };
+ RES_CHRATR_CTL_FONT };
const SfxPoolItem *pItem;
-for(sal_uInt16 i : aWhichIds)
-{
-if( SfxItemState::SET == rItemSet.GetItemState( i, false,&pItem ) )
-{
-const SvxFontItem& rFont = *static_cast(pItem);
-if( RTL_TEXTENCODING_SYMBOL != rFont.GetCharSet() )
-{
-SvxFontItem aFont( rFont.GetFamily(), rFont.GetFamilyName(),
- rFont.GetStyleName(), rFont.GetPitch(),
- eEnc, i);
-rFormat.SetFormatAttr( aFont );
-}
-}
+for (sal_uInt16 i : aWhichIds)
+{
+if (SfxItemState::SET != rItemSet.GetItemState(i, false, &pItem))
+continue;
+const SvxFontItem& rFont = *static_cast(pItem);
+if (RTL_TEXTENCODING_SYMBOL == rFont.GetCharSet())
+continue;
+SvxFontItem aFont(rFont.GetFamily(), rFont.GetFamilyName(),
+ rFont.GetStyleName(), rFont.GetPitch(),
+ eEnc, i);
+rFormat.SetFormatAttr(aFont);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/filter/eppt/pptx-epptooxml.cxx | 15 ---
1 file changed, 4 insertions(+), 11 deletions(-)
New commits:
commit 3ebee45e504abac356d68a4a79ee7a644e6c106d
Author: Caolán McNamara
AuthorDate: Sat Jul 3 14:26:14 2021 +0100
Commit: Caolán McNamara
CommitDate: Sun Jul 4 16:51:53 2021 +0200
cid#1486703 if bUsePlaceholderIndex is true then ePlaceholder != Outliner
so this is Logically dead code
Change-Id: Ieede7331bf2639610ad7a3a983a87263d291c75d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118352
Tested-by: Jenkins
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index ac7449fd38a6..6a7035347f20 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1568,17 +1568,10 @@ ShapeExport&
PowerPointShapeExport::WritePlaceholderShape(const Reference< XShap
SAL_INFO("sd.eppt", "write placeholder " << pType);
if (bUsePlaceholderIndex)
{
-if ((mePageType == PageType::LAYOUT || mePageType == PageType::NORMAL)
-&& ePlaceholder == Outliner)
-mpFS->singleElementNS(
-XML_p, XML_ph, XML_idx,
-OString::number(
-
static_cast(GetFB())->CreateNewPlaceholderIndex(xShape)));
-else
-mpFS->singleElementNS(
-XML_p, XML_ph, XML_type, pType, XML_idx,
-OString::number(
-
static_cast(GetFB())->CreateNewPlaceholderIndex(xShape)));
+mpFS->singleElementNS(
+XML_p, XML_ph, XML_type, pType, XML_idx,
+OString::number(
+
static_cast(GetFB())->CreateNewPlaceholderIndex(xShape)));
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/editeng include/sfx2 include/svl include/svx sc/inc sfx2/source svl/source
include/editeng/scripttypeitem.hxx |2 -
include/sfx2/tabdlg.hxx|1
include/svl/poolitem.hxx | 28 ---
include/svl/setitem.hxx| 52 +
include/svx/pageitem.hxx |2 -
include/svx/xflasit.hxx|2 -
include/svx/xlnasit.hxx|2 -
sc/inc/patattr.hxx |2 -
sfx2/source/control/shell.cxx |1
svl/source/items/itempool.cxx |1
svl/source/items/itemset.cxx |1
svl/source/items/poolcach.cxx |1
svl/source/items/sitem.cxx |1
13 files changed, 63 insertions(+), 33 deletions(-)
New commits:
commit 9f669d2271d5ac64e4cd38ba450fb4ce3dadd5f2
Author: Noel Grandin
AuthorDate: Sat Jul 3 21:18:24 2021 +0200
Commit: Noel Grandin
CommitDate: Sun Jul 4 16:12:17 2021 +0200
move SfxSetItem to own header file
Change-Id: I77ba873ed236091443627e26e6127e89cd8e15bd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118360
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/editeng/scripttypeitem.hxx
b/include/editeng/scripttypeitem.hxx
index e69ea0bdc4da..bfe84f5f6a9a 100644
--- a/include/editeng/scripttypeitem.hxx
+++ b/include/editeng/scripttypeitem.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_EDITENG_SCRIPTTYPEITEM_HXX
#include
-#include
+#include
#include
class EDITENG_DLLPUBLIC SvxScriptSetItem final : public SfxSetItem
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index e6aee128f4bf..7d338e40c342 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -30,6 +30,7 @@
#include
#include
#include
+#include
#include
class SfxTabPage;
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index 7dbd7d85c24b..ba22aed9a9cc 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -305,34 +305,6 @@ public:
virtual boolIsVoidItem() const override;
};
-class SVL_DLLPUBLIC SfxSetItem: public SfxPoolItem
-{
-std::unique_ptr pSet;
-
-SfxSetItem & operator=( const SfxSetItem& ) = delete;
-
-public:
-SfxSetItem( sal_uInt16 nWhich,
std::unique_ptr &&pSet );
-SfxSetItem( sal_uInt16 nWhich, const SfxItemSet
&rSet );
-SfxSetItem( const SfxSetItem&, SfxItemPool *pPool
= nullptr );
-virtual ~SfxSetItem() override;
-
-virtual booloperator==( const SfxPoolItem& ) const override;
-
-virtual bool GetPresentation( SfxItemPresentation ePres,
-MapUnit eCoreMetric,
-MapUnit ePresMetric,
-OUString &rText,
-const IntlWrapper& ) const override;
-
-// create a copy of itself
-virtual SfxSetItem* Clone( SfxItemPool *pPool = nullptr ) const
override = 0;
-
-const SfxItemSet& GetItemSet() const
-{ return *pSet; }
-SfxItemSet& GetItemSet()
-{ return *pSet; }
-};
class SVL_DLLPUBLIC SfxPoolItemHint final : public SfxHint
{
diff --git a/include/svl/setitem.hxx b/include/svl/setitem.hxx
new file mode 100644
index ..81f832b756ae
--- /dev/null
+++ b/include/svl/setitem.hxx
@@ -0,0 +1,52 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include
+
+#include
+#include
+
+class SVL_DLLPUBLIC SfxSetItem : public SfxPoolItem
+{
+std::unique_ptr pSet;
+
+SfxSetItem& operator=(const SfxSetItem&) = delete;
+
+public:
+SfxSetItem(sal_uInt16 nWhich, std::unique_ptr&& pSet);
+SfxSetItem(sal_uInt16 nWhich, const SfxItemSet& rSet);
+SfxSetItem(const SfxSetItem&, SfxItemPool* pPool = nullptr);
+virtual ~SfxSetItem() override;
+
+virtual bool operator==(const SfxPoolItem&) const override;
+
+virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit
eCoreMetric,
+ MapUnit ePresMetric, OUString& rT
[Libreoffice-commits] core.git: sal/rtl
sal/rtl/math.cxx |8 1 file changed, 8 deletions(-) New commits: commit 420e4544267545217d54e9acbc9dbf321d58740a Author: BaiXiaochun AuthorDate: Fri Jul 2 12:36:06 2021 +0200 Commit: Mike Kaganski CommitDate: Sun Jul 4 15:41:40 2021 +0200 Remove unused includes Change-Id: I243d2998725f09ef533bd06865081d5c415f0d18 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118282 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx index 75981d970d74..e9b50a1b4638 100644 --- a/sal/rtl/math.cxx +++ b/sal/rtl/math.cxx @@ -19,17 +19,9 @@ #include -#include #include -#include #include #include -#include -#include -#include -#include -#include -#include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf142464_ampm.docx |binary
sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx | 26 +
writerfilter/source/dmapper/ConversionHelper.cxx | 62 --
3 files changed, 62 insertions(+), 26 deletions(-)
New commits:
commit cd0ab69d4afee0c77884ae17ab9410216695b58b
Author: Mike Kaganski
AuthorDate: Sun Jul 4 12:29:08 2021 +0300
Commit: Mike Kaganski
CommitDate: Sun Jul 4 14:16:35 2021 +0200
tdf#142464: do not escape '/' is AM/PM when importing DOCX.
See also commit a2e964afc5187fc1e3b38720ec10ad9856b87020, doing the
same for DOC.
Change-Id: Ib0ddb36de8589f9264fe857b20a6ef2aa2607c52
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118369
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sw/qa/extras/ooxmlexport/data/tdf142464_ampm.docx
b/sw/qa/extras/ooxmlexport/data/tdf142464_ampm.docx
new file mode 100644
index ..d63398488858
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf142464_ampm.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
index e828519ed4cf..d92c29fefbe7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
@@ -10,6 +10,7 @@
#include
#include
+#include
#include
@@ -688,6 +689,31 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testConditionalText,
"conditional-text.fodt"
assertXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:r[2]/w:instrText",
OUString(aExpected));
}
+DECLARE_OOXMLEXPORT_TEST(testTdf142464_ampm, "tdf142464_ampm.docx")
+{
+css::uno::Reference xTextFieldsSupplier(
+mxComponent, css::uno::UNO_QUERY_THROW);
+auto xFieldsAccess(xTextFieldsSupplier->getTextFields());
+auto xFields(xFieldsAccess->createEnumeration());
+css::uno::Reference xField(xFields->nextElement(),
+
css::uno::UNO_QUERY_THROW);
+
+// Without the fix in place, this would have failed with:
+// - Expected: 12:32 PM
+// - Actual : 12:32 a12/p12
+CPPUNIT_ASSERT_EQUAL(OUString("12:32 PM"), xField->getPresentation(false));
+
+if (xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml"))
+{
+// Without the fix in place, this would have failed with:
+// - Expected: DATE \@"H:mm\ AM/PM"
+// - Actual : DATE \@"H:mm' a'M'/p'M"
+// i.e., the AM/PM would be treated as literal 'a' and 'p' followed by
a month code
+assertXPathContent(pXmlDoc,
"/w:document/w:body/w:p/w:r[2]/w:instrText",
+ " DATE \\@\"H:mm\\ AM/PM\" ");
+}
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx
b/writerfilter/source/dmapper/ConversionHelper.cxx
index e0385a5c6a65..c5b1d3e5d027 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -295,8 +295,17 @@ bool lcl_IsNotAM(OUString const & rFmt, sal_Int32 nPos)
)
);
}
+bool IsPreviousAM(OUString const& rParams, sal_Int32 nPos)
+{
+return nPos >= 2 && rParams.matchIgnoreAsciiCase("am", nPos - 2);
+}
+bool IsNextPM(OUString const& rParams, sal_Int32 nPos)
+{
+return nPos + 2 < rParams.getLength() &&
rParams.matchIgnoreAsciiCase("pm", nPos + 1);
+}
}
+// See also sw::ms::MSDateTimeFormatToSwFormat
OUString ConvertMSFormatStringToSO(
const OUString& rFormat, lang::Locale& rLocale, bool bHijri)
{
@@ -306,37 +315,38 @@ OUString ConvertMSFormatStringToSO(
//#102782#, #102815#, #108341# & #111944# have to work at the same time :-)
bool bForceJapanese(false);
bool bForceNatNum(false);
-sal_Int32 nLen = sFormat.getLength();
+const sal_Int32 nLen = sFormat.getLength();
sal_Int32 nI = 0;
+sal_Int32 nAddedChars = 0;
//const sal_Unicode* pFormat = sFormat.getStr();
OUStringBuffer aNewFormat( sFormat );
while (nI < nLen)
{
-if (aNewFormat[nI] == '\\')
-nI++;
-else if (aNewFormat[nI] == '\"')
+if (sFormat[nI] == '\\')
+++nI;
+else if (sFormat[nI] == '\"')
{
++nI;
//While not at the end and not at an unescaped end quote
-while ((nI < nLen) && ((aNewFormat[nI] != '\"') &&
(aNewFormat[nI-1] != '\\')))
+while ((nI < nLen) && ((sFormat[nI] != '\"') && (sFormat[nI-1] !=
'\\')))
++nI;
}
else //normal unquoted section
{
-sal_Unicode nChar = aNewFormat[nI];
+sal_Unicode nChar = sFormat[nI];
if (nChar == 'O')
{
-aNewFormat[nI] = 'M';
+aNewFormat[nI + nAddedChars] = 'M';
bForceNatNum = true;
}
else if (nChar == 'o')
{
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/localedata/data/fr_FR.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 0151a178d4e26b4546f7b27d569f0d94420caa9d Author: Julien Nabet AuthorDate: Sat Jul 3 23:51:11 2021 +0200 Commit: Julien Nabet CommitDate: Sun Jul 4 10:04:54 2021 +0200 tdf#143173: fix wrong French abbr for Alphabetical Index-Grouped entries Change-Id: If478fc1127f957e05cdf7bc247881f0c59146896 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118366 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/i18npool/source/localedata/data/fr_FR.xml b/i18npool/source/localedata/data/fr_FR.xml index ac7e17710cf9..b2b3abb329bb 100644 --- a/i18npool/source/localedata/data/fr_FR.xml +++ b/i18npool/source/localedata/data/fr_FR.xml @@ -212,8 +212,8 @@ A-Z 0 1 - sv - sv + sq. + sqq. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source sw/qa
oox/source/core/xmlfilterbase.cxx| 10 --
sw/qa/extras/ooxmlexport/data/tdf143175.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport2.cxx| 13 +
3 files changed, 17 insertions(+), 6 deletions(-)
New commits:
commit 965639aec1407c25bed1716a1f2c3ee19923ec1a
Author: Andreas Heinisch
AuthorDate: Sat Jul 3 21:00:20 2021 +0200
Commit: Noel Grandin
CommitDate: Sun Jul 4 09:10:32 2021 +0200
tdf#143175 - Join elements including a delimiter using a standard iterator
Otherwise, the document's keywords will be duplicated since the first
keyword is written twice. Regression from
I19eba57bc6058c317473d0746f06699a09ba2830.
Change-Id: I4c6f840b6e095ca9eaf5ffb53af07280b901e28d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118358
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/oox/source/core/xmlfilterbase.cxx
b/oox/source/core/xmlfilterbase.cxx
index 307949ae4076..b2184e7a97d8 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -56,6 +56,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -598,12 +599,9 @@ writeElement( const FSHelperPtr& pDoc, sal_Int32
nXmlElement, const Sequence< OU
return;
OUStringBuffer sRep;
-sRep.append( aItems[ 0 ] );
-
-for( const OUString& rItem : aItems )
-{
-sRep.append( " " + rItem );
-}
+// tdf#143175 - join elements including a delimiter using a standard
iterator
+::comphelper::intersperse(aItems.begin(), aItems.end(),
+ ::comphelper::OUStringBufferAppender(sRep),
OUString(" "));
writeElement( pDoc, nXmlElement, sRep.makeStringAndClear() );
}
diff --git a/sw/qa/extras/ooxmlexport/data/tdf143175.docx
b/sw/qa/extras/ooxmlexport/data/tdf143175.docx
new file mode 100644
index ..bcfbd2db763b
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf143175.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
index fb21f41284b4..24c4ecbce63d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
@@ -166,6 +166,19 @@ DECLARE_OOXMLEXPORT_TEST(testUTF8CustomProperties,
"tdf127864.docx")
CPPUNIT_ASSERT_EQUAL(OUString(u"первый"),
getProperty(xPropertySet, u"первый"));
}
+DECLARE_OOXMLEXPORT_TEST(testKeywords, "tdf143175.docx")
+{
+uno::Reference
xDocumentPropertiesSupplier(
+mxComponent, uno::UNO_QUERY);
+uno::Reference xDocumentProperties
+= xDocumentPropertiesSupplier->getDocumentProperties();
+uno::Sequence aKeywords(xDocumentProperties->getKeywords());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aKeywords.getLength());
+CPPUNIT_ASSERT_EQUAL(OUString("One"), aKeywords[0]);
+CPPUNIT_ASSERT_EQUAL(OUString("Two"), aKeywords[1]);
+CPPUNIT_ASSERT_EQUAL(OUString("Three"), aKeywords[2]);
+}
+
DECLARE_OOXMLEXPORT_TEST(testZoom, "zoom.docx")
{
uno::Reference xModel(mxComponent, uno::UNO_QUERY);
___
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' - sw/source
sw/source/uibase/uiview/uivwimp.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 0c89088b3974ae5c2e0853a2d9971f2fc00d1d5c
Author: Noel Grandin
AuthorDate: Fri Jul 2 11:19:39 2021 +0200
Commit: Noel Grandin
CommitDate: Sun Jul 4 09:09:43 2021 +0200
fix potential use-after-free in SwClipboardChangeListener
we think we're seeing this in COOL
Change-Id: I29a287b032158076a99a836d98113d1623ebef99
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118277
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 558dface96fbc5f487b16cfa1bf3c3ea20776331)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118264
Reviewed-by: Michael Meeks
Tested-by: Noel Grandin
diff --git a/sw/source/uibase/uiview/uivwimp.cxx
b/sw/source/uibase/uiview/uivwimp.cxx
index 9dc6d467f941..ee6b5d66de1c 100644
--- a/sw/source/uibase/uiview/uivwimp.cxx
+++ b/sw/source/uibase/uiview/uivwimp.cxx
@@ -292,6 +292,8 @@ SwClipboardChangeListener::~SwClipboardChangeListener()
void SAL_CALL SwClipboardChangeListener::disposing( const EventObject&
/*rEventObject*/ )
{
+SolarMutexGuard aGuard;
+pView = nullptr; // so we don't touch the view if changedContents somehow
fires afterwards
}
void SAL_CALL SwClipboardChangeListener::changedContents( const
css::datatransfer::clipboard::ClipboardEvent& rEventObject )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
