[Libreoffice-commits] core.git: xmlhelp/source xmlscript/source xmlsecurity/source
xmlhelp/source/cxxhelp/provider/content.cxx |4 +---
xmlscript/source/xmlflat_imexp/xmlbas_export.cxx |6 ++
xmlsecurity/source/component/certificatecontainer.cxx |3 +--
3 files changed, 4 insertions(+), 9 deletions(-)
New commits:
commit bd43c754d3a6977fc2de80bce27d4045046cb32f
Author: Mani Kumar
AuthorDate: Wed Mar 17 22:50:33 2021 +0530
Commit: Mike Kaganski
CommitDate: Thu Mar 18 07:29:56 2021 +0100
tdf#88205: Use initializer_list ctor in css::uno::Sequence
Change-Id: I95aaefa11c733f5c020600cf13510af1bc9c0de7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112652
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx
b/xmlhelp/source/cxxhelp/provider/content.cxx
index f16c6b880471..1dc5347f2d1e 100644
--- a/xmlhelp/source/cxxhelp/provider/content.cxx
+++ b/xmlhelp/source/cxxhelp/provider/content.cxx
@@ -105,9 +105,7 @@ OUString SAL_CALL Content::getImplementationName()
// virtual
uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
{
-uno::Sequence aSNS { "com.sun.star.ucb.CHelpContent" };
-
-return aSNS;
+return { "com.sun.star.ucb.CHelpContent" };
}
// XContent methods.
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
index fcec0985dbec..3f0351a1f97e 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
@@ -331,8 +331,7 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence<
beans::PropertyValue >& /
Sequence< OUString > XMLBasicExporter::getSupportedServiceNames( )
{
-Sequence< OUString > aNames { "com.sun.star.document.XMLBasicExporter"
};
-return aNames;
+return { "com.sun.star.document.XMLBasicExporter" };
}
// XMLOasisBasicExporter
@@ -355,8 +354,7 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence<
beans::PropertyValue >& /
Sequence< OUString > XMLOasisBasicExporter::getSupportedServiceNames( )
{
-Sequence< OUString > aNames {
"com.sun.star.document.XMLOasisBasicExporter" };
-return aNames;
+return { "com.sun.star.document.XMLOasisBasicExporter" };
}
} // namespace xmlscript
diff --git a/xmlsecurity/source/component/certificatecontainer.cxx
b/xmlsecurity/source/component/certificatecontainer.cxx
index 8f921d881715..e311b1b600f8 100644
--- a/xmlsecurity/source/component/certificatecontainer.cxx
+++ b/xmlsecurity/source/component/certificatecontainer.cxx
@@ -138,8 +138,7 @@ CertificateContainer::supportsService( const OUString&
ServiceName )
Sequence< OUString > SAL_CALL
CertificateContainer::getSupportedServiceNames( )
{
-Sequence< OUString > aRet { "com.sun.star.security.CertificateContainer" };
-return aRet;
+return { "com.sun.star.security.CertificateContainer" };
}
namespace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/CppunitTest_vcl_bitmap_test.mk vcl/inc vcl/qa vcl/source vcl/workben
vcl/CppunitTest_vcl_bitmap_test.mk |1
vcl/qa/cppunit/XpmFilterTest.cxx| 76 ++
vcl/qa/cppunit/data/XPM_1.xpm | 15 ++
vcl/qa/cppunit/data/XPM_4.xpm | 23 +++
vcl/qa/cppunit/data/XPM_8.xpm | 263
vcl/source/filter/graphicfilter.cxx |2
vcl/source/filter/ixpm/xpmread.cxx |3
vcl/workben/fftester.cxx|2
vcl/workben/xpmfuzzer.cxx |2
9 files changed, 383 insertions(+), 4 deletions(-)
New commits:
commit 80da19ae298b4b4d8802906f88fde0c0f9348765
Author: Tomaž Vajngerl
AuthorDate: Wed Mar 17 14:20:43 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Thu Mar 18 04:02:36 2021 +0100
vcl: test for reading the XPM format
Change-Id: I416a1c02d737dba716b55a7eb902181c3cff22b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112598
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/vcl/CppunitTest_vcl_bitmap_test.mk
b/vcl/CppunitTest_vcl_bitmap_test.mk
index 187bb6871845..3e28b96b62e9 100644
--- a/vcl/CppunitTest_vcl_bitmap_test.mk
+++ b/vcl/CppunitTest_vcl_bitmap_test.mk
@@ -17,6 +17,7 @@ $(eval $(call
gb_CppunitTest_add_exception_objects,vcl_bitmap_test, \
vcl/qa/cppunit/BitmapScaleTest \
vcl/qa/cppunit/BitmapFilterTest \
vcl/qa/cppunit/BmpFilterTest \
+vcl/qa/cppunit/XpmFilterTest \
))
$(eval $(call gb_CppunitTest_use_externals,vcl_bitmap_test,\
diff --git a/vcl/source/filter/ixpm/xpmread.hxx b/vcl/inc/filter/XpmReader.hxx
similarity index 100%
rename from vcl/source/filter/ixpm/xpmread.hxx
rename to vcl/inc/filter/XpmReader.hxx
diff --git a/vcl/qa/cppunit/XpmFilterTest.cxx b/vcl/qa/cppunit/XpmFilterTest.cxx
new file mode 100644
index ..121dc62a4fd6
--- /dev/null
+++ b/vcl/qa/cppunit/XpmFilterTest.cxx
@@ -0,0 +1,76 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+
+#include
+#include
+#include
+#include
+
+class XpmFilterTest : public test::BootstrapFixture
+{
+public:
+OUString maDataUrl;
+OUString getFullUrl(std::u16string_view sFileName)
+{
+return m_directories.getURLFromSrc(maDataUrl) + sFileName;
+}
+XpmFilterTest()
+: maDataUrl(u"/vcl/qa/cppunit/data/")
+{
+}
+};
+
+CPPUNIT_TEST_FIXTURE(XpmFilterTest, testXPM_8bit)
+{
+SvFileStream aFileStream(getFullUrl(u"XPM_8.xpm"), StreamMode::READ);
+Graphic aGraphic;
+CPPUNIT_ASSERT(ImportXPM(aFileStream, aGraphic));
+auto aBitmap = aGraphic.GetBitmapEx();
+CPPUNIT_ASSERT_EQUAL(tools::Long(4), aBitmap.GetSizePixel().Width());
+CPPUNIT_ASSERT_EQUAL(tools::Long(4), aBitmap.GetSizePixel().Height());
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(8), aBitmap.GetBitCount());
+CPPUNIT_ASSERT_EQUAL(COL_LIGHTBLUE, aBitmap.GetPixelColor(0, 0));
+CPPUNIT_ASSERT_EQUAL(COL_LIGHTRED, aBitmap.GetPixelColor(2, 0));
+CPPUNIT_ASSERT_EQUAL(COL_YELLOW, aBitmap.GetPixelColor(0, 2));
+CPPUNIT_ASSERT_EQUAL(COL_LIGHTGREEN, aBitmap.GetPixelColor(2, 2));
+}
+
+CPPUNIT_TEST_FIXTURE(XpmFilterTest, testXPM_4bit)
+{
+SvFileStream aFileStream(getFullUrl(u"XPM_4.xpm"), StreamMode::READ);
+Graphic aGraphic;
+CPPUNIT_ASSERT(ImportXPM(aFileStream, aGraphic));
+auto aBitmap = aGraphic.GetBitmapEx();
+CPPUNIT_ASSERT_EQUAL(tools::Long(4), aBitmap.GetSizePixel().Width());
+CPPUNIT_ASSERT_EQUAL(tools::Long(4), aBitmap.GetSizePixel().Height());
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(4), aBitmap.GetBitCount());
+CPPUNIT_ASSERT_EQUAL(COL_LIGHTBLUE, aBitmap.GetPixelColor(0, 0));
+CPPUNIT_ASSERT_EQUAL(COL_LIGHTRED, aBitmap.GetPixelColor(2, 0));
+CPPUNIT_ASSERT_EQUAL(COL_YELLOW, aBitmap.GetPixelColor(0, 2));
+CPPUNIT_ASSERT_EQUAL(COL_LIGHTGREEN, aBitmap.GetPixelColor(2, 2));
+}
+
+CPPUNIT_TEST_FIXTURE(XpmFilterTest, testXPM_1bit)
+{
+SvFileStream aFileStream(getFullUrl(u"XPM_1.xpm"), StreamMode::READ);
+Graphic aGraphic;
+CPPUNIT_ASSERT(ImportXPM(aFileStream, aGraphic));
+auto aBitmap = aGraphic.GetBitmapEx();
+CPPUNIT_ASSERT_EQUAL(tools::Long(10), aBitmap.GetSizePixel().Width());
+CPPUNIT_ASSERT_EQUAL(tools::Long(10), aBitmap.GetSizePixel().Height());
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(1), aBitmap.GetBitCount());
+CPPUNIT_ASSERT_EQUAL(Color(0xff), aBitmap.GetPixelColor(0, 0));
+CPPUNIT_ASSERT_EQUAL(Color(0x72d1c8), aBitmap.GetPixelColor(1, 1));
+CPPUNIT_ASSERT_EQUAL(Color(0x72d1c8), aBitmap.GetPixelColor(8, 8));
+CPPUNIT_ASSERT_EQUAL(Color(0xff), aBitmap.GetPixelColor(9, 9));
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/qa/cppunit/data/XPM_1.xpm b/vcl/qa/cppunit/data/XPM_1.xpm
new file mode 100644
index 000
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/utlui/content.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 005adbefc746f9024adcf572c287dc061acbcf00
Author: Jim Raykowski
AuthorDate: Tue Mar 9 12:06:20 2021 -0900
Commit: Jim Raykowski
CommitDate: Thu Mar 18 01:50:50 2021 +0100
Sw Navigator: fix table selection
Fixes table selection from the Navigator not selecting the whole table.
Change-Id: If6a9161d011a056aad02c3bd99c19e62802288c7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112254
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index d70494d64cc7..fe9da9cfc0e1 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3953,7 +3953,7 @@ void SwContentTree::ExecuteContextMenuAction(const
OString& rSelectedPopupEntry)
case 804:
ExecCommand("demote", true);
break;
-case 805:
+case 805: // select document content
{
m_pActiveShell->KillPams();
m_pActiveShell->ClearMark();
@@ -3973,7 +3973,7 @@ void SwContentTree::ExecuteContextMenuAction(const
OString& rSelectedPopupEntry)
else if (eTypeId == ContentTypeId::TABLE)
{
m_pActiveShell->GotoTable(pCnt->GetName());
-m_pActiveShell->SelAll();
+
m_pActiveShell->GetView().GetViewFrame()->GetDispatcher()->Execute(FN_TABLE_SELECT_ALL);
}
else if (eTypeId == ContentTypeId::REGION)
{
___
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' - dbaccess/source xmlsecurity/CppunitTest_xmlsecurity_signing.mk xmlsecurity/qa
dbaccess/source/core/dataaccess/ModelImpl.cxx | 11 -
xmlsecurity/CppunitTest_xmlsecurity_signing.mk |1
xmlsecurity/qa/unit/signing/data/odb_signed_macros.odb |binary
xmlsecurity/qa/unit/signing/signing2.cxx | 127 +
4 files changed, 135 insertions(+), 4 deletions(-)
New commits:
commit 5a25faaa27cfed40bb6a9406146719599ba99e47
Author: Samuel Mehrbrodt
AuthorDate: Thu May 7 12:03:48 2020 +0200
Commit: Thorsten Behrens
CommitDate: Thu Mar 18 01:15:54 2021 +0100
tdf#97694 Add test for macro signature preservation in Base
Conflicts:
dbaccess/source/core/dataaccess/ModelImpl.cxx
Change-Id: I35fb8d499eed66f9a5e208a4778a1f0f12637079
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93630
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112638
Tested-by: Thorsten Behrens
Reviewed-by: Thorsten Behrens
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx
b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index d5c3b9b3e086..21e45033ea4f 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -856,14 +856,17 @@ bool
ODatabaseModelImpl::commitStorageIfWriteable_ignoreErrors( const Reference<
aTempFile.EnableKillingFile();
OUString m_sTmpFileUrl = aTempFile.GetURL();
SignatureState aSignatureState = getScriptingSignatureState();
-if (aSignatureState == SignatureState::OK
-|| aSignatureState == SignatureState::NOTVALIDATED
-|| aSignatureState == SignatureState::INVALID)
+OUString sLocation = getDocFileLocation();
+bool bIsEmbedded = sLocation.startsWith("vnd.sun.star.pkg:") &&
sLocation.endsWith("/EmbeddedDatabase");
+if (!bIsEmbedded && !sLocation.isEmpty()
+&& (aSignatureState == SignatureState::OK || aSignatureState ==
SignatureState::NOTVALIDATED
+|| aSignatureState == SignatureState::INVALID
+|| aSignatureState == SignatureState::UNKNOWN))
{
bTryToPreserveScriptSignature = true;
// We need to first save the file (which removes the macro signature),
then add the macro signature again.
// For that, we need a temporary copy of the original file.
-osl::File::RC rc = osl::File::copy(getDocFileLocation(),
m_sTmpFileUrl);
+osl::File::RC rc = osl::File::copy(sLocation, m_sTmpFileUrl);
if (rc != osl::FileBase::E_None)
throw uno::RuntimeException("Could not create temp file");
}
diff --git a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
index 84e7a76c043b..7d0c5200ff27 100644
--- a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
+++ b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,xmlsecurity_signing))
$(eval $(call gb_CppunitTest_add_exception_objects,xmlsecurity_signing, \
xmlsecurity/qa/unit/signing/signing \
+ xmlsecurity/qa/unit/signing/signing2 \
))
$(eval $(call gb_CppunitTest_use_libraries,xmlsecurity_signing, \
diff --git a/xmlsecurity/qa/unit/signing/data/odb_signed_macros.odb
b/xmlsecurity/qa/unit/signing/data/odb_signed_macros.odb
new file mode 100644
index ..3e90f4514599
Binary files /dev/null and
b/xmlsecurity/qa/unit/signing/data/odb_signed_macros.odb differ
diff --git a/xmlsecurity/qa/unit/signing/signing2.cxx
b/xmlsecurity/qa/unit/signing/signing2.cxx
new file mode 100644
index ..152d62a18974
--- /dev/null
+++ b/xmlsecurity/qa/unit/signing/signing2.cxx
@@ -0,0 +1,127 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+using namespace css;
+
+namespace
+{
+char const DATA_DIRECTORY[] = "/xmlsecurity/qa/unit/signing/data/";
+}
+
+/// Testsuite for the document signing feature.
+class SigningTest2 : public test::BootstrapFixture, public
unotest::MacrosTest, public XmlTestTools
+{
+protected:
+uno::Reference mxComponentContext;
+uno::Reference mxComponent;
+uno::Reference mxSEInitializer;
+uno::Reference mxSecurityContext;
+
+public:
+SigningTest2();
+virtual void setUp() override;
+virtual void tearDown() override;
+void registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx) override;
+};
+
+SigningTest2::SigningTest2() {}
+
+void SigningTest2::setUp()
+{
+test::BootstrapFixture::setUp();
+
+// Initialize crypto after setting up the environme
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7053ec94b47432aad6c5d1d82dd85e41bc08d2ac Author: Seth Chaiklin AuthorDate: Thu Mar 18 01:05:07 2021 +0100 Commit: Gerrit Code Review CommitDate: Thu Mar 18 01:05:07 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 367a4f5cf3d78adaeec36715a37286a6a2cea694 - tdf#139667 update numbering paragraphs; joining lists; chapter numbering ( swriter/01/0606.xhp ) + variable to tip about using Chapter Numbering dialog to add numbering to headings, so that it can be embedded in other help pages. + add links in tip to Tools - Chapter Numbering and other icons, toolbars, and dialogs mentioned in the tip. + Emphasize in the tip to use the Chapter Numbering dialog instead of direct formatting, when adding numbering to Headings. ( swriter/guide/join_numbered_lists.xhp ) * "numbered" -> "ordered" * "Numbering On/Off" -> "Toggle Ordered List" * In paragraphs with changes, update to + add a about "Add to List", with link to relevant page. * update to ,, ( swriter/guide/numbering_paras.xhp ) * "numbered" -> "ordered" * replace tip about chapter numbering with embed from swriter/01/0606.xhp * "Numbering On/Off" -> "No List" Change-Id: I242bfef2535d5fbcd95355d79e77403ce0071679 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112518 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index 5ed37664620c..367a4f5cf3d7 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 5ed37664620c9e664b06c4660529ad0f200bbc5e +Subproject commit 367a4f5cf3d78adaeec36715a37286a6a2cea694 ___ 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/swriter/01/0606.xhp |2 +- source/text/swriter/guide/join_numbered_lists.xhp | 17 + source/text/swriter/guide/numbering_paras.xhp | 16 3 files changed, 18 insertions(+), 17 deletions(-) New commits: commit 367a4f5cf3d78adaeec36715a37286a6a2cea694 Author: Seth Chaiklin AuthorDate: Mon Mar 15 17:42:29 2021 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Thu Mar 18 01:05:07 2021 +0100 tdf#139667 update numbering paragraphs; joining lists; chapter numbering ( swriter/01/0606.xhp ) + variable to tip about using Chapter Numbering dialog to add numbering to headings, so that it can be embedded in other help pages. + add links in tip to Tools - Chapter Numbering and other icons, toolbars, and dialogs mentioned in the tip. + Emphasize in the tip to use the Chapter Numbering dialog instead of direct formatting, when adding numbering to Headings. ( swriter/guide/join_numbered_lists.xhp ) * "numbered" -> "ordered" * "Numbering On/Off" -> "Toggle Ordered List" * In paragraphs with changes, update to + add a about "Add to List", with link to relevant page. * update to ,, ( swriter/guide/numbering_paras.xhp ) * "numbered" -> "ordered" * replace tip about chapter numbering with embed from swriter/01/0606.xhp * "Numbering On/Off" -> "No List" Change-Id: I242bfef2535d5fbcd95355d79e77403ce0071679 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112518 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/source/text/swriter/01/0606.xhp b/source/text/swriter/01/0606.xhp index 677c488e1..8fef88075 100644 --- a/source/text/swriter/01/0606.xhp +++ b/source/text/swriter/01/0606.xhp @@ -39,7 +39,7 @@ Chapter numbering is linked to paragraph styles. By default, the "Heading" paragraph styles (1-10) are assigned to the corresponding chapter and outline number levels (1-10). If you want, you can assign different paragraph styles to the outline number level. -If you want numbered headings, use the Chapter Numbering dialog. Do not use the Toggle Ordered List icon on the Formatting bar. +If you want numbered headings, choose Tools - Chapter Numbering. This command opens a dialog where numbering schemes can be assigned to paragraph styles used for headings. Do not use the Toggle Ordered List icon on the Formatting Bar or the Format - Bullets and Numbering dialog. diff --git a/source/text/swriter/guide/join_numbered_lists.xhp b/source/text/swriter/guide/join_numbered_lists.xhp index 7fa6db49e..f343d4a52 100644 --- a/source/text/swriter/guide/join_numbered_lists.xhp +++ b/source/text/swriter/guide/join_numbered_lists.xhp @@ -35,22 +35,21 @@ paragraphs;numbering non-consecutive +Combining Ordered Lists +You can combine two ordered lists into a single list. -Combining Numbered Lists -You can combine numbered lists into a single consecutively numbered list. - -To Combine Consecutive Numbered Lists +To Combine Two Ordered Lists Select all of the paragraphs in the lists. -On the Formatting Bar, click the Numbering On/Off icon twice. +On the Formatting Bar, click the Toggle Ordered List icon twice. -To Create a Numbered List From Non-consecutive Paragraphs: +To Create a Ordered List From Non-consecutive Paragraphs @@ -60,16 +59,18 @@ Continue to hold down CommandCtrl, and drag a selection in each numbered paragraph of the lists you want to combine. -On the Formatting Bar, click the Numbering On/Off icon twice. +On the Formatting Bar, click the Toggle Ordered List icon twice. - +To add selected paragraphs to an existing list, use Format - Lists - Add to List. + + diff --git a/source/text/swriter/guide/numbering_paras.xhp b/source/text/swriter/guide/numbering_paras.xhp index 4bf7f70de..ddf4c84e8 100644 --- a/source/text/swriter/guide/numbering_paras.xhp +++ b/source/text/swriter/guide/numbering_paras.xhp @@ -20,7 +20,7 @@ -Modifying Numbering in a Numbered List +Modifying Numbering in an Ordered List /text/swriter/guide/numbering_paras.xhp @@ -37,11 +37,11 @@ MW changed "removing;..." to "deleting;...", and deleted "modifying;..." -Modifying Numbering in a Numbered List -You can remove the numbering from a paragraph in a numbered list or change the number that a numbered list starts with. -If you want numbered headings, use the Tools - Chapter Numbering menu command to assign a numbering to a paragraph style. Do not use the Numbering icon on the Formatting toolbar. +Modifying Numbering in an Ordered List +You can remove the numbering from a paragraph in an ordered list or change the number that an ordered list starts with. + -
Re: Unit Tests failing when built with clang 12
Sounds like there is a headless or distro dependent aspect of this bug too. I can reproduce this on both my i686 openSUSE Tumbleweed (32-bit) laptop and on my x86-64 openSUSE Tumbleweed desktop. This issue has not been fixed in clang 13 as today's build 402f2cae7dcab also fails. I also was able to reproduce the failures with this autogen.input: --enable-optimized --disable-debug --disable-dbgutil CC=clang CXX=clang++ What distro is this working on? I can try that in a VM. -Luke ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/glyphitem.hxx | 13
vcl/source/gdi/impglyphitem.cxx | 61
2 files changed, 57 insertions(+), 17 deletions(-)
New commits:
commit d697e792c5b4b27aad8806694e1b8e22dcc70eae
Author: Luboš Luňák
AuthorDate: Tue Mar 16 16:28:02 2021 +0100
Commit: Luboš Luňák
CommitDate: Wed Mar 17 22:49:57 2021 +0100
optimize SalLayoutGlyphs for the common case
This should reduce memory usage (libstdc++ vector is 3 int's and
allocates dynamically). The usual case should be no font fallback.
Change-Id: I2e7981c0962f4f417fd024e3c27f01bc2a71127e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112591
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/include/vcl/glyphitem.hxx b/include/vcl/glyphitem.hxx
index 02d783a3e166..d928bb954ee7 100644
--- a/include/vcl/glyphitem.hxx
+++ b/include/vcl/glyphitem.hxx
@@ -31,7 +31,11 @@ class SalLayoutGlyphsImpl;
class VCL_DLLPUBLIC SalLayoutGlyphs final
{
-std::vector m_pImpls;
+SalLayoutGlyphsImpl* m_pImpl = nullptr;
+// Extra items are in a dynamically allocated vector in order to save
memory.
+// The usual case should be that this stays unused (it should be only used
+// when font fallback takes place).
+std::vector* m_pExtraImpls = nullptr;
public:
SalLayoutGlyphs() = default;
@@ -42,11 +46,8 @@ public:
SalLayoutGlyphs& operator=(const SalLayoutGlyphs&) = delete;
SalLayoutGlyphs& operator=(SalLayoutGlyphs&&);
-SalLayoutGlyphsImpl* Impl(unsigned int nLevel) const
-{
-return nLevel < m_pImpls.size() ? m_pImpls[nLevel] : nullptr;
-}
-void AppendImpl(SalLayoutGlyphsImpl* pImpl) { m_pImpls.push_back(pImpl); }
+SalLayoutGlyphsImpl* Impl(unsigned int nLevel) const;
+void AppendImpl(SalLayoutGlyphsImpl* pImpl);
bool IsValid() const;
void Invalidate();
diff --git a/vcl/source/gdi/impglyphitem.cxx b/vcl/source/gdi/impglyphitem.cxx
index d271032e2ad6..e368305cdba1 100644
--- a/vcl/source/gdi/impglyphitem.cxx
+++ b/vcl/source/gdi/impglyphitem.cxx
@@ -25,35 +25,74 @@
SalLayoutGlyphs::~SalLayoutGlyphs()
{
-for (SalLayoutGlyphsImpl* impl : m_pImpls)
-delete impl;
+delete m_pImpl;
+if (m_pExtraImpls)
+for (SalLayoutGlyphsImpl* impl : *m_pExtraImpls)
+delete impl;
}
-SalLayoutGlyphs::SalLayoutGlyphs(SalLayoutGlyphs&& rOther) {
std::swap(m_pImpls, rOther.m_pImpls); }
+SalLayoutGlyphs::SalLayoutGlyphs(SalLayoutGlyphs&& rOther)
+{
+std::swap(m_pImpl, rOther.m_pImpl);
+std::swap(m_pExtraImpls, rOther.m_pExtraImpls);
+}
SalLayoutGlyphs& SalLayoutGlyphs::operator=(SalLayoutGlyphs&& rOther)
{
if (this != &rOther)
-std::swap(m_pImpls, rOther.m_pImpls);
+{
+std::swap(m_pImpl, rOther.m_pImpl);
+std::swap(m_pExtraImpls, rOther.m_pExtraImpls);
+}
return *this;
}
bool SalLayoutGlyphs::IsValid() const
{
-if (m_pImpls.empty())
+if (m_pImpl == nullptr)
+return false;
+if (!m_pImpl->IsValid())
return false;
-for (SalLayoutGlyphsImpl* impl : m_pImpls)
-if (!impl->IsValid())
-return false;
+if (m_pExtraImpls)
+for (SalLayoutGlyphsImpl* impl : *m_pExtraImpls)
+if (!impl->IsValid())
+return false;
return true;
}
void SalLayoutGlyphs::Invalidate()
{
// Invalidating is in fact simply clearing.
-for (SalLayoutGlyphsImpl* impl : m_pImpls)
-delete impl;
-m_pImpls.clear();
+delete m_pImpl;
+m_pImpl = nullptr;
+if (m_pExtraImpls)
+{
+for (SalLayoutGlyphsImpl* impl : *m_pExtraImpls)
+delete impl;
+delete m_pExtraImpls;
+m_pExtraImpls = nullptr;
+}
+}
+
+SalLayoutGlyphsImpl* SalLayoutGlyphs::Impl(unsigned int nLevel) const
+{
+if (nLevel == 0)
+return m_pImpl;
+if (m_pExtraImpls != nullptr && nLevel - 1 < m_pExtraImpls->size())
+return (*m_pExtraImpls)[nLevel - 1];
+return nullptr;
+}
+
+void SalLayoutGlyphs::AppendImpl(SalLayoutGlyphsImpl* pImpl)
+{
+if (m_pImpl == nullptr)
+m_pImpl = pImpl;
+else
+{
+if (m_pExtraImpls == nullptr)
+m_pExtraImpls = new std::vector;
+m_pExtraImpls->push_back(pImpl);
+}
}
SalLayoutGlyphsImpl* SalLayoutGlyphsImpl::clone() const { return new
SalLayoutGlyphsImpl(*this); }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl sc/source svtools/source sw/source vcl/inc vcl/qa vcl/source
include/vcl/glyphitem.hxx | 19 ++
include/vcl/outdev.hxx |6 ++-
include/vcl/vcllayout.hxx |6 +--
sc/source/ui/view/output2.cxx |4 +-
svtools/source/control/ruler.cxx|6 ---
sw/source/core/txtnode/fntcache.cxx |6 ---
vcl/inc/impglyphitem.hxx|7 +--
vcl/inc/sallayout.hxx | 13 --
vcl/qa/cppunit/complextext.cxx | 10 ++---
vcl/source/control/imp_listbox.cxx |6 ---
vcl/source/gdi/CommonSalLayout.cxx | 68 ++--
vcl/source/gdi/impglyphitem.cxx | 42 ++
vcl/source/gdi/sallayout.cxx| 64 +++--
vcl/source/outdev/font.cxx |9 ++--
vcl/source/outdev/text.cxx |4 +-
vcl/source/window/menuitemlist.cxx |6 ---
vcl/source/window/status.cxx| 16
17 files changed, 147 insertions(+), 145 deletions(-)
New commits:
commit 7439cabc643de2f07c18adc35056f802997f484a
Author: Luboš Luňák
AuthorDate: Tue Mar 16 15:04:08 2021 +0100
Commit: Luboš Luňák
CommitDate: Wed Mar 17 22:49:33 2021 +0100
make SalLayoutGlyphs work with MultiSalLayout
Code that needs to lay out texts repeatedly can cache the result
of SalLayout::GetGlyphs() can reuse it. But GetGlyphs() returns
nullptr for MultiSalLayout, so caching for it doesn't work. Worse
still, it actually increases the number of layout calls, because
there's the initial layout for caching and then each call
will need to do the layout again because of the nullptr that's
not cached.
This commit changes SalLayoutGlyphs to possibly include multiple
SalLayoutGlyphsImpl objects, one for each SalLayout handled
by MultiSalLayout. Changes include making GenericSalLayout
work directly with the Impl class, which avoids an indirection
and simplifies code.
Change-Id: Ic4b19934a8a06d4955b51527fe3777c5e91107b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112590
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/include/vcl/glyphitem.hxx b/include/vcl/glyphitem.hxx
index 7634bd3a4413..02d783a3e166 100644
--- a/include/vcl/glyphitem.hxx
+++ b/include/vcl/glyphitem.hxx
@@ -23,23 +23,30 @@
#include
#include
+#include
+
typedef sal_uInt16 sal_GlyphId;
class SalLayoutGlyphsImpl;
class VCL_DLLPUBLIC SalLayoutGlyphs final
{
-friend class SalLayoutGlyphsImpl;
-SalLayoutGlyphsImpl* m_pImpl;
+std::vector m_pImpls;
public:
-SalLayoutGlyphs();
-SalLayoutGlyphs(const SalLayoutGlyphs&);
+SalLayoutGlyphs() = default;
+SalLayoutGlyphs(const SalLayoutGlyphs&) = delete;
+SalLayoutGlyphs(SalLayoutGlyphs&&);
~SalLayoutGlyphs();
-SalLayoutGlyphs& operator=(const SalLayoutGlyphs&);
+SalLayoutGlyphs& operator=(const SalLayoutGlyphs&) = delete;
+SalLayoutGlyphs& operator=(SalLayoutGlyphs&&);
-SalLayoutGlyphsImpl* Impl() const { return m_pImpl; }
+SalLayoutGlyphsImpl* Impl(unsigned int nLevel) const
+{
+return nLevel < m_pImpls.size() ? m_pImpls[nLevel] : nullptr;
+}
+void AppendImpl(SalLayoutGlyphsImpl* pImpl) { m_pImpls.push_back(pImpl); }
bool IsValid() const;
void Invalidate();
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index a8d77c77b30e..ce7d54e75689 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1352,11 +1352,13 @@ public:
SalLayoutFlags flags
= SalLayoutFlags::NONE,
vcl::TextLayoutCache
const* = nullptr) const;
SAL_DLLPRIVATE std::unique_ptr
-ImplGlyphFallbackLayout(
std::unique_ptr, ImplLayoutArgs& ) const;
+ImplGlyphFallbackLayout(
std::unique_ptr,
+ ImplLayoutArgs&,
+ const
SalLayoutGlyphs* ) const;
SAL_DLLPRIVATE std::unique_ptr
getFallbackLayout(
LogicalFontInstance* pLogicalFont, int
nFallbackLevel,
-ImplLayoutArgs& rLayoutArgs) const;
+ImplLayoutArgs& rLayoutArgs, const
SalLayoutGlyphs* ) const;
// Enabling/disabling RTL only makes sense for OutputDevices that use a
mirroring SalGraphicsLayout
diff --git a/include/vcl/vcllayout.hxx b/include/vcl/vcllayout.hxx
index 7d53d12bd40b..e09e54f59d65 100644
--- a/include/vcl/vcllayout.hxx
+++ b/include/vcl/vcllayout.hxx
@@ -24,13 +24,13 @@
#include
#include
#include
+#include
#include
class ImplLayoutArgs;
class PhysicalFontFace;
class SalGraphics;
class GlyphItem;
-class SalLayoutGlyphs;
// all positions/widths are in font units
// one exception: drawposition is in pixel uni
[Libreoffice-commits] core.git: sw/source
sw/source/core/txtnode/fntcache.cxx | 18 --
1 file changed, 18 deletions(-)
New commits:
commit 9d02d86e8a9111b7a689062eb9a856146a9e80b1
Author: Luboš Luňák
AuthorDate: Fri Mar 12 14:08:11 2021 +0100
Commit: Luboš Luňák
CommitDate: Wed Mar 17 22:49:05 2021 +0100
do not disable Writer font caching on zoom mismatch
This code disables font caching for some cases, e.g. when exporting
to PDF if the zoom is set to anything else than 100%, or also when
loading a document.
It unfortunately comes from the OOo initial import, so it's
impossible to find out why it should be needed. SwFntObj instances
are created only using SwFntAccess ctor, which checks any SwFntObj
it tries to reuse, so if this some additional factor to consider
when reusing SwFntObj, then it can be checked there. But when I
remove the code, I cannot see any breakage. Tests pass, normal
rendering is fine, document thumbnail is fine, printing is fine,
PDF export is fine, embedding in a spreadsheet is fine.
We had a look at this with Miklos and concluded that it is not
needed (until proven otherwise, in which case it'll be also known
why it would be needed).
Change-Id: I59d375229a265a4353c1da6dd067d892dd4ecfb6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112589
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/sw/source/core/txtnode/fntcache.cxx
b/sw/source/core/txtnode/fntcache.cxx
index b0ed8eb4d72b..2327ce0de4ce 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -591,24 +591,6 @@ void SwFntObj::CreateScrFont( const SwViewShell& rSh,
const OutputDevice& rOut )
m_pScrFont = m_pPrtFont;
}
-// check zoom factor, e.g. because of PrtOle2 during export
-{
-// In case the zoom factor of the output device differs from the
-// one in the ViewOptions, this Font must not be cached,
-// hence set zoom factor to an invalid value
-tools::Long nTmp;
-if( pOut->GetMapMode().GetScaleX().IsValid() &&
-pOut->GetMapMode().GetScaleY().IsValid() &&
-pOut->GetMapMode().GetScaleX() == pOut->GetMapMode().GetScaleY() )
-{
-nTmp = tools::Long(100 * pOut->GetMapMode().GetScaleX());
-}
-else
-nTmp = 0;
-if( nTmp != m_nZoom )
-m_nZoom = USHRT_MAX - 1;
-}
-
m_nScrAscent = static_cast(pOut->GetFontMetric().GetAscent());
if ( USHRT_MAX == m_nScrHeight )
m_nScrHeight = static_cast(pOut->GetTextHeight());
___
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/inc/fntcache.hxx | 23 ++
sw/source/core/txtnode/fntcache.cxx | 136 +---
2 files changed, 103 insertions(+), 56 deletions(-)
New commits:
commit 3f69ec9ab4236de13d229f675943123aeb42ea29
Author: Luboš Luňák
AuthorDate: Thu Mar 11 15:34:41 2021 +0100
Commit: Luboš Luňák
CommitDate: Wed Mar 17 22:48:45 2021 +0100
improve font caching in SwFntObj
The code previously cached only SalGlyphItems, but such caching
fails if SalLayout::GetGlyphs() does not return valid glyphs,
which is the case with MultiSalLayout. Worse, it not only fails,
but layout is once computed for caching, that fails, and is computed
a second time for actual use.
This improved cache caches the result of GetTextWidth(), which
itself improves the performance a bit, but it also allows caching
the value for GetGlyph() not returning valid glyphs. Moreover this
also caches failures to get valid glyphs from GetGlyphs().
There are quite some calls to GetTextArray(), I didn't cache those,
but it might be added if needed.
Change-Id: Ia2589fb1b778f4f154c88f65d9906584284239da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112588
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index 61564de93e72..848ad3611c10 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -60,19 +60,9 @@ void SwClearFntCacheTextGlyphs();
extern SwFntCache *pFntCache;
extern SwFntObj *pLastFont;
-/**
- * Defines a substring on a given output device, to be used as an std::map<>
- * key.
- */
-struct SwTextGlyphsKey
-{
-VclPtr m_pOutputDevice;
-OUString m_aText;
-sal_Int32 m_nIndex;
-sal_Int32 m_nLength;
-
-};
+struct SwTextGlyphsKey;
bool operator<(const SwTextGlyphsKey& l, const SwTextGlyphsKey& r);
+struct SwTextGlyphsData;
class SwFntObj : public SwCacheObj
{
@@ -95,8 +85,8 @@ class SwFntObj : public SwCacheObj
bool m_bSymbol : 1;
bool m_bPaintBlank : 1;
-/// Cache of already calculated layout glyphs.
-std::map m_aTextGlyphs;
+/// Cache of already calculated layout glyphs and text widths.
+std::map m_aTextGlyphs;
static tools::Long nPixWidth;
static MapMode *pPixMap;
@@ -125,7 +115,10 @@ public:
sal_uInt16 GetZoom() const { return m_nZoom; }
sal_uInt16 GetPropWidth() const { return m_nPropWidth; }
bool IsSymbol() const { return m_bSymbol; }
-std::map& GetTextGlyphs() { return
m_aTextGlyphs; }
+
+tools::Long GetCachedTextWidth(const SwTextGlyphsKey& key, const
vcl::TextLayoutCache* vclCache);
+SalLayoutGlyphs* GetCachedSalLayoutGlyphs(const SwTextGlyphsKey& key);
+void ClearCachedTextGlyphs();
void DrawText( SwDrawTextInfo &rInf );
/// determine the TextSize (of the printer)
diff --git a/sw/source/core/txtnode/fntcache.cxx
b/sw/source/core/txtnode/fntcache.cxx
index 5b8661b4cf5a..b0ed8eb4d72b 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -71,6 +71,28 @@ tools::Long SwFntObj::nPixWidth;
MapMode* SwFntObj::pPixMap = nullptr;
static vcl::DeleteOnDeinit< VclPtr > s_pFntObjPixOut( new
VclPtr );
+/**
+ * Defines a substring on a given output device, to be used as an std::map<>
+ * key.
+ */
+struct SwTextGlyphsKey
+{
+VclPtr m_pOutputDevice;
+OUString m_aText;
+sal_Int32 m_nIndex;
+sal_Int32 m_nLength;
+
+};
+
+/**
+ * Glyphs and text width for the given SwTextGlyphsKey.
+ */
+struct SwTextGlyphsData
+{
+SalLayoutGlyphs m_aTextGlyphs;
+tools::Long m_nTextWidth = -1; // -1 = not computed yet
+};
+
namespace
{
@@ -93,36 +115,6 @@ tools::Long EvalGridWidthAdd( const SwTextGridItem *const
pGrid, const SwDrawTex
return nGridWidthAdd;
}
-/**
- * Pre-calculates glyph items for the rendered subset of rKey's text, assuming
- * outdev state does not change between the outdev calls.
- */
-SalLayoutGlyphs* lcl_CreateLayout(const SwTextGlyphsKey& rKey,
SalLayoutGlyphs& rTextGlyphs)
-{
-// Use pre-calculated result.
-if (rTextGlyphs.IsValid())
-return &rTextGlyphs;
-
-if (rKey.m_nIndex >= rKey.m_aText.getLength())
-// Same as in OutputDevice::GetTextArray().
-return nullptr;
-
-// Calculate glyph items.
-std::unique_ptr pLayout
-= rKey.m_pOutputDevice->ImplLayout(rKey.m_aText, rKey.m_nIndex,
rKey.m_nLength, Point(0, 0), 0,
- nullptr,
SalLayoutFlags::GlyphItemsOnly);
-if (!pLayout)
-return nullptr;
-
-const SalLayoutGlyphs* pGlyphs = pLayout->GetGlyphs();
-if (!pGlyphs)
-return nullptr;
-
-// Remember the calculation result.
-rTextGlyphs = *pGlyphs;
-
-return &rTextGlyphs;
-}
}
bool operator<(const SwTextGlyphsKey& l, const SwTextGlyphsKey& r)
@@ -223,6 +215,72 @@ void SwFntObj::CreatePrtFont(
[Libreoffice-commits] core.git: sw/inc sw/qa sw/source
sw/inc/IDocumentMarkAccess.hxx|2
sw/qa/extras/uiwriter/data2/tdf115815.odt |binary
sw/qa/extras/uiwriter/uiwriter2.cxx | 74 +-
sw/source/core/doc/docbm.cxx | 13 +++--
sw/source/core/doc/docredln.cxx | 67 ---
sw/source/core/inc/MarkManager.hxx|2
sw/source/uibase/shells/basesh.cxx|6 ++
7 files changed, 131 insertions(+), 33 deletions(-)
New commits:
commit a001a66ba27e2fe9a485388869d53f001f2b09af
Author: László Németh
AuthorDate: Wed Mar 17 11:24:42 2021 +0100
Commit: László Németh
CommitDate: Wed Mar 17 22:17:12 2021 +0100
tdf#140982 sw ChangesInMargin: fix annotation ranges
Annotation ranges of tracked deletions collapsed in
ChangesInMargin mode (as before saving the document,
see commit d325cd0c69b7c0cc4f47105749a98995de81cc9d
"tdf#115815 sw: fix lost annotation ranges of redlines").
Change-Id: I413804cfcdf972f054b65e28e6265c30d25731e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112644
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index 801ce98ba503..49ce72ad28b4 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -343,7 +343,7 @@ class IDocumentMarkAccess
virtual sw::mark::IMark* getAnnotationMarkFor(const SwPosition&
rPosition) const = 0;
// restore text ranges of annotations of tracked deletions
// based on the helper bookmarks (which can survive I/O and hiding
redlines)
-virtual void restoreAnnotationMarks() = 0;
+virtual void restoreAnnotationMarks(bool bDelete = true) = 0;
/** Finds the first mark that is starting after.
@returns
diff --git a/sw/qa/extras/uiwriter/data2/tdf115815.odt
b/sw/qa/extras/uiwriter/data2/tdf115815.odt
new file mode 100644
index ..7c2aad0da638
Binary files /dev/null and b/sw/qa/extras/uiwriter/data2/tdf115815.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 0bc22e23aca4..97fea5d32797 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -2390,7 +2390,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf138666)
CPPUNIT_ASSERT_EQUAL(OUString("Loremm"), getParagraph(1)->getString());
CPPUNIT_ASSERT_EQUAL(OUString("dolsit"), getParagraph(2)->getString());
-// switch on "Show changes in margin" mode
+// switch off "Show changes in margin" mode
dispatchCommand(mxComponent, ".uno:ShowChangesInMargin", {});
// show deletions inline again
@@ -2398,6 +2398,78 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf138666)
CPPUNIT_ASSERT_EQUAL(OUString("dolor sit"), getParagraph(2)->getString());
}
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf140982)
+{
+SwDoc* pDoc = createDoc("tdf115815.odt");
+
+SwXTextDocument* pTextDoc =
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+//turn on red-lining and show changes
+pDoc->getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On |
RedlineFlags::ShowDelete
+ |
RedlineFlags::ShowInsert);
+CPPUNIT_ASSERT_MESSAGE("redlining should be on",
+ pDoc->getIDocumentRedlineAccess().IsRedlineOn());
+CPPUNIT_ASSERT_MESSAGE(
+"redlines should be visible",
+
IDocumentRedlineAccess::IsShowChanges(pDoc->getIDocumentRedlineAccess().GetRedlineFlags()));
+
+// show deletions inline
+CPPUNIT_ASSERT_EQUAL(OUString("Lorem ipsum dolor sit amet..."),
getParagraph(1)->getString());
+
+// switch on "Show changes in margin" mode
+dispatchCommand(mxComponent, ".uno:ShowChangesInMargin", {});
+
+// show deletions in margin
+CPPUNIT_ASSERT_EQUAL(OUString("Lorem amet..."),
getParagraph(1)->getString());
+
+// switch off "Show changes in margin" mode
+dispatchCommand(mxComponent, ".uno:ShowChangesInMargin", {});
+
+// show deletions inline again
+CPPUNIT_ASSERT_EQUAL(OUString("Lorem ipsum dolor sit amet..."),
getParagraph(1)->getString());
+
+// Save it and load it back.
+reload("writer8", "tdf115815.odt");
+
+// Test comment range feature on tracked deletion.
+uno::Reference xTextDocument(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xParaEnumAccess(xTextDocument->getText(),
+
uno::UNO_QUERY);
+uno::Reference xParaEnum =
xParaEnumAccess->createEnumeration();
+uno::Reference
xRunEnumAccess(xParaEnum->nextElement(),
+
uno::UNO_QUERY);
+uno::Reference xRunEnum =
xRunEnumAccess->createEnumeration();
+bool bAnnotationStart = false;
+bool bBeforeAnnotation = true;
+OUString sTextBeforeAnnotation;
+
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/spellingdialog.ui | 12 1 file changed, 12 insertions(+) New commits: commit feb6fd1f4213ef114e63a3dd398c2cba6a5e93ea Author: Caolán McNamara AuthorDate: Tue Mar 16 16:07:24 2021 + Commit: Caolán McNamara CommitDate: Wed Mar 17 21:57:36 2021 +0100 tdf#141027 set all buttons to the same max width so changing from "ignore all" to "ignore rule" makes no difference, which removes the redraw problem with Russian UI Change-Id: I27c0e7b00a4f77ac5348aeee64bf312afff423cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112587 Tested-by: Jenkins Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/cui/uiconfig/ui/spellingdialog.ui b/cui/uiconfig/ui/spellingdialog.ui index 13a4da14e661..4156b2822186 100644 --- a/cui/uiconfig/ui/spellingdialog.ui +++ b/cui/uiconfig/ui/spellingdialog.ui @@ -655,4 +655,16 @@ + + + + + + + + + + + + ___ 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 vcl/source
sw/qa/extras/htmlexport/data/ole1-pres-data-wmf.odt |binary
sw/qa/extras/htmlexport/htmlexport.cxx | 93 +---
sw/source/filter/html/htmlreqifreader.cxx | 11 +-
vcl/source/filter/wmf/wmfwr.cxx |8 +
4 files changed, 80 insertions(+), 32 deletions(-)
New commits:
commit 5c7255d3a98568a2965f840b76371cf03eb0d99a
Author: Miklos Vajna
AuthorDate: Wed Mar 17 17:30:52 2021 +0100
Commit: Miklos Vajna
CommitDate: Wed Mar 17 21:41:56 2021 +0100
sw reqif-xhtml export: make sure OLE1 preview is WMF-only
reqif-xhtml has previews for embedded objects at 4 levels:
- png preview
- RTF preview
- OLE1 preview
- OLE2 preview
The OLE1 preview has to be a WMF one, and in case our WMF export tries
to inject EMF into it, Word will refuse to open the embedded object. So
add a new flag to allow opting out of the EMF embedding for reqif-xhtml
export purposes.
The other option would be what Word does to just omit the OLE1 preview,
but then this would break reqif-xhtml consumers who take the preview
from the OLE1 data.
Change-Id: Ia8d4626aefb6309743c9f4023f289c9a7b872035
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112648
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/qa/extras/htmlexport/data/ole1-pres-data-wmf.odt
b/sw/qa/extras/htmlexport/data/ole1-pres-data-wmf.odt
new file mode 100644
index ..9bcca729bc52
Binary files /dev/null and
b/sw/qa/extras/htmlexport/data/ole1-pres-data-wmf.odt differ
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index f749c363880e..295acb34f04c 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -119,6 +119,43 @@ bool TestReqIfRtfReader::WriteObjectData(SvStream& rOLE)
rOLE.WriteStream(aStream);
return true;
}
+
+/// Parser for [MS-OLEDS] 2.2.5 EmbeddedObject, aka OLE1.
+struct OLE1Reader
+{
+sal_uInt32 m_nNativeDataSize;
+sal_uInt32 m_nPresentationDataSize;
+
+OLE1Reader(SvStream& rStream);
+};
+
+OLE1Reader::OLE1Reader(SvStream& rStream)
+{
+// Skip ObjectHeader, see [MS-OLEDS] 2.2.4.
+rStream.Seek(0);
+sal_uInt32 nData;
+rStream.ReadUInt32(nData); // OLEVersion
+rStream.ReadUInt32(nData); // FormatID
+rStream.ReadUInt32(nData); // ClassName
+rStream.SeekRel(nData);
+rStream.ReadUInt32(nData); // TopicName
+rStream.SeekRel(nData);
+rStream.ReadUInt32(nData); // ItemName
+rStream.SeekRel(nData);
+
+rStream.ReadUInt32(m_nNativeDataSize);
+rStream.SeekRel(m_nNativeDataSize);
+
+rStream.ReadUInt32(nData); // OLEVersion for presentation data
+CPPUNIT_ASSERT(rStream.good());
+rStream.ReadUInt32(nData); // FormatID
+rStream.ReadUInt32(nData); // ClassName
+rStream.SeekRel(nData);
+rStream.ReadUInt32(nData); // Width
+rStream.ReadUInt32(nData); // Height
+rStream.ReadUInt32(nData); // PresentationDataSize
+m_nPresentationDataSize = nData;
+}
}
class HtmlExportTest : public SwModelTestBase, public HtmlTestTools
@@ -1080,25 +1117,14 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest,
testReqifOle1PDF)
ParseOle1FromRtfUrl(aRtfUrl, aOle1);
// Check the content of the ole1 data.
-// Skip ObjectHeader, see [MS-OLEDS] 2.2.4.
-aOle1.Seek(0);
-sal_uInt32 nData;
-aOle1.ReadUInt32(nData); // OLEVersion
-aOle1.ReadUInt32(nData); // FormatID
-aOle1.ReadUInt32(nData); // ClassName
-aOle1.SeekRel(nData);
-aOle1.ReadUInt32(nData); // TopicName
-aOle1.SeekRel(nData);
-aOle1.ReadUInt32(nData); // ItemName
-aOle1.SeekRel(nData);
-aOle1.ReadUInt32(nData); // NativeDataSize
+OLE1Reader aOle1Reader(aOle1);
// Without the accompanying fix in place, this test would have failed with:
// - Expected: 39405
// - Actual : 43008
// i.e. we did not work with the Ole10Native stream, rather created an
OLE1 wrapper around the
// OLE1-in-OLE2 data, resulting in additional size.
-CPPUNIT_ASSERT_EQUAL(static_cast(0x99ed), nData);
+CPPUNIT_ASSERT_EQUAL(static_cast(0x99ed),
aOle1Reader.m_nNativeDataSize);
// Now import this back and check the ODT result.
mxComponent->dispose();
@@ -1285,26 +1311,33 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest,
testReqifOle1PresDataNoOle2)
ParseOle1FromRtfUrl(aRtfUrl, aOle1);
// Check the content of the ole1 data.
-// Skip ObjectHeader, see [MS-OLEDS] 2.2.4.
-aOle1.Seek(0);
-sal_uInt32 nData;
-aOle1.ReadUInt32(nData); // OLEVersion
-aOle1.ReadUInt32(nData); // FormatID
-aOle1.ReadUInt32(nData); // ClassName
-aOle1.SeekRel(nData);
-aOle1.ReadUInt32(nData); // TopicName
-aOle1.SeekRel(nData);
-aOle1.ReadUInt32(nData); // ItemName
-aOle1.SeekRel(nData);
-aOle1.ReadUInt32(nData); // NativeDataSize
-aOle1.SeekRel(nData);
-
-aOle1.Rea
[Libreoffice-commits] core.git: Branch 'private/timar/pythonupgrademsp' - configure.ac external/python3 postprocess/CustomTarget_signing.mk pyuno/CustomTarget_python_shell.mk pyuno/CustomTarget_pyuno_
Rebased ref, commits from common ancestor:
commit d15f97eabeb7a19957f560a4bd8060dddf3d1402
Author: Andras Timar
AuthorDate: Tue Mar 16 21:56:04 2021 +0100
Commit: Andras Timar
CommitDate: Wed Mar 17 21:40:05 2021 +0100
we have to keep the original python version number 3.7.7
because MSP creation does not tolerate adding/removing files, or
renaming directories
Change-Id: Ib997d438add82652d570753a749170f207dc3a80
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 884bececcf08..8cb8582d2ace 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3985,7 +3985,7 @@ $(call
gb_ExternalExecutable_add_dependencies,python,$(call gb_GeneratedPackage_
else
-$(call
gb_ExternalExecutable_set_internal,python,$(INSTROOT)/$(LIBO_BIN_FOLDER)/$(if
$(filter WNT,$(OS)),python-core-$(PYTHON_VERSION)/bin/python.exe,python.bin))
+$(call
gb_ExternalExecutable_set_internal,python,$(INSTROOT)/$(LIBO_BIN_FOLDER)/$(if
$(filter WNT,$(OS)),python-core-3.7.7/bin/python.exe,python.bin))
$(call gb_ExternalExecutable_set_precommand,python,$(subst
$$,,$(gb_Python_PRECOMMAND)))
$(call gb_ExternalExecutable_add_dependencies,python,$(call
gb_Package_get_target_for_build,python3))
diff --git a/configure.ac b/configure.ac
index b89c5cc36b44..24893787a733 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8945,7 +8945,7 @@ internal)
if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in
download.lst])
fi
-AC_DEFINE_UNQUOTED([PYTHON_VERSION_STRING], [L"${PYTHON_VERSION}"])
+AC_DEFINE_UNQUOTED([PYTHON_VERSION_STRING], [L"3.7.7"])
BUILD_TYPE="$BUILD_TYPE PYTHON"
if test "$OS" = LINUX; then
BUILD_TYPE="$BUILD_TYPE LIBFFI"
diff --git a/external/python3/ExternalPackage_python3.mk
b/external/python3/ExternalPackage_python3.mk
index 4dfc3b196f82..02ba67ffe0dd 100644
--- a/external/python3/ExternalPackage_python3.mk
+++ b/external/python3/ExternalPackage_python3.mk
@@ -17,12 +17,12 @@ python_arch_subdir=amd64/
else
python_arch_subdir=win32/
endif
-$(eval $(call
gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/bin/python.exe,PCbuild/$(python_arch_subdir)python$(if
$(MSVC_USE_DEBUG_RUNTIME),_d).exe))
+$(eval $(call
gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python-core-3.7.7/bin/python.exe,PCbuild/$(python_arch_subdir)python$(if
$(MSVC_USE_DEBUG_RUNTIME),_d).exe))
$(eval $(call
gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if
$(MSVC_USE_DEBUG_RUNTIME),_d).dll,PCbuild/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if
$(MSVC_USE_DEBUG_RUNTIME),_d).dll))
ifeq ($(MSVC_USE_DEBUG_RUNTIME),)
$(eval $(call
gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python$(PYTHON_VERSION_MAJOR).dll,PCbuild/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR).dll))
endif
-$(eval $(call
gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
+$(eval $(call
gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-3.7.7/lib,\
PCbuild/$(python_arch_subdir)_asyncio$(if
$(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
PCbuild/$(python_arch_subdir)_ctypes$(if
$(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
PCbuild/$(python_arch_subdir)_ctypes_test$(if
$(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
@@ -55,7 +55,7 @@ $(eval $(call
gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/libpython$(
# that may not be available on baseline systems.
ifneq ($(OS),AIX)
-$(eval $(call
gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/lib-dynload,\
+$(eval $(call
gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-3.7.7/lib/lib-dynload,\
LO_lib/array.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
LO_lib/_asyncio.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
LO_lib/audioop.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
@@ -139,7 +139,7 @@ endif
# note: python configure overrides config.guess with something that doesn't
# put -pc in its linux platform triplets, so filter that...
ifneq ($(OS),WNT)
-$(eval $(call
gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
+$(eval $(call
gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-3.7.7/lib,\
LO_lib/_sysconfigdata_m_$(python3_MACHDEP)_$(subst i686,i386,$(subst
-pc,,$(HOST_PLATFORM))).py \
))
endif
@@ -151,7 +151,7 @@ endif
# test - probably unnecessary? was explicitly removed #i116738#
# venv - why would we need virtual environments
-$(eval $(call
gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
+$(eval $(call
gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - vcl/qa vcl/skia
vcl/qa/cppunit/skia/skia.cxx | 30 ++
vcl/skia/gdiimpl.cxx | 20 ++--
2 files changed, 48 insertions(+), 2 deletions(-)
New commits:
commit ded4b38deb2d7190ecc500250b63204b0f6d5577
Author: Luboš Luňák
AuthorDate: Wed Mar 17 16:03:12 2021 +0100
Commit: Xisco Fauli
CommitDate: Wed Mar 17 21:22:17 2021 +0100
round polygon points before merging them for Skia drawing (tdf#140848)
basegfx::utils::mergeToSinglePolyPolygon() appears to have rounding
problems. Point coordinates are in pixels anyway.
Change-Id: I9880cc32f934a08923a5c59278f6aa07852c05f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112647
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
(cherry picked from commit ff1cfaf87ce0aa9673e1c3f92308cde6a2c6aa69)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112615
Reviewed-by: Xisco Fauli
diff --git a/vcl/qa/cppunit/skia/skia.cxx b/vcl/qa/cppunit/skia/skia.cxx
index 1f04c5825584..33341bf6ad69 100644
--- a/vcl/qa/cppunit/skia/skia.cxx
+++ b/vcl/qa/cppunit/skia/skia.cxx
@@ -36,6 +36,7 @@ public:
void testAlphaBlendWith();
void testBitmapCopyOnWrite();
void testTdf137329();
+void testTdf140848();
CPPUNIT_TEST_SUITE(SkiaTest);
CPPUNIT_TEST(testBitmapErase);
@@ -44,6 +45,7 @@ public:
CPPUNIT_TEST(testAlphaBlendWith);
CPPUNIT_TEST(testBitmapCopyOnWrite);
CPPUNIT_TEST(testTdf137329);
+CPPUNIT_TEST(testTdf140848);
CPPUNIT_TEST_SUITE_END();
private:
@@ -326,6 +328,34 @@ void SkiaTest::testTdf137329()
CPPUNIT_ASSERT_EQUAL(COL_BLACK, device->GetPixel(Point(4, 4)));
}
+void SkiaTest::testTdf140848()
+{
+if (!SkiaHelper::isVCLSkiaEnabled())
+return;
+ScopedVclPtr device =
VclPtr::Create(DeviceFormat::DEFAULT);
+device->SetOutputSizePixel(Size(1300, 400));
+device->SetBackground(Wallpaper(COL_BLACK));
+device->SetAntialiasing(AntialiasingFlags::Enable);
+device->Erase();
+device->SetLineColor();
+device->SetFillColor(COL_WHITE);
+basegfx::B2DPolygon p1 = { { 952.73121259842514519, 102.4599685039370911 },
+ { 952.73121259842514519, 66.55445669291347599 },
+ { 1239.9753070866140661, 66.554456692913390725
},
+ { 1239.9753070866140661, 138.36548031496062094
},
+ { 952.73121259842514519, 138.36548031496070621
} };
+basegfx::B2DPolygon p2 = { { 1168.1642834645670064, 210.17650393700790801
},
+ { 1168.1642834645670064, 66.554456692913404936
},
+ { 1239.9753070866140661, 66.554456692913390725
},
+ { 1239.9753070866142934, 353.79855118110236845
},
+ { 1168.1642834645670064, 353.79855118110236845
} };
+device->DrawPolyPolygon(basegfx::B2DPolyPolygon(p1));
+device->DrawPolyPolygon(basegfx::B2DPolyPolygon(p2));
+//savePNG("/tmp/tdf140848.png", device);
+// Rounding errors caused the overlapping part not to be drawn.
+CPPUNIT_ASSERT_EQUAL(COL_WHITE, device->GetPixel(Point(1200, 100)));
+}
+
} // namespace
CPPUNIT_TEST_SUITE_REGISTRATION(SkiaTest);
diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 4e6383d91473..ba9737c6544c 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -1012,6 +1012,20 @@ bool SkiaSalGraphicsImpl::delayDrawPolyPolygon(const
basegfx::B2DPolyPolygon& aP
return true;
}
+// Tdf#140848 - basegfx::utils::mergeToSinglePolyPolygon() seems to have
rounding
+// errors that sometimes cause it to merge incorrectly.
+static void roundPolygonPoints(basegfx::B2DPolyPolygon& polyPolygon)
+{
+for (basegfx::B2DPolygon& polygon : polyPolygon)
+{
+polygon.makeUnique();
+for (sal_uInt32 i = 0; i < polygon.count(); ++i)
+polygon.setB2DPoint(i,
basegfx::B2DPoint(basegfx::fround(polygon.getB2DPoint(i;
+// Control points are saved as vectors relative to points, so hopefully
+// there's no need to round those.
+}
+}
+
void SkiaSalGraphicsImpl::checkPendingDrawing()
{
if (mLastPolyPolygonInfo.polygons.size() != 0)
@@ -1023,10 +1037,12 @@ void SkiaSalGraphicsImpl::checkPendingDrawing()
if (polygons.size() == 1)
performDrawPolyPolygon(polygons.front(), transparency, true);
else
-// TODO: tdf#136222 shows that
basegfx::utils::mergeToSinglePolyPolygon() is unreliable
-// in corner cases, possibly either a bug or rounding errors
somewhere.
+{
+for (basegfx::B2DPolyPolygon& p : polygons)
+roundPolygonPoints(p);
performDrawPolyPolygon(basegfx::utils::mergeToSinglePolyPolygon(polygons),
transparency,
true);
+}
}
}
___
Libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sd/qa svx/source
sd/qa/unit/misc-tests.cxx | 35 ++
svx/source/table/tablemodel.cxx | 62 +++-
2 files changed, 71 insertions(+), 26 deletions(-)
New commits:
commit d47afb54ed3e37be7216b5f2e3943f1ab7bdb84f
Author: Mark Hung
AuthorDate: Thu Mar 11 23:44:06 2021 +0800
Commit: Xisco Fauli
CommitDate: Wed Mar 17 21:21:38 2021 +0100
tdf#136956 reorder undo actions in removeColumns
and removeRows. Inside the removeColumns and removeRows, undo actions
are added first, and then cell spans are updated to reflect the removed
columns or rows. Once undo the cell spans they become immediately
invalid because the rows or columns are already removed, hence cause
Impress to crash.
Change-Id: I9d8641bdad43026eca03cbeaaa3a5907b516304f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112355
Tested-by: Jenkins
Reviewed-by: Mark Hung
(cherry picked from commit f3f7cc53efda828af8897fa45fa2a8f18cf3b48b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112526
Reviewed-by: Michael Stahl
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112649
diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx
index 216bdb7d08b0..086170576636 100644
--- a/sd/qa/unit/misc-tests.cxx
+++ b/sd/qa/unit/misc-tests.cxx
@@ -27,6 +27,8 @@
#include
#include
#include
+#include
+#include
#include
#include
@@ -83,6 +85,7 @@ public:
void testTdf130988();
void testTdf131033();
void testTdf129898LayerDrawnInSlideshow();
+void testTdf136956();
CPPUNIT_TEST_SUITE(SdMiscTest);
CPPUNIT_TEST(testTdf96206);
@@ -104,6 +107,7 @@ public:
CPPUNIT_TEST(testTdf130988);
CPPUNIT_TEST(testTdf131033);
CPPUNIT_TEST(testTdf129898LayerDrawnInSlideshow);
+CPPUNIT_TEST(testTdf136956);
CPPUNIT_TEST_SUITE_END();
virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override
@@ -879,6 +883,37 @@ void SdMiscTest::testTdf129898LayerDrawnInSlideshow()
xDocShRef->DoClose();
}
+void SdMiscTest::testTdf136956()
+{
+::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/cellspan.odp"), ODP);
+
+const SdrPage *pPage = GetPage( 1, xDocShRef );
+sdr::table::SdrTableObj *pTableObj =
dynamic_cast(pPage->GetObj(0));
+CPPUNIT_ASSERT( pTableObj );
+uno::Reference< table::XTable > xTable(pTableObj->getTable(),
uno::UNO_SET_THROW);
+
+uno::Reference< css::table::XMergeableCellRange > xRange(
+xTable->createCursorByRange( xTable->getCellRangeByPosition( 0, 0,
3, 2 ) ), uno::UNO_QUERY_THROW );
+
+// 4x3 Table before merge.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4), xTable->getColumnCount());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xTable->getRowCount());
+
+xRange->merge();
+
+// 1x1 Table after merge.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getColumnCount());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getRowCount());
+
+xDocShRef->GetUndoManager()->Undo();
+
+// 4x3 Table after undo. Undo crashed before.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4), xTable->getColumnCount());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xTable->getRowCount());
+
+xDocShRef->DoClose();
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SdMiscTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 464f862c0947..0fb08353d8a8 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -692,24 +692,6 @@ void TableModel::removeColumns( sal_Int32 nIndex,
sal_Int32 nCount )
{
rModel.BegUndo( SvxResId(STR_UNDO_COL_DELETE) );
rModel.AddUndo(
rModel.GetSdrUndoFactory().CreateUndoGeoObject(*mpTableObj) );
-
-TableModelRef xThis( this );
-ColumnVector aRemovedCols( nCount );
-sal_Int32 nOffset;
-for( nOffset = 0; nOffset < nCount; ++nOffset )
-{
-aRemovedCols[nOffset] = maColumns[nIndex+nOffset];
-}
-
-CellVector aRemovedCells( nCount * nRows );
-CellVector::iterator aCellIter( aRemovedCells.begin() );
-for( sal_Int32 nRow = 0; nRow < nRows; ++nRow )
-{
-for( nOffset = 0; nOffset < nCount; ++nOffset )
-(*aCellIter++) = getCell( nIndex + nOffset, nRow );
-}
-
-rModel.AddUndo( std::make_unique( xThis,
nIndex, aRemovedCols, aRemovedCells ) );
}
// only rows before and inside the removed rows are considered
@@ -756,6 +738,29 @@ void TableModel::removeColumns( sal_Int32 nIndex,
sal_Int32 nCount )
}
}
+// We must not add RemoveColUndo before we make cell spans
correct, otherwise we
+// get invalid cel
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sw/source
sw/source/uibase/uiview/view.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit b3c94568e25990b1f6b3df1f7919acecdca3ffd2
Author: Mike Kaganski
AuthorDate: Sun Mar 14 12:08:25 2021 +0300
Commit: Xisco Fauli
CommitDate: Wed Mar 17 21:14:14 2021 +0100
tdf#141015: Show Mail Merge toolbar when DBData has data source
Change-Id: I74ea06b47d851d979103599526ae970035854dae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112465
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit 346153f08c907739ca310934ad45814379971027)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112514
Reviewed-by: Xisco Fauli
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index ff6f2bc82349..3e10ab192e5a 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -439,7 +439,9 @@ void SwView::SelectShell()
}
// Show Mail Merge toolbar initially for documents with Database fields
-if (!m_bInitOnceCompleted && GetWrtShell().IsAnyDatabaseFieldInDoc())
+if (!m_bInitOnceCompleted
+&& (GetWrtShell().IsAnyDatabaseFieldInDoc()
+|| !GetWrtShell().GetDBData().sDataSource.isEmpty()))
ShowUIElement("private:resource/toolbar/mailmerge");
// Activate the toolbar to the new selection which also was active
last time.
___
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' - sw/qa sw/source
sw/qa/core/layout/data/tdf122894-4.doc |binary
sw/qa/core/layout/layout.cxx|5 +
sw/source/core/layout/objectformattertxtfrm.cxx |3 ++-
3 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 7d7eb9895e18a48660965a87c9e2136f028e7022
Author: Caolán McNamara
AuthorDate: Tue Mar 16 10:18:18 2021 +
Commit: Caolán McNamara
CommitDate: Wed Mar 17 21:10:12 2021 +0100
tdf#122894 skipping anchor in column in footnote
a trawl of crash testing document didn't show up another example
and it doesn't seem possible to create this scenario directly in out
UI
Change-Id: Ie65a51bf609e8bacd261f368f0b8037431c116ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112567
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112581
Tested-by: Caolán McNamara
diff --git a/sw/qa/core/layout/data/tdf122894-4.doc
b/sw/qa/core/layout/data/tdf122894-4.doc
new file mode 100644
index ..4ebdb53de04f
Binary files /dev/null and b/sw/qa/core/layout/data/tdf122894-4.doc differ
diff --git a/sw/qa/core/layout/layout.cxx b/sw/qa/core/layout/layout.cxx
index e9f1d22bd70b..3f6199f8dd01 100644
--- a/sw/qa/core/layout/layout.cxx
+++ b/sw/qa/core/layout/layout.cxx
@@ -260,6 +260,11 @@ CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest,
testKeepwithnextFullheight)
assertXPath(pXmlDoc, "//page[2]/body/txt/anchored/fly", 1);
}
+CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest, testCrashRemoveFromLayout)
+{
+load(DATA_DIRECTORY, "tdf122894-4.doc");
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx
b/sw/source/core/layout/objectformattertxtfrm.cxx
index bf066909251f..98e374a7e5fb 100644
--- a/sw/source/core/layout/objectformattertxtfrm.cxx
+++ b/sw/source/core/layout/objectformattertxtfrm.cxx
@@ -748,7 +748,8 @@ void
SwObjectFormatterTextFrame::FormatAnchorFrameAndItsPrevs( SwTextFrame& _rAn
// format the content of the previous columns.
// Note: It's a very simple format without formatting objects.
SwFrame* pColFrameOfAnchor = _rAnchorTextFrame.FindColFrame();
-if ( pColFrameOfAnchor )
+SAL_WARN_IF(pColFrameOfAnchor && _rAnchorTextFrame.IsInFootnote(),
"sw.layout", "tdf#122894 skipping anchor in column in footnote");
+if (pColFrameOfAnchor && !_rAnchorTextFrame.IsInFootnote())
{
// #i44049#
_rAnchorTextFrame.LockJoin();
___
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' - svx/CppunitTest_svx_unit.mk svx/qa svx/source
svx/CppunitTest_svx_unit.mk |1
svx/qa/unit/customshapes.cxx | 37 ++
svx/qa/unit/data/tdf141021_ExtrusionNorth.odp |binary
svx/source/toolbars/extrusionbar.cxx |2 -
4 files changed, 39 insertions(+), 1 deletion(-)
New commits:
commit 8eb4bf3b4d94413cb6f10fecc878829f5d1995ec
Author: Regina Henschel
AuthorDate: Sun Mar 14 16:26:22 2021 +0100
Commit: Xisco Fauli
CommitDate: Wed Mar 17 21:09:35 2021 +0100
tdf#141021 Correct sign in Origin in Extrusion North
This is about customs shapes in 3D mode using direction floater.
Shapes, which were created with older versions, keep their values until
the direction is newly assigned. So the change will not automatically
change existing documents.
Change-Id: Ib1ce511de0f524bf59279fb4e976f66ed65bc080
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112474
Tested-by: Jenkins
Reviewed-by: Regina Henschel
(cherry picked from commit fa8d00560bbfededec7f2c328f04eb2b369c00e2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112617
Reviewed-by: Xisco Fauli
diff --git a/svx/CppunitTest_svx_unit.mk b/svx/CppunitTest_svx_unit.mk
index 892490265261..598d788392b4 100644
--- a/svx/CppunitTest_svx_unit.mk
+++ b/svx/CppunitTest_svx_unit.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_CppunitTest_use_libraries,svx_unit, \
editeng \
sal \
sfx \
+svl \
svxcore \
svx \
tl \
diff --git a/svx/qa/unit/customshapes.cxx b/svx/qa/unit/customshapes.cxx
index e3a5e0ac92a3..db7808a16f2f 100644
--- a/svx/qa/unit/customshapes.cxx
+++ b/svx/qa/unit/customshapes.cxx
@@ -18,9 +18,16 @@
#include
#include
#include
+#include
+#include
+#include
+#include
#include
+#include
#include
#include
+#include
+#include
#include
#include
#include
@@ -117,6 +124,36 @@ void lcl_AssertRectEqualWithTolerance(const OString&
sInfo, const tools::Rectang
std::abs(rExpected.GetHeight() -
rActual.GetHeight()) <= nTolerance);
}
+CPPUNIT_TEST_FIXTURE(CustomshapesTest, testTdf141021ExtrusionNorth)
+{
+// tdf#141021 Setting extrusion direction in projection method
'perspective' to
+// 'Extrusion North' had used a wrong origin for the ViewPoint and thus the
+// side faces were wrong calculated.
+
+// Load document and get shape. It is a custom shape in 3D mode.
+OUString aURL = m_directories.getURLFromSrc(sDataDirectory) +
"tdf141021_ExtrusionNorth.odp";
+mxComponent = loadFromDesktop(aURL,
"com.sun.star.comp.presentation.PresentationDocument");
+CPPUNIT_ASSERT_MESSAGE("Could not load document", mxComponent.is());
+uno::Reference xShape(getShape(0));
+SdrObjCustomShape& rSdrCustomShape(
+static_cast(*GetSdrObjectFromXShape(xShape)));
+
+// Mark Object
+SfxViewShell* pViewShell = SfxViewShell::Current();
+SdrView* pSdrView = pViewShell->GetDrawView();
+pSdrView->MarkObj(&rSdrCustomShape, pSdrView->GetSdrPageView());
+
+// Set direction
+SfxRequest aReq(pViewShell->GetViewFrame(), SID_EXTRUSION_DIRECTION);
+SfxInt32Item aItem(SID_EXTRUSION_DIRECTION, 90);
+aReq.AppendItem(aItem);
+svx::ExtrusionBar::execute(pSdrView, aReq,
SfxViewFrame::Current()->GetBindings());
+
+// Verify height. Without the fix in place the height would 4001.
+tools::Rectangle aBoundRect(rSdrCustomShape.GetCurrentBoundRect());
+CPPUNIT_ASSERT_EQUAL(tools::Long(5895), aBoundRect.GetHeight());
+}
+
CPPUNIT_TEST_FIXTURE(CustomshapesTest, testResizeRotatedShape)
{
// tdf#138945 Setting width or height for a rotated or sheared shape in
the Position&Size dialog
diff --git a/svx/qa/unit/data/tdf141021_ExtrusionNorth.odp
b/svx/qa/unit/data/tdf141021_ExtrusionNorth.odp
new file mode 100644
index ..559b2c0d58e0
Binary files /dev/null and b/svx/qa/unit/data/tdf141021_ExtrusionNorth.odp
differ
diff --git a/svx/source/toolbars/extrusionbar.cxx
b/svx/source/toolbars/extrusionbar.cxx
index 5297f304b7bf..cffcaa3836fa 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -197,7 +197,7 @@ static void impl_execute( SfxRequest const & rReq,
SdrCustomShapeGeometryItem& r
aViewPoint.PositionX = 0;
aViewPoint.PositionY = 3472;
fOriginX = 0;
-fOriginY = -0.50;
+fOriginY = 0.50;
break;
case 45:
aViewPoint.PositionX = -3472;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/subsequent_filters-test.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 840b05f519a3cbc35842b0af7825e516771ce44d
Author: Andrea Gelmini
AuthorDate: Tue Mar 16 21:55:40 2021 +0100
Commit: Julien Nabet
CommitDate: Wed Mar 17 19:59:33 2021 +0100
Fix typo
Change-Id: I9da07f8ba5e3528d8b29a75739f92f26eb1d91c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112597
Tested-by: Julien Nabet
Reviewed-by: Julien Nabet
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 7dd6fee558be..09d0f6df601a 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -5219,7 +5219,7 @@ void ScFiltersTest::testTdf112780()
ScDocument& rDoc = xDocSh->GetDocument();
-// Without the fix in place, this test would haved failed with
+// Without the fix in place, this test would have failed with
// - Expected:
// - Actual : #VALUE!
CPPUNIT_ASSERT_EQUAL(OUString(""), rDoc.GetString(ScAddress(3,5,0)));
___
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' - include/sfx2 sfx2/source sw/source
include/sfx2/tabdlg.hxx |2 ++
sfx2/source/dialog/tabdlg.cxx |7 ++-
sw/source/ui/fldui/flddb.cxx |4
sw/source/ui/fldui/flddb.hxx |1 +
4 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 64f98e467794f98836a99719ecde51bf6a8f8bad
Author: Mike Kaganski
AuthorDate: Sun Mar 14 14:42:15 2021 +0300
Commit: Xisco Fauli
CommitDate: Wed Mar 17 19:34:43 2021 +0100
tdf#141011: Postpone SwFieldDBPage::Reset to tab activation
This way, it will only ask for password when dialog is switched to that tab.
Change-Id: Ie2a453b0b6867ceb1ef3728a8565de4f6cbf4757
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112469
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit 0adf52a644aaf85ba2bd666147c62c134234ffbb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112516
Reviewed-by: Xisco Fauli
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 0d770572f051..50f378d14dc4 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -208,6 +208,8 @@ public:
virtual boolFillItemSet( SfxItemSet* );
virtual voidReset( const SfxItemSet* );
+// Allows to postpone some initialization to the first activation
+virtual boolDeferResetToFirstActivation();
boolHasExchangeSupport() const
{ return bHasExchangeSupport; }
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 22acd6791b25..484b431a690e 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -168,6 +168,8 @@ void SfxTabPage::Reset( const SfxItemSet* )
{
}
+bool SfxTabPage::DeferResetToFirstActivation() { return false; }
+
void SfxTabPage::ActivatePage( const SfxItemSet& )
/* [Description]
@@ -919,7 +921,10 @@ void SfxTabDialogController::CreatePages()
pDataObject->xTabPage->SetUserData(sUserData);
PageCreated(pDataObject->sId, *pDataObject->xTabPage);
-pDataObject->xTabPage->Reset(m_pSet.get());
+if (pDataObject->xTabPage->DeferResetToFirstActivation())
+pDataObject->bRefresh = true; // Reset will be called in
ActivatePageHdl
+else
+pDataObject->xTabPage->Reset(m_pSet.get());
}
}
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index e2097cb77291..220ccbb58302 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -178,6 +178,10 @@ void SwFieldDBPage::Reset(const SfxItemSet*)
}
}
+// SwFieldDBPage may ask for password to select current document's data source,
+// so only do that when activating the page, not when dialog is creating all
pages
+bool SwFieldDBPage::DeferResetToFirstActivation() { return true; }
+
bool SwFieldDBPage::FillItemSet(SfxItemSet* )
{
OUString sTableName;
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index e507fcb86ee0..b25c38699234 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -70,6 +70,7 @@ public:
virtual boolFillItemSet( SfxItemSet* rSet ) override;
virtual voidReset( const SfxItemSet* rSet ) override;
+virtual boolDeferResetToFirstActivation() override;
virtual voidFillUserData() override;
voidActivateMailMergeAddress();
___
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' - sw/source
sw/source/uibase/dbui/dbtree.cxx | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 69ff121dbee216ed2e4d47207db1d3715bbe0f85
Author: Mike Kaganski
AuthorDate: Sun Mar 14 14:33:34 2021 +0300
Commit: Xisco Fauli
CommitDate: Wed Mar 17 19:34:09 2021 +0100
tdf#141012: do not try to expand the node if RequestingChildrenHdl failed
Just select the database node itself, so that it's still obvious which
database is associated with this document.
After selecting this node when initializing the tab, another call to
SwDBTreeList::Select will be made, so make sure to handle empty table and
column names.
Change-Id: Ie1d1bd445e18d5900910c780a24102b4dde5c787
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112467
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit 351edb44eb0548f7e56464de42c1758a1f5e4ab4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112515
Reviewed-by: Xisco Fauli
diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx
index 9b23f2a4f457..96088dd2611c 100644
--- a/sw/source/uibase/dbui/dbtree.cxx
+++ b/sw/source/uibase/dbui/dbtree.cxx
@@ -332,14 +332,25 @@ void SwDBTreeList::Select(const OUString& rDBName, const
OUString& rTableName, c
{
if (rDBName == m_xTreeView->get_text(*xParent))
{
+if (rTableName.isEmpty() && rColumnName.isEmpty())
+{
+// Just select the database node, do not expand
+m_xTreeView->scroll_to_row(*xParent);
+m_xTreeView->select(*xParent);
+return;
+}
if (!m_xTreeView->iter_has_child(*xParent))
{
RequestingChildrenHdl(*xParent);
-m_xTreeView->expand_row(*xParent);
+// If successful, it will be expanded in a call to
scroll_to_row for its children
}
std::unique_ptr
xChild(m_xTreeView->make_iterator(xParent.get()));
if (!m_xTreeView->iter_children(*xChild))
+{
+m_xTreeView->scroll_to_row(*xParent);
+m_xTreeView->select(*xParent);
continue;
+}
do
{
if (rTableName == m_xTreeView->get_text(*xChild))
___
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' - sw/source
sw/source/uibase/utlui/content.cxx | 61 +
1 file changed, 42 insertions(+), 19 deletions(-)
New commits:
commit b250a748e6b28ea79e153ae9136fe2930ac9c3d8
Author: Mike Kaganski
AuthorDate: Tue Mar 9 12:59:41 2021 +0300
Commit: Xisco Fauli
CommitDate: Wed Mar 17 19:32:20 2021 +0100
tdf#40427: use node index as position, not Y position on screen
As mentioned in comment to SwContent::nYPosition in
sw/source/uibase/inc/swcont.hxx:
some subclasses appear to use this for a tools/gen.hxx-style
geometric Y position, while e.g. SwOutlineContent wants to store
the index in its subtree
Abusing the nYPosition to store vertical position *on screen* gives
wrong results when a following section is positioned on screen higher
than a previous section - e.g., when multiple-page view is active.
So just use the section's node as Y position of the Navigator entry.
When the section is inside a fly frame, use the frame's anchor node.
Change-Id: I6caf26aeb19d845129dc837138c37f42bbc18655
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112197
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit 4caf4403c1b862e7ccca94b9caee31394d019732)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112226
Reviewed-by: Xisco Fauli
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index 3129d7ee572f..87f526a17996 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -262,6 +262,26 @@ namespace
return false;
}
+
+// Gets "YPos" for SwRegionContent, i.e. a number used to sort sections in
Navigator's list
+tools::Long getYPosForSection(const SwNodeIndex& rNodeIndex)
+{
+sal_uLong nIndex = rNodeIndex.GetIndex();
+if (rNodeIndex.GetNodes().GetEndOfExtras().GetIndex() >= nIndex)
+{
+// Not a node of BodyText
+// Are we in a fly?
+if (const auto pFlyFormat = rNodeIndex.GetNode().GetFlyFormat())
+{
+// Get node index of anchor
+if (auto pSwPosition = pFlyFormat->GetAnchor().GetContentAnchor())
+{
+nIndex = getYPosForSection(pSwPosition->nNode);
+}
+}
+}
+return static_cast(nIndex);
+}
} // end of anonymous namespace
SwContentType::SwContentType(SwWrtShell* pShell, ContentTypeId nType,
sal_uInt8 nLevel) :
@@ -354,18 +374,20 @@ void SwContentType::Init(bool* pbInvalidateWindow)
pOldMember = std::move(m_pMember);
m_pMember.reset( new SwContentArr );
}
-const Point aNullPt;
m_nMemberCount = m_pWrtShell->GetSectionFormatCount();
for(size_t i = 0; i < m_nMemberCount; ++i)
{
-const SwSectionFormat* pFormat;
-SectionType eTmpType;
-if( (pFormat =
&m_pWrtShell->GetSectionFormat(i))->IsInNodesArr() &&
-(eTmpType = pFormat->GetSection()->GetType()) !=
SectionType::ToxContent
-&& SectionType::ToxHeader != eTmpType )
+const SwSectionFormat* pFormat =
&m_pWrtShell->GetSectionFormat(i);
+if (!pFormat->IsInNodesArr())
+continue;
+const SwSection* pSection = pFormat->GetSection();
+if (SectionType eTmpType = pSection->GetType();
+eTmpType == SectionType::ToxContent || eTmpType ==
SectionType::ToxHeader)
+continue;
+const SwNodeIndex* pNodeIndex =
pFormat->GetContent().GetContentIdx();
+if (pNodeIndex)
{
-const OUString& rSectionName =
-pFormat->GetSection()->GetSectionName();
+const OUString& rSectionName = pSection->GetSectionName();
sal_uInt8 nLevel = 0;
SwSectionFormat* pParentFormat = pFormat->GetParent();
while(pParentFormat)
@@ -375,8 +397,7 @@ void SwContentType::Init(bool* pbInvalidateWindow)
}
std::unique_ptr pCnt(new SwRegionContent(this,
rSectionName,
-nLevel,
-pFormat->FindLayoutRect( false, &aNullPt ).Top()));
+nLevel, getYPosForSection(*pNodeIndex)));
SwPtrMsgPoolItem aAskItem( RES_CONTENT_VISIBLE, nullptr );
if( !pFormat->GetInfo( aAskItem ) &&
@@ -676,17 +697,20 @@ void SwContentType::FillMemberList(bool*
pbLevelOrVisibilityChanged)
break;
case ContentTypeId::REGION:
{
-const Point aNullPt;
m_nMemberCount = m_pWrtShell->GetSectionFormatCount();
for(size_t i = 0; i < m_nMemberCount; ++i)
{
-const SwSectionFormat* pFormat
[Libreoffice-commits] core.git: wizards/source
wizards/source/scriptforge/SF_PythonHelper.xba | 27 -- wizards/source/scriptforge/python/scriptforge.py | 34 --- 2 files changed, 55 insertions(+), 6 deletions(-) New commits: commit 8c04c9b3c726deb4bcab82aff0aec7d4f4ee6158 Author: Jean-Pierre Ledure AuthorDate: Tue Mar 16 16:57:28 2021 +0100 Commit: Jean-Pierre Ledure CommitDate: Wed Mar 17 18:11:23 2021 +0100 ScriptForge - (scriptforge.py) Array class The SF_Array (Basic) class is highly redundant with the Python tuple/list classes. Hence only 1 method is implemented in Python: ImportFromCSVFile() to have the same csv files imported identically in both environments. The returned value is a tuple of tuples. Restriction: dates are recognized but converted to their ISO format. Up to the user to interpret them correctly. Change-Id: I6611964a8083a9d7c6f9622b2aef64fe8b1491ea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112585 Tested-by: Jean-Pierre Ledure Reviewed-by: Jean-Pierre Ledure diff --git a/wizards/source/scriptforge/SF_PythonHelper.xba b/wizards/source/scriptforge/SF_PythonHelper.xba index 38aaa0e4681b..7368390c97bf 100644 --- a/wizards/source/scriptforge/SF_PythonHelper.xba +++ b/wizards/source/scriptforge/SF_PythonHelper.xba @@ -547,8 +547,9 @@ Dim sObjectType As String ' Alias of object.ObjectType Dim bBasicClass As Boolean ' True when BasicObject is a class Dim sLibrary As String ' Library where the object belongs to Dim bUno As Boolean' Return value is a UNO object +Dim iDims As Integer ' # of dims of vReturn Dim sess As Object : Set sess = ScriptForge.SF_Session -Dim i As Long +Dim i As Long, j As Long ' Conventional special input or output values Const cstNoArgs = "+++NOARGS+++", cstSymEmpty = "+++EMPTY+++", cstSymNull = "+++NULL+++", cstSymMissing = "+++MISSING+++" @@ -658,6 +659,15 @@ Try: If sObjectType = "SF_FileSystem" And Script = "GetFileModified" Then vReturn = SF_FileSystem.GetFileModified(vArgs(0)) End Select + ' Methods in usual modules using a 2D array or returning arrays are hardcoded as exceptions + ElseIf Not bBasicClass And _ + (((CallType And vbMethod) + (CallType And cstArgArray)) = vbMethod + cstArgArray Or _ + ((CallType And vbMethod) + (CallType And cstRetArray)) = vbMethod + cstRetArray) Then + Select Case sLibrary + Case "ScriptForge" + If sObjectType = "SF_Array" And Script = "ImportFromCSVFile" Then vReturn = SF_Array.ImportFromCSVFile(vArgs(0), vArgs(1), vArgs(2)) + End Select + ' Methods in usual modules are called by ExecuteBasicScript() except if they use a ParamArray ElseIf Not bBasicClass And (CallType And vbMethod) = vbMethod Then sScript = sLibrary & "." & sObjectType & "." & Script @@ -721,9 +731,22 @@ Try: ' Scalar If IsArray(vReturn) Then ReDim vReturnArray(0 To 2) + iDims = SF_Array.CountDims(vReturn) + ' Replace dates by ISO notation + If iDims = 1 Then + For i = LBound(vReturn) To UBound(vReturn) + If VarType(vReturn(i)) = V_DATE Then vReturn(i) = SF_Utils._CDateToIso(vReturn(i)) + Next i + ElseIf iDims = 2 Then + For i = LBound(vReturn, 1) To UBound(vReturn, 1) + For j = LBound(vReturn, 2) To UBound(vReturn, 2) + If VarType(vReturn(i, j)) = V_DATE Then vReturn(i, j) = SF_Utils._CDateToIso(vReturn(i, j)) + Next j + Next i + End If vReturnArray(0) = vReturn ' 2D arrays are flattened by the script provider when returning to Python vReturnArray(1) = VarType(vReturn) - vReturnArray(2) = SF_Array.CountDims(vReturn) + vReturnArray(2) = iDims ElseIf VarType(vReturn) = V_OBJECT And Not IsNull(vReturn) Then ' Uno or not Uno ?BuildPath bUno = False diff --git a/wizards/source/scriptforge/python/scriptforge.py b/wizards/source/scriptforge/python/scriptforge.py index 86e35167b83b..ed87679ee99f 100644 --- a/wizards/source/scriptforge/python/scriptforge.py +++ b/wizards/source/scrip
[Libreoffice-commits] core.git: vcl/qa vcl/skia
vcl/qa/cppunit/skia/skia.cxx | 30 ++
vcl/skia/gdiimpl.cxx | 20 ++--
2 files changed, 48 insertions(+), 2 deletions(-)
New commits:
commit ff1cfaf87ce0aa9673e1c3f92308cde6a2c6aa69
Author: Luboš Luňák
AuthorDate: Wed Mar 17 16:03:12 2021 +0100
Commit: Luboš Luňák
CommitDate: Wed Mar 17 18:01:00 2021 +0100
round polygon points before merging them for Skia drawing (tdf#140848)
basegfx::utils::mergeToSinglePolyPolygon() appears to have rounding
problems. Point coordinates are in pixels anyway.
Change-Id: I9880cc32f934a08923a5c59278f6aa07852c05f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112647
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/vcl/qa/cppunit/skia/skia.cxx b/vcl/qa/cppunit/skia/skia.cxx
index d8e103d1a431..6ed0b884955d 100644
--- a/vcl/qa/cppunit/skia/skia.cxx
+++ b/vcl/qa/cppunit/skia/skia.cxx
@@ -43,6 +43,7 @@ public:
void testMatrixQuality();
void testDelayedScale();
void testTdf137329();
+void testTdf140848();
CPPUNIT_TEST_SUITE(SkiaTest);
CPPUNIT_TEST(testBitmapErase);
@@ -53,6 +54,7 @@ public:
CPPUNIT_TEST(testMatrixQuality);
CPPUNIT_TEST(testDelayedScale);
CPPUNIT_TEST(testTdf137329);
+CPPUNIT_TEST(testTdf140848);
CPPUNIT_TEST_SUITE_END();
private:
@@ -395,6 +397,34 @@ void SkiaTest::testTdf137329()
CPPUNIT_ASSERT_EQUAL(COL_BLACK, device->GetPixel(Point(4, 4)));
}
+void SkiaTest::testTdf140848()
+{
+if (!SkiaHelper::isVCLSkiaEnabled())
+return;
+ScopedVclPtr device =
VclPtr::Create(DeviceFormat::DEFAULT);
+device->SetOutputSizePixel(Size(1300, 400));
+device->SetBackground(Wallpaper(COL_BLACK));
+device->SetAntialiasing(AntialiasingFlags::Enable);
+device->Erase();
+device->SetLineColor();
+device->SetFillColor(COL_WHITE);
+basegfx::B2DPolygon p1 = { { 952.73121259842514519, 102.4599685039370911 },
+ { 952.73121259842514519, 66.55445669291347599 },
+ { 1239.9753070866140661, 66.554456692913390725
},
+ { 1239.9753070866140661, 138.36548031496062094
},
+ { 952.73121259842514519, 138.36548031496070621
} };
+basegfx::B2DPolygon p2 = { { 1168.1642834645670064, 210.17650393700790801
},
+ { 1168.1642834645670064, 66.554456692913404936
},
+ { 1239.9753070866140661, 66.554456692913390725
},
+ { 1239.9753070866142934, 353.79855118110236845
},
+ { 1168.1642834645670064, 353.79855118110236845
} };
+device->DrawPolyPolygon(basegfx::B2DPolyPolygon(p1));
+device->DrawPolyPolygon(basegfx::B2DPolyPolygon(p2));
+//savePNG("/tmp/tdf140848.png", device);
+// Rounding errors caused the overlapping part not to be drawn.
+CPPUNIT_ASSERT_EQUAL(COL_WHITE, device->GetPixel(Point(1200, 100)));
+}
+
} // namespace
CPPUNIT_TEST_SUITE_REGISTRATION(SkiaTest);
diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index aa934f1e4942..be31e0ee649a 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -1015,6 +1015,20 @@ bool SkiaSalGraphicsImpl::delayDrawPolyPolygon(const
basegfx::B2DPolyPolygon& aP
return true;
}
+// Tdf#140848 - basegfx::utils::mergeToSinglePolyPolygon() seems to have
rounding
+// errors that sometimes cause it to merge incorrectly.
+static void roundPolygonPoints(basegfx::B2DPolyPolygon& polyPolygon)
+{
+for (basegfx::B2DPolygon& polygon : polyPolygon)
+{
+polygon.makeUnique();
+for (sal_uInt32 i = 0; i < polygon.count(); ++i)
+polygon.setB2DPoint(i,
basegfx::B2DPoint(basegfx::fround(polygon.getB2DPoint(i;
+// Control points are saved as vectors relative to points, so hopefully
+// there's no need to round those.
+}
+}
+
void SkiaSalGraphicsImpl::checkPendingDrawing()
{
if (mLastPolyPolygonInfo.polygons.size() != 0)
@@ -1026,10 +1040,12 @@ void SkiaSalGraphicsImpl::checkPendingDrawing()
if (polygons.size() == 1)
performDrawPolyPolygon(polygons.front(), transparency, true);
else
-// TODO: tdf#136222 shows that
basegfx::utils::mergeToSinglePolyPolygon() is unreliable
-// in corner cases, possibly either a bug or rounding errors
somewhere.
+{
+for (basegfx::B2DPolyPolygon& p : polygons)
+roundPolygonPoints(p);
performDrawPolyPolygon(basegfx::utils::mergeToSinglePolyPolygon(polygons),
transparency,
true);
+}
}
}
___
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-2' - setup_native/scripts
setup_native/scripts/osx_install_languagepack.applescript |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 40ae5790249811b38f6fafbda5f1396fdb12e996
Author: Christian Lohmaier
AuthorDate: Fri Mar 12 12:25:30 2021 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Wed Mar 17 17:52:29 2021 +0100
tdf#134607 use kMDItemFSName instead of _kMDItemDisplayNameWithExtensions
apparently the latter is not available on older versions of macOS.
https://developer.apple.com/documentation/coreservices/kmditemfsname
lists it as in version 10.4 and not flagged as deprecated, so keeping
fingers crossed that it is not affected by user-settings or similar…
Change-Id: I208d22f2abd628e7d95babc23ddb145a88bcf5cc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112385
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier
(cherry picked from commit daa162c20f4c7d61edc217ed44cb2854652a63ec)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112527
Reviewed-by: Michael Stahl
(cherry picked from commit 78f69c686c9f8b40fbd183dde71e94d4d7a729ab)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112614
Reviewed-by: Xisco Fauli
Reviewed-by: Adolfo Jayme Barrientos
Tested-by: Adolfo Jayme Barrientos
diff --git a/setup_native/scripts/osx_install_languagepack.applescript
b/setup_native/scripts/osx_install_languagepack.applescript
index bc793a510c8d..4083b01cd97c 100644
--- a/setup_native/scripts/osx_install_languagepack.applescript
+++ b/setup_native/scripts/osx_install_languagepack.applescript
@@ -66,7 +66,7 @@ end if
set found_ooos_all to ""
-- command might return an error if spotlight is disabled completely
try
- set found_ooos_all to (do shell script "mdfind \"kMDItemContentType ==
'com.apple.application-bundle' && _kMDItemDisplayNameWithExtensions ==
'[PRODUCTNAME].app'\"")
+ set found_ooos_all to (do shell script "mdfind \"kMDItemContentType ==
'com.apple.application-bundle' && kMDItemFSName == '[PRODUCTNAME].app'\"")
end try
set found_ooos_all to found_ooos_all & "
" & chooseMyOwn
@@ -126,7 +126,7 @@ end if
-- now only check whether the path is really from [PRODUCTNAME]
try
- do shell script "mdls --raw --name _kMDItemDisplayNameWithExtensions
--name kMDItemVersion " & quoted form of (choice as string) & " | xargs -0 |
fgrep '[PRODUCTNAME].app [PRODUCTVERSION]'"
+ do shell script "mdls --raw --name kMDItemFSName --name kMDItemVersion
" & quoted form of (choice as string) & " | xargs -0 | fgrep '[PRODUCTNAME].app
[PRODUCTVERSION]'"
on error
display dialog (choice as string) & appInvalid buttons {InstallLabel}
default button 1 with icon 0
return 3 --wrong target-directory
___
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' - sw/qa
sw/qa/core/objectpositioning/data/inside-outside-vert-align.docx |binary sw/qa/core/objectpositioning/objectpositioning.cxx |4 ++-- sw/qa/extras/layout/data/tdf116486.docx |binary sw/qa/extras/ooxmlexport/data/effectextent-margin.docx |binary sw/qa/extras/ooxmlexport/data/tdf133045_TestShapeAlignmentRelativeFromTopMargin.docx |binary sw/qa/extras/ooxmlexport/data/textframe-gradient.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport6.cxx |6 +++--- 7 files changed, 5 insertions(+), 5 deletions(-) New commits: commit d4fda377710391a2155cc6a55d8565a2ed32f518 Author: Miklos Vajna AuthorDate: Fri Mar 12 18:12:11 2021 +0100 Commit: Xisco Fauli CommitDate: Wed Mar 17 17:31:46 2021 +0100 CppunitTest_sw_ooxmlexport: clean up testEffectExtentMargin The shape had line information, but the intent was to test what happens when the shape has some non-zero effect extent, line information is not needed for that. And do the same for a bunch of other tests: a test document should ideally have line information only if it's relevant for a test. (cherry picked from commit 0fc76a646233bebebbca3f86144f30eb32a5d60c) Change-Id: I9ea1f38841a30e7e61088d347443e37948b1a9d2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112586 Tested-by: Jenkins Reviewed-by: Xisco Fauli diff --git a/sw/qa/core/objectpositioning/data/inside-outside-vert-align.docx b/sw/qa/core/objectpositioning/data/inside-outside-vert-align.docx index 15d2dca0775e..1308e1f6a8a5 100644 Binary files a/sw/qa/core/objectpositioning/data/inside-outside-vert-align.docx and b/sw/qa/core/objectpositioning/data/inside-outside-vert-align.docx differ diff --git a/sw/qa/core/objectpositioning/objectpositioning.cxx b/sw/qa/core/objectpositioning/objectpositioning.cxx index 13a936500329..648be357 100644 --- a/sw/qa/core/objectpositioning/objectpositioning.cxx +++ b/sw/qa/core/objectpositioning/objectpositioning.cxx @@ -227,9 +227,9 @@ CPPUNIT_TEST_FIXTURE(SwCoreObjectpositioningTest, testInsideOutsideVertAlignBott = getXPath(pXmlDoc, "//SwAnchoredDrawObject[2]/bounds", "top").toInt32(); //15694 // Verify that the distance between the bottom of page and bottom of first shape is around 0cm. (align=outside) -CPPUNIT_ASSERT_EQUAL(static_cast(23), nPageBottom - nFirstShapeOutside); +CPPUNIT_ASSERT_EQUAL(static_cast(3), nPageBottom - nFirstShapeOutside); // Verify that the distance between the bottom of body and top of second shape is around 0cm. (align=inside) -CPPUNIT_ASSERT_EQUAL(static_cast(10), nBodyBottom - nSecondShapeInside); +CPPUNIT_ASSERT_EQUAL(static_cast(0), nBodyBottom - nSecondShapeInside); } CPPUNIT_TEST_FIXTURE(SwCoreObjectpositioningTest, testVMLVertAlignBottomMargin) diff --git a/sw/qa/extras/layout/data/tdf116486.docx b/sw/qa/extras/layout/data/tdf116486.docx index c6a4891b0cf4..825b0ef33a55 100644 Binary files a/sw/qa/extras/layout/data/tdf116486.docx and b/sw/qa/extras/layout/data/tdf116486.docx differ diff --git a/sw/qa/extras/ooxmlexport/data/effectextent-margin.docx b/sw/qa/extras/ooxmlexport/data/effectextent-margin.docx index 22db162a78b0..5dccf967fe7a 100644 Binary files a/sw/qa/extras/ooxmlexport/data/effectextent-margin.docx and b/sw/qa/extras/ooxmlexport/data/effectextent-margin.docx differ diff --git a/sw/qa/extras/ooxmlexport/data/tdf133045_TestShapeAlignmentRelativeFromTopMargin.docx b/sw/qa/extras/ooxmlexport/data/tdf133045_TestShapeAlignmentRelativeFromTopMargin.docx index 2cd299ff211a..aa976e7cc925 100644 Binary files a/sw/qa/extras/ooxmlexport/data/tdf133045_TestShapeAlignmentRelativeFromTopMargin.docx and b/sw/qa/extras/ooxmlexport/data/tdf133045_TestShapeAlignmentRelativeFromTopMargin.docx differ diff --git a/sw/qa/extras/ooxmlexport/data/textframe-gradient.docx b/sw/qa/extras/ooxmlexport/data/textframe-gradient.docx index e5ed0689d251..edbfe53b1627 100644 Binary files a/sw/qa/extras/ooxmlexport/data/textframe-gradient.docx and b/sw/qa/extras/ooxmlexport/data/textframe-gradient.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx index cb00fff1f684..d7bdc09c0c34 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx @@ -1008,9 +1008,9 @@ DECLARE_OOXMLEXPORT_TEST(testRelativeAlignmentFromTopMargin, return; xmlDocUniquePtr pXmlDoc = parseLayoutDump(); -assertXPath(pXmlDoc, "//SwAnchoredDrawObject[1]/bounds", "top", "1487"); // center -assertXPath(pXmlDoc, "//SwAnchoredDrawObject[2]/bounds", "top", "2668"); // bottom -assertXPath(pXmlDoc, "//SwAnchoredDrawObject[3]/bounds", "top", "298"); // top +assertXPath(pXmlDoc, "//SwAnchoredDrawObject
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - cui/source
cui/source/customize/cfgutil.cxx | 16
cui/source/inc/cfgutil.hxx |2 +-
2 files changed, 5 insertions(+), 13 deletions(-)
New commits:
commit c8881fa20aa7b194cc2b87b78903d6d2e5780120
Author: Henry Castro
AuthorDate: Wed Mar 17 07:35:39 2021 -0400
Commit: Szymon Kłos
CommitDate: Wed Mar 17 16:18:24 2021 +0100
lok: fix the empty script node type container without "+" symbol expander
According to description in https://bz.apache.org/ooo/show_bug.cgi?id=30923
"In this case I think it's an acceptable solution to display a '+' symbol
for all
library nodes, and if a library has no children and the user clicks on the
'+'
symbol, the '+' will disappear".
Unfortunately this behaviour is not well driven for final users'
client side, so they misinterpret as a bug.
After tracing the method hasChildNodes(), the log result indicates
that this method does not load the libraries, but it is necessary
to iterate applying the method getChildNodes(), which will cause
to load all libraries and determine if the child has a script
CONTAINER node type to assign the '+' symbol.
Also, I have traced the loading libraries when the Macro Selector
dialog pops up and the result it load once, so I do not think it
is a problem loading a small finite number of libraries today.
Change-Id: I4ae5395b6afa7b7d6ff2b2ec692771e93c46c529
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112636
Reviewed-by: Pedro Silva
Reviewed-by: Szymon Kłos
Tested-by: Jenkins CollaboraOffice
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 24fec3396858..758dd2adb700 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -481,7 +481,7 @@ void CuiConfigGroupListBox::InitModule()
}
void CuiConfigGroupListBox::FillScriptList(const css::uno::Reference<
css::script::browse::XBrowseNode >& xRootNode,
- const weld::TreeIter* pParentEntry,
bool bCheapChildrenOnDemand)
+ const weld::TreeIter* pParentEntry)
{
try {
if ( xRootNode->hasChildNodes() )
@@ -544,7 +544,7 @@ void CuiConfigGroupListBox::FillScriptList(const
css::uno::Reference< css::scrip
theChild->acquire();
bool bChildOnDemand = false;
-if ( !bCheapChildrenOnDemand &&
children[n]->hasChildNodes() )
+if ( children[n]->hasChildNodes() )
{
Sequence< Reference< browse::XBrowseNode > >
grandchildren =
children[n]->getChildNodes();
@@ -558,14 +558,6 @@ void CuiConfigGroupListBox::FillScriptList(const
css::uno::Reference< css::scrip
}
}
}
-else
-{
-/* i30923 - Would be nice if there was a better
-* way to determine if a basic lib had children
-* without having to ask for them (which forces
-* the library to be loaded */
-bChildOnDemand = true;
-}
OUString aImage = GetImage(theChild, m_xContext,
bIsRootNode);
@@ -651,7 +643,7 @@ void CuiConfigGroupListBox::Init(const css::uno::Reference<
css::uno::XComponent
{
//We are only showing scripts not slot APIs so skip
//Root node and show location nodes
-FillScriptList(rootNode, nullptr, false);
+FillScriptList(rootNode, nullptr);
}
}
@@ -938,7 +930,7 @@ IMPL_LINK(CuiConfigGroupListBox, ExpandingHdl, const
weld::TreeIter&, rIter, boo
{
Reference< browse::XBrowseNode > rootNode(
static_cast< browse::XBrowseNode* >( pInfo->pObject ) ) ;
-FillScriptList(rootNode, &rIter, true /* i30923 */ );
+FillScriptList(rootNode, &rIter);
}
break;
}
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 20da0fc6f4a6..f6301f4e09bb 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -203,7 +203,7 @@ class CuiConfigGroupListBox
void InitModule();
void FillScriptList(const css::uno::Reference<
css::script::browse::XBrowseNode >& xRootNode,
-const weld::TreeIter* pParentEntry, bool
bCheapChildrenOnDemand);
+const weld::TreeIter* pParentEntry);
void FillFunctionsList(const css::uno::Sequence<
css::frame::DispatchInformation >& xCommands);
OUString MapCommand2UIName(const OUString& sCommand);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lis
[Libreoffice-commits] core.git: vcl/qa
vcl/qa/cppunit/BmpFilterTest.cxx | 44 +++ 1 file changed, 22 insertions(+), 22 deletions(-) New commits: commit d7ed130f537a81b900c55d222004cc9e88c0b355 Author: Stephan Bergmann AuthorDate: Wed Mar 17 14:34:26 2021 +0100 Commit: Stephan Bergmann CommitDate: Wed Mar 17 15:52:33 2021 +0100 Fix CPPUNIT_ASSERT_EQUAL argument type mismatch (Windows, 64-bit) long vs. tools::Long aka sal_Int64 aka __int64 aka long long Change-Id: Iabf0b18dba12985250b63664c464fba53ae552b3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112641 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/vcl/qa/cppunit/BmpFilterTest.cxx b/vcl/qa/cppunit/BmpFilterTest.cxx index e1341353c299..1b38e6c3193f 100644 --- a/vcl/qa/cppunit/BmpFilterTest.cxx +++ b/vcl/qa/cppunit/BmpFilterTest.cxx @@ -34,8 +34,8 @@ CPPUNIT_TEST_FIXTURE(BmpFilterTest, testBMP_RGB_888) Graphic aGraphic; CPPUNIT_ASSERT(BmpReader(aFileStream, aGraphic)); auto aBitmap = aGraphic.GetBitmapEx(); -CPPUNIT_ASSERT_EQUAL(10L, aBitmap.GetSizePixel().Width()); -CPPUNIT_ASSERT_EQUAL(10L, aBitmap.GetSizePixel().Height()); +CPPUNIT_ASSERT_EQUAL(tools::Long(10), aBitmap.GetSizePixel().Width()); +CPPUNIT_ASSERT_EQUAL(tools::Long(10), aBitmap.GetSizePixel().Height()); CPPUNIT_ASSERT_EQUAL(COL_WHITE, aBitmap.GetPixelColor(0, 0)); CPPUNIT_ASSERT_EQUAL(COL_WHITE, aBitmap.GetPixelColor(9, 9)); CPPUNIT_ASSERT_EQUAL(Color(0x72, 0xd1, 0xc8), aBitmap.GetPixelColor(1, 1)); @@ -48,8 +48,8 @@ CPPUNIT_TEST_FIXTURE(BmpFilterTest, testBMP_RGB_565) Graphic aGraphic; CPPUNIT_ASSERT(BmpReader(aFileStream, aGraphic)); auto aBitmap = aGraphic.GetBitmapEx(); -CPPUNIT_ASSERT_EQUAL(10L, aBitmap.GetSizePixel().Width()); -CPPUNIT_ASSERT_EQUAL(10L, aBitmap.GetSizePixel().Height()); +CPPUNIT_ASSERT_EQUAL(tools::Long(10), aBitmap.GetSizePixel().Width()); +CPPUNIT_ASSERT_EQUAL(tools::Long(10), aBitmap.GetSizePixel().Height()); // White is not completely white //CPPUNIT_ASSERT_EQUAL(Color(0xf8, 0xfc, 0xf8), aBitmap.GetPixelColor(0, 0)); @@ -65,8 +65,8 @@ CPPUNIT_TEST_FIXTURE(BmpFilterTest, testBMP_32_ARGB_) Graphic aGraphic; CPPUNIT_ASSERT(BmpReader(aFileStream, aGraphic)); auto aBitmap = aGraphic.GetBitmapEx(); -CPPUNIT_ASSERT_EQUAL(4L, aBitmap.GetSizePixel().Width()); -CPPUNIT_ASSERT_EQUAL(4L, aBitmap.GetSizePixel().Height()); +CPPUNIT_ASSERT_EQUAL(tools::Long(4), aBitmap.GetSizePixel().Width()); +CPPUNIT_ASSERT_EQUAL(tools::Long(4), aBitmap.GetSizePixel().Height()); //CPPUNIT_ASSERT_EQUAL(COL_LIGHTBLUE, aBitmap.GetPixelColor(0, 0)); //CPPUNIT_ASSERT_EQUAL(COL_LIGHTRED, aBitmap.GetPixelColor(2, 0)); @@ -80,8 +80,8 @@ CPPUNIT_TEST_FIXTURE(BmpFilterTest, testBMP_Paint_24_RGB_888) Graphic aGraphic; CPPUNIT_ASSERT(BmpReader(aFileStream, aGraphic)); auto aBitmap = aGraphic.GetBitmapEx(); -CPPUNIT_ASSERT_EQUAL(4L, aBitmap.GetSizePixel().Width()); -CPPUNIT_ASSERT_EQUAL(4L, aBitmap.GetSizePixel().Height()); +CPPUNIT_ASSERT_EQUAL(tools::Long(4), aBitmap.GetSizePixel().Width()); +CPPUNIT_ASSERT_EQUAL(tools::Long(4), aBitmap.GetSizePixel().Height()); CPPUNIT_ASSERT_EQUAL(COL_LIGHTBLUE, aBitmap.GetPixelColor(0, 0)); CPPUNIT_ASSERT_EQUAL(COL_LIGHTRED, aBitmap.GetPixelColor(2, 0)); @@ -95,8 +95,8 @@ CPPUNIT_TEST_FIXTURE(BmpFilterTest, testBMP_Index_1BPP) Graphic aGraphic; CPPUNIT_ASSERT(BmpReader(aFileStream, aGraphic)); auto aBitmap = aGraphic.GetBitmapEx(); -CPPUNIT_ASSERT_EQUAL(4L, aBitmap.GetSizePixel().Width()); -CPPUNIT_ASSERT_EQUAL(4L, aBitmap.GetSizePixel().Height()); +CPPUNIT_ASSERT_EQUAL(tools::Long(4), aBitmap.GetSizePixel().Width()); +CPPUNIT_ASSERT_EQUAL(tools::Long(4), aBitmap.GetSizePixel().Height()); CPPUNIT_ASSERT_EQUAL(COL_BLACK, aBitmap.GetPixelColor(0, 0)); CPPUNIT_ASSERT_EQUAL(COL_BLACK, aBitmap.GetPixelColor(0, 2)); @@ -110,8 +110,8 @@ CPPUNIT_TEST_FIXTURE(BmpFilterTest, testBMP_Index_4BPP) Graphic aGraphic; CPPUNIT_ASSERT(BmpReader(aFileStream, aGraphic)); auto aBitmap = aGraphic.GetBitmapEx(); -CPPUNIT_ASSERT_EQUAL(4L, aBitmap.GetSizePixel().Width()); -CPPUNIT_ASSERT_EQUAL(4L, aBitmap.GetSizePixel().Height()); +CPPUNIT_ASSERT_EQUAL(tools::Long(4), aBitmap.GetSizePixel().Width()); +CPPUNIT_ASSERT_EQUAL(tools::Long(4), aBitmap.GetSizePixel().Height()); CPPUNIT_ASSERT_EQUAL(COL_LIGHTBLUE, aBitmap.GetPixelColor(0, 0)); CPPUNIT_ASSERT_EQUAL(COL_LIGHTRED, aBitmap.GetPixelColor(2, 0)); @@ -125,8 +125,8 @@ CPPUNIT_TEST_FIXTURE(BmpFilterTest, testBMP_Index_8BPP) Graphic aGraphic; CPPUNIT_ASSERT(BmpReader(aFileStream, aGraphic)); auto aBitmap = aGraphic.GetBitmapEx(); -CPPUNIT_ASSERT_EQUAL(4L, aBitmap.GetSizePixel().Width()); -CPPUNIT_ASSERT_EQUAL(4L, aBitmap.GetSizePixel().Height()); +CPPUNIT_ASSERT_EQUAL(tools::Long(4), aBi
[Libreoffice-commits] core.git: Branch 'private/timar/pythonupgrademsp' - 2 commits - external/python3 postprocess/CustomTarget_signing.mk pyuno/CustomTarget_python_shell.mk pyuno/CustomTarget_pyuno_p
Rebased ref, commits from common ancestor: commit 43170b9389bda7986889079bfa22b8cb87dacf49 Author: Andras Timar AuthorDate: Tue Mar 16 21:56:04 2021 +0100 Commit: Andras Timar CommitDate: Wed Mar 17 15:40:30 2021 +0100 we have to keep the original python version number 3.7.7 because MSP creation does not tolerate adding/removing files, or remaming directories Change-Id: Ib997d438add82652d570753a749170f207dc3a80 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 884bececcf08..8cb8582d2ace 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3985,7 +3985,7 @@ $(call gb_ExternalExecutable_add_dependencies,python,$(call gb_GeneratedPackage_ else -$(call gb_ExternalExecutable_set_internal,python,$(INSTROOT)/$(LIBO_BIN_FOLDER)/$(if $(filter WNT,$(OS)),python-core-$(PYTHON_VERSION)/bin/python.exe,python.bin)) +$(call gb_ExternalExecutable_set_internal,python,$(INSTROOT)/$(LIBO_BIN_FOLDER)/$(if $(filter WNT,$(OS)),python-core-3.7.7/bin/python.exe,python.bin)) $(call gb_ExternalExecutable_set_precommand,python,$(subst $$,,$(gb_Python_PRECOMMAND))) $(call gb_ExternalExecutable_add_dependencies,python,$(call gb_Package_get_target_for_build,python3)) diff --git a/external/python3/ExternalPackage_python3.mk b/external/python3/ExternalPackage_python3.mk index 4dfc3b196f82..02ba67ffe0dd 100644 --- a/external/python3/ExternalPackage_python3.mk +++ b/external/python3/ExternalPackage_python3.mk @@ -17,12 +17,12 @@ python_arch_subdir=amd64/ else python_arch_subdir=win32/ endif -$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/bin/python.exe,PCbuild/$(python_arch_subdir)python$(if $(MSVC_USE_DEBUG_RUNTIME),_d).exe)) +$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python-core-3.7.7/bin/python.exe,PCbuild/$(python_arch_subdir)python$(if $(MSVC_USE_DEBUG_RUNTIME),_d).exe)) $(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).dll,PCbuild/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).dll)) ifeq ($(MSVC_USE_DEBUG_RUNTIME),) $(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python$(PYTHON_VERSION_MAJOR).dll,PCbuild/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR).dll)) endif -$(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\ +$(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-3.7.7/lib,\ PCbuild/$(python_arch_subdir)_asyncio$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ PCbuild/$(python_arch_subdir)_ctypes$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ PCbuild/$(python_arch_subdir)_ctypes_test$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ @@ -55,7 +55,7 @@ $(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/libpython$( # that may not be available on baseline systems. ifneq ($(OS),AIX) -$(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/lib-dynload,\ +$(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-3.7.7/lib/lib-dynload,\ LO_lib/array.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ LO_lib/_asyncio.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ LO_lib/audioop.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \ @@ -139,7 +139,7 @@ endif # note: python configure overrides config.guess with something that doesn't # put -pc in its linux platform triplets, so filter that... ifneq ($(OS),WNT) -$(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\ +$(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-3.7.7/lib,\ LO_lib/_sysconfigdata_m_$(python3_MACHDEP)_$(subst i686,i386,$(subst -pc,,$(HOST_PLATFORM))).py \ )) endif @@ -151,7 +151,7 @@ endif # test - probably unnecessary? was explicitly removed #i116738# # venv - why would we need virtual environments -$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-3.7.7/lib,\ LICENSE \ Lib/__future__.py \ Lib/__phello__.foo.py \ @@ -324,30 +324,30 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p Lib/zipfile.py \ )) -$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/asyncio,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-3.7.7/lib/asyncio,\ Lib/asyncio/base_futures.py \ Lib/asyncio/base_tasks.py \ Lib/asyncio/format_helpers.
Re: ANN: renaming of master branch to "main" for core repository and submodules (dictionaries, help, translations)
Nt L.O. related, but I think it is worth mentioning on this topic:
the Python language is doing this same month over the coming weeks
(i.e. renaming the default git branch to 'main') - the announcement was
made by the steering council last week.
On Wed, 17 Mar 2021 at 07:46, Christian Lohmaier <
lohmaier+libreoff...@googlemail.com> wrote:
> Hi *,
>
> as requested and announced in previous ESC-minutes and infra-call
> minutes, master branch will be renamed for the LibreOffice core
> repositories and the submodules used by LibreOffice (dictionaries,
> help, translations).
>
> Current plan is to do the switchover on April 1st
> If you have objections to this date or the plan laid out below (for
> current changes please see also
> https://redmine.documentfoundation.org/issues/3442 please raise your
> concerns ASAP)
>
> What will be done?
> * git branch rename from master → main for LibreOffice-repos only
> (core, dictionaries, help, translations)
> more specifically creation of a new main branch main from master and
> setting the default branch for those repositories to the new name)
> ** pushes (submitting to actual branch) to the master branch will be
> prohibited by the ACL (permissions)
> ** final commit on master branch will be a change to .gitreview to use
> the new name as default and to logerrit using main as target branch if
> the current local branch is master
> ** it will be a hard cut, main will continue where master stopped,
> master won't receive any more commits
> ** open changes for master branch will be moved to the new branch
> using gerrit's "move change" feature (that keeps the current parent,
> so it is not a rebase)
> ** pushing to refs/for/master (i.e. creating new changesets) will be
> allowed for a transition period, but jenkins will immediately ask to
> move the change to the new branch (not done automatically, to make
> people also change their local branch configuration/upstream settings)
> * adjusting of jenkins' gerrit-trigger and tinderboxes to use the new
> branch name
> * adjusting of the bugzilla-status-notification ("fixed in version x")
> bot to use the new branch name
>
>
> What won't be done at that stage:
> * update of all the documentation/wiki pages mentioning master (that's
> a community effort, no deadline, if you stumble upon mentions of
> master poke #infra or change in wiki yourself :-))
> * renaming of auxiliary repositories (like the intermediate repository
> used for weblate). Projects will be renamed, but weblate itself will
> still use "master" branch in the underlying repo, any change there
> will be postponed until 7.2 projects will be created)
> * dashboard will not have any custom migration, instead repository
> data will be rebuilt/reimported from scratch
>
> ciao
> Christian
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/source
cui/source/options/optgdlg.cxx | 17 ++---
1 file changed, 10 insertions(+), 7 deletions(-)
New commits:
commit 1ec33490e92d884b75371e9227605f7d2f4f17e3
Author: Mike Kaganski
AuthorDate: Wed Mar 17 07:28:39 2021 +0100
Commit: Mike Kaganski
CommitDate: Wed Mar 17 14:14:08 2021 +0100
Use COMReference here
Change-Id: Ic9a12de597724e17c575336bb313f50ad1cecfa0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112612
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index f15171e38103..673815bb60ab 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -89,6 +89,7 @@
#include
#include
#include
+#include
#include
#endif
using namespace ::com::sun::star::uno;
@@ -367,20 +368,22 @@ IMPL_LINK_NOARG( OfaMiscTabPage, TwoFigureHdl,
weld::SpinButton&, void )
IMPL_STATIC_LINK_NOARG(OfaMiscTabPage, FileAssocClick, weld::Button&, void)
{
const bool bUninit = SUCCEEDED(CoInitializeEx(nullptr,
COINIT_APARTMENTTHREADED));
-IApplicationAssociationRegistrationUI* pIf = nullptr;
-HRESULT res = CoCreateInstance(CLSID_ApplicationAssociationRegistrationUI,
nullptr,
- CLSCTX_INPROC_SERVER,
IID_IApplicationAssociationRegistrationUI,
- reinterpret_cast(&pIf));
-
-if (SUCCEEDED(res) && pIf)
+try
{
+auto pIf
+=
sal::systools::COMReference().CoCreateInstance(
+CLSID_ApplicationAssociationRegistrationUI, nullptr,
CLSCTX_INPROC_SERVER);
+
// LaunchAdvancedAssociationUI only works for applications registered
under
// Software\RegisteredApplications. See
scp2/source/ooo/registryitem_ooo.scp
const OUString expanded = Translate::ExpandVariables("%PRODUCTNAME
%PRODUCTVERSION");
// This will only show "To change your default apps, go to Settings >
Apps > Default apps"
// on Win10; this is expected. At least this will self-document it to
users.
pIf->LaunchAdvancedAssociationUI(o3tl::toW(expanded.getStr()));
-pIf->Release();
+}
+catch (...)
+{
+// Just ignore any error here: this is not something we need to make
sure to succeed
}
if (bUninit)
CoUninitialize();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: comphelper/source configure.ac ios/CustomTarget_iOS_setup.mk lingucomponent/Module_lingucomponent.mk lingucomponent/source postprocess/Rdb_services.mk Repository.mk sol
Repository.mk |2 - comphelper/source/misc/lok.cxx |2 - configure.ac|4 --- ios/CustomTarget_iOS_setup.mk |8 +++ lingucomponent/Module_lingucomponent.mk |2 - lingucomponent/source/lingutil/lingutil.cxx | 13 +--- lingucomponent/source/spellcheck/macosxspell/macspellimp.mm |7 +++--- postprocess/Rdb_services.mk |2 - solenv/bin/native-code.py |2 - 9 files changed, 28 insertions(+), 14 deletions(-) New commits: commit cb6ba06d286d0b44e0a54635588e33c2a650e0b8 Author: Tor Lillqvist AuthorDate: Wed Mar 17 11:50:23 2021 +0200 Commit: Tor Lillqvist CommitDate: Wed Mar 17 13:56:50 2021 +0100 tdf#124909: Use the myspell dictionary for Swiss German on iOS The iOS system German dictionary is not good for Swiss German. (And it doesn't even claim to be, it says it is for de_DE.) The system German dictionary accepts 'ß' but that is not used in Swiss German, 'ss' is always used instead. Build the spell library for iOS, too, and don't assume that the system de_DE dictionary would be usable for de_CH and de_LI. Copy those dictionaries for inclusion in the iOS app bundle. Change-Id: I0f8020812221024756c792bddc16a707de35b827 Signed-off-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112603 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112635 diff --git a/Repository.mk b/Repository.mk index 930ae5bfdc94..d61b3037c1f0 100644 --- a/Repository.mk +++ b/Repository.mk @@ -410,7 +410,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ simplecanvas \ slideshow \ sot \ - $(if $(filter-out iOS,$(OS)),spell) \ + spell \ $(if $(DISABLE_GUI),,spl) \ storagefd \ $(call gb_Helper_optional,SCRIPTING,stringresource) \ diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx index c2a44872755f..796a3dc3b839 100644 --- a/comphelper/source/misc/lok.cxx +++ b/comphelper/source/misc/lok.cxx @@ -210,7 +210,7 @@ bool isAllowlistedLanguage(const OUString& lang) if (!isActive()) return true; -#ifdef ANDROID +#if defined ANDROID || defined IOS (void) lang; return true; #else diff --git a/configure.ac b/configure.ac index 887db854e7d5..5984c986cfd1 100644 --- a/configure.ac +++ b/configure.ac @@ -10760,9 +10760,7 @@ dnl === dnl Check for system hunspell dnl === AC_MSG_CHECKING([which libhunspell to use]) -if test "$_os" = iOS; then - AC_MSG_RESULT([none]) -elif test "$with_system_hunspell" = "yes"; then +if test "$with_system_hunspell" = "yes"; then AC_MSG_RESULT([external]) SYSTEM_HUNSPELL=TRUE AC_LANG_PUSH([C++]) diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk index d417be34cfed..95cf79abfe3f 100644 --- a/ios/CustomTarget_iOS_setup.mk +++ b/ios/CustomTarget_iOS_setup.mk @@ -76,6 +76,14 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \ mkdir -p $(IOSRES)/share/fonts cp -R $(INSTDIR)/share/fonts/truetype $(IOSRES)/share/fonts cp -R $(INSTDIR)/share/gallery $(IOSRES)/share + mkdir -p $(IOSRES)/share/spell + # Install the Swiss German dictionary and use it for Liechtenstein, too + if test -d $(INSTDIR)/share/extensions/dict-de; then \ + cp $(INSTDIR)/share/extensions/dict-de/de_CH_frami.aff $(IOSRES)/share/spell/de_CH.aff; \ + cp $(INSTDIR)/share/extensions/dict-de/de_CH_frami.dic $(IOSRES)/share/spell/de_CH.dic; \ + cp $(INSTDIR)/share/extensions/dict-de/de_CH_frami.aff $(IOSRES)/share/spell/de_LI.aff; \ + cp $(INSTDIR)/share/extensions/dict-de/de_CH_frami.dic $(IOSRES)/share/spell/de_LI.dic; \ + fi cp -R $(INSTDIR)/share/palette $(IOSRES)/share cp -R $(INSTDIR)/share/fingerprint $(IOSRES)/share cp $(SRCDIR)/ios/welcome.odt $(IOSRES) diff --git a/lingucomponent/Module_lingucomponent.mk b/lingucomponent/Module_lingucomponent.mk index 9dabeb155673..3f8bcb026fa2 100644 --- a/lingucomponent/Module_lingucomponent.mk +++ b/lingucomponent/Module_lingucomponent.mk @@ -15,7 +15,7 @@ $(eval $(call gb_Module_add_targets,lingucomponent,\ Library_hyphen \ $(if $(filter-out iOS,$(OS)),Library_lnth) \ $(if $(filter iOS MACOSX,$(OS)),Library_MacOSXSpell) \ - $(if $(filter-out iOS,$(OS)),Library_spell) \ + Library_spell \ StaticLibrary_ulingu \ Library_numbertext \ )) diff --git a/lingucomponent/source/lingutil/lingutil.cxx b/lingucomponent/source/lingutil/lingutil.cxx inde
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/uiwriter/uiwriter.cxx |4 -
sw/qa/uitest/data/tdf46561.odt |binary
sw/qa/uitest/writer_tests7/tdf46561.py | 105 +
sw/source/core/doc/docdesc.cxx | 87 +--
sw/source/core/layout/pagedesc.cxx | 27 +---
5 files changed, 156 insertions(+), 67 deletions(-)
New commits:
commit 8d8486f43c1a8a51157bfc3e0b87090b05a9229e
Author: Daniel Arato (NISZ)
AuthorDate: Mon Feb 22 16:59:38 2021 +0100
Commit: Balazs Varga
CommitDate: Wed Mar 17 13:10:27 2021 +0100
tdf#46561 sw: fix lost undo stack setting header/footer
Changing 'shared' setting of left vs right or
first vs non-first page headers or footers removed
the whole undo stack.
Note: style changes before a 'shared' change
can still not be undone.
Co-authored-by: Attila Bakos (NISZ)
Change-Id: I6875bd0581869ffeb853911347dbc9f8c666214b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111635
Reviewed-by: László Németh
Reviewed-by: Balazs Varga
Tested-by: Balazs Varga
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index c39659fa9bab..dae657a35088 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -2225,7 +2225,9 @@ void SwUiWriterTest::testTextCursorInvalidation()
// this does not actually delete the header:
xPageStyle->setPropertyValue("HeaderIsOn", uno::makeAny(false));
pWrtShell->ChangeHeaderOrFooter(u"Default Page Style", true, false, false);
// must be disposed after deleting header
-CPPUNIT_ASSERT_THROW(xCursor->goRight(1, false), uno::RuntimeException);
+// cursor ends up in body
+// UPDATE: this behaviour has been corrected as a side effect of the fix
to tdf#46561:
+//CPPUNIT_ASSERT_THROW(xCursor->goRight(1, false), uno::RuntimeException);
}
void SwUiWriterTest::testTdf68183()
diff --git a/sw/qa/uitest/data/tdf46561.odt b/sw/qa/uitest/data/tdf46561.odt
new file mode 100644
index ..c9f9942521d0
Binary files /dev/null and b/sw/qa/uitest/data/tdf46561.odt differ
diff --git a/sw/qa/uitest/writer_tests7/tdf46561.py
b/sw/qa/uitest/writer_tests7/tdf46561.py
new file mode 100644
index ..235136524903
--- /dev/null
+++ b/sw/qa/uitest/writer_tests7/tdf46561.py
@@ -0,0 +1,105 @@
+# -*- 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 libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import select_pos
+from uitest.uihelper.common import type_text
+import importlib
+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 tdf46561(UITestCase):
+def check_header_texts(self, master="", first="", left="", right=""):
+# Get the current header style and its text contents
+xPageStyle = self.document.getStyleFamilies().getByIndex(2)
+xHeaderText = xPageStyle.getByIndex(0).HeaderText.String
+xHeaderTextFirst = xPageStyle.getByIndex(0).HeaderTextFirst.String
+xHeaderTextLeft = xPageStyle.getByIndex(0).HeaderTextLeft.String
+xHeaderTextRight = xPageStyle.getByIndex(0).HeaderTextRight.String
+
+# Check the current values
+self.assertEqual(master, xHeaderText)
+self.assertEqual(first, xHeaderTextFirst)
+self.assertEqual(left, xHeaderTextLeft)
+self.assertEqual(right, xHeaderTextRight)
+
+def test_tdf46561(self):
+self.ui_test.load_file(get_url_for_data_file("tdf46561.odt"))
+self.document = self.ui_test.get_component()
+self.check_header_texts(master="right", first="1st", left="left",
right="right")
+
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+xWriterEdit.executeAction("GOTO", mkPropertyValues({"PAGE": "2"}))
+self.xUITest.executeCommand(".uno:JumpToHeader")
+
+# Switch "same left and right page headers" on and off a few times
+for _ in range(4):
+self.ui_test.execute_dialog_through_command(".uno:PageDialog")
+PageDialog = self.xUITest.getTopFocusWindow();
+
+xTabs = PageDialog.getChild("tabcontrol")
+select_pos(xTabs, "4")
+
+Button = xTabs.getChild('checkSameLR')
+Button.executeAction("CLICK",tuple())
+ok = PageDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(ok)
+
+# We should be back to the starting state after 2*k on/off changes
+self.check_header_texts(master="right", first="1st", left="l
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 262c07d2b733543dd895b92325b36ce093226f26 Author: Johnny_M AuthorDate: Wed Mar 17 12:46:00 2021 +0100 Commit: Gerrit Code Review CommitDate: Wed Mar 17 12:46:00 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 5ed37664620c9e664b06c4660529ad0f200bbc5e - tdf#132643 Translate German section IDs Change-Id: I800890dd9d9f377cf1c57b56c193935184b2cc07 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112607 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 172a31b73a15..5ed37664620c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 172a31b73a1528385a05fc5afb137d811dd4886e +Subproject commit 5ed37664620c9e664b06c4660529ad0f200bbc5e ___ 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/shared/02/1213.xhp |4 ++-- source/text/shared/main0213.xhp|4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 5ed37664620c9e664b06c4660529ad0f200bbc5e Author: Johnny_M AuthorDate: Wed Mar 17 10:48:36 2021 +0100 Commit: Olivier Hallot CommitDate: Wed Mar 17 12:46:00 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I800890dd9d9f377cf1c57b56c193935184b2cc07 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112607 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/02/1213.xhp b/source/text/shared/02/1213.xhp index 6be90282f..828b8eae2 100644 --- a/source/text/shared/02/1213.xhp +++ b/source/text/shared/02/1213.xhp @@ -28,14 +28,14 @@ - + data sources; as tables Data source as table Activates an additional table view when in the form view. When the Data source as table function is activated, you see the table in an area above the form. - + diff --git a/source/text/shared/main0213.xhp b/source/text/shared/main0213.xhp index 55b873a7e..9f712539d 100644 --- a/source/text/shared/main0213.xhp +++ b/source/text/shared/main0213.xhp @@ -184,8 +184,8 @@ - - + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa sd/qa sw/qa uitest/demo_ui vcl/source
sc/qa/uitest/calc_tests/formatCells.py |8 ---
sc/qa/uitest/calc_tests6/tdf107267.py | 12 -
sc/qa/uitest/calc_tests8/tdf126248.py |1
sd/qa/uitest/impress_tests/customSlideShow.py |1
sw/qa/uitest/findReplace/findReplace.py |1
sw/qa/uitest/writer_tests2/deleteAllComments.py |1
sw/qa/uitest/writer_tests2/formatParagraph.py |1
uitest/demo_ui/listbox.py |9
uitest/demo_ui/spinfield.py |6 --
uitest/demo_ui/tabdialog.py |6 --
vcl/source/uitest/uiobject.cxx | 50
11 files changed, 25 insertions(+), 71 deletions(-)
New commits:
commit f1cc5d2229956e3698fd40a4d900fe45e7f8e160
Author: Noel Grandin
AuthorDate: Sun Mar 14 14:37:19 2021 +0200
Commit: Noel Grandin
CommitDate: Wed Mar 17 12:30:41 2021 +0100
throw exception for errors in uitest actions
so we abort early when a uitest goes wrong,
instead of letting tests become fragile
because it looks like its passing, but the code
is just accidentally working
Remove code in python uitests that was not actually
doing anything (and now crashes because we throw an exception
for actions that don't mean anything)
Change-Id: I9c52f9fdc06f1c01e9b93b58a5200f9c3684db1f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112471
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/qa/uitest/calc_tests/formatCells.py
b/sc/qa/uitest/calc_tests/formatCells.py
index 3bb78348fac2..62c1e55c7e9c 100644
--- a/sc/qa/uitest/calc_tests/formatCells.py
+++ b/sc/qa/uitest/calc_tests/formatCells.py
@@ -41,14 +41,6 @@ class formatCell(UITestCase):
props3 = {"TEXT": "English (USA)"}
actionProps3 = mkPropertyValues(props3)
xlanguagelb.executeAction("SELECT", actionProps3)
-#set Number
-props = {"TEXT": "Number"}
-actionProps = mkPropertyValues(props)
-xliststore1.executeAction("SELECT", actionProps)
-#set Standard
-props2 = {"TEXT": "Standard"}
-actionProps2 = mkPropertyValues(props2)
-xliststore2.executeAction("SELECT", actionProps2)
#other properties
xdecimalsed.executeAction("UP", tuple())
xleadzerosed.executeAction("UP", tuple())
diff --git a/sc/qa/uitest/calc_tests6/tdf107267.py
b/sc/qa/uitest/calc_tests6/tdf107267.py
index ec39c7b4b366..70350a15e127 100644
--- a/sc/qa/uitest/calc_tests6/tdf107267.py
+++ b/sc/qa/uitest/calc_tests6/tdf107267.py
@@ -40,10 +40,6 @@ class Subtotals(UITestCase):
#x6Entry = xTreeList.getChild("5")
#xFirstEntry.executeAction("CLICK", tuple())
#use the Max function
-xfunctions = xDialog.getChild("functions")
-propsF = {"TEXT": "Max"}
-actionPropsF = mkPropertyValues(propsF)
-xfunctions.executeAction("SELECT", actionPropsF)
#= 2nd group =5. Group by "Person Number", select "shipping time" and
use the Min function.
select_pos(xTabs, "1")
@@ -57,10 +53,6 @@ class Subtotals(UITestCase):
#x6Entry = xTreeList.getChild("5")
#xFirstEntry.executeAction("CLICK", tuple())
#use the Min function
-xfunctions = xDialog.getChild("functions")
-propsF2 = {"TEXT": "Min"}
-actionPropsF2 = mkPropertyValues(propsF2)
-xfunctions.executeAction("SELECT", actionPropsF2)
#= 3rd group = Group by "Person Number", select "shipping time" and
use the Average function.
select_pos(xTabs, "2")
@@ -74,10 +66,6 @@ class Subtotals(UITestCase):
#x6Entry = xTreeList.getChild("5")
#xFirstEntry.executeAction("CLICK", tuple())
#use the Average function
-xfunctions = xDialog.getChild("functions")
-propsF3 = {"TEXT": "Average"}
-actionPropsF3 = mkPropertyValues(propsF3)
-xfunctions.executeAction("SELECT", actionPropsF3)
# 5. Click OK
xOKBtn = xDialog.getChild("ok")
diff --git a/sc/qa/uitest/calc_tests8/tdf126248.py
b/sc/qa/uitest/calc_tests8/tdf126248.py
index 967e5c027c3e..f633bf9bcf41 100644
--- a/sc/qa/uitest/calc_tests8/tdf126248.py
+++ b/sc/qa/uitest/calc_tests8/tdf126248.py
@@ -59,7 +59,6 @@ class tdf126248(UITestCase):
self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog")
xCellsDlg = self.xUITest.getTopFocusWindow()
-select_pos(xCellsDlg, "2")
# Get current font names from the Format Cell dialog
westFontName =
get_state_as_dict(xCellsDlg.getChild("westfontnamelb-cjk"))['Text']
diff --git a/sd/qa/uitest/impress_tests/customSlideShow.py
b/sd/qa/uitest/impress_tests/customSlideShow.py
index 9feef4a12a81..9f491d9a5141 100644
--- a/sd/qa/uitest/impress_tests/customSlideShow.py
+++ b/sd/qa/uitest/impress_tests/customSlideShow.py
@@ -41,7 +41,6 @@ class customSlideShow(UITestCase):
edit = CustomSlide
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/cellsh3.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 32a0b409282554df7d66b7212ddd0fe187f86690
Author: Noel Grandin
AuthorDate: Wed Mar 17 10:16:17 2021 +0100
Commit: Noel Grandin
CommitDate: Wed Mar 17 12:30:19 2021 +0100
Revert "tdf#101217 Change row height and col width decimal places to 4"
This reverts commit 872ab577ccc4626f4720ae71cc298dca8e2968f4.
Reason for revert: this causes unit test failures in UITest_calc_tests
Change-Id: Ib4ec84393ba4bb3db56f62bb0a5a76c58c73b127
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112613
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index 433ce133997d..c809c79fce60 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -699,7 +699,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
ScopedVclPtr
pDlg(pFact->CreateScMetricInputDlg(
pTabViewShell->GetFrameWeld(), "RowHeightDialog",
nCurHeight, ScGlobal::nStdRowHeight,
-eMetric, 4, MAX_ROW_HEIGHT));
+eMetric, 2, MAX_ROW_HEIGHT));
if ( pDlg->Execute() == RET_OK )
{
@@ -736,7 +736,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
ScAbstractDialogFactory* pFact =
ScAbstractDialogFactory::Create();
ScopedVclPtr
pDlg(pFact->CreateScMetricInputDlg(
pTabViewShell->GetFrameWeld(),
"OptimalRowHeightDialog",
-ScGlobal::nLastRowHeightExtra, 0, eMetric, 4,
MAX_EXTRA_HEIGHT));
+ScGlobal::nLastRowHeightExtra, 0, eMetric, 1,
MAX_EXTRA_HEIGHT));
if ( pDlg->Execute() == RET_OK )
{
tools::Long nVal = pDlg->GetInputValue();
@@ -797,7 +797,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
ScAbstractDialogFactory* pFact =
ScAbstractDialogFactory::Create();
ScopedVclPtr
pDlg(pFact->CreateScMetricInputDlg(
pTabViewShell->GetFrameWeld(), "ColWidthDialog",
nCurHeight,
-STD_COL_WIDTH, eMetric, 4, MAX_COL_WIDTH));
+STD_COL_WIDTH, eMetric, 2, MAX_COL_WIDTH));
if ( pDlg->Execute() == RET_OK )
{
tools::Long nVal = pDlg->GetInputValue();
@@ -833,7 +833,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
ScAbstractDialogFactory* pFact =
ScAbstractDialogFactory::Create();
ScopedVclPtr
pDlg(pFact->CreateScMetricInputDlg(
pTabViewShell->GetFrameWeld(), "OptimalColWidthDialog",
-ScGlobal::nLastColWidthExtra, STD_EXTRA_WIDTH,
eMetric, 4, MAX_EXTRA_WIDTH));
+ScGlobal::nLastColWidthExtra, STD_EXTRA_WIDTH,
eMetric, 1, MAX_EXTRA_WIDTH));
if ( pDlg->Execute() == RET_OK )
{
tools::Long nVal = pDlg->GetInputValue();
___
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 9f03b05f063d4dd886088f99e59cf7be3b7bfb24 Author: Johnny_M AuthorDate: Wed Mar 17 12:07:51 2021 +0100 Commit: Gerrit Code Review CommitDate: Wed Mar 17 12:07:51 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 172a31b73a1528385a05fc5afb137d811dd4886e - tdf#132643 Translate German section IDs Change-Id: I8a778692623c91fed358e43715ec3588222ca066 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112634 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 10556be199df..172a31b73a15 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 10556be199df72d2180e0be1e9ffa7a1076742aa +Subproject commit 172a31b73a1528385a05fc5afb137d811dd4886e ___ 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/shared/02/0201.xhp |6 ++ source/text/swriter/main0202.xhp |4 ++-- source/text/swriter/main0215.xhp |4 ++-- source/text/swriter/main0216.xhp |4 ++-- 4 files changed, 8 insertions(+), 10 deletions(-) New commits: commit 172a31b73a1528385a05fc5afb137d811dd4886e Author: Johnny_M AuthorDate: Wed Mar 17 11:34:41 2021 +0100 Commit: Olivier Hallot CommitDate: Wed Mar 17 12:07:51 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I8a778692623c91fed358e43715ec3588222ca066 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112634 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/02/0201.xhp b/source/text/shared/02/0201.xhp index 91af5fc27..e73dbd1ec 100644 --- a/source/text/shared/02/0201.xhp +++ b/source/text/shared/02/0201.xhp @@ -28,15 +28,13 @@ - + Set Paragraph Style - Assigns a style to the current paragraph, selected paragraphs, or to a selected object. - To reset the selected objects to the default paragraph style, select Clear formatting. Select More Styles to open the Styles window. Clicking on the Down Arrow button on the right of a style name shows a pop-up menu that allows you to update the style from the current selection or to edit the style. - + diff --git a/source/text/swriter/main0202.xhp b/source/text/swriter/main0202.xhp index 74df42c79..9fedc17c4 100644 --- a/source/text/swriter/main0202.xhp +++ b/source/text/swriter/main0202.xhp @@ -31,8 +31,8 @@ - - + + diff --git a/source/text/swriter/main0215.xhp b/source/text/swriter/main0215.xhp index a6b06090d..4f3b6cf41 100644 --- a/source/text/swriter/main0215.xhp +++ b/source/text/swriter/main0215.xhp @@ -29,8 +29,8 @@ Frame Bar When a frame is selected, the Frame Bar provides the most important functions for formatting and positioning the frame. - - + + Wrap Off You can also choose this setting on the Wrap tab page. diff --git a/source/text/swriter/main0216.xhp b/source/text/swriter/main0216.xhp index 49b6a4410..702dd6976 100644 --- a/source/text/swriter/main0216.xhp +++ b/source/text/swriter/main0216.xhp @@ -35,8 +35,8 @@ OLE-Object Bar The OLE-Object bar appears when objects are selected, and contains the most important functions for formatting and positioning objects. - - + + No Wrap You can also choose this setting on the Wrap tab page. ___ 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 c3949c3e7370adf38ac53818d07077e3dfb189df Author: Johnny_M AuthorDate: Wed Mar 17 12:06:57 2021 +0100 Commit: Gerrit Code Review CommitDate: Wed Mar 17 12:06:57 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 10556be199df72d2180e0be1e9ffa7a1076742aa - tdf#132643 Translate German section IDs Change-Id: I11440d50dad489f944f9d850db193e888f7d3304 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112633 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index cf5110fec4a0..10556be199df 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit cf5110fec4a036307a33a70e45fd7d981de4d944 +Subproject commit 10556be199df72d2180e0be1e9ffa7a1076742aa ___ 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/main0208.xhp |2 +- source/text/shared/02/2006.xhp |2 +- source/text/shared/main0208.xhp|2 +- source/text/simpress/main0206.xhp |2 +- source/text/smath/main0202.xhp |2 +- source/text/swriter/main0208.xhp |2 +- 6 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 10556be199df72d2180e0be1e9ffa7a1076742aa Author: Johnny_M AuthorDate: Wed Mar 17 11:25:22 2021 +0100 Commit: Olivier Hallot CommitDate: Wed Mar 17 12:06:57 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I11440d50dad489f944f9d850db193e888f7d3304 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112633 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/main0208.xhp b/source/text/scalc/main0208.xhp index 0b38f04bb..f35ccabc5 100644 --- a/source/text/scalc/main0208.xhp +++ b/source/text/scalc/main0208.xhp @@ -36,7 +36,7 @@ - + Digital Signature See also Digital Signatures. diff --git a/source/text/shared/02/2006.xhp b/source/text/shared/02/2006.xhp index 28fa170da..8b3e69291 100644 --- a/source/text/shared/02/2006.xhp +++ b/source/text/shared/02/2006.xhp @@ -25,7 +25,7 @@ - + Document Modification diff --git a/source/text/shared/main0208.xhp b/source/text/shared/main0208.xhp index 016f56035..eb8a479d4 100644 --- a/source/text/shared/main0208.xhp +++ b/source/text/shared/main0208.xhp @@ -35,7 +35,7 @@ The Status Bar displays information about the current $[officename] Basic document. - + diff --git a/source/text/simpress/main0206.xhp b/source/text/simpress/main0206.xhp index b09dd9ae5..9893a7ae8 100644 --- a/source/text/simpress/main0206.xhp +++ b/source/text/simpress/main0206.xhp @@ -38,7 +38,7 @@ - + diff --git a/source/text/smath/main0202.xhp b/source/text/smath/main0202.xhp index b283b2403..f46338a63 100644 --- a/source/text/smath/main0202.xhp +++ b/source/text/smath/main0202.xhp @@ -35,6 +35,6 @@ The status bar displays information about the active document. - + diff --git a/source/text/swriter/main0208.xhp b/source/text/swriter/main0208.xhp index 6f060e28a..ba693253a 100644 --- a/source/text/swriter/main0208.xhp +++ b/source/text/swriter/main0208.xhp @@ -52,7 +52,7 @@ - + Digital Signature Click to start digital signature process. You must have a digital certificate to complete the process. See also Digital Signatures. ___ 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 f9ebae343267d4d80ebe7a4813c07b219c5f631a Author: Johnny_M AuthorDate: Wed Mar 17 12:06:07 2021 +0100 Commit: Gerrit Code Review CommitDate: Wed Mar 17 12:06:07 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to cf5110fec4a036307a33a70e45fd7d981de4d944 - tdf#132643 Translate German section IDs Change-Id: If9db453e78dd4395779c81ecfced846720935f7b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112611 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 3242bf4e1cc4..cf5110fec4a0 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 3242bf4e1cc445ac5a9bb07de5196670dd621aa0 +Subproject commit cf5110fec4a036307a33a70e45fd7d981de4d944 ___ 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/shared/01/05030100.xhp |4 ++-- source/text/shared/02/0312.xhp |4 ++-- source/text/simpress/main0203.xhp |4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) New commits: commit cf5110fec4a036307a33a70e45fd7d981de4d944 Author: Johnny_M AuthorDate: Wed Mar 17 11:09:43 2021 +0100 Commit: Olivier Hallot CommitDate: Wed Mar 17 12:06:07 2021 +0100 tdf#132643 Translate German section IDs Change-Id: If9db453e78dd4395779c81ecfced846720935f7b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112611 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/05030100.xhp b/source/text/shared/01/05030100.xhp index 46e212ea6..f8656562c 100644 --- a/source/text/shared/01/05030100.xhp +++ b/source/text/shared/01/05030100.xhp @@ -77,7 +77,7 @@ - + @@ -89,7 +89,7 @@ - + diff --git a/source/text/shared/02/0312.xhp b/source/text/shared/02/0312.xhp index 1f5f5efd4..597837199 100644 --- a/source/text/shared/02/0312.xhp +++ b/source/text/shared/02/0312.xhp @@ -28,12 +28,12 @@ - + Decrease Spacing Click the Decrease Spacing icon to decrease the paragraph spacing above the selected paragraph. - + diff --git a/source/text/simpress/main0203.xhp b/source/text/simpress/main0203.xhp index 0f6e45f66..26505a43c 100644 --- a/source/text/simpress/main0203.xhp +++ b/source/text/simpress/main0203.xhp @@ -54,8 +54,8 @@ - - + + ___ 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 fd2132c1eb24eba0af67f5822b3c41009a1344e6 Author: Johnny_M AuthorDate: Wed Mar 17 12:05:19 2021 +0100 Commit: Gerrit Code Review CommitDate: Wed Mar 17 12:05:19 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 3242bf4e1cc445ac5a9bb07de5196670dd621aa0 - tdf#132643 Translate German section IDs Change-Id: Iabb895b801a308331c819ce4a7bd199a29a332b0 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112632 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 4afa5b102c5d..3242bf4e1cc4 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 4afa5b102c5d42c2205623a48413b97099e979e4 +Subproject commit 3242bf4e1cc445ac5a9bb07de5196670dd621aa0 ___ 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/shared/02/01170101.xhp |2 +- source/text/shared/02/01170201.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 3242bf4e1cc445ac5a9bb07de5196670dd621aa0 Author: Johnny_M AuthorDate: Wed Mar 17 11:21:25 2021 +0100 Commit: Olivier Hallot CommitDate: Wed Mar 17 12:05:19 2021 +0100 tdf#132643 Translate German section IDs Change-Id: Iabb895b801a308331c819ce4a7bd199a29a332b0 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112632 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/02/01170101.xhp b/source/text/shared/02/01170101.xhp index 650605f77..21f1b04f7 100644 --- a/source/text/shared/02/01170101.xhp +++ b/source/text/shared/02/01170101.xhp @@ -363,7 +363,7 @@ Frame Specifies the target frame to display the document that is opened by the "Open document / web page" action. You can also specify the target frame to display a URL that you open when you click a button that has been assigned to the "Open document or web page" action. - + If you click the field, you can select an option from the list that specifies into which frame the next document should be loaded. The following possibilities exist: diff --git a/source/text/shared/02/01170201.xhp b/source/text/shared/02/01170201.xhp index b7e44faee..5f6d00b05 100644 --- a/source/text/shared/02/01170201.xhp +++ b/source/text/shared/02/01170201.xhp @@ -47,7 +47,7 @@ Specifies the URL to which the data of the completed form is to be transmitted. Frame Defines the target frame in which the loaded URL is to appear. - + Type of submission Specifies the method to transfer the completed form information. ___ 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 2316d3a1f6bc36a03f7237c99f8e19ecc10763f2 Author: Johnny_M AuthorDate: Wed Mar 17 12:04:40 2021 +0100 Commit: Gerrit Code Review CommitDate: Wed Mar 17 12:04:40 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 4afa5b102c5d42c2205623a48413b97099e979e4 - tdf#132643 Translate German section IDs Change-Id: I99ea90321fae6b1b800fe0f5ee29e46bce01242c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112610 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index ea1776d6f625..4afa5b102c5d 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ea1776d6f6253ec2ddd2f9c8b4b4e8346d8f19e8 +Subproject commit 4afa5b102c5d42c2205623a48413b97099e979e4 ___ 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 |4 ++-- source/text/shared/02/0217.xhp |4 ++-- source/text/swriter/main0202.xhp |4 ++-- source/text/swriter/main0204.xhp |4 ++-- source/text/swriter/main0215.xhp |2 +- 5 files changed, 9 insertions(+), 9 deletions(-) New commits: commit 4afa5b102c5d42c2205623a48413b97099e979e4 Author: Johnny_M AuthorDate: Wed Mar 17 11:05:18 2021 +0100 Commit: Olivier Hallot CommitDate: Wed Mar 17 12:04:40 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I99ea90321fae6b1b800fe0f5ee29e46bce01242c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112610 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/main0202.xhp b/source/text/scalc/main0202.xhp index fdd25638a..a444ad8ac 100644 --- a/source/text/scalc/main0202.xhp +++ b/source/text/scalc/main0202.xhp @@ -75,8 +75,8 @@ - - + + Align Top diff --git a/source/text/shared/02/0217.xhp b/source/text/shared/02/0217.xhp index 6c68d70c7..9c6655d6b 100644 --- a/source/text/shared/02/0217.xhp +++ b/source/text/shared/02/0217.xhp @@ -25,13 +25,13 @@ - + Background Color Click to open a toolbar where you can click a background color for a paragraph. The color is applied to the background of the current paragraph or the selected paragraphs. - + diff --git a/source/text/swriter/main0202.xhp b/source/text/swriter/main0202.xhp index 1f743f478..74df42c79 100644 --- a/source/text/swriter/main0202.xhp +++ b/source/text/swriter/main0202.xhp @@ -66,8 +66,8 @@ - - + + Additional icons Increase Font diff --git a/source/text/swriter/main0204.xhp b/source/text/swriter/main0204.xhp index 5512bea0b..eabf90895 100644 --- a/source/text/swriter/main0204.xhp +++ b/source/text/swriter/main0204.xhp @@ -40,8 +40,8 @@ - - + + Merge Cells diff --git a/source/text/swriter/main0215.xhp b/source/text/swriter/main0215.xhp index 9c214cb8a..a6b06090d 100644 --- a/source/text/swriter/main0215.xhp +++ b/source/text/swriter/main0215.xhp @@ -63,7 +63,7 @@ Background Color - + Frame Properties ___ 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/01/1204.xhp |2 +- source/text/scalc/01/12040400.xhp |2 +- source/text/shared/02/1204.xhp |4 ++-- source/text/shared/main0212.xhp|4 ++-- source/text/shared/main0213.xhp|4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) New commits: commit ea1776d6f6253ec2ddd2f9c8b4b4e8346d8f19e8 Author: Johnny_M AuthorDate: Wed Mar 17 11:00:06 2021 +0100 Commit: Olivier Hallot CommitDate: Wed Mar 17 12:03:15 2021 +0100 tdf#132643 Translate German section IDs Change-Id: Ibdb8385c6ca3d78baace4824ce71f091226c02c1 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112609 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/01/1204.xhp b/source/text/scalc/01/1204.xhp index 437f2b984..01cecc8c0 100644 --- a/source/text/scalc/01/1204.xhp +++ b/source/text/scalc/01/1204.xhp @@ -41,7 +41,7 @@ Advanced filter - + diff --git a/source/text/scalc/01/12040400.xhp b/source/text/scalc/01/12040400.xhp index a5d5960d1..fc52e0b78 100644 --- a/source/text/scalc/01/12040400.xhp +++ b/source/text/scalc/01/12040400.xhp @@ -29,7 +29,7 @@ - + Reset Filter Removes the filter from the selected cell range. To enable this command, click inside the cell area where the filter was applied. diff --git a/source/text/shared/02/1204.xhp b/source/text/shared/02/1204.xhp index 43ab98c03..c2ca975cb 100644 --- a/source/text/shared/02/1204.xhp +++ b/source/text/shared/02/1204.xhp @@ -30,12 +30,12 @@ - + Reset Filter/Sorting Cancels the filter settings and displays all of the records in the current table. - + diff --git a/source/text/shared/main0212.xhp b/source/text/shared/main0212.xhp index 602c6294b..00aad8632 100644 --- a/source/text/shared/main0212.xhp +++ b/source/text/shared/main0212.xhp @@ -76,8 +76,8 @@ - - + + Data to Text Inserts all fields of the marked record into the current document at the cursor position. diff --git a/source/text/shared/main0213.xhp b/source/text/shared/main0213.xhp index 790dc8fc5..55b873a7e 100644 --- a/source/text/shared/main0213.xhp +++ b/source/text/shared/main0213.xhp @@ -182,8 +182,8 @@ Sort - - + + ___ 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' - comphelper/source configure.ac ios/CustomTarget_iOS_setup.mk lingucomponent/Module_lingucomponent.mk lingucomponent/source postproces
Repository.mk |2 - comphelper/source/misc/lok.cxx |2 - configure.ac|4 --- ios/CustomTarget_iOS_setup.mk |8 +++ lingucomponent/Module_lingucomponent.mk |2 - lingucomponent/source/lingutil/lingutil.cxx | 13 +--- lingucomponent/source/spellcheck/macosxspell/macspellimp.mm |7 +++--- postprocess/Rdb_services.mk |2 - solenv/bin/native-code.py |2 - 9 files changed, 28 insertions(+), 14 deletions(-) New commits: commit e693b5b6f5d61f8f4108cc70669ce3e5e87910a6 Author: Tor Lillqvist AuthorDate: Wed Mar 17 11:50:23 2021 +0200 Commit: Tor Lillqvist CommitDate: Wed Mar 17 12:03:00 2021 +0100 tdf#124909: Use the myspell dictionary for Swiss German on iOS The iOS system German dictionary is not good for Swiss German. (And it doesn't even claim to be, it says it is for de_DE.) The system German dictionary accepts 'ß' but that is not used in Swiss German, 'ss' is always used instead. Build the spell library for iOS, too, and don't assume that the system de_DE dictionary would be usable for de_CH and de_LI. Copy those dictionaries for inclusion in the iOS app bundle. Change-Id: I0f8020812221024756c792bddc16a707de35b827 Signed-off-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112603 diff --git a/Repository.mk b/Repository.mk index 2d9bb907dd74..43da9de09616 100644 --- a/Repository.mk +++ b/Repository.mk @@ -419,7 +419,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ simplecanvas \ slideshow \ sot \ - $(if $(filter-out iOS,$(OS)),spell) \ + spell \ $(if $(DISABLE_GUI),,spl) \ storagefd \ $(call gb_Helper_optional,SCRIPTING,stringresource) \ diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx index 77c8c13a7e82..208fe7bb25df 100644 --- a/comphelper/source/misc/lok.cxx +++ b/comphelper/source/misc/lok.cxx @@ -214,7 +214,7 @@ bool isWhitelistedLanguage(const OUString& lang) if (!isActive()) return true; -#ifdef ANDROID +#if defined ANDROID || defined IOS (void) lang; return true; #else diff --git a/configure.ac b/configure.ac index e36325456c82..d71a127b92e5 100644 --- a/configure.ac +++ b/configure.ac @@ -10172,9 +10172,7 @@ dnl === dnl Check for system hunspell dnl === AC_MSG_CHECKING([which libhunspell to use]) -if test "$_os" = iOS; then - AC_MSG_RESULT([none]) -elif test "$with_system_hunspell" = "yes"; then +if test "$with_system_hunspell" = "yes"; then AC_MSG_RESULT([external]) SYSTEM_HUNSPELL=TRUE AC_LANG_PUSH([C++]) diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk index c8a9b72f..53ea70f1306a 100644 --- a/ios/CustomTarget_iOS_setup.mk +++ b/ios/CustomTarget_iOS_setup.mk @@ -72,6 +72,14 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \ mkdir -p $(IOSRES)/share/fonts cp -R $(INSTDIR)/share/fonts/truetype $(IOSRES)/share/fonts cp -R $(INSTDIR)/share/gallery $(IOSRES)/share + mkdir -p $(IOSRES)/share/spell + # Install the Swiss German dictionary and use it for Liechtenstein, too + if test -d $(INSTDIR)/share/extensions/dict-de; then \ + cp $(INSTDIR)/share/extensions/dict-de/de_CH_frami.aff $(IOSRES)/share/spell/de_CH.aff; \ + cp $(INSTDIR)/share/extensions/dict-de/de_CH_frami.dic $(IOSRES)/share/spell/de_CH.dic; \ + cp $(INSTDIR)/share/extensions/dict-de/de_CH_frami.aff $(IOSRES)/share/spell/de_LI.aff; \ + cp $(INSTDIR)/share/extensions/dict-de/de_CH_frami.dic $(IOSRES)/share/spell/de_LI.dic; \ + fi cp -R $(INSTDIR)/share/palette $(IOSRES)/share cp -R $(INSTDIR)/share/fingerprint $(IOSRES)/share cp $(SRCDIR)/ios/welcome.odt $(IOSRES) diff --git a/lingucomponent/Module_lingucomponent.mk b/lingucomponent/Module_lingucomponent.mk index 9dabeb155673..3f8bcb026fa2 100644 --- a/lingucomponent/Module_lingucomponent.mk +++ b/lingucomponent/Module_lingucomponent.mk @@ -15,7 +15,7 @@ $(eval $(call gb_Module_add_targets,lingucomponent,\ Library_hyphen \ $(if $(filter-out iOS,$(OS)),Library_lnth) \ $(if $(filter iOS MACOSX,$(OS)),Library_MacOSXSpell) \ - $(if $(filter-out iOS,$(OS)),Library_spell) \ + Library_spell \ StaticLibrary_ulingu \ Library_numbertext \ )) diff --git a/lingucomponent/source/lingutil/lingutil.cxx b/lingucomponent/source/lingutil/lingutil.cxx index 76c79aba698a..5ef22bbeff34 100644 --- a/lingucomponent/source/
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ce776dc26a96c655d8758968292db8ec983db72a Author: Johnny_M AuthorDate: Wed Mar 17 12:03:15 2021 +0100 Commit: Gerrit Code Review CommitDate: Wed Mar 17 12:03:15 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to ea1776d6f6253ec2ddd2f9c8b4b4e8346d8f19e8 - tdf#132643 Translate German section IDs Change-Id: Ibdb8385c6ca3d78baace4824ce71f091226c02c1 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112609 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 8d418b9c58e8..ea1776d6f625 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 8d418b9c58e89f1e1bb98ada13370c31e5b7afa2 +Subproject commit ea1776d6f6253ec2ddd2f9c8b4b4e8346d8f19e8 ___ 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 2c818b70a4e8bd98fa1cce80ea9b7fb408a88401 Author: Johnny_M AuthorDate: Wed Mar 17 12:01:56 2021 +0100 Commit: Gerrit Code Review CommitDate: Wed Mar 17 12:01:56 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 8d418b9c58e89f1e1bb98ada13370c31e5b7afa2 - tdf#132643 Translate German section IDs Change-Id: I588afd634bc5ff443a722561c5577f8d683ad11b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112608 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 23230b3198e3..8d418b9c58e8 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 23230b3198e341db72ae7183a2aa328f39a63cc8 +Subproject commit 8d418b9c58e89f1e1bb98ada13370c31e5b7afa2 ___ 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/shared/00/00040501.xhp |4 ++-- source/text/shared/02/0117.xhp |4 ++-- source/text/shared/02/01170200.xhp |4 ++-- source/text/shared/main0213.xhp|2 -- source/text/swriter/main0120.xhp |2 +- 5 files changed, 7 insertions(+), 9 deletions(-) New commits: commit 8d418b9c58e89f1e1bb98ada13370c31e5b7afa2 Author: Johnny_M AuthorDate: Wed Mar 17 10:55:19 2021 +0100 Commit: Olivier Hallot CommitDate: Wed Mar 17 12:01:56 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I588afd634bc5ff443a722561c5577f8d683ad11b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112608 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/00040501.xhp b/source/text/shared/00/00040501.xhp index 3c6a671ba..fa4408c71 100644 --- a/source/text/shared/00/00040501.xhp +++ b/source/text/shared/00/00040501.xhp @@ -48,9 +48,9 @@ - + Open context menu of a selected form element - choose Form Properties. - + diff --git a/source/text/shared/02/0117.xhp b/source/text/shared/02/0117.xhp index 382b31918..7da60477b 100644 --- a/source/text/shared/02/0117.xhp +++ b/source/text/shared/02/0117.xhp @@ -108,8 +108,8 @@ - - + + diff --git a/source/text/shared/02/01170200.xhp b/source/text/shared/02/01170200.xhp index 01c9e8c38..2e00c97ab 100644 --- a/source/text/shared/02/01170200.xhp +++ b/source/text/shared/02/01170200.xhp @@ -31,14 +31,14 @@ - + forms; propertiesproperties; forms Form Properties In this dialog you can specify, among others, the data source and the events for the whole form. - + diff --git a/source/text/shared/main0213.xhp b/source/text/shared/main0213.xhp index 8e5242e81..790dc8fc5 100644 --- a/source/text/shared/main0213.xhp +++ b/source/text/shared/main0213.xhp @@ -30,7 +30,6 @@ - toolbars; Form Navigation bar Navigation bar;forms sorting; data in forms @@ -39,7 +38,6 @@ MW changed "toolbars;..." Form Navigation Bar The Form Navigation bar contains icons to edit a database table or to control the data view. The bar is displayed at the bottom of a document that contains fields that are linked to a database. - You can use the Form Navigation bar to move within records as well as to insert and to delete records. If data is saved in a form, the changes are transferred to the database. The Form Navigation bar also contains sort, filter, and search functions for data records. You can use the Navigation bar icon on the More Controls bar to add a Navigation bar to a form. The Navigation bar is only visible for forms connected to a database. In the Design view of a form, the Navigation bar is not available. See also Table Data bar. diff --git a/source/text/swriter/main0120.xhp b/source/text/swriter/main0120.xhp index 1684b5215..bdb4a8cf2 100644 --- a/source/text/swriter/main0120.xhp +++ b/source/text/swriter/main0120.xhp @@ -41,7 +41,7 @@ - + ___ 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 5ba069caeec1055c1368c8610c662491634f5921 Author: Johnny_M AuthorDate: Wed Mar 17 12:00:48 2021 +0100 Commit: Gerrit Code Review CommitDate: Wed Mar 17 12:00:48 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 23230b3198e341db72ae7183a2aa328f39a63cc8 - tdf#132643 Translate German section IDs Change-Id: I4797eb6465845f34e7184b8d12b140c68260db1e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112605 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index dfd9e76f7ed7..23230b3198e3 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit dfd9e76f7ed79755de70053a7c7c3598e96d48d9 +Subproject commit 23230b3198e341db72ae7183a2aa328f39a63cc8 ___ 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/01/0214.xhp |2 +- source/text/scalc/01/0510.xhp |2 +- source/text/shared/00/0001.xhp |6 ++ source/text/shared/00/0005.xhp |3 +-- source/text/shared/02/1200.xhp |2 -- source/text/shared/guide/tabs.xhp |2 +- source/text/smath/01/0304.xhp |2 +- source/text/smath/01/0305.xhp |2 +- source/text/smath/01/0306.xhp |2 +- source/text/smath/01/03090100.xhp |2 +- source/text/smath/01/03090300.xhp |2 +- source/text/smath/01/03090400.xhp |2 +- source/text/smath/01/03090500.xhp |2 +- source/text/smath/01/03090600.xhp |2 +- source/text/smath/01/03090700.xhp |2 +- source/text/smath/01/03090800.xhp |2 +- 16 files changed, 16 insertions(+), 21 deletions(-) New commits: commit 23230b3198e341db72ae7183a2aa328f39a63cc8 Author: Johnny_M AuthorDate: Wed Mar 17 10:43:19 2021 +0100 Commit: Olivier Hallot CommitDate: Wed Mar 17 12:00:48 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I4797eb6465845f34e7184b8d12b140c68260db1e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112605 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/01/0214.xhp b/source/text/scalc/01/0214.xhp index 76d867937..3a9f248d7 100644 --- a/source/text/scalc/01/0214.xhp +++ b/source/text/scalc/01/0214.xhp @@ -54,7 +54,7 @@ -Call the context menu when positioned in a cell and choose Selection List. +Call the context menu when positioned in a cell and choose Selection List. diff --git a/source/text/scalc/01/0510.xhp b/source/text/scalc/01/0510.xhp index edea55a1b..0a2afb20e 100644 --- a/source/text/scalc/01/0510.xhp +++ b/source/text/scalc/01/0510.xhp @@ -155,7 +155,7 @@ Style List Displays the list of the styles from the selected style category. -In the context menu you can choose commands to create a new style, delete a user-defined style, or change the selected style. +In the context menu you can choose commands to create a new style, delete a user-defined style, or change the selected style. Style GroupsUFI: use "groups" to be consistent with Writer diff --git a/source/text/shared/00/0001.xhp b/source/text/shared/00/0001.xhp index ed294dbea..06a587c9e 100644 --- a/source/text/shared/00/0001.xhp +++ b/source/text/shared/00/0001.xhp @@ -68,13 +68,11 @@ Convert If you click forward through the dialog, this button is called Next. On the last page the button has the name Convert. The conversion is then performed by clicking the button. - + Context Menu - To activate the context menu of an object, first click the object with the left mouse button to select it, and then, while holding down the Ctrl key or the Command and Option keys, click the mouse button again click the right mouse button. Some context menus can be called even if the object has not been selected. Context menus are found just about everywhere in $[officename]. - @@ -254,7 +252,7 @@ If an error occurs, the function returns a logical or numerical value. -(This command is only accessible through the context menu). +(This command is only accessible through the context menu). By double-clicking a tool, you can use it for multiple tasks. If you call the tool with a single-click, it reverts back to the last selection after completing the task. Press Shift+F1 and point to a control to learn more about that control. diff --git a/source/text/shared/00/0005.xhp b/source/text/shared/00/0005.xhp index 812481b16..d21098403 100644 --- a/source/text/shared/00/0005.xhp +++ b/source/text/shared/00/0005.xhp @@ -71,8 +71,7 @@ Enable CTL support using %PRODUCTNAME - PreferencesTools - Options - Language Settings - Languages. - - Context Menu + diff --git a/source/text/shared/02/1200.xhp b/source/text/shared/02/1200.xhp index cc0c61d6f..6546d6f5c 100644 --- a/source/text/shared/02/1200.xhp +++ b/source/text/shared/02/1200.xhp @@ -50,7 +50,6 @@ In the data source explorer you see the data sources registered in $[officename] with their queries and tables. Establishing a connection - As soon as you select an individual table or query, a connection to the data source is established. Once the connection is opened, the name of the data source, the Queries or Tables entry, and the name of the query or table selected is shown in bold type. - Closes the connection to the data source. See %PRODUCTNAME Base - Connections in the Options dialog box. @@ -59,6 +58,5 @@ Opens the selected database file for editing.i66574 new command "Database Registrations" / but name in UI is "Registered databases" Opens a dialog to add/edit/remove a database file from the list of registered databases. The same dialog opens by choosing %PRODUCTNAME Ba
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5ba08dfad54b886896e29603265ea798637e25e3 Author: Johnny_M AuthorDate: Wed Mar 17 11:57:25 2021 +0100 Commit: Gerrit Code Review CommitDate: Wed Mar 17 11:57:25 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to dfd9e76f7ed79755de70053a7c7c3598e96d48d9 - tdf#132643 Translate German section IDs Change-Id: Iaf2ad84ab62390c87791ef3ce71da60c5c7862a3 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112606 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index bc88b90f1a9a..dfd9e76f7ed7 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit bc88b90f1a9ac821b856a0d963189797c37d3b80 +Subproject commit dfd9e76f7ed79755de70053a7c7c3598e96d48d9 ___ 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/shared/02/2403.xhp |4 ++-- source/text/shared/02/colortoolbar.xhp |4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit dfd9e76f7ed79755de70053a7c7c3598e96d48d9 Author: Johnny_M AuthorDate: Wed Mar 17 10:45:56 2021 +0100 Commit: Olivier Hallot CommitDate: Wed Mar 17 11:57:25 2021 +0100 tdf#132643 Translate German section IDs Change-Id: Iaf2ad84ab62390c87791ef3ce71da60c5c7862a3 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112606 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/02/2403.xhp b/source/text/shared/02/2403.xhp index d2bd4f7a7..b2deff09e 100644 --- a/source/text/shared/02/2403.xhp +++ b/source/text/shared/02/2403.xhp @@ -25,12 +25,12 @@ - + Red Specifies the proportion of red RGB color components for the selected graphic object. Values from -100% (no red) to +100% (full red) are possible. - + diff --git a/source/text/shared/02/colortoolbar.xhp b/source/text/shared/02/colortoolbar.xhp index 3dd1b9a88..aada8ab18 100644 --- a/source/text/shared/02/colortoolbar.xhp +++ b/source/text/shared/02/colortoolbar.xhp @@ -36,8 +36,8 @@ With the Color toolbar you can edit some properties of the selected object. To open the Color toolbar, click the Color icon on the Image toolbar. - - + + ___ 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 2690bf8b729d0674f8d3f56b426c566c4097b9df Author: Johnny_M AuthorDate: Wed Mar 17 11:56:48 2021 +0100 Commit: Gerrit Code Review CommitDate: Wed Mar 17 11:56:48 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to bc88b90f1a9ac821b856a0d963189797c37d3b80 - tdf#132643 Translate German section IDs Change-Id: Id8c1b9e78358bf522310325a45162991a7875695 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112604 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index e04720946e34..bc88b90f1a9a 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e04720946e34fa81c6a9e6b6ab3fde56a405b94d +Subproject commit bc88b90f1a9ac821b856a0d963189797c37d3b80 ___ 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/main0112.xhp |2 +- source/text/shared/02/1201.xhp |2 +- source/text/shared/main0212.xhp|2 +- source/text/shared/main0213.xhp|2 +- 4 files changed, 4 insertions(+), 4 deletions(-) New commits: commit bc88b90f1a9ac821b856a0d963189797c37d3b80 Author: Johnny_M AuthorDate: Wed Mar 17 10:24:29 2021 +0100 Commit: Olivier Hallot CommitDate: Wed Mar 17 11:56:48 2021 +0100 tdf#132643 Translate German section IDs Change-Id: Id8c1b9e78358bf522310325a45162991a7875695 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112604 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/main0112.xhp b/source/text/scalc/main0112.xhp index 7c24bee3f..ae1960cf1 100644 --- a/source/text/scalc/main0112.xhp +++ b/source/text/scalc/main0112.xhp @@ -29,7 +29,7 @@ Use the Data menu commands to edit the data in the current sheet. You can define ranges, sort and filter the data, calculate results, outline data, and create a pivot table. - + diff --git a/source/text/shared/02/1201.xhp b/source/text/shared/02/1201.xhp index 879ad2fb5..a6b02a075 100644 --- a/source/text/shared/02/1201.xhp +++ b/source/text/shared/02/1201.xhp @@ -24,7 +24,7 @@ - + Sort Ascending Sorts the data of the selected field in ascending order. Text fields are sorted alphabetically, numerical fields are sorted by number.UFI: Help ID .uno:Sortup is found in text/shared/explorer/database/1109.xhp so I deleted it here diff --git a/source/text/shared/main0212.xhp b/source/text/shared/main0212.xhp index fb9b454e6..602c6294b 100644 --- a/source/text/shared/main0212.xhp +++ b/source/text/shared/main0212.xhp @@ -66,7 +66,7 @@ - + diff --git a/source/text/shared/main0213.xhp b/source/text/shared/main0213.xhp index e90ff8927..8e5242e81 100644 --- a/source/text/shared/main0213.xhp +++ b/source/text/shared/main0213.xhp @@ -173,7 +173,7 @@ Find Record - + ___ 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 d4f66fc8dc19340aaa956ee8b1bf9baf46ad5537 Author: Johnny_M AuthorDate: Wed Mar 17 11:56:05 2021 +0100 Commit: Gerrit Code Review CommitDate: Wed Mar 17 11:56:05 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to e04720946e34fa81c6a9e6b6ab3fde56a405b94d - tdf#132643 Translate German section IDs Change-Id: I652e0f0721e4be139d458eb9ee1d8ac2eba4d027 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112506 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 388eddd88749..e04720946e34 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 388eddd88749782ec239cd87094f536e276b67f6 +Subproject commit e04720946e34fa81c6a9e6b6ab3fde56a405b94d ___ 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/shared/01/05030500.xhp |2 +- source/text/shared/02/0314.xhp |4 ++-- source/text/shared/main0204.xhp|4 ++-- source/text/swriter/main0204.xhp |4 ++-- source/text/swriter/main0215.xhp |4 ++-- source/text/swriter/main0216.xhp |4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) New commits: commit e04720946e34fa81c6a9e6b6ab3fde56a405b94d Author: Johnny_M AuthorDate: Mon Mar 15 12:54:37 2021 +0100 Commit: Olivier Hallot CommitDate: Wed Mar 17 11:56:05 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I652e0f0721e4be139d458eb9ee1d8ac2eba4d027 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112506 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/05030500.xhp b/source/text/shared/01/05030500.xhp index 8d60b1bf4..043701100 100644 --- a/source/text/shared/01/05030500.xhp +++ b/source/text/shared/01/05030500.xhp @@ -50,7 +50,7 @@ Line Click the border style that you want to apply. The style is applied to the borders selected in the preview. - + Select the line color that you want to use for the selected border(s). Padding Specify the amount of space that you want to leave between the border and the contents of the selection. diff --git a/source/text/shared/02/0314.xhp b/source/text/shared/02/0314.xhp index 7837f3a46..0b824ac19 100644 --- a/source/text/shared/02/0314.xhp +++ b/source/text/shared/02/0314.xhp @@ -25,13 +25,13 @@ - + Line Style Click this icon to open the Line Style toolbar, where you can modify the border line style. This border can be the border of a frame, graphic or table. The Line Style icon will only be visible if a graphic, table, chart object or frame has been selected. - + diff --git a/source/text/shared/main0204.xhp b/source/text/shared/main0204.xhp index f0445275e..85c1d696c 100644 --- a/source/text/shared/main0204.xhp +++ b/source/text/shared/main0204.xhp @@ -34,8 +34,8 @@ - - + + diff --git a/source/text/swriter/main0204.xhp b/source/text/swriter/main0204.xhp index 90535684b..5512bea0b 100644 --- a/source/text/swriter/main0204.xhp +++ b/source/text/swriter/main0204.xhp @@ -34,8 +34,8 @@ - - + + diff --git a/source/text/swriter/main0215.xhp b/source/text/swriter/main0215.xhp index 601b230b1..9c214cb8a 100644 --- a/source/text/swriter/main0215.xhp +++ b/source/text/swriter/main0215.xhp @@ -57,8 +57,8 @@ - - + + Background Color diff --git a/source/text/swriter/main0216.xhp b/source/text/swriter/main0216.xhp index 50b2b1def..49b6a4410 100644 --- a/source/text/swriter/main0216.xhp +++ b/source/text/swriter/main0216.xhp @@ -63,8 +63,8 @@ - - + + Object Properties ___ 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 88f499381df2127ca3093c87461df3d2a4d14a54 Author: Johnny_M AuthorDate: Wed Mar 17 11:54:51 2021 +0100 Commit: Gerrit Code Review CommitDate: Wed Mar 17 11:54:51 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 388eddd88749782ec239cd87094f536e276b67f6 - tdf#132643 Translate German section IDs Change-Id: I33b16ae21790de5963ce31fd753a95c4468056c6 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112505 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 1dfd6f32abf0..388eddd88749 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 1dfd6f32abf0b10263fb5e2331afbdc648f19825 +Subproject commit 388eddd88749782ec239cd87094f536e276b67f6 ___ 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/shared/02/0610.xhp |4 ++-- source/text/simpress/main0203.xhp |4 ++-- source/text/swriter/main0206.xhp |4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 388eddd88749782ec239cd87094f536e276b67f6 Author: Johnny_M AuthorDate: Mon Mar 15 12:50:49 2021 +0100 Commit: Olivier Hallot CommitDate: Wed Mar 17 11:54:51 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I33b16ae21790de5963ce31fd753a95c4468056c6 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112505 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/02/0610.xhp b/source/text/shared/02/0610.xhp index 1712134d0..d9a0200c9 100644 --- a/source/text/shared/02/0610.xhp +++ b/source/text/shared/02/0610.xhp @@ -28,7 +28,7 @@ - + Move Up @@ -38,7 +38,7 @@ The Move Up icon appears on the Text Formatting bar when you use the outline view. This function can be called by pressing CommandCtrl+Up Arrow. - + diff --git a/source/text/simpress/main0203.xhp b/source/text/simpress/main0203.xhp index 6b0391388..0f6e45f66 100644 --- a/source/text/simpress/main0203.xhp +++ b/source/text/simpress/main0203.xhp @@ -98,11 +98,11 @@ - + - + diff --git a/source/text/swriter/main0206.xhp b/source/text/swriter/main0206.xhp index 8030ca3a3..3de9c5ebf 100644 --- a/source/text/swriter/main0206.xhp +++ b/source/text/swriter/main0206.xhp @@ -40,8 +40,8 @@ - - + + ___ 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 647bbf517462c50bad831fcfd0d44ccd2c1b79d6 Author: Johnny_M AuthorDate: Wed Mar 17 11:53:57 2021 +0100 Commit: Gerrit Code Review CommitDate: Wed Mar 17 11:53:57 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 1dfd6f32abf0b10263fb5e2331afbdc648f19825 - tdf#132643 Translate German section IDs Change-Id: Ie1195e80e4a1a59341e2e63324863ce7cc305fa3 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112504 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 8cf1a84f8c30..1dfd6f32abf0 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 8cf1a84f8c307dda37253d240e079ce12c175295 +Subproject commit 1dfd6f32abf0b10263fb5e2331afbdc648f19825 ___ 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/shared/02/0114.xhp |4 +--- source/text/shared/main0201.xhp|4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) New commits: commit 1dfd6f32abf0b10263fb5e2331afbdc648f19825 Author: Johnny_M AuthorDate: Mon Mar 15 12:45:03 2021 +0100 Commit: Olivier Hallot CommitDate: Wed Mar 17 11:53:57 2021 +0100 tdf#132643 Translate German section IDs Change-Id: Ie1195e80e4a1a59341e2e63324863ce7cc305fa3 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112504 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/02/0114.xhp b/source/text/shared/02/0114.xhp index eb93027a1..27948c800 100644 --- a/source/text/shared/02/0114.xhp +++ b/source/text/shared/02/0114.xhp @@ -44,12 +44,11 @@ shapes MW moved "frames;" and "selecting;" to the shared guide groups.xhpMW added 5 entries - + Show Draw Functions Click to open or close the Drawing bar, where you can add shapes, lines, text, and callouts to the current document. - You can switch on and off the Drawing toolbar of Writer and Calc documents using an icon on the Standard toolbar. @@ -63,7 +62,6 @@ - You can change which buttons are visible in the toolbars. Right-click a toolbar to access the Visible Buttons command. Selection diff --git a/source/text/shared/main0201.xhp b/source/text/shared/main0201.xhp index 95884bf6f..649fd3d19 100644 --- a/source/text/shared/main0201.xhp +++ b/source/text/shared/main0201.xhp @@ -77,7 +77,7 @@ - + @@ -88,7 +88,7 @@ - + ___ 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 47f4b8366bcc9d05454ab2262b39d28821c8b8a1 Author: Johnny_M AuthorDate: Wed Mar 17 11:53:11 2021 +0100 Commit: Gerrit Code Review CommitDate: Wed Mar 17 11:53:11 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 8cf1a84f8c307dda37253d240e079ce12c175295 - tdf#132643 Translate German section IDs Change-Id: I188580eee66a36f3bd5b728c0764e1623b0caccc Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112503 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index fa336b651eb6..8cf1a84f8c30 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit fa336b651eb6bd4e020a055004913a01bee01192 +Subproject commit 8cf1a84f8c307dda37253d240e079ce12c175295 ___ 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/shared/00/00040501.xhp |2 +- source/text/shared/02/01171100.xhp |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 8cf1a84f8c307dda37253d240e079ce12c175295 Author: Johnny_M AuthorDate: Mon Mar 15 12:39:28 2021 +0100 Commit: Olivier Hallot CommitDate: Wed Mar 17 11:53:11 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I188580eee66a36f3bd5b728c0764e1623b0caccc Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112503 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/00040501.xhp b/source/text/shared/00/00040501.xhp index 83ec5dcbe..3c6a671ba 100644 --- a/source/text/shared/00/00040501.xhp +++ b/source/text/shared/00/00040501.xhp @@ -182,7 +182,7 @@ - + On Form Control toolbar, click diff --git a/source/text/shared/02/01171100.xhp b/source/text/shared/02/01171100.xhp index 01be8cbfb..c171e9b83 100644 --- a/source/text/shared/02/01171100.xhp +++ b/source/text/shared/02/01171100.xhp @@ -30,13 +30,13 @@ - + Wizards On/Off Specifies whether to start the wizard automatically when inserting a new control. This setting applies globally to all documents. - + There are wizards for inserting a list box or combo box, a table element and group boxes. ___ 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/main0208.xhp |2 +- source/text/shared/02/2004.xhp |2 +- source/text/shared/main0208.xhp|2 +- source/text/swriter/main0208.xhp |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) New commits: commit fa336b651eb6bd4e020a055004913a01bee01192 Author: Johnny_M AuthorDate: Mon Mar 15 12:36:59 2021 +0100 Commit: Olivier Hallot CommitDate: Wed Mar 17 11:51:30 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I66ba9f686ed2407e415b6e4c72e035a290235b83 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112502 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/main0208.xhp b/source/text/scalc/main0208.xhp index 5b34bb4e7..0b38f04bb 100644 --- a/source/text/scalc/main0208.xhp +++ b/source/text/scalc/main0208.xhp @@ -34,7 +34,7 @@ - + Digital Signature diff --git a/source/text/shared/02/2004.xhp b/source/text/shared/02/2004.xhp index 2193cad07..b927bdf7c 100644 --- a/source/text/shared/02/2004.xhp +++ b/source/text/shared/02/2004.xhp @@ -25,7 +25,7 @@ - + Insert Mode Displays the current insert mode. You can toggle between INSRT = insert and OVER = overwrite. This field is only active if the cursor is in the input line of the formula bar or in a cell. diff --git a/source/text/shared/main0208.xhp b/source/text/shared/main0208.xhp index c75d60e06..016f56035 100644 --- a/source/text/shared/main0208.xhp +++ b/source/text/shared/main0208.xhp @@ -37,6 +37,6 @@ - + diff --git a/source/text/swriter/main0208.xhp b/source/text/swriter/main0208.xhp index 8d72f41fe..6f060e28a 100644 --- a/source/text/swriter/main0208.xhp +++ b/source/text/swriter/main0208.xhp @@ -50,7 +50,7 @@ - + ___ 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 a3ceecdc438493a27b7e28f2b1ca61c602cb5481 Author: Johnny_M AuthorDate: Wed Mar 17 11:51:30 2021 +0100 Commit: Gerrit Code Review CommitDate: Wed Mar 17 11:51:30 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to fa336b651eb6bd4e020a055004913a01bee01192 - tdf#132643 Translate German section IDs Change-Id: I66ba9f686ed2407e415b6e4c72e035a290235b83 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112502 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index b2908642c69c..fa336b651eb6 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b2908642c69c7bf1c7759d8a28fb0144f2467295 +Subproject commit fa336b651eb6bd4e020a055004913a01bee01192 ___ 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 fd6ede3bf97628d3eabea2fb898071c1110332a4 Author: Johnny_M AuthorDate: Wed Mar 17 11:50:41 2021 +0100 Commit: Gerrit Code Review CommitDate: Wed Mar 17 11:50:41 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to b2908642c69c7bf1c7759d8a28fb0144f2467295 - tdf#132643 Translate German section IDs Change-Id: Ib4807f699bd43a14b20fd7e2e9c2b81f925f11aa Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112495 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 158c207ac80a..b2908642c69c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 158c207ac80ae531d38d90f5ad66f43c07f44bf7 +Subproject commit b2908642c69c7bf1c7759d8a28fb0144f2467295 ___ 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/sdraw/main0213.xhp |2 +- source/text/shared/02/01171200.xhp |2 +- source/text/shared/main0201.xhp|2 +- source/text/shared/main0226.xhp|2 +- source/text/simpress/main0213.xhp |2 +- 5 files changed, 5 insertions(+), 5 deletions(-) New commits: commit b2908642c69c7bf1c7759d8a28fb0144f2467295 Author: Johnny_M AuthorDate: Mon Mar 15 12:18:30 2021 +0100 Commit: Olivier Hallot CommitDate: Wed Mar 17 11:50:41 2021 +0100 tdf#132643 Translate German section IDs Change-Id: Ib4807f699bd43a14b20fd7e2e9c2b81f925f11aa Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112495 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/sdraw/main0213.xhp b/source/text/sdraw/main0213.xhp index a45f24557..fc93a9328 100644 --- a/source/text/sdraw/main0213.xhp +++ b/source/text/sdraw/main0213.xhp @@ -35,7 +35,7 @@ Display Grid - + Helplines While Moving diff --git a/source/text/shared/02/01171200.xhp b/source/text/shared/02/01171200.xhp index 21da0066f..b5868d4d6 100644 --- a/source/text/shared/02/01171200.xhp +++ b/source/text/shared/02/01171200.xhp @@ -40,7 +40,7 @@ - + diff --git a/source/text/shared/main0201.xhp b/source/text/shared/main0201.xhp index 0701ac6d6..95884bf6f 100644 --- a/source/text/shared/main0201.xhp +++ b/source/text/shared/main0201.xhp @@ -109,7 +109,7 @@ Display Grid - + Chart diff --git a/source/text/shared/main0226.xhp b/source/text/shared/main0226.xhp index c17af4e21..00c4046b1 100644 --- a/source/text/shared/main0226.xhp +++ b/source/text/shared/main0226.xhp @@ -71,7 +71,7 @@ Display Grid - + Snap to Grid Specifies that you can move objects only between grid points. diff --git a/source/text/simpress/main0213.xhp b/source/text/simpress/main0213.xhp index b804eb51e..59eaa0ff1 100644 --- a/source/text/simpress/main0213.xhp +++ b/source/text/simpress/main0213.xhp @@ -39,7 +39,7 @@ Display Grid - + Helplines While Moving ___ 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 e4a02b4aa057d4599f8a3b7a9f74783bbfe312a7 Author: Johnny_M AuthorDate: Wed Mar 17 11:49:49 2021 +0100 Commit: Gerrit Code Review CommitDate: Wed Mar 17 11:49:49 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 158c207ac80ae531d38d90f5ad66f43c07f44bf7 - tdf#132643 Translate German section IDs Change-Id: I2b1b20df6a6e268fbd48ad5287296747f9e5bafa Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112496 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index aa623cdddae3..158c207ac80a 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit aa623cdddae3b09e3891d50ce321f695d43e1397 +Subproject commit 158c207ac80ae531d38d90f5ad66f43c07f44bf7 ___ 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/main0214.xhp |4 ++-- source/text/shared/02/2402.xhp |4 ++-- source/text/simpress/main0214.xhp |4 ++-- source/text/swriter/main0203.xhp |2 +- 4 files changed, 7 insertions(+), 7 deletions(-) New commits: commit 158c207ac80ae531d38d90f5ad66f43c07f44bf7 Author: Johnny_M AuthorDate: Mon Mar 15 12:21:48 2021 +0100 Commit: Olivier Hallot CommitDate: Wed Mar 17 11:49:49 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I2b1b20df6a6e268fbd48ad5287296747f9e5bafa Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112496 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/main0214.xhp b/source/text/scalc/main0214.xhp index 6a0567ea1..75fe53fb5 100644 --- a/source/text/scalc/main0214.xhp +++ b/source/text/scalc/main0214.xhp @@ -36,8 +36,8 @@ - - + + diff --git a/source/text/shared/02/2402.xhp b/source/text/shared/02/2402.xhp index ef126763f..ba30d1f36 100644 --- a/source/text/shared/02/2402.xhp +++ b/source/text/shared/02/2402.xhp @@ -25,12 +25,12 @@ - + Graphics Mode Lists view attributes for the selected graphic object. The embedded or linked graphic object in the current file will not be changed, only the view of the object. - + diff --git a/source/text/simpress/main0214.xhp b/source/text/simpress/main0214.xhp index 3c1c7f0e1..dc0bba804 100644 --- a/source/text/simpress/main0214.xhp +++ b/source/text/simpress/main0214.xhp @@ -36,8 +36,8 @@ - - + + diff --git a/source/text/swriter/main0203.xhp b/source/text/swriter/main0203.xhp index a1baa0726..4f985d9bb 100644 --- a/source/text/swriter/main0203.xhp +++ b/source/text/swriter/main0203.xhp @@ -28,7 +28,7 @@ Image Bar The Image Bar contains functions for formatting and positioning selected bitmap graphics. - + Flip Vertically Flip Horizontally Graphics Properties ___ 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/shared/02/1402.xhp |4 ++-- source/text/shared/main0214.xhp|4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit aa623cdddae3b09e3891d50ce321f695d43e1397 Author: Johnny_M AuthorDate: Mon Mar 15 12:24:16 2021 +0100 Commit: Olivier Hallot CommitDate: Wed Mar 17 11:48:51 2021 +0100 tdf#132643 Translate German section IDs Change-Id: Ia3ee1aeb5c74b7b4871f6bbe5cfef89d54570a2c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112497 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/02/1402.xhp b/source/text/shared/02/1402.xhp index 89d20e06f..36fd6d826 100644 --- a/source/text/shared/02/1402.xhp +++ b/source/text/shared/02/1402.xhp @@ -28,12 +28,12 @@ - + Clear query Clears the query and removes all tables from the design window. - + diff --git a/source/text/shared/main0214.xhp b/source/text/shared/main0214.xhp index 14194f287..e80b3f9f2 100644 --- a/source/text/shared/main0214.xhp +++ b/source/text/shared/main0214.xhp @@ -37,8 +37,8 @@ Depending on whether you have created the query or view in the Design or SQL tab page, the following icons appear: - - + + Add Tables ___ 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 5c330f84245978f20343ba6bc2ebcc303ab9c5f6 Author: Johnny_M AuthorDate: Wed Mar 17 11:48:51 2021 +0100 Commit: Gerrit Code Review CommitDate: Wed Mar 17 11:48:51 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to aa623cdddae3b09e3891d50ce321f695d43e1397 - tdf#132643 Translate German section IDs Change-Id: Ia3ee1aeb5c74b7b4871f6bbe5cfef89d54570a2c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112497 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index ff28bcefe403..aa623cdddae3 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ff28bcefe403cbcd31fb27de8db7af8dd437473e +Subproject commit aa623cdddae3b09e3891d50ce321f695d43e1397 ___ 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 797e931d45b8b4fe179cf19850f633799cc5cbda Author: Johnny_M AuthorDate: Wed Mar 17 11:48:00 2021 +0100 Commit: Gerrit Code Review CommitDate: Wed Mar 17 11:48:00 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to ff28bcefe403cbcd31fb27de8db7af8dd437473e - tdf#132643 Translate German section IDs Change-Id: I41d176b52557a39f55e5e82162153fe902d56970 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112498 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index ff8d34fe56a1..ff28bcefe403 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ff8d34fe56a1971abe54aa77c9f2baea1f32840b +Subproject commit ff28bcefe403cbcd31fb27de8db7af8dd437473e ___ 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/shared/02/1207.xhp |2 +- source/text/shared/main0212.xhp|2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit ff28bcefe403cbcd31fb27de8db7af8dd437473e Author: Johnny_M AuthorDate: Mon Mar 15 12:27:13 2021 +0100 Commit: Olivier Hallot CommitDate: Wed Mar 17 11:48:00 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I41d176b52557a39f55e5e82162153fe902d56970 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112498 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/02/1207.xhp b/source/text/shared/02/1207.xhp index dde2eb1ba..738ee5f8e 100644 --- a/source/text/shared/02/1207.xhp +++ b/source/text/shared/02/1207.xhp @@ -34,7 +34,7 @@ Insert Database Columns Inserts all fields of the marked record into the current document at the cursor position. The icon is only visible if the current document is a text document or a spreadsheet. - + diff --git a/source/text/shared/main0212.xhp b/source/text/shared/main0212.xhp index 2e534a1da..fb9b454e6 100644 --- a/source/text/shared/main0212.xhp +++ b/source/text/shared/main0212.xhp @@ -81,7 +81,7 @@ Data to Text Inserts all fields of the marked record into the current document at the cursor position. - + Help ID is here because we need it in shared since the F4 browser has another context "sdatabase" so I had to move the Help ID from the swriter folder ___ 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 1ed2accfc3e95474ffaa69d28b45af750dcca633 Author: Johnny_M AuthorDate: Wed Mar 17 11:47:17 2021 +0100 Commit: Gerrit Code Review CommitDate: Wed Mar 17 11:47:17 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to ff8d34fe56a1971abe54aa77c9f2baea1f32840b - tdf#132643 Translate German section IDs Change-Id: I5f6fba58998bc14cc32676525cea0fd2ebb82291 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112500 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 0b7250bd4e8a..ff8d34fe56a1 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 0b7250bd4e8a237643db7c9ed416d1a89ae7f09f +Subproject commit ff8d34fe56a1971abe54aa77c9f2baea1f32840b ___ 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/main0203.xhp |4 ++-- source/text/shared/02/0509.xhp |4 ++-- source/text/simpress/main_format.xhp |2 +- source/text/swriter/main0205.xhp |4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) New commits: commit ff8d34fe56a1971abe54aa77c9f2baea1f32840b Author: Johnny_M AuthorDate: Mon Mar 15 12:34:49 2021 +0100 Commit: Olivier Hallot CommitDate: Wed Mar 17 11:47:17 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I5f6fba58998bc14cc32676525cea0fd2ebb82291 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112500 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/main0203.xhp b/source/text/scalc/main0203.xhp index 24ffe1dbf..deee51981 100644 --- a/source/text/scalc/main0203.xhp +++ b/source/text/scalc/main0203.xhp @@ -53,8 +53,8 @@ Background Color - - + + diff --git a/source/text/shared/02/0509.xhp b/source/text/shared/02/0509.xhp index 5596a9e9e..e4d0c79b6 100644 --- a/source/text/shared/02/0509.xhp +++ b/source/text/shared/02/0509.xhp @@ -28,7 +28,7 @@ - + Rotate Rotates the selected object. @@ -36,7 +36,7 @@ Select an object and click the Rotate icon on the Drawing toolbar. Select an object and click the Rotate icon on the Drawing toolbar. Select an object and click the Rotate icon on the Drawing Object Properties toolbar. Drag a corner handle of the object in the direction you want to rotate it. - + diff --git a/source/text/simpress/main_format.xhp b/source/text/simpress/main_format.xhp index ca95949cd..2a22f6377 100644 --- a/source/text/simpress/main_format.xhp +++ b/source/text/simpress/main_format.xhp @@ -60,7 +60,7 @@ - + diff --git a/source/text/swriter/main0205.xhp b/source/text/swriter/main0205.xhp index 4a05865ab..33377db65 100644 --- a/source/text/swriter/main0205.xhp +++ b/source/text/swriter/main0205.xhp @@ -51,8 +51,8 @@ Area Style/Filling - - + + ___ 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/sdraw/main0210.xhp |4 ++-- source/text/shared/02/1801.xhp |4 ++-- source/text/simpress/main0210.xhp |4 ++-- source/text/simpress/main0212.xhp |4 ++-- source/text/smath/01/0309.xhp |2 +- source/text/smath/main0103.xhp |2 +- 6 files changed, 10 insertions(+), 10 deletions(-) New commits: commit 0b7250bd4e8a237643db7c9ed416d1a89ae7f09f Author: Johnny_M AuthorDate: Mon Mar 15 12:32:01 2021 +0100 Commit: Olivier Hallot CommitDate: Wed Mar 17 11:46:31 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I60ada0ec1e3040ea00ad20869baac002589c5c19 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112499 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/sdraw/main0210.xhp b/source/text/sdraw/main0210.xhp index 70b0bd7a4..8402815ae 100644 --- a/source/text/sdraw/main0210.xhp +++ b/source/text/sdraw/main0210.xhp @@ -28,8 +28,8 @@ Drawing Bar The Drawing bar holds the main drawing tools. - - + + Rectangle Draws a filled rectangle where you drag in the current document. Click where you want to place a corner of the rectangle, and drag to the size you want. To draw a square, hold down Shift while you drag. diff --git a/source/text/shared/02/1801.xhp b/source/text/shared/02/1801.xhp index 05b235271..0e8d7e2da 100644 --- a/source/text/shared/02/1801.xhp +++ b/source/text/shared/02/1801.xhp @@ -25,12 +25,12 @@ - + Selection Allows you to select objects in the current document. - + diff --git a/source/text/simpress/main0210.xhp b/source/text/simpress/main0210.xhp index 5422677a3..a8b2191ca 100644 --- a/source/text/simpress/main0210.xhp +++ b/source/text/simpress/main0210.xhp @@ -40,8 +40,8 @@ To remove a selection, click anywhere outside the selected object, or press Escape. - - + + Rectangle Draws a filled rectangle where you drag in the current document. Click where you want to place a corner of the rectangle, and drag to the size you want. To draw a square, hold down Shift while you drag. diff --git a/source/text/simpress/main0212.xhp b/source/text/simpress/main0212.xhp index defa6982d..3821c7b09 100644 --- a/source/text/simpress/main0212.xhp +++ b/source/text/simpress/main0212.xhp @@ -34,8 +34,8 @@ Slide Sorter Bar In Slide Sorter view, the Slide Sorter bar can be used. - - + + Slide Show diff --git a/source/text/smath/01/0309.xhp b/source/text/smath/01/0309.xhp index 78670e698..90980a4e8 100644 --- a/source/text/smath/01/0309.xhp +++ b/source/text/smath/01/0309.xhp @@ -27,7 +27,7 @@ - + selection options in formulas formulas; selections diff --git a/source/text/smath/main0103.xhp b/source/text/smath/main0103.xhp index c45400706..e412badf1 100644 --- a/source/text/smath/main0103.xhp +++ b/source/text/smath/main0103.xhp @@ -39,7 +39,7 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - helpcontent2 sw/source
helpcontent2 |2
sw/source/core/text/porhyph.hxx |8 +--
sw/source/core/text/pormulti.cxx | 91 +++
sw/source/core/text/porref.cxx | 10 ++--
sw/source/core/text/porref.hxx |2
sw/source/core/text/portox.cxx | 10 ++--
sw/source/core/text/portox.hxx |2
sw/source/core/text/txthyph.cxx | 10 ++--
8 files changed, 67 insertions(+), 68 deletions(-)
New commits:
commit 530b87b73eb509a32a2154b7a75b4d56abd0e381
Author: Johnny_M
AuthorDate: Wed Mar 17 11:46:31 2021 +0100
Commit: Gerrit Code Review
CommitDate: Wed Mar 17 11:46:31 2021 +0100
Update git submodules
* Update helpcontent2 from branch 'master'
to 0b7250bd4e8a237643db7c9ed416d1a89ae7f09f
- tdf#132643 Translate German section IDs
Change-Id: I60ada0ec1e3040ea00ad20869baac002589c5c19
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112499
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/helpcontent2 b/helpcontent2
index a218d09ebd42..0b7250bd4e8a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a218d09ebd42ac46902331ddea406f17ca75c576
+Subproject commit 0b7250bd4e8a237643db7c9ed416d1a89ae7f09f
commit c414683608f0500ffb71c6f91ac31ea6a6080274
Author: Miklos Vajna
AuthorDate: Tue Mar 16 20:51:58 2021 +0100
Commit: Miklos Vajna
CommitDate: Wed Mar 17 11:46:15 2021 +0100
sw: prefix members of SwIsoRefPortion, SwIsoToxPortion, ...
... SwSoftHyphPortion and SwSpaceManipulator
See tdf#94879 for motivation.
Change-Id: Ib7034bfa158885d23cf51b9db2e8f7095885cf39
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112595
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/source/core/text/porhyph.hxx b/sw/source/core/text/porhyph.hxx
index bbc799349752..1deccb036255 100644
--- a/sw/source/core/text/porhyph.hxx
+++ b/sw/source/core/text/porhyph.hxx
@@ -57,8 +57,8 @@ public:
class SwSoftHyphPortion : public SwHyphPortion
{
-boolbExpand;
-sal_uInt16 nViewWidth;
+boolm_bExpand;
+sal_uInt16 m_nViewWidth;
public:
SwSoftHyphPortion();
@@ -67,8 +67,8 @@ public:
virtual void Paint( const SwTextPaintInfo &rInf ) const override;
virtual bool Format( SwTextFormatInfo &rInf ) override;
virtual void FormatEOL( SwTextFormatInfo &rInf ) override;
-void SetExpand( const bool bNew ) { bExpand = bNew; }
-bool IsExpand() const { return bExpand; }
+void SetExpand( const bool bNew ) { m_bExpand = bNew; }
+bool IsExpand() const { return m_bExpand; }
virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const
override;
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index 4f75a5765356..c51fb973ad29 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -1409,86 +1409,85 @@ namespace {
// The destructor restores the values of the last manipulation.
class SwSpaceManipulator
{
-SwTextPaintInfo& rInfo;
-SwMultiPortion& rMulti;
-std::vector* pOldSpaceAdd;
-sal_uInt16 nOldSpIdx;
-tools::Long nSpaceAdd;
-bool bSpaceChg;
-sal_uInt8 nOldDir;
+SwTextPaintInfo& m_rInfo;
+SwMultiPortion& m_rMulti;
+std::vector* m_pOldSpaceAdd;
+sal_uInt16 m_nOldSpaceIndex;
+tools::Long m_nSpaceAdd;
+bool m_bSpaceChg;
+sal_uInt8 m_nOldDir;
+
public:
SwSpaceManipulator( SwTextPaintInfo& rInf, SwMultiPortion& rMult );
~SwSpaceManipulator();
void SecondLine();
-tools::Long GetSpaceAdd() const { return nSpaceAdd; }
+tools::Long GetSpaceAdd() const { return m_nSpaceAdd; }
};
}
-SwSpaceManipulator::SwSpaceManipulator( SwTextPaintInfo& rInf,
-SwMultiPortion& rMult )
-: rInfo(rInf)
-, rMulti(rMult)
-, nSpaceAdd(0)
+SwSpaceManipulator::SwSpaceManipulator(SwTextPaintInfo& rInf, SwMultiPortion&
rMult)
+: m_rInfo(rInf)
+, m_rMulti(rMult)
+, m_nSpaceAdd(0)
{
-pOldSpaceAdd = rInfo.GetpSpaceAdd();
-nOldSpIdx = rInfo.GetSpaceIdx();
-nOldDir = rInfo.GetDirection();
-rInfo.SetDirection( rMulti.GetDirection() );
-bSpaceChg = false;
+m_pOldSpaceAdd = m_rInfo.GetpSpaceAdd();
+m_nOldSpaceIndex = m_rInfo.GetSpaceIdx();
+m_nOldDir = m_rInfo.GetDirection();
+m_rInfo.SetDirection(m_rMulti.GetDirection());
+m_bSpaceChg = false;
-if( rMulti.IsDouble() )
+if (m_rMulti.IsDouble())
{
-nSpaceAdd = ( pOldSpaceAdd && !rMulti.HasTabulator() ) ?
- rInfo.GetSpaceAdd() : 0;
-if( rMulti.GetRoot().IsSpaceAdd() )
+m_nSpaceAdd = (m_pOldSpaceAdd && !m_rMulti.HasTabulator()) ?
m_rInfo.GetSpaceAdd() : 0;
+if (m_rMulti.GetRoot().IsSpaceAdd())
{
-rInfo.SetpSpaceAdd( rMulti.GetRoot().GetpLLSpaceAdd() );
-rInfo.ResetSpaceIdx();
-bSpaceChg = rMul
ANN: renaming of master branch to "main" for core repository and submodules (dictionaries, help, translations)
Hi *,
as requested and announced in previous ESC-minutes and infra-call
minutes, master branch will be renamed for the LibreOffice core
repositories and the submodules used by LibreOffice (dictionaries,
help, translations).
Current plan is to do the switchover on April 1st
If you have objections to this date or the plan laid out below (for
current changes please see also
https://redmine.documentfoundation.org/issues/3442 please raise your
concerns ASAP)
What will be done?
* git branch rename from master → main for LibreOffice-repos only
(core, dictionaries, help, translations)
more specifically creation of a new main branch main from master and
setting the default branch for those repositories to the new name)
** pushes (submitting to actual branch) to the master branch will be
prohibited by the ACL (permissions)
** final commit on master branch will be a change to .gitreview to use
the new name as default and to logerrit using main as target branch if
the current local branch is master
** it will be a hard cut, main will continue where master stopped,
master won't receive any more commits
** open changes for master branch will be moved to the new branch
using gerrit's "move change" feature (that keeps the current parent,
so it is not a rebase)
** pushing to refs/for/master (i.e. creating new changesets) will be
allowed for a transition period, but jenkins will immediately ask to
move the change to the new branch (not done automatically, to make
people also change their local branch configuration/upstream settings)
* adjusting of jenkins' gerrit-trigger and tinderboxes to use the new
branch name
* adjusting of the bugzilla-status-notification ("fixed in version x")
bot to use the new branch name
What won't be done at that stage:
* update of all the documentation/wiki pages mentioning master (that's
a community effort, no deadline, if you stumble upon mentions of
master poke #infra or change in wiki yourself :-))
* renaming of auxiliary repositories (like the intermediate repository
used for weblate). Projects will be renamed, but weblate itself will
still use "master" branch in the underlying repo, any change there
will be postponed until 7.2 projects will be created)
* dashboard will not have any custom migration, instead repository
data will be rebuilt/reimported from scratch
ciao
Christian
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2102a1b0e3c5ffeca63e6808e9f9b575359755fe Author: Johnny_M AuthorDate: Wed Mar 17 11:45:34 2021 +0100 Commit: Gerrit Code Review CommitDate: Wed Mar 17 11:45:34 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to a218d09ebd42ac46902331ddea406f17ca75c576 - tdf#132643 Translate German section IDs Change-Id: I0f539b984122bd1332982f12a2e92dbff6e516c2 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112494 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 09799dd8cd57..a218d09ebd42 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 09799dd8cd57f5971241ba7a5a3365220d106407 +Subproject commit a218d09ebd42ac46902331ddea406f17ca75c576 ___ 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/main0210.xhp |4 ++-- source/text/shared/02/1002.xhp |4 ++-- source/text/swriter/main0210.xhp |4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) New commits: commit a218d09ebd42ac46902331ddea406f17ca75c576 Author: Johnny_M AuthorDate: Mon Mar 15 12:15:04 2021 +0100 Commit: Olivier Hallot CommitDate: Wed Mar 17 11:45:34 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I0f539b984122bd1332982f12a2e92dbff6e516c2 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/112494 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/main0210.xhp b/source/text/scalc/main0210.xhp index fe0d0be62..436bba9cf 100644 --- a/source/text/scalc/main0210.xhp +++ b/source/text/scalc/main0210.xhp @@ -36,8 +36,8 @@ - - + + diff --git a/source/text/shared/02/1002.xhp b/source/text/shared/02/1002.xhp index 27189424a..bd5fa882a 100644 --- a/source/text/shared/02/1002.xhp +++ b/source/text/shared/02/1002.xhp @@ -28,13 +28,13 @@ - + Next Page Moves forward to the next page in the document. This function is only active when you select the Print Preview function on the File menu. - + diff --git a/source/text/swriter/main0210.xhp b/source/text/swriter/main0210.xhp index b6775a513..4dc141917 100644 --- a/source/text/swriter/main0210.xhp +++ b/source/text/swriter/main0210.xhp @@ -35,8 +35,8 @@ - - + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/timar/pythonupgrademsp' - external/python3
external/python3/macos-11.patch.0 | 25 ++---
1 file changed, 2 insertions(+), 23 deletions(-)
New commits:
commit 55b38e9ec099713e31d3cdeb7079748311aaa221
Author: Andras Timar
AuthorDate: Wed Mar 17 10:59:31 2021 +0100
Commit: Andras Timar
CommitDate: Wed Mar 17 11:07:22 2021 +0100
Amend python3/macos-11.patch.0 after upgrade to Python 3.7.10
Change-Id: I27040845f1f526cf1116726f0bcabd8b1a023e68
diff --git a/external/python3/macos-11.patch.0
b/external/python3/macos-11.patch.0
index 3a3da0e99bac..42b74f4b2f50 100644
--- a/external/python3/macos-11.patch.0
+++ b/external/python3/macos-11.patch.0
@@ -1,25 +1,4 @@
-*- Mode: diff -*-
configure
-+++ configure
-@@ -3374,7 +3374,7 @@
- # has no effect, don't bother defining them
- Darwin/[6789].*)
- define_xopen_source=no;;
-- Darwin/1[0-9].*)
-+ Darwin/[12][0-9].*)
- define_xopen_source=no;;
- # On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but
- # used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined
-@@ -9372,6 +9275,9 @@
- esac
- else
- case `/usr/bin/arch` in
-+ arm64)
-+ MACOSX_DEFAULT_ARCH="arm64"
-+ ;;
- i386)
- MACOSX_DEFAULT_ARCH="x86_64"
- ;;
--- Mac/Tools/pythonw.c
+++ Mac/Tools/pythonw.c
@@ -121,6 +121,8 @@
@@ -36,7 +15,7 @@
@@ -670,7 +670,10 @@
add_dir_to_list(self.compiler.include_dirs,
sysconfig.get_config_var("INCLUDEDIR"))
-
+
-system_lib_dirs = ['/lib64', '/usr/lib64', '/lib', '/usr/lib']
+if host_platform == 'darwin':
+system_lib_dirs = ['/usr/lib', macosx_sdk_root()+'/usr/lib']
@@ -62,7 +41,7 @@
@@ -31,6 +31,8 @@
# define SYS_getdents64 __NR_getdents64
#endif
-
+
+#include
+
#if defined(__sun) && defined(__SVR4)
___
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' - xmlsecurity/source
xmlsecurity/source/helper/xmlsignaturehelper.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 52a23d595b820cab27d76d0e7c129f2757c762d6
Author: Caolán McNamara
AuthorDate: Thu Mar 11 20:23:31 2021 +
Commit: Michael Stahl
CommitDate: Wed Mar 17 11:04:38 2021 +0100
do same set error state as ReadAndVerifySignature does
this function is nearly exactly the same as ReadAndVerifySignature
except it doesn't set error-state on exception during parse
Change-Id: Ife881f639a11d3185920ca62cc2cd22812fae36d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112366
Tested-by: Jenkins
Reviewed-by: Michael Stahl
Reviewed-by: Miklos Vajna
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112412
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index 6ec834053a17..22c056e70da1 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -402,6 +402,7 @@ bool
XMLSignatureHelper::ReadAndVerifySignatureStorageStream(const css::uno::Ref
catch(const uno::Exception&)
{
DBG_UNHANDLED_EXCEPTION("xmlsecurity.helper");
+mbError = true;
}
mpXSecController->releaseSignatureReader();
___
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' - setup_native/scripts
setup_native/scripts/osx_install_languagepack.applescript |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 78f69c686c9f8b40fbd183dde71e94d4d7a729ab
Author: Christian Lohmaier
AuthorDate: Fri Mar 12 12:25:30 2021 +0100
Commit: Michael Stahl
CommitDate: Wed Mar 17 11:04:20 2021 +0100
tdf#134607 use kMDItemFSName instead of _kMDItemDisplayNameWithExtensions
apparently the latter is not available on older versions of macOS.
https://developer.apple.com/documentation/coreservices/kmditemfsname
lists it as in version 10.4 and not flagged as deprecated, so keeping
fingers crossed that it is not affected by user-settings or similar…
Change-Id: I208d22f2abd628e7d95babc23ddb145a88bcf5cc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112385
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier
(cherry picked from commit daa162c20f4c7d61edc217ed44cb2854652a63ec)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112527
Reviewed-by: Michael Stahl
diff --git a/setup_native/scripts/osx_install_languagepack.applescript
b/setup_native/scripts/osx_install_languagepack.applescript
index bc793a510c8d..4083b01cd97c 100644
--- a/setup_native/scripts/osx_install_languagepack.applescript
+++ b/setup_native/scripts/osx_install_languagepack.applescript
@@ -66,7 +66,7 @@ end if
set found_ooos_all to ""
-- command might return an error if spotlight is disabled completely
try
- set found_ooos_all to (do shell script "mdfind \"kMDItemContentType ==
'com.apple.application-bundle' && _kMDItemDisplayNameWithExtensions ==
'[PRODUCTNAME].app'\"")
+ set found_ooos_all to (do shell script "mdfind \"kMDItemContentType ==
'com.apple.application-bundle' && kMDItemFSName == '[PRODUCTNAME].app'\"")
end try
set found_ooos_all to found_ooos_all & "
" & chooseMyOwn
@@ -126,7 +126,7 @@ end if
-- now only check whether the path is really from [PRODUCTNAME]
try
- do shell script "mdls --raw --name _kMDItemDisplayNameWithExtensions
--name kMDItemVersion " & quoted form of (choice as string) & " | xargs -0 |
fgrep '[PRODUCTNAME].app [PRODUCTVERSION]'"
+ do shell script "mdls --raw --name kMDItemFSName --name kMDItemVersion
" & quoted form of (choice as string) & " | xargs -0 | fgrep '[PRODUCTNAME].app
[PRODUCTVERSION]'"
on error
display dialog (choice as string) & appInvalid buttons {InstallLabel}
default button 1 with icon 0
return 3 --wrong target-directory
___
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' - setup_native/scripts
setup_native/scripts/osx_install_languagepack.applescript |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 00ce3c5c8238035dc0c470e54f055b2406bffd64
Author: Christian Lohmaier
AuthorDate: Fri Mar 12 12:25:30 2021 +0100
Commit: Michael Stahl
CommitDate: Wed Mar 17 11:04:02 2021 +0100
tdf#134607 use kMDItemFSName instead of _kMDItemDisplayNameWithExtensions
apparently the latter is not available on older versions of macOS.
https://developer.apple.com/documentation/coreservices/kmditemfsname
lists it as in version 10.4 and not flagged as deprecated, so keeping
fingers crossed that it is not affected by user-settings or similar…
Change-Id: I208d22f2abd628e7d95babc23ddb145a88bcf5cc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112385
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier
(cherry picked from commit daa162c20f4c7d61edc217ed44cb2854652a63ec)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112528
Reviewed-by: Michael Stahl
diff --git a/setup_native/scripts/osx_install_languagepack.applescript
b/setup_native/scripts/osx_install_languagepack.applescript
index bc793a510c8d..4083b01cd97c 100644
--- a/setup_native/scripts/osx_install_languagepack.applescript
+++ b/setup_native/scripts/osx_install_languagepack.applescript
@@ -66,7 +66,7 @@ end if
set found_ooos_all to ""
-- command might return an error if spotlight is disabled completely
try
- set found_ooos_all to (do shell script "mdfind \"kMDItemContentType ==
'com.apple.application-bundle' && _kMDItemDisplayNameWithExtensions ==
'[PRODUCTNAME].app'\"")
+ set found_ooos_all to (do shell script "mdfind \"kMDItemContentType ==
'com.apple.application-bundle' && kMDItemFSName == '[PRODUCTNAME].app'\"")
end try
set found_ooos_all to found_ooos_all & "
" & chooseMyOwn
@@ -126,7 +126,7 @@ end if
-- now only check whether the path is really from [PRODUCTNAME]
try
- do shell script "mdls --raw --name _kMDItemDisplayNameWithExtensions
--name kMDItemVersion " & quoted form of (choice as string) & " | xargs -0 |
fgrep '[PRODUCTNAME].app [PRODUCTVERSION]'"
+ do shell script "mdls --raw --name kMDItemFSName --name kMDItemVersion
" & quoted form of (choice as string) & " | xargs -0 | fgrep '[PRODUCTNAME].app
[PRODUCTVERSION]'"
on error
display dialog (choice as string) & appInvalid buttons {InstallLabel}
default button 1 with icon 0
return 3 --wrong target-directory
___
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' - sd/qa svx/source
sd/qa/unit/misc-tests.cxx | 35 ++
svx/source/table/tablemodel.cxx | 61 ++--
2 files changed, 70 insertions(+), 26 deletions(-)
New commits:
commit eeeb3a422e25c22201e1325154f1913df3942f2a
Author: Mark Hung
AuthorDate: Thu Mar 11 23:44:06 2021 +0800
Commit: Michael Stahl
CommitDate: Wed Mar 17 11:00:44 2021 +0100
tdf#136956 reorder undo actions in removeColumns
and removeRows. Inside the removeColumns and removeRows, undo actions
are added first, and then cell spans are updated to reflect the removed
columns or rows. Once undo the cell spans they become immediately
invalid because the rows or columns are already removed, hence cause
Impress to crash.
Change-Id: I9d8641bdad43026eca03cbeaaa3a5907b516304f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112355
Tested-by: Jenkins
Reviewed-by: Mark Hung
(cherry picked from commit f3f7cc53efda828af8897fa45fa2a8f18cf3b48b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112526
Reviewed-by: Michael Stahl
diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx
index 52c3b55513be..75818805295a 100644
--- a/sd/qa/unit/misc-tests.cxx
+++ b/sd/qa/unit/misc-tests.cxx
@@ -27,6 +27,8 @@
#include
#include
#include
+#include
+#include
#include
#include
@@ -83,6 +85,7 @@ public:
void testTdf130988();
void testTdf131033();
void testTdf129898LayerDrawnInSlideshow();
+void testTdf136956();
CPPUNIT_TEST_SUITE(SdMiscTest);
CPPUNIT_TEST(testTdf96206);
@@ -104,6 +107,7 @@ public:
CPPUNIT_TEST(testTdf130988);
CPPUNIT_TEST(testTdf131033);
CPPUNIT_TEST(testTdf129898LayerDrawnInSlideshow);
+CPPUNIT_TEST(testTdf136956);
CPPUNIT_TEST_SUITE_END();
virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override
@@ -875,6 +879,37 @@ void SdMiscTest::testTdf129898LayerDrawnInSlideshow()
xDocShRef->DoClose();
}
+void SdMiscTest::testTdf136956()
+{
+::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/cellspan.odp"), ODP);
+
+const SdrPage *pPage = GetPage( 1, xDocShRef );
+sdr::table::SdrTableObj *pTableObj =
dynamic_cast(pPage->GetObj(0));
+CPPUNIT_ASSERT( pTableObj );
+uno::Reference< table::XTable > xTable(pTableObj->getTable(),
uno::UNO_SET_THROW);
+
+uno::Reference< css::table::XMergeableCellRange > xRange(
+xTable->createCursorByRange( xTable->getCellRangeByPosition( 0, 0,
3, 2 ) ), uno::UNO_QUERY_THROW );
+
+// 4x3 Table before merge.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4), xTable->getColumnCount());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xTable->getRowCount());
+
+xRange->merge();
+
+// 1x1 Table after merge.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getColumnCount());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getRowCount());
+
+xDocShRef->GetUndoManager()->Undo();
+
+// 4x3 Table after undo. Undo crashed before.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4), xTable->getColumnCount());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xTable->getRowCount());
+
+xDocShRef->DoClose();
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SdMiscTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index d7d04191163c..993535a52ec7 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -694,24 +694,6 @@ void TableModel::removeColumns( sal_Int32 nIndex,
sal_Int32 nCount )
{
rModel.BegUndo( SvxResId(STR_UNDO_COL_DELETE) );
rModel.AddUndo(
rModel.GetSdrUndoFactory().CreateUndoGeoObject(*mpTableObj) );
-
-TableModelRef xThis( this );
-ColumnVector aRemovedCols( nCount );
-sal_Int32 nOffset;
-for( nOffset = 0; nOffset < nCount; ++nOffset )
-{
-aRemovedCols[nOffset] = maColumns[nIndex+nOffset];
-}
-
-CellVector aRemovedCells( nCount * nRows );
-CellVector::iterator aCellIter( aRemovedCells.begin() );
-for( sal_Int32 nRow = 0; nRow < nRows; ++nRow )
-{
-for( nOffset = 0; nOffset < nCount; ++nOffset )
-(*aCellIter++) = getCell( nIndex + nOffset, nRow );
-}
-
-rModel.AddUndo( std::make_unique( xThis, nIndex,
aRemovedCols, aRemovedCells ) );
}
// only rows before and inside the removed rows are considered
@@ -758,6 +740,29 @@ void TableModel::removeColumns( sal_Int32 nIndex,
sal_Int32 nCount )
}
}
+// We must not add RemoveColUndo before we make cell spans correct,
otherwise we
+// get invalid cell span after undo.
+if( bUndo )
+{
+TableModelRef xThis( this );
+ColumnVector aRemovedCols( nCount );
+sal_Int32 nOffset;
+f
[Libreoffice-commits] core.git: solenv/clang-format sw/CppunitTest_sw_odfexport2.mk sw/Module_sw.mk sw/qa sw/source
solenv/clang-format/excludelist |1 sw/CppunitTest_sw_odfexport2.mk | 72 sw/Module_sw.mk |1 sw/qa/core/data/README | 16 +++ sw/qa/core/layout/data/tdf45908_invoice.odt |binary sw/qa/core/layout/layout.cxx|6 + sw/qa/extras/odfexport/data/testTdf52065_centerTabs.odt |binary sw/qa/extras/odfexport/odfexport2.cxx | 45 ++ sw/source/core/text/porlin.hxx |2 sw/source/core/text/txttab.cxx |5 + 10 files changed, 148 insertions(+) New commits: commit b6850b9827a13b8f8d9b9749a982e128b7e0e867 Author: Justin Luth AuthorDate: Tue Mar 16 10:16:02 2021 +0200 Commit: Miklos Vajna CommitDate: Wed Mar 17 09:28:46 2021 +0100 tdf#52065 sw: revert tdf#45908: Cleaning up the tabs too early ... can cause loops from LO 3.5 commit 36c905d8c2874f6f984d5fbbc07784ec20c43524 The PostFormat for Center and Decimal tabstops is critical since the space they take up is unknown until the following text is evaluated. The search position in these two cases is invalid until the text position is calculated by PostFormat. PostFormat normally returns FALSE, so in almost all cases the rest of NewTabPortion completes. The function only returned early if the start of the tabstop was beyond the right margin. I assume the original intent was to avoid potentially unnecessary processing. However, returning early can cause looping, which the LO 3.5 commit "fixed" by removing everything. Well, just remove the early return and both problems are solved. Change-Id: I4afc4cce8249f90097bc1f263df1a39bc219098d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112559 Tested-by: Jenkins Reviewed-by: Justin Luth Reviewed-by: Miklos Vajna diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index bd07aeebc58f..9aacb7ba1b77 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -12320,6 +12320,7 @@ sw/qa/extras/globalfilter/globalfilter.cxx sw/qa/extras/htmlimport/htmlimport.cxx sw/qa/extras/mailmerge/mailmerge.cxx sw/qa/extras/odfexport/odfexport.cxx +sw/qa/extras/odfexport/odfexport2.cxx sw/qa/extras/odfimport/odfimport.cxx sw/qa/extras/ooxmlexport/ooxmlexport.cxx sw/qa/extras/ooxmlexport/ooxmlexport10.cxx diff --git a/sw/CppunitTest_sw_odfexport2.mk b/sw/CppunitTest_sw_odfexport2.mk new file mode 100644 index ..4ad073a9e2e2 --- /dev/null +++ b/sw/CppunitTest_sw_odfexport2.mk @@ -0,0 +1,72 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#* +# +# 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/. +# +#* + +$(eval $(call gb_CppunitTest_CppunitTest,sw_odfexport2)) + +$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_odfexport2)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sw_odfexport2, \ +sw/qa/extras/odfexport/odfexport2 \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sw_odfexport2, \ +comphelper \ +cppu \ +cppuhelper \ +sal \ +sfx \ +svl \ +sw \ +swqahelper \ +test \ +tl \ +unotest \ +utl \ +vcl \ +)) + +$(eval $(call gb_CppunitTest_use_externals,sw_odfexport2,\ +boost_headers \ +libxml2 \ +)) + +$(eval $(call gb_CppunitTest_set_include,sw_odfexport2,\ +-I$(SRCDIR)/sw/inc \ +-I$(SRCDIR)/sw/source/core/inc \ +-I$(SRCDIR)/sw/qa/inc \ +$$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_api,sw_odfexport2,\ +udkapi \ +offapi \ +oovbaapi \ +)) + +$(eval $(call gb_CppunitTest_use_ure,sw_odfexport2)) +$(eval $(call gb_CppunitTest_use_vcl,sw_odfexport2)) + +$(eval $(call gb_CppunitTest_use_rdb,sw_odfexport2,services)) + +$(eval $(call gb_CppunitTest_use_custom_headers,sw_odfexport2,\ +officecfg/registry \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,sw_odfexport2)) + +$(eval $(call gb_CppunitTest_use_uiconfigs,sw_odfexport2, \ +modules/swriter \ +svx \ +)) + +$(eval $(call gb_CppunitTest_use_more_fonts,sw_odfexport2)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index 75bf13e75231..07a79c3ad951 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -96,6 +96,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\ CppunitTest_sw_ww8import \ CppunitTest_sw_rtfimport \ CppunitTest_sw_odfexport \ +CppunitTest_sw_odfexport2 \ CppunitTest_sw_odfim
Re: Unit Tests failing when built with clang 12
On 16/03/2021 23:05, slacka wrote: Yes, I just verified that you'll need an --enable-optimized build to reproduce this failure. When I built with clang 12 + --enable-debug, all unit tests passed. though a Clang 13 trunk build with --enable-optimized (and --disable-debug, --disable-dbgutil) runs UITest_calc_tests9 successfully for me ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 719ca339f54698482087e17e2271e18ec10de142 Author: Samuel Mehrbrodt AuthorDate: Tue Mar 16 16:27:35 2021 +0100 Commit: Samuel Mehrbrodt CommitDate: Wed Mar 17 08:50:11 2021 +0100 Fix indentation Change-Id: Ibcab3f6cd41a286ec720ba2bd3fdca16b26aa664 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112583 Tested-by: Samuel Mehrbrodt Reviewed-by: Samuel Mehrbrodt diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index f6f87e53c1f3..5f51032addb5 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -3616,7 +3616,7 @@ List of Favorite characters - + € ¥ £ ___ 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/source
sc/source/ui/view/hintwin.cxx | 15 +++
1 file changed, 15 insertions(+)
New commits:
commit b6e705ec690b9911ce44f3e6cb1273737449f186
Author: Noel Grandin
AuthorDate: Sat Mar 13 20:35:12 2021 +0200
Commit: Noel Grandin
CommitDate: Wed Mar 17 08:25:05 2021 +0100
tdf#140986 hang in validity message
this doesn't fix the root of the problem (something generating an
insanely long validation message).
It just prevents that problem from locking up the UI.
Change-Id: I334729a30eca4a11d0150e3c89ff11c92a862061
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112461
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 924733c65902d0b17764aded56c88c99d4b9a568)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112529
diff --git a/sc/source/ui/view/hintwin.cxx b/sc/source/ui/view/hintwin.cxx
index d690ab33d002..047b3be2dc3e 100644
--- a/sc/source/ui/view/hintwin.cxx
+++ b/sc/source/ui/view/hintwin.cxx
@@ -31,6 +31,7 @@
#include
#include
#include
+#include
#define HINT_LINESPACE 2
#define HINT_INDENT 3
@@ -104,9 +105,16 @@ drawinglayer::primitive2d::Primitive2DContainer
ScOverlayHint::createOverlaySequ
sal_Int32 nIndex = 0;
Point aLineStart = aTextStart;
+sal_Int32 nLineCount = 0;
while (nIndex != -1)
{
OUString aLine = m_aMessage.getToken( 0, '\r', nIndex );
+if (aLine.getLength() > 255)
+{
+// prevent silliness higher up from hanging up the program
+SAL_WARN("sc", "ridiculously long line, truncating, len=" <<
aLine.getLength());
+aLine = aLine.copy(0,255);
+}
aTextMatrix = basegfx::utils::createScaleTranslateB2DHomMatrix(
aFontSize.getX(), aFontSize.getY(),
@@ -125,6 +133,13 @@ drawinglayer::primitive2d::Primitive2DContainer
ScOverlayHint::createOverlaySequ
aSeq.push_back(aMessage);
aLineStart.AdjustY(nLineHeight );
+nLineCount++;
+if (nLineCount > 50)
+{
+// prevent silliness higher up from hanging up the program
+SAL_WARN("sc", "ridiculously long message, bailing out");
+break;
+}
}
rRange.expand(basegfx::B2DTuple(rRange.getMaxX() + aHintMargin.Width(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
