[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - desktop/source include/vcl vcl/inc vcl/unx
desktop/source/lib/init.cxx| 12 ---
include/vcl/unx/freetypemanager.hxx| 98 -
vcl/inc/unx/glyphcache.hxx | 62 +++
vcl/unx/generic/glyphs/freetype_glyphcache.cxx |5 -
vcl/unx/generic/glyphs/glyphcache.cxx |5 -
5 files changed, 62 insertions(+), 120 deletions(-)
New commits:
commit 594c0d55915b2b5e5192d193e7f2ac155917be46
Author: Tor Lillqvist
AuthorDate: Tue Aug 2 12:22:40 2022 +0300
Commit: Tor Lillqvist
CommitDate: Thu Aug 4 16:35:37 2022 +0200
Revert "mmap a "downloaded" font in Collabora Online already in the..."
Font files are opened in a lot of places anyway, that commit was very
far from enough.
This reverts commit ba00d997ddd6867c3f2bd4909625a91bf4db590b.
Change-Id: Ifca3c86f1e5d9b35a58abda52e3e214a969d99e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137790
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index b694ed1b8642..2847e64621b2 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -42,9 +42,6 @@
#include
#include
#include
-#ifdef LINUX
-#include
-#endif
#include
#include
#include
@@ -4198,22 +4195,13 @@ static void lo_setOption(LibreOfficeKit* /*pThis*/,
const char *pOption, const c
else
sal_detail_set_log_selector(pCurrentSalLogOverride);
}
-#ifdef LINUX
else if (strcmp(pOption, "addfont") == 0)
{
-SAL_INFO("vcl.unx.freetype", "Loading and mapping the font '" <<
pValue << "'");
OutputDevice *pDevice = Application::GetDefaultDevice();
OutputDevice::ImplClearAllFontData(false);
pDevice->AddTempDevFont(OUString::fromUtf8(pValue), "");
OutputDevice::ImplRefreshAllFontData(false);
-FreetypeManager = FreetypeManager::get();
-OUString sFontFileName;
-osl::FileBase::getSystemPathFromFileURL( OUString::fromUtf8(pValue),
sFontFileName );
-FreetypeFontFile *pFTFile =
rFTManager.FindFontFile(OUStringToOString(sFontFileName,
RTL_TEXTENCODING_UTF8));
-FreetypeManager::MapFontFile(pFTFile);
-// Intentionally leak that FreetypeFontFile object
}
-#endif
}
static void lo_dumpState (LibreOfficeKit* pThis, const char* /* pOptions */,
char** pState)
diff --git a/include/vcl/unx/freetypemanager.hxx
b/include/vcl/unx/freetypemanager.hxx
deleted file mode 100644
index 2298ddb1f70c..
--- a/include/vcl/unx/freetypemanager.hxx
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#pragma once
-
-#include
-
-class FontAttributes;
-class FreetypeFont;
-class FreetypeFontFile;
-class FreetypeFontInfo;
-class FreetypeFontInstance;
-
-namespace vcl
-{
-namespace font
-{
-class PhysicalFontCollection;
-}
-}
-
-/**
- * The FreetypeManager caches various aspects of Freetype fonts
- *
- * It mainly consists of two std::unordered_map lists, which hold the items
of the cache.
- *
- * They form kind of a tree, with FreetypeFontFile as the roots, referenced
by multiple FreetypeFontInfo
- * entries, which are referenced by the FreetypeFont items.
- *
- * All of these items have reference counters, but these don't control the
items life-cycle, but that of
- * the managed resources.
- *
- * The respective resources are:
- * FreetypeFontFile = holds the mmapped font file, as long as it's used by
any FreetypeFontInfo.
- * FreetypeFontInfo = holds the FT_FaceRec_ object, as long as it's used by
any FreetypeFont.
- * FreetypeFont = holds the FT_SizeRec_ and is owned by a
FreetypeFontInstance
- *
- * FreetypeFontInfo therefore is embedded in the Freetype subclass of
PhysicalFontFace.
- * FreetypeFont is owned by FreetypeFontInstance, the Freetype subclass of
LogicalFontInstance.
- *
- * Nowadays there is not really a reason to have separate files for the
classes
[Libreoffice-commits] core.git: vcl/inc vcl/unx
vcl/inc/unx/glyphcache.hxx |1 -
vcl/unx/generic/glyphs/freetype_glyphcache.cxx |2 --
vcl/unx/generic/glyphs/glyphcache.cxx |1 -
3 files changed, 4 deletions(-)
New commits:
commit 1c31791b0635dd626ce05a697c648ded0d6fea87
Author: Tor Lillqvist
AuthorDate: Tue Jul 26 13:21:49 2022 +0300
Commit: Tor Lillqvist
CommitDate: Tue Jul 26 20:36:09 2022 +0200
FreetypeManager::m_nMaxFontId is unused
Change-Id: Idf50eee8dee0ad5f5e789a8554b80114c2c9f795
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137461
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index 8c2d0e6400ef..b54e10bdb20b 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -105,7 +105,6 @@ private:
typedef std::unordered_map,
rtl::CStringHash, rtl::CStringEqual> FontFileList;
FontInfoListm_aFontInfoList;
-sal_IntPtr m_nMaxFontId;
FontFileListm_aFontFileList;
};
diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
index cd5e771d4c96..848405169cd2 100644
--- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
@@ -366,8 +366,6 @@ void FreetypeManager::AddFontFile(const OString&
rNormalizedName,
FreetypeFontInfo* pFontInfo = new FreetypeFontInfo( rDevFontAttr,
FindFontFile(rNormalizedName), nFaceNum, nVariantNum, nFontId);
m_aFontInfoList[ nFontId ].reset(pFontInfo);
-if( m_nMaxFontId < nFontId )
-m_nMaxFontId = nFontId;
}
void FreetypeManager::AnnounceFonts( vcl::font::PhysicalFontCollection* pToAdd
) const
diff --git a/vcl/unx/generic/glyphs/glyphcache.cxx
b/vcl/unx/generic/glyphs/glyphcache.cxx
index 79db2d87bdb0..896585a87a27 100644
--- a/vcl/unx/generic/glyphs/glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/glyphcache.cxx
@@ -29,7 +29,6 @@
#include
FreetypeManager::FreetypeManager()
-: m_nMaxFontId(0)
{
InitFreetype();
}
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - desktop/source include/vcl vcl/inc vcl/unx
desktop/source/lib/init.cxx| 12 +++
include/vcl/unx/freetypemanager.hxx| 98 +
vcl/inc/unx/glyphcache.hxx | 62 ---
vcl/unx/generic/glyphs/freetype_glyphcache.cxx |5 +
vcl/unx/generic/glyphs/glyphcache.cxx |5 +
5 files changed, 120 insertions(+), 62 deletions(-)
New commits:
commit ba00d997ddd6867c3f2bd4909625a91bf4db590b
Author: Tor Lillqvist
AuthorDate: Wed Jul 20 16:31:28 2022 +0300
Commit: Tor Lillqvist
CommitDate: Thu Jul 21 11:43:16 2022 +0200
mmap a "downloaded" font in Collabora Online already in the ForKit process
Instead of waiting until it gets used in a Kit process.
Change-Id: I8671fd637837d66002bd5645734e4fee2f07d864
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137266
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 07276ebd1eea..5e9d48b75925 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -42,6 +42,9 @@
#include
#include
#include
+#ifdef LINUX
+#include
+#endif
#include
#include
#include
@@ -4149,13 +4152,22 @@ static void lo_setOption(LibreOfficeKit* /*pThis*/,
const char *pOption, const c
else
sal_detail_set_log_selector(pCurrentSalLogOverride);
}
+#ifdef LINUX
else if (strcmp(pOption, "addfont") == 0)
{
+SAL_INFO("vcl.unx.freetype", "Loading and mapping the font '" <<
pValue << "'");
OutputDevice *pDevice = Application::GetDefaultDevice();
OutputDevice::ImplClearAllFontData(false);
pDevice->AddTempDevFont(OUString::fromUtf8(pValue), "");
OutputDevice::ImplRefreshAllFontData(false);
+FreetypeManager = FreetypeManager::get();
+OUString sFontFileName;
+osl::FileBase::getSystemPathFromFileURL( OUString::fromUtf8(pValue),
sFontFileName );
+FreetypeFontFile *pFTFile =
rFTManager.FindFontFile(OUStringToOString(sFontFileName,
RTL_TEXTENCODING_UTF8));
+FreetypeManager::MapFontFile(pFTFile);
+// Intentionally leak that FreetypeFontFile object
}
+#endif
}
static void doc_postUnoCommand(LibreOfficeKitDocument* pThis, const char*
pCommand, const char* pArguments, bool bNotifyWhenFinished)
diff --git a/include/vcl/unx/freetypemanager.hxx
b/include/vcl/unx/freetypemanager.hxx
new file mode 100644
index ..2298ddb1f70c
--- /dev/null
+++ b/include/vcl/unx/freetypemanager.hxx
@@ -0,0 +1,98 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include
+
+class FontAttributes;
+class FreetypeFont;
+class FreetypeFontFile;
+class FreetypeFontInfo;
+class FreetypeFontInstance;
+
+namespace vcl
+{
+namespace font
+{
+class PhysicalFontCollection;
+}
+}
+
+/**
+ * The FreetypeManager caches various aspects of Freetype fonts
+ *
+ * It mainly consists of two std::unordered_map lists, which hold the items
of the cache.
+ *
+ * They form kind of a tree, with FreetypeFontFile as the roots, referenced
by multiple FreetypeFontInfo
+ * entries, which are referenced by the FreetypeFont items.
+ *
+ * All of these items have reference counters, but these don't control the
items life-cycle, but that of
+ * the managed resources.
+ *
+ * The respective resources are:
+ * FreetypeFontFile = holds the mmapped font file, as long as it's used by
any FreetypeFontInfo.
+ * FreetypeFontInfo = holds the FT_FaceRec_ object, as long as it's used by
any FreetypeFont.
+ * FreetypeFont = holds the FT_SizeRec_ and is owned by a
FreetypeFontInstance
+ *
+ * FreetypeFontInfo therefore is embedded in the Freetype subclass of
PhysicalFontFace.
+ * FreetypeFont is owned by FreetypeFontInstance, the Freetype subclass of
LogicalFontInstance.
+ *
+ * Nowadays there is not really a reason to have separate files for the
classes, as the FreetypeManager
+ * is just about handling of Freetype based fonts, n
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit ff7b8ea3d38e0c747dfa069b33bf746839fd174d Author: Tor Lillqvist AuthorDate: Tue May 17 11:09:23 2022 +0300 Commit: Tor Lillqvist CommitDate: Mon Jul 11 07:36:12 2022 +0200 Accept iOS SDK 15.5 Change-Id: I19f54042613769993b92cfaf04de292cfbb72b5f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134459 Tested-by: Jenkins Reviewed-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136903 Tested-by: Tor Lillqvist diff --git a/configure.ac b/configure.ac index 568a1867786a..acfd70ed4859 100644 --- a/configure.ac +++ b/configure.ac @@ -3596,8 +3596,8 @@ dnl === if test $_os = iOS; then AC_MSG_CHECKING([what iOS SDK to use]) -current_sdk_ver=15.4 -older_sdk_vers="15.2 15.0" +current_sdk_ver=15.5 +older_sdk_vers="15.4 15.2 15.0" if test "$enable_ios_simulator" = "yes"; then platform=iPhoneSimulator versionmin=-mios-simulator-version-min=13.6
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - desktop/source
desktop/source/deployment/misc/dp_misc.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit ece304df9ad2aa0f974927320a1324c06b89f337
Author: Tor Lillqvist
AuthorDate: Thu Jul 7 11:37:21 2022 +0300
Commit: Tor Lillqvist
CommitDate: Thu Jul 7 12:01:44 2022 +0200
Avoid compiler warning
Change-Id: I322b2c0ea14bbf8ed2fe1a306c0ed28f5e5ae258
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136875
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
diff --git a/desktop/source/deployment/misc/dp_misc.cxx
b/desktop/source/deployment/misc/dp_misc.cxx
index f4437711dab5..ad2763bb804c 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -513,7 +513,9 @@ void syncRepositories(
Reference(), xCmdEnv);
}
}
-#if !HAVE_FEATURE_MACOSX_SANDBOX
+#if HAVE_FEATURE_MACOSX_SANDBOX
+(void) bModified;
+#else
if (bModified && !comphelper::LibreOfficeKit::isActive())
{
Reference
restarter(task::OfficeRestartManager::get(comphelper::getProcessComponentContext()));
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - solenv/bin
solenv/bin/ooinstall |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit b1f87dcc0a3007c9e47b10a39a5c8d88bc9a2112
Author: Tor Lillqvist
AuthorDate: Wed Nov 22 21:05:48 2017 +0200
Commit: Tor Lillqvist
CommitDate: Wed Jul 6 12:37:27 2022 +0200
Use the same solenv/bin/ooinstall as in the cp-5.3 branch
Specifically, pass the correct product name and not a hardcoded
"LibreOffice" for the make_installer.pl script's -p option.
As such, instsetoo_native/util/openoffice.lst.in hardcodes the product
name as "CollaboraOffice" so we could as well do that also in
ooinstall.
(cherry picked from commit 852ffcae172c8ce1536f847410d94b6fcb486b96)
Change-Id: I9b2d84bcc18e21b325960f7057e259daa37234a5
Reviewed-on: https://gerrit.libreoffice.org/55640
Reviewed-by: Andras Timar
Tested-by: Andras Timar
(cherry picked from commit 12d1b08aac8cc8c3176040efc7290377e380f0c4)
Reviewed-on: https://gerrit.libreoffice.org/79128
Reviewed-by: Tor Lillqvist
Tested-by: Tor Lillqvist
(cherry picked from commit 0069417b55c99166aec5489ccef803eba25d2b4f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136842
Tested-by: Jenkins CollaboraOffice
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index efb1f28de824..71f10c739036 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -88,11 +88,14 @@ if ($destdir && "$ENV{DESTDIR}" ne "/" && -d
"$ENV{DESTDIR}") {
print "Running LibreOffice installer\n";
+my $PRODUCTNAME_no_spaces = $ENV{PRODUCTNAME};
+$PRODUCTNAME_no_spaces =~ s/ //g;
+
system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
"perl " .
(scalar keys(%DB::sub) ? "-d " : "") .
"-w $ENV{SRCDIR}/solenv/bin/make_installer.pl " .
-"-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p
LibreOffice " .
+"-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p
$PRODUCTNAME_no_spaces " .
"-u $tmp_dir " .
"-buildid $BUILD $destdir $strip $msi " .
"-simple $path") && die "Failed to install: $!";
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sc/inc sc/source
sc/inc/document.hxx |2 - sc/inc/table.hxx |4 +-- sc/source/core/data/dociter.cxx |4 +-- sc/source/core/data/document.cxx |6 ++-- sc/source/core/data/table1.cxx| 23 + sc/source/core/data/table2.cxx| 25 --- sc/source/filter/rtf/eeimpars.cxx |2 - sc/source/ui/docshell/docfunc.cxx | 50 +++--- sc/source/ui/docshell/docsh5.cxx |2 - sc/source/ui/inc/docfunc.hxx |2 - sc/source/ui/inc/viewfunc.hxx |2 - sc/source/ui/undo/undobase.cxx|2 - sc/source/ui/undo/undoblk.cxx |6 ++-- sc/source/ui/undo/undoblk3.cxx|6 ++-- sc/source/ui/view/viewfun2.cxx|6 ++-- sc/source/ui/view/viewfun3.cxx|2 - sc/source/ui/view/viewfun4.cxx|2 - sc/source/ui/view/viewfunc.cxx| 10 +++ 18 files changed, 82 insertions(+), 74 deletions(-) New commits: commit 84f149b2bb88832b7493ec6edee1c3b9d0753dd9 Author: Tor Lillqvist AuthorDate: Fri Jan 29 16:03:29 2021 +0200 Commit: Thorsten Behrens CommitDate: Sun Jun 26 22:14:10 2022 +0200 Don't bother shrinking row height when changing just one row interactively I.e. when interactively entering a new value. This used to happen at least for a sample document in .xlsx format for cells with automatic wrap turned on. After entering a value, the row height was annoyingly shrunk by a few pixels, which looked weird and pointless, and caused unnecessary invalidation thrash in the online collaborative editing context. We assume that the call to ScDocFunc::SetNormalString() in ScViewFunc::EnterData() is the result of interactivity. Change-Id: I3c77f7fb4e575f02e1dd7cdc18f2919f5eb3426e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110245 Tested-by: Jenkins CollaboraOffice Reviewed-by: Michael Meeks Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136366 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index f505f06114a9..d5aaf44d9db5 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1879,7 +1879,7 @@ public: const ScColWidthParam* pParam = nullptr ); SC_DLLPUBLIC bool SetOptimalHeight( sc::RowHeightContext& rCxt, SCROW nStartRow, - SCROW nEndRow, SCTAB nTab ); + SCROW nEndRow, SCTAB nTab, bool bApi ); voidUpdateAllRowHeights( sc::RowHeightContext& rCxt, const ScMarkData* pTabMark ); diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 96702d1213e0..ab979afebc72 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -776,7 +776,7 @@ public: bool bFormula, const ScMarkData* pMarkData, const ScColWidthParam* pParam ); bool SetOptimalHeight( -sc::RowHeightContext& rCxt, SCROW nStartRow, SCROW nEndRow, +sc::RowHeightContext& rCxt, SCROW nStartRow, SCROW nEndRow, bool bApi, ScProgress* pOuterProgress = nullptr, sal_uLong nProgressStart = 0 ); void SetOptimalHeightOnly( @@ -792,7 +792,7 @@ public: voidSetColWidthOnly( SCCOL nCol, sal_uInt16 nNewWidth ); voidSetRowHeight( SCROW nRow, sal_uInt16 nNewHeight ); boolSetRowHeightRange( SCROW nStartRow, SCROW nEndRow, sal_uInt16 nNewHeight, - double nPPTY ); + double nPPTY, bool bApi ); /** * Set specified row height to specified ranges. Don't check for drawing diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index ed55445d0558..407c5484a4c2 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -2734,7 +2734,7 @@ void ScDocRowHeightUpdater::update() continue; mrDoc.maTabs[nTab]->SetOptimalHeight( -aCxt, aData.mnRow1, aData.mnRow2, , nProgressStart); +aCxt, aData.mnRow1, aData.mnRow2, true, , nProgressStart); nProgressStart += mrDoc.maTabs[nTab]->GetWeightedCount(aData.mnRow1, aData.mnRow2); } @@ -2762,7 +2762,7 @@ void ScDocRowHeightUpdater::updateAll() if (!ValidTab(nTab) || !mrDoc.maTabs[nTab]) continue; -mrDoc.maTabs[nTab]->SetOptimalHeight(aCxt, 0, mrDoc.MaxRow(), , nProgressStart); +mrDoc.maTabs[nTab]->SetOptimalHeight(aCxt, 0, mrDoc.MaxRow(), true, , nProgressStart); nProgressStart += mrDoc.maTabs[nTab]->GetWeightedCount(); } } diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 725f6918411a..9ce58cbe64bb 100644 --- a/sc/source/core/data/document.cxx +++ b/s
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.4-62'
Tag 'cp-6.4-62' created by Andras Timar at 2022-05-31 13:57 + cp-6.4-62 Changes since cp-6.4-48: Tor Lillqvist (1): Add missing mobile-specific Impress German translations --- source/de/sd/messages.po | 37 + 1 file changed, 37 insertions(+) ---
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - connectivity/source include/vcl xmlsecurity/source
connectivity/source/inc/java/tools.hxx |2 ++ include/vcl/BitmapBuffer.hxx |2 ++ xmlsecurity/source/gpg/SecurityEnvironment.hxx |3 +++ 3 files changed, 7 insertions(+) New commits: commit 3a43c4c65e0e4531479408882b931f9d92f63d87 Author: Tor Lillqvist AuthorDate: Mon May 23 13:16:13 2022 +0300 Commit: Tor Lillqvist CommitDate: Mon May 23 13:40:19 2022 +0200 Include for std::unique_ptr Change-Id: Ife038559e03ace7ceebe02a95cb89689cd699135 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134810 Tested-by: Jenkins CollaboraOffice Reviewed-by: Tor Lillqvist diff --git a/connectivity/source/inc/java/tools.hxx b/connectivity/source/inc/java/tools.hxx index aa7cb20cad9b..c6024c2a7fb9 100644 --- a/connectivity/source/inc/java/tools.hxx +++ b/connectivity/source/inc/java/tools.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_TOOLS_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_TOOLS_HXX +#include + #include #include diff --git a/include/vcl/BitmapBuffer.hxx b/include/vcl/BitmapBuffer.hxx index 4a4ec8404a08..c7516dc52e78 100644 --- a/include/vcl/BitmapBuffer.hxx +++ b/include/vcl/BitmapBuffer.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_VCL_BITMAPBUFFER_HXX #define INCLUDED_VCL_BITMAPBUFFER_HXX +#include + #include #include #include diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.hxx b/xmlsecurity/source/gpg/SecurityEnvironment.hxx index c815e0e1f5d2..548d76597f56 100644 --- a/xmlsecurity/source/gpg/SecurityEnvironment.hxx +++ b/xmlsecurity/source/gpg/SecurityEnvironment.hxx @@ -11,6 +11,9 @@ #define INCLUDED_XMLSECURITY_SOURCE_GPG_SECURITYENVIRONMENT_HXX #include + +#include + #include #include
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 42eeb373978deb660f38707babfc9d5af9da5cd9 Author: Tor Lillqvist AuthorDate: Tue May 17 11:42:25 2022 +0300 Commit: Tor Lillqvist CommitDate: Tue May 17 12:41:37 2022 +0200 AC_RUN_IFELSE won't work when cross-compiling Change-Id: I8e4d439f0e03ca9e9e3088b451efd8d09bf37203 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134462 Tested-by: Jenkins Reviewed-by: Tor Lillqvist diff --git a/configure.ac b/configure.ac index 3ba32994cb96..34ba3f7844e0 100644 --- a/configure.ac +++ b/configure.ac @@ -7420,7 +7420,7 @@ AC_SUBST([HAVE_LIBSTDCPP]) AC_SUBST([HAVE_LIBCPP]) HAVE_LIBCPP_DEBUG= -if test -n "$HAVE_LIBCPP" -a -n "$ENABLE_DBGUTIL"; then +if test -z "$CROSS_COMPILING" -a -n "$HAVE_LIBCPP" -a -n "$ENABLE_DBGUTIL"; then # Libc++ supports debug mode only if built for it, Mac libc++ isn't, # and there would be undefined references to debug functions. # Moreover std::to_string() has a bug (https://reviews.llvm.org/D125184).
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/window.cxx | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
New commits:
commit f6b3746f9c410ff34024acbbcea73d35c6789a2e
Author: Tor Lillqvist
AuthorDate: Thu May 12 13:18:56 2022 +0300
Commit: Tor Lillqvist
CommitDate: Tue May 17 12:18:34 2022 +0200
Drop pointless and misleading copypasta comments
Change-Id: I68701a61944c0d950468c6f069d2d2f82d5237f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134228
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 180aa4a78dd2..6c5eed3e4621 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -260,7 +260,7 @@ void Window::dispose()
pTempWin = pTempWin->mpWindowImpl->mpNext;
}
OSL_FAIL( aTempStr.getStr() );
-
Application::Abort(OStringToOUString(aTempStr.makeStringAndClear(),
RTL_TEXTENCODING_UTF8)); // abort in debug builds, this must be fixed!
+
Application::Abort(OStringToOUString(aTempStr.makeStringAndClear(),
RTL_TEXTENCODING_UTF8));
}
if (mpWindowImpl->mpFrameData != nullptr)
@@ -283,7 +283,6 @@ void Window::dispose()
") with live SystemWindows destroyed: " +
aErrorStr;
OSL_FAIL(aTempStr.getStr());
-// abort in debug builds, must be fixed!
Application::Abort(OStringToOUString(aTempStr,
RTL_TEXTENCODING_UTF8));
}
}
@@ -306,7 +305,7 @@ void Window::dispose()
") with live SystemWindows destroyed: " +
aErrorStr;
OSL_FAIL( aTempStr.getStr() );
-Application::Abort(OStringToOUString(aTempStr,
RTL_TEXTENCODING_UTF8)); // abort in debug builds, this must be fixed!
+Application::Abort(OStringToOUString(aTempStr,
RTL_TEXTENCODING_UTF8));
}
if ( mpWindowImpl->mpFirstOverlap )
@@ -321,7 +320,7 @@ void Window::dispose()
pTempWin = pTempWin->mpWindowImpl->mpNext;
}
OSL_FAIL( aTempStr.getStr() );
-
Application::Abort(OStringToOUString(aTempStr.makeStringAndClear(),
RTL_TEXTENCODING_UTF8)); // abort in debug builds, this must be fixed!
+
Application::Abort(OStringToOUString(aTempStr.makeStringAndClear(),
RTL_TEXTENCODING_UTF8));
}
vcl::Window* pMyParent = GetParent();
@@ -341,7 +340,7 @@ void Window::dispose()
lcl_createWindowInfo(this) +
") still in TaskPanelList!";
OSL_FAIL( aTempStr.getStr() );
-Application::Abort(OStringToOUString(aTempStr,
RTL_TEXTENCODING_UTF8)); // abort in debug builds, this must be fixed!
+Application::Abort(OStringToOUString(aTempStr,
RTL_TEXTENCODING_UTF8));
}
}
#endif
@@ -400,7 +399,7 @@ void Window::dispose()
OUString aTempStr = "Window (" + GetText() +
") with focused child window destroyed ! THIS WILL LEAD TO
CRASHES AND MUST BE FIXED !";
SAL_WARN( "vcl", aTempStr );
-Application::Abort(aTempStr); // abort in debug build version, this
must be fixed!
+Application::Abort(aTempStr);
#endif
}
[Libreoffice-commits] core.git: configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit b3dc91920605705d8a1172fb3784a2377edfc4e7 Author: Tor Lillqvist AuthorDate: Tue May 17 11:09:23 2022 +0300 Commit: Tor Lillqvist CommitDate: Tue May 17 11:41:32 2022 +0200 Accept iOS SDK 15.5 Change-Id: I19f54042613769993b92cfaf04de292cfbb72b5f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134459 Tested-by: Jenkins Reviewed-by: Tor Lillqvist diff --git a/configure.ac b/configure.ac index 79c8b20a5043..3ba32994cb96 100644 --- a/configure.ac +++ b/configure.ac @@ -3641,8 +3641,8 @@ dnl === if test $_os = iOS; then AC_MSG_CHECKING([what iOS SDK to use]) -current_sdk_ver=15.4 -older_sdk_vers="15.2 15.0 14.5" +current_sdk_ver=15.5 +older_sdk_vers="15.4 15.2 15.0 14.5" if test "$enable_ios_simulator" = "yes"; then platform=iPhoneSimulator versionmin=-mios-simulator-version-min=13.6
[Libreoffice-commits] core.git: configmgr/source
configmgr/source/config_map.hxx |5 ++---
configmgr/source/nodemap.cxx|7 ---
configmgr/source/nodemap.hxx|5 ++---
3 files changed, 8 insertions(+), 9 deletions(-)
New commits:
commit c400311414fca20d3705ee9ef24747b9a5301167
Author: Tor Lillqvist
AuthorDate: Tue May 17 10:46:45 2022 +0300
Commit: Caolán McNamara
CommitDate: Tue May 17 10:48:20 2022 +0200
Revert "use boost::flat_map in config_map"
Fixes build breakage on macOS at least. Noel said it was OK to revert.
This reverts commit cc4325f84a0ba35d8bbb564512bce0c6b8aab408.
Change-Id: Ib78d29fc21d4d030b4032955b18271de1761f396
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134458
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/configmgr/source/config_map.hxx b/configmgr/source/config_map.hxx
index f968165736d1..5d2990d5a0d8 100644
--- a/configmgr/source/config_map.hxx
+++ b/configmgr/source/config_map.hxx
@@ -9,7 +9,7 @@
#ifndef CONFIG_MAP_HXX
#define CONFIG_MAP_HXX
-#include
+#include
#include
// The realisation here is that while a map is a reasonably compact
@@ -28,8 +28,7 @@ struct LengthContentsCompare
}
};
-template
-struct config_map : public boost::container::flat_map
+template struct config_map : public std::map
{
};
diff --git a/configmgr/source/nodemap.cxx b/configmgr/source/nodemap.cxx
index 0b524846bfcd..e21578b2880b 100644
--- a/configmgr/source/nodemap.cxx
+++ b/configmgr/source/nodemap.cxx
@@ -42,9 +42,10 @@ void NodeMap::cloneInto(NodeMap* target) const
rtl::Reference NodeMap::findNode(int layer, OUString const& name) const
{
-if (!moCache || (*moCache)->first != name)
-moCache = const_cast(this)->maImpl.find(name);
-const_iterator i = *moCache;
+const_iterator i;
+if (maCache == end() || maCache->first != name)
+maCache = const_cast(this)->maImpl.find(name);
+i = maCache;
return i == end() || i->second->getLayer() > layer ?
rtl::Reference() : i->second;
}
}
diff --git a/configmgr/source/nodemap.hxx b/configmgr/source/nodemap.hxx
index b03a6503bb22..19447c7f77f7 100644
--- a/configmgr/source/nodemap.hxx
+++ b/configmgr/source/nodemap.hxx
@@ -23,7 +23,6 @@
#include "config_map.hxx"
#include
#include "node.hxx"
-#include
namespace configmgr {
@@ -60,8 +59,8 @@ class NodeMap
private:
// We get a large number of repeated identical lookups.
-mutable std::optional moCache;
-void clearCache() { moCache.reset(); }
+mutable const_iterator maCache;
+void clearCache() { maCache = maImpl.end(); }
};
}
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - vcl/source
vcl/source/control/edit.cxx | 22 +-
1 file changed, 13 insertions(+), 9 deletions(-)
New commits:
commit 5802927f319a2174f6536ff2ceac0a2c5c6d158e
Author: Tor Lillqvist
AuthorDate: Tue May 10 11:56:32 2022 +0300
Commit: Tor Lillqvist
CommitDate: Sun May 15 20:14:53 2022 +0200
Fix a problem with multiple tunneled dialogs in Online
If your Collabora Online installation uses VCL theming, and you have
two tunnelled dialogs open (with the second one being "logically" a
child of the first, even though I don't think the code in Online or
here in core necessarily has any such concepts), typing into a text
field of the second dialog is very hard. One has to keep clicking in
the field for each character typed. Core and Online are confused which
dialog should have focus, or something.
This change seems to help, but I definitely don't fully understand the
mechanisms. The change affects only LibreOfficeKit clients,
i.e. mainly Collabora Online.
Change-Id: I5337989f5ea57a72d83691653f554e7754667fe8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134108
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index f631500b8408..e9cd6f2b4bdf 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -445,8 +445,9 @@ void Edit::ImplInvalidateOrRepaint()
if( IsPaintTransparent() )
{
Invalidate();
-// FIXME: this is currently only on macOS
-if( ImplGetSVData()->maNWFData.mbNoFocusRects )
+// FIXME: this was only for macOS, unclear now.
+if( !comphelper::LibreOfficeKit::isActive() &&
+ImplGetSVData()->maNWFData.mbNoFocusRects )
PaintImmediately();
}
else
@@ -1875,9 +1876,10 @@ void Edit::GetFocus()
ImplShowCursor();
-// FIXME: this is currently only on macOS
+// FIXME: this was only on macOS
// check for other platforms that need similar handling
-if( ImplGetSVData()->maNWFData.mbNoFocusRects &&
+if( !comphelper::LibreOfficeKit::isActive() &&
+ImplGetSVData()->maNWFData.mbNoFocusRects &&
IsNativeWidgetEnabled() &&
IsNativeControlSupported( ControlType::Editbox,
ControlPart::Entire ) )
{
@@ -1902,15 +1904,15 @@ void Edit::LoseFocus()
{
if ( !mpSubEdit )
{
-// FIXME: this is currently only on macOS
+// FIXME: this was only on macOS
// check for other platforms that need similar handling
-if( ImplGetSVData()->maNWFData.mbNoFocusRects &&
+if( !comphelper::LibreOfficeKit::isActive() &&
+ImplGetSVData()->maNWFData.mbNoFocusRects &&
IsNativeWidgetEnabled() &&
IsNativeControlSupported( ControlType::Editbox,
ControlPart::Entire ) )
{
ImplInvalidateOutermostBorder( mbIsSubEdit ? GetParent() : this );
}
-
if ( !mbActivePopup && !( GetStyle() & WB_NOHIDESELECTION ) &&
maSelection.Len() )
ImplInvalidateOrRepaint();// paint the selection
}
@@ -2339,9 +2341,11 @@ void Edit::Modify()
// #i13677# notify edit listeners about caret position change
CallEventListeners( VclEventId::EditCaretChanged );
-// FIXME: this is currently only on macOS
+
+// FIXME: this was only on macOS
// check for other platforms that need similar handling
-if( ImplGetSVData()->maNWFData.mbNoFocusRects &&
+if( !comphelper::LibreOfficeKit::isActive() &&
+ImplGetSVData()->maNWFData.mbNoFocusRects &&
IsNativeWidgetEnabled() &&
IsNativeControlSupported( ControlType::Editbox,
ControlPart::Entire ) )
{
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.4-61'
Tag 'cp-6.4-61' created by Andras Timar at 2022-05-04 11:43 + cp-6.4-61 Changes since cp-6.4-48: Tor Lillqvist (1): Add missing mobile-specific Impress German translations --- source/de/sd/messages.po | 37 + 1 file changed, 37 insertions(+) ---
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - desktop/source
desktop/source/lib/init.cxx | 17 ++---
1 file changed, 14 insertions(+), 3 deletions(-)
New commits:
commit 92db31fa44040706d627fb5cafe6b0e2641b0bec
Author: Tor Lillqvist
AuthorDate: Tue Apr 19 16:40:11 2022 +0300
Commit: Tor Lillqvist
CommitDate: Thu Apr 21 21:19:41 2022 +0200
Fix regression in the iOS app (and possibly the Android and GTK apps)
The problem was caused by my remote font downloading changes. We need
to be more careful in lo_initialize() and libreofficekit_hook_2() to
distinguish whether the code is called from "normal" Online (with
"pre-initialisation" through lok_preinit_2()) or otherwise, for
instance the iOS app (where pre-initialisation is not done).
Sadly, this fix makes state handling in init.cxx even more complex
with one more static Boolean flag.
Change-Id: I2a8fa96740eb79725aa162cf7adc86d49a8ba603
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133181
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 6ab245c55d35..df5f67ad3c2b 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -200,6 +200,7 @@ using namespace desktop;
using namespace utl;
static LibLibreOffice_Impl *gImpl = nullptr;
+static bool lok_preinit_2_called = false;
static std::weak_ptr< LibreOfficeKitClass > gOfficeClass;
static std::weak_ptr< LibreOfficeKitDocumentClass > gDocumentClass;
@@ -6500,8 +6501,11 @@ static int lo_initialize(LibreOfficeKit* pThis, const
char* pAppPath, const char
if (pThis == nullptr)
{
eStage = PRE_INIT;
-SAL_INFO("lok", "Create libreoffice object");
-gImpl = new LibLibreOffice_Impl();
+if (lok_preinit_2_called)
+{
+SAL_INFO("lok", "Create libreoffice object");
+gImpl = new LibLibreOffice_Impl();
+}
}
else if (bPreInited)
eStage = SECOND_INIT;
@@ -6788,10 +6792,16 @@ LibreOfficeKit *libreofficekit_hook_2(const char*
install_path, const char* user
{
static bool alreadyCalled = false;
-if (!alreadyCalled)
+if ((!lok_preinit_2_called && !gImpl) || (lok_preinit_2_called &&
!alreadyCalled))
{
alreadyCalled = true;
+if (!lok_preinit_2_called)
+{
+SAL_INFO("lok", "Create libreoffice object");
+gImpl = new LibLibreOffice_Impl();
+}
+
if (!lo_initialize(gImpl, install_path, user_profile_url))
{
lo_destroy(gImpl);
@@ -6815,6 +6825,7 @@ int lok_preinit(const char* install_path, const char*
user_profile_url)
SAL_JNI_EXPORT
int lok_preinit_2(const char* install_path, const char* user_profile_url,
LibLibreOffice_Impl** kit)
{
+lok_preinit_2_called = true;
int result = lo_initialize(nullptr, install_path, user_profile_url);
if (kit != nullptr)
*kit = gImpl;
[Libreoffice-commits] core.git: desktop/source
desktop/source/lib/init.cxx | 17 ++---
1 file changed, 14 insertions(+), 3 deletions(-)
New commits:
commit 63bad2bf8dc0d1052532e92be1a18118c0398fbf
Author: Tor Lillqvist
AuthorDate: Tue Apr 19 16:40:11 2022 +0300
Commit: Tor Lillqvist
CommitDate: Wed Apr 20 14:06:51 2022 +0200
Fix regression in the iOS app (and possibly the Android and GTK apps)
The problem was caused by my remote font downloading changes. We need
to be more careful in lo_initialize() and libreofficekit_hook_2() to
distinguish whether the code is called from "normal" Online (with
"pre-initialisation" through lok_preinit_2()) or otherwise, for
instance the iOS app, where not pre-initialisation is done.
Sadly, this fix makes state handling in init.cxx even more complex
with one more static Boolean flag.
Change-Id: I2a8fa96740eb79725aa162cf7adc86d49a8ba603
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133175
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133196
Tested-by: Jenkins
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 7b99ed49fdc9..9a4ec4881805 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -196,6 +196,7 @@ using namespace desktop;
using namespace utl;
static LibLibreOffice_Impl *gImpl = nullptr;
+static bool lok_preinit_2_called = false;
static std::weak_ptr< LibreOfficeKitClass > gOfficeClass;
static std::weak_ptr< LibreOfficeKitDocumentClass > gDocumentClass;
@@ -6494,8 +6495,11 @@ static int lo_initialize(LibreOfficeKit* pThis, const
char* pAppPath, const char
if (pThis == nullptr)
{
eStage = PRE_INIT;
-SAL_INFO("lok", "Create libreoffice object");
-gImpl = new LibLibreOffice_Impl();
+if (lok_preinit_2_called)
+{
+SAL_INFO("lok", "Create libreoffice object");
+gImpl = new LibLibreOffice_Impl();
+}
}
else if (bPreInited)
eStage = SECOND_INIT;
@@ -6782,10 +6786,16 @@ LibreOfficeKit *libreofficekit_hook_2(const char*
install_path, const char* user
{
static bool alreadyCalled = false;
-if (!alreadyCalled)
+if ((!lok_preinit_2_called && !gImpl) || (lok_preinit_2_called &&
!alreadyCalled))
{
alreadyCalled = true;
+if (!lok_preinit_2_called)
+{
+SAL_INFO("lok", "Create libreoffice object");
+gImpl = new LibLibreOffice_Impl();
+}
+
if (!lo_initialize(gImpl, install_path, user_profile_url))
{
lo_destroy(gImpl);
@@ -6809,6 +6819,7 @@ int lok_preinit(const char* install_path, const char*
user_profile_url)
SAL_JNI_EXPORT
int lok_preinit_2(const char* install_path, const char* user_profile_url,
LibLibreOffice_Impl** kit)
{
+lok_preinit_2_called = true;
int result = lo_initialize(nullptr, install_path, user_profile_url);
if (kit != nullptr)
*kit = gImpl;
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - desktop/source
desktop/source/lib/init.cxx | 17 ++---
1 file changed, 14 insertions(+), 3 deletions(-)
New commits:
commit 37916a87204560f3bccbf9495b01c5d9295f1f11
Author: Tor Lillqvist
AuthorDate: Tue Apr 19 16:40:11 2022 +0300
Commit: Tor Lillqvist
CommitDate: Tue Apr 19 16:39:41 2022 +0200
Fix regression in the iOS app (and possibly the Android and GTK apps)
The problem was caused by my remote font downloading changes. We need
to be more careful in lo_initialize() and libreofficekit_hook_2() to
distinguish whether the code is called from "normal" Online (with
"pre-initialisation" through lok_preinit_2()) or otherwise, for
instance the iOS app, where not pre-initialisation is done.
Sadly, this fix makes state handling in init.c even more complex with
one more static Boolean flag.
Change-Id: I2a8fa96740eb79725aa162cf7adc86d49a8ba603
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133175
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 392441079820..58236658c08a 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -198,6 +198,7 @@ using namespace desktop;
using namespace utl;
static LibLibreOffice_Impl *gImpl = nullptr;
+static bool lok_preinit_2_called = false;
static std::weak_ptr< LibreOfficeKitClass > gOfficeClass;
static std::weak_ptr< LibreOfficeKitDocumentClass > gDocumentClass;
@@ -6537,8 +6538,11 @@ static int lo_initialize(LibreOfficeKit* pThis, const
char* pAppPath, const char
if (pThis == nullptr)
{
eStage = PRE_INIT;
-SAL_INFO("lok", "Create libreoffice object");
-gImpl = new LibLibreOffice_Impl();
+if (lok_preinit_2_called)
+{
+SAL_INFO("lok", "Create libreoffice object");
+gImpl = new LibLibreOffice_Impl();
+}
}
else if (bPreInited)
eStage = SECOND_INIT;
@@ -6828,10 +6832,16 @@ LibreOfficeKit *libreofficekit_hook_2(const char*
install_path, const char* user
{
static bool alreadyCalled = false;
-if (!alreadyCalled)
+if ((!lok_preinit_2_called && !gImpl) || (lok_preinit_2_called &&
!alreadyCalled))
{
alreadyCalled = true;
+if (!lok_preinit_2_called)
+{
+SAL_INFO("lok", "Create libreoffice object");
+gImpl = new LibLibreOffice_Impl();
+}
+
if (!lo_initialize(gImpl, install_path, user_profile_url))
{
lo_destroy(gImpl);
@@ -6855,6 +6865,7 @@ int lok_preinit(const char* install_path, const char*
user_profile_url)
SAL_JNI_EXPORT
int lok_preinit_2(const char* install_path, const char* user_profile_url,
LibLibreOffice_Impl** kit)
{
+lok_preinit_2_called = true;
int result = lo_initialize(nullptr, install_path, user_profile_url);
if (kit != nullptr)
*kit = gImpl;
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - postprocess/Rdb_services.mk solenv/bin vcl/source
postprocess/Rdb_services.mk |2 +-
solenv/bin/native-code.py |2 +-
vcl/source/treelist/transfer2.cxx |5 +
3 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 19a34e3f2985fb66f99f9e308f37b5f8f11e47f4
Author: Tor Lillqvist
AuthorDate: Thu Apr 14 14:25:31 2022 +0300
Commit: Tor Lillqvist
CommitDate: Tue Apr 19 11:07:36 2022 +0200
Avoid LOKClipboard harder on iOS
When I back- or side-ported cde6577dcb9c94aca7605790d34c83a5ff62edad
to this branch (as 0111b70afdce44118a3616496c70c75962e7f57f) I could
not apply all of it because this branch was so different, or
something, then. But now more of it is needed, and does apply.
Change-Id: I2710a7537594c486878a68c630f762a24ac81c49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133017
Tested-by: Tor Lillqvist
Reviewed-by: Tor Lillqvist
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 98abf2de3f7b..47c340b020a7 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -340,7 +340,7 @@ endif
# lokclipboard.component
ifneq ($(filter $(OS),ANDROID iOS MACOSX WNT),)
-$(if $(filter-out $(OS),IOS), \
+$(if $(filter-out $(OS),iOS), \
$(eval $(call gb_Rdb_add_components,services,\
desktop/lokclipboard)))
else
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 5e1b4db93ec9..0e2ed402c750 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -129,7 +129,7 @@ core_constructor_list = [
"com_sun_star_comp_dba_ODatabaseSource",
"com_sun_star_comp_dba_ORowSet_get_implementation",
# desktop/lokclipboard.component
-"desktop_LOKClipboard_get_implementation",
+("desktop_LOKClipboard_get_implementation", "#ifndef IOS"),
# drawinglayer/drawinglayer.component
"drawinglayer_XPrimitive2DRenderer",
# embeddedobj/util/embobj.component
diff --git a/vcl/source/treelist/transfer2.cxx
b/vcl/source/treelist/transfer2.cxx
index d0a105554c0f..05183b9c0485 100644
--- a/vcl/source/treelist/transfer2.cxx
+++ b/vcl/source/treelist/transfer2.cxx
@@ -484,11 +484,16 @@ Reference GetSystemClipboard()
Reference xClipboard;
try
{
+#ifdef IOS
+if (false)
+;
+#else
if (comphelper::LibreOfficeKit::isActive())
{
xClipboard = css::datatransfer::clipboard::LokClipboard::create(
comphelper::getProcessComponentContext());
}
+#endif
else
{
xClipboard = css::datatransfer::clipboard::SystemClipboard::create(
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac
configure.ac |6 +- 1 file changed, 1 insertion(+), 5 deletions(-) New commits: commit 6db3014de5e7c1852c27437287e327f765f2a88b Author: Tor Lillqvist AuthorDate: Wed May 19 14:18:56 2021 +0300 Commit: Tor Lillqvist CommitDate: Tue Apr 19 09:38:39 2022 +0200 We do want scripting on iOS, too The native-code.py script unconditionally generates references to that now. Change-Id: Ib0ca1e994af15597f8a191ccdd32d95efca063da Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115796 Tested-by: Jenkins CollaboraOffice Reviewed-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118897 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133016 diff --git a/configure.ac b/configure.ac index 6cdcb539da44..07a56aa37fd1 100644 --- a/configure.ac +++ b/configure.ac @@ -3001,11 +3001,7 @@ else fi if test -z "$enable_scripting"; then -# Disable scripting for iOS unless specifically overridden -# with --enable-scripting. -if test $_os != iOS -o $_os = Emscripten; then -enable_scripting=yes -fi +enable_scripting=yes fi DISABLE_SCRIPTING=''
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - desktop/source include/LibreOfficeKit include/sal include/vcl vcl/unx
desktop/source/lib/init.cxx| 27 ++---
include/LibreOfficeKit/LibreOfficeKit.hxx |4 +++
include/LibreOfficeKit/LibreOfficeKitInit.h|2 +
include/sal/log-areas.dox |1
include/vcl/outdev.hxx |4 +--
vcl/unx/generic/glyphs/freetype_glyphcache.cxx |7 ++
6 files changed, 40 insertions(+), 5 deletions(-)
New commits:
commit 7eec383744f6e5c36362ef22e2fd0c526e3077b1
Author: Tor Lillqvist
AuthorDate: Wed Mar 9 11:33:16 2022 +0200
Commit: Tor Lillqvist
CommitDate: Thu Apr 14 03:05:03 2022 +0200
Handle "addfont" from Collabora Online
We use the AddTempDevFont() API to add a new font. Sadly there is no
corresponding way to remove such a temporarily added font.
In this branch this commit also includes a follow-up fix to avoid an
assertion failure (in a build with assertions).
Change-Id: I6fe61919daa5af29e964cec1caf7293aefa8ea4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132948
Tested-by: Tor Lillqvist
Reviewed-by: Tor Lillqvist
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132967
Tested-by: Jenkins CollaboraOffice
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 18259e045415..82bb8715960b 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4119,6 +4119,13 @@ static void lo_setOption(LibreOfficeKit* /*pThis*/,
const char *pOption, const c
else
sal_detail_set_log_selector(pCurrentSalLogOverride);
}
+else if (strcmp(pOption, "addfont") == 0)
+{
+OutputDevice *pDevice = Application::GetDefaultDevice();
+OutputDevice::ImplClearAllFontData(false);
+pDevice->AddTempDevFont(OUString::fromUtf8(pValue), "");
+OutputDevice::ImplRefreshAllFontData(false);
+}
}
static void doc_postUnoCommand(LibreOfficeKitDocument* pThis, const char*
pCommand, const char* pArguments, bool bNotifyWhenFinished)
@@ -6482,7 +6489,11 @@ static int lo_initialize(LibreOfficeKit* pThis, const
char* pAppPath, const char
// What stage are we at ?
if (pThis == nullptr)
+{
eStage = PRE_INIT;
+SAL_INFO("lok", "Create libreoffice object");
+gImpl = new LibLibreOffice_Impl();
+}
else if (bPreInited)
eStage = SECOND_INIT;
else
@@ -6766,11 +6777,12 @@ static int lo_initialize(LibreOfficeKit* pThis, const
char* pAppPath, const char
SAL_JNI_EXPORT
LibreOfficeKit *libreofficekit_hook_2(const char* install_path, const char*
user_profile_url)
{
-if (!gImpl)
+static bool alreadyCalled = false;
+
+if (!alreadyCalled)
{
-SAL_INFO("lok", "Create libreoffice object");
+alreadyCalled = true;
-gImpl = new LibLibreOffice_Impl();
if (!lo_initialize(gImpl, install_path, user_profile_url))
{
lo_destroy(gImpl);
@@ -6791,6 +6803,15 @@ int lok_preinit(const char* install_path, const char*
user_profile_url)
return lo_initialize(nullptr, install_path, user_profile_url);
}
+SAL_JNI_EXPORT
+int lok_preinit_2(const char* install_path, const char* user_profile_url,
LibLibreOffice_Impl** kit)
+{
+int result = lo_initialize(nullptr, install_path, user_profile_url);
+if (kit != nullptr)
+*kit = gImpl;
+return result;
+}
+
static void lo_destroy(LibreOfficeKit* pThis)
{
SolarMutexClearableGuard aGuard;
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index 064caae2729b..912b3e0d2203 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -1036,6 +1036,10 @@ public:
* environment variable SAL_LOG is again used as by default. You
* can switch back and forth as you like.
*
+ * "addfont": ""
+ *
+ * Adds the font at the URL given.
+ *
* @param pOption the option name
* @param pValue its value
*/
diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h
b/include/LibreOfficeKit/LibreOfficeKitInit.h
index ccd42863ba25..5bbb722b5b18 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -255,6 +255,8 @@ typedef LibreOfficeKit *(LokHookFunction2)( const char
*install_path, const char
typedef int (LokHookPreInit) ( const char *install_path, const
char *user_profile_url );
+typedef int (LokHookPreInit2) ( const char *install_path, const
char *user_profile_url, LibreOfficeKit** kit);
+
#if defined(IOS) || defined(ANDROID)
LibreOfficeKit *libreofficekit_hook_2(const char* install_path, const char*
user_profile_path);
#endif
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 9a623b88dc8f..b1f8bb99723a 100644
--- a/include/sal/log
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - desktop/source
desktop/source/lib/init.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 126e1d15fd8764fe95c1df5de28a6149c0b3d380
Author: Tor Lillqvist
AuthorDate: Wed Apr 13 16:50:17 2022 +0300
Commit: Tor Lillqvist
CommitDate: Wed Apr 13 21:57:52 2022 +0200
Follow-up fix to Collabora Online "addfont" handling: avoid assertion
failure
Change-Id: Ib75954a39d515088dbd432d0aa0ca5893194ecc6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132969
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 8f991c37f818..392441079820 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4164,9 +4164,9 @@ static void lo_setOption(LibreOfficeKit* /*pThis*/, const
char *pOption, const c
else if (strcmp(pOption, "addfont") == 0)
{
OutputDevice *pDevice = Application::GetDefaultDevice();
-OutputDevice::ImplClearAllFontData(true);
+OutputDevice::ImplClearAllFontData(false);
pDevice->AddTempDevFont(OUString::fromUtf8(OString(pValue)), "");
-OutputDevice::ImplRefreshAllFontData(true);
+OutputDevice::ImplRefreshAllFontData(false);
}
}
[Libreoffice-commits] core.git: desktop/source
desktop/source/lib/init.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ab612633003c75dfb30664db8cc8924c086a91ee
Author: Tor Lillqvist
AuthorDate: Wed Apr 13 16:50:17 2022 +0300
Commit: Tor Lillqvist
CommitDate: Wed Apr 13 20:09:54 2022 +0200
Follow-up fix to Collabora Online "addfont" handling: avoid assertion
failure
Change-Id: Ib75954a39d515088dbd432d0aa0ca5893194ecc6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132970
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 442297d5d348..dd9c3874b93c 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4116,9 +4116,9 @@ static void lo_setOption(LibreOfficeKit* /*pThis*/, const
char *pOption, const c
else if (strcmp(pOption, "addfont") == 0)
{
OutputDevice *pDevice = Application::GetDefaultDevice();
-OutputDevice::ImplClearAllFontData(true);
+OutputDevice::ImplClearAllFontData(false);
pDevice->AddTempDevFont(OUString::fromUtf8(pValue), "");
-OutputDevice::ImplRefreshAllFontData(true);
+OutputDevice::ImplRefreshAllFontData(false);
}
}
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - desktop/source include/LibreOfficeKit include/vcl vcl/unx
desktop/source/lib/init.cxx| 27 ++---
include/LibreOfficeKit/LibreOfficeKit.hxx |4 +++
include/LibreOfficeKit/LibreOfficeKitInit.h|2 +
include/vcl/outdev.hxx |4 +--
vcl/unx/generic/glyphs/freetype_glyphcache.cxx |7 ++
5 files changed, 39 insertions(+), 5 deletions(-)
New commits:
commit cef57d2bfa19d249e1c1721f32640f955a137955
Author: Tor Lillqvist
AuthorDate: Wed Mar 9 11:33:16 2022 +0200
Commit: Tor Lillqvist
CommitDate: Wed Apr 13 12:54:33 2022 +0200
Handle "addfont" from Collabora Online
We use the AddTempDevFont() API to add a new font. Sadly there is no
corresponding way to remove such a temporarily added font.
Change-Id: I6fe61919daa5af29e964cec1caf7293aefa8ea4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131250
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 3e4265969053..8f991c37f818 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4161,6 +4161,13 @@ static void lo_setOption(LibreOfficeKit* /*pThis*/,
const char *pOption, const c
else
sal_detail_set_log_selector(pCurrentSalLogOverride);
}
+else if (strcmp(pOption, "addfont") == 0)
+{
+OutputDevice *pDevice = Application::GetDefaultDevice();
+OutputDevice::ImplClearAllFontData(true);
+pDevice->AddTempDevFont(OUString::fromUtf8(OString(pValue)), "");
+OutputDevice::ImplRefreshAllFontData(true);
+}
}
static void doc_postUnoCommand(LibreOfficeKitDocument* pThis, const char*
pCommand, const char* pArguments, bool bNotifyWhenFinished)
@@ -6528,7 +6535,11 @@ static int lo_initialize(LibreOfficeKit* pThis, const
char* pAppPath, const char
// What stage are we at ?
if (pThis == nullptr)
+{
eStage = PRE_INIT;
+SAL_INFO("lok", "Create libreoffice object");
+gImpl = new LibLibreOffice_Impl();
+}
else if (bPreInited)
eStage = SECOND_INIT;
else
@@ -6815,11 +6826,12 @@ static int lo_initialize(LibreOfficeKit* pThis, const
char* pAppPath, const char
SAL_JNI_EXPORT
LibreOfficeKit *libreofficekit_hook_2(const char* install_path, const char*
user_profile_url)
{
-if (!gImpl)
+static bool alreadyCalled = false;
+
+if (!alreadyCalled)
{
-SAL_INFO("lok", "Create libreoffice object");
+alreadyCalled = true;
-gImpl = new LibLibreOffice_Impl();
if (!lo_initialize(gImpl, install_path, user_profile_url))
{
lo_destroy(gImpl);
@@ -6840,6 +6852,15 @@ int lok_preinit(const char* install_path, const char*
user_profile_url)
return lo_initialize(nullptr, install_path, user_profile_url);
}
+SAL_JNI_EXPORT
+int lok_preinit_2(const char* install_path, const char* user_profile_url,
LibLibreOffice_Impl** kit)
+{
+int result = lo_initialize(nullptr, install_path, user_profile_url);
+if (kit != nullptr)
+*kit = gImpl;
+return result;
+}
+
static void lo_destroy(LibreOfficeKit* pThis)
{
SolarMutexClearableGuard aGuard;
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index 2a4a8fd72661..507d1c5202b5 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -1037,6 +1037,10 @@ public:
* environment variable SAL_LOG is again used as by default. You
* can switch back and forth as you like.
*
+ * "addfont": ""
+ *
+ * Adds the font at the URL given.
+ *
* @param pOption the option name
* @param pValue its value
*/
diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h
b/include/LibreOfficeKit/LibreOfficeKitInit.h
index 8a48bd8392be..b1bfd2b54d7f 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -249,6 +249,8 @@ typedef LibreOfficeKit *(LokHookFunction2)( const char
*install_path, const char
typedef int (LokHookPreInit) ( const char *install_path, const
char *user_profile_url );
+typedef int (LokHookPreInit2) ( const char *install_path, const
char *user_profile_url, LibreOfficeKit** kit);
+
#if defined(IOS) || defined(ANDROID)
LibreOfficeKit *libreofficekit_hook_2(const char* install_path, const char*
user_profile_path);
#endif
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index ac5fa932a5b0..06f902388a8b 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1286,10 +1286,10 @@ public:
//drop font data for all outputdevices.
//If bNewFontLists is true then empty lists of system fonts
-SAL_DLLPRIVATE static void ImplClearAllFontData( bool bNewFontLists );
+static v
[Libreoffice-commits] core.git: desktop/source include/LibreOfficeKit include/sal include/vcl vcl/unx
desktop/source/lib/init.cxx| 27 ++---
include/LibreOfficeKit/LibreOfficeKit.hxx |4 +++
include/LibreOfficeKit/LibreOfficeKitInit.h|2 +
include/sal/log-areas.dox |1
include/vcl/outdev.hxx |4 +--
vcl/unx/generic/glyphs/freetype_glyphcache.cxx |7 ++
6 files changed, 40 insertions(+), 5 deletions(-)
New commits:
commit 5de22d1e559cd0f1f5fa4e247f0ce153710fbeab
Author: Tor Lillqvist
AuthorDate: Wed Mar 9 11:33:16 2022 +0200
Commit: Tor Lillqvist
CommitDate: Wed Apr 13 12:54:04 2022 +0200
Handle "addfont" from Collabora Online
We use the AddTempDevFont() API to add a new font. Sadly there is no
corresponding way to remove such a temporarily added font.
Change-Id: I6fe61919daa5af29e964cec1caf7293aefa8ea4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132948
Tested-by: Tor Lillqvist
Reviewed-by: Tor Lillqvist
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 33b763b3a1cb..442297d5d348 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4113,6 +4113,13 @@ static void lo_setOption(LibreOfficeKit* /*pThis*/,
const char *pOption, const c
else
sal_detail_set_log_selector(pCurrentSalLogOverride);
}
+else if (strcmp(pOption, "addfont") == 0)
+{
+OutputDevice *pDevice = Application::GetDefaultDevice();
+OutputDevice::ImplClearAllFontData(true);
+pDevice->AddTempDevFont(OUString::fromUtf8(pValue), "");
+OutputDevice::ImplRefreshAllFontData(true);
+}
}
static void doc_postUnoCommand(LibreOfficeKitDocument* pThis, const char*
pCommand, const char* pArguments, bool bNotifyWhenFinished)
@@ -6476,7 +6483,11 @@ static int lo_initialize(LibreOfficeKit* pThis, const
char* pAppPath, const char
// What stage are we at ?
if (pThis == nullptr)
+{
eStage = PRE_INIT;
+SAL_INFO("lok", "Create libreoffice object");
+gImpl = new LibLibreOffice_Impl();
+}
else if (bPreInited)
eStage = SECOND_INIT;
else
@@ -6760,11 +6771,12 @@ static int lo_initialize(LibreOfficeKit* pThis, const
char* pAppPath, const char
SAL_JNI_EXPORT
LibreOfficeKit *libreofficekit_hook_2(const char* install_path, const char*
user_profile_url)
{
-if (!gImpl)
+static bool alreadyCalled = false;
+
+if (!alreadyCalled)
{
-SAL_INFO("lok", "Create libreoffice object");
+alreadyCalled = true;
-gImpl = new LibLibreOffice_Impl();
if (!lo_initialize(gImpl, install_path, user_profile_url))
{
lo_destroy(gImpl);
@@ -6785,6 +6797,15 @@ int lok_preinit(const char* install_path, const char*
user_profile_url)
return lo_initialize(nullptr, install_path, user_profile_url);
}
+SAL_JNI_EXPORT
+int lok_preinit_2(const char* install_path, const char* user_profile_url,
LibLibreOffice_Impl** kit)
+{
+int result = lo_initialize(nullptr, install_path, user_profile_url);
+if (kit != nullptr)
+*kit = gImpl;
+return result;
+}
+
static void lo_destroy(LibreOfficeKit* pThis)
{
SolarMutexClearableGuard aGuard;
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index 064caae2729b..912b3e0d2203 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -1036,6 +1036,10 @@ public:
* environment variable SAL_LOG is again used as by default. You
* can switch back and forth as you like.
*
+ * "addfont": ""
+ *
+ * Adds the font at the URL given.
+ *
* @param pOption the option name
* @param pValue its value
*/
diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h
b/include/LibreOfficeKit/LibreOfficeKitInit.h
index ccd42863ba25..5bbb722b5b18 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -255,6 +255,8 @@ typedef LibreOfficeKit *(LokHookFunction2)( const char
*install_path, const char
typedef int (LokHookPreInit) ( const char *install_path, const
char *user_profile_url );
+typedef int (LokHookPreInit2) ( const char *install_path, const
char *user_profile_url, LibreOfficeKit** kit);
+
#if defined(IOS) || defined(ANDROID)
LibreOfficeKit *libreofficekit_hook_2(const char* install_path, const char*
user_profile_path);
#endif
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index b00d1c1c8236..4e9c3105c844 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -509,6 +509,7 @@ certain functionality.
@li @c vcl.uitest - The UI testing framework code
@li @c vcl.unity
@li @c vcl.unx.dtrans
+@li @c vcl.unx.freetype
@li @c vcl.unx.print
@li @c vcl.v
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 69c10ca6dedb5b07abab0740fa17bf70beec7144 Author: Tor Lillqvist AuthorDate: Tue Mar 15 10:13:34 2022 +0200 Commit: Tor Lillqvist CommitDate: Wed Apr 13 08:31:39 2022 +0200 Accept iOS SDK 15.4 Change-Id: I53efea3dcc7308f2189d331a9f5ec52d0e610b42 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131581 Tested-by: Jenkins Reviewed-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132196 Tested-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132942 diff --git a/configure.ac b/configure.ac index 4d4a19a29c12..6cdcb539da44 100644 --- a/configure.ac +++ b/configure.ac @@ -3577,8 +3577,8 @@ dnl === if test $_os = iOS; then AC_MSG_CHECKING([what iOS SDK to use]) -current_sdk_ver=15.2 -older_sdk_vers="15.0 14.5" +current_sdk_ver=15.4 +older_sdk_vers="15.2 15.0" if test "$enable_ios_simulator" = "yes"; then platform=iPhoneSimulator versionmin=-mios-simulator-version-min=13.6
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.4-60'
Tag 'cp-6.4-60' created by Andras Timar at 2022-04-06 08:53 + cp-6.4-60 Changes since cp-6.4-48: Tor Lillqvist (1): Add missing mobile-specific Impress German translations --- source/de/sd/messages.po | 37 + 1 file changed, 37 insertions(+) ---
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - configure.ac
configure.ac | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 1d9205e7093b367d95521016c0aba4a246ac818d
Author: Tor Lillqvist
AuthorDate: Mon Mar 14 23:43:35 2022 +0200
Commit: Xisco Fauli
CommitDate: Fri Apr 1 22:42:52 2022 +0200
Accept macOS SDK 12.3
Change-Id: Ice469236dd79675b6fad6f7c5a244888200fea8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131565
Tested-by: Tor Lillqvist
Reviewed-by: Tor Lillqvist
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131975
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132436
diff --git a/configure.ac b/configure.ac
index a8802eb6eb78..1bb6ea0a1af9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3225,7 +3225,7 @@ if test $_os = Darwin; then
# higher than or equal to the minimum required should be found.
AC_MSG_CHECKING([what macOS SDK to use])
-for _macosx_sdk in ${with_macosx_sdk-12.1 12.0 11.3 11.1 11.0 10.15 10.14
10.13}; do
+for _macosx_sdk in ${with_macosx_sdk-12.3 12.1 12.0 11.3 11.1 11.0 10.15
10.14 10.13}; do
MACOSX_SDK_PATH=`xcrun --sdk macosx${_macosx_sdk} --show-sdk-path 2>
/dev/null`
if test -d "$MACOSX_SDK_PATH"; then
with_macosx_sdk="${_macosx_sdk}"
@@ -3269,6 +3269,9 @@ if test $_os = Darwin; then
12.1)
MACOSX_SDK_VERSION=120100
;;
+12.3)
+MACOSX_SDK_VERSION=120300
+;;
*)
AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported
value, supported values are 10.13--12.1])
;;
@@ -3344,8 +3347,11 @@ if test $_os = Darwin; then
12.1)
MAC_OS_X_VERSION_MIN_REQUIRED="120100"
;;
+12.3)
+MAC_OS_X_VERSION_MIN_REQUIRED="120300"
+;;
*)
-AC_MSG_ERROR([with-macosx-version-min-required
$with_macosx_version_min_required is not a supported value, supported values
are 10.10--12.1])
+AC_MSG_ERROR([with-macosx-version-min-required
$with_macosx_version_min_required is not a supported value, supported values
are 10.10--12.3])
;;
esac
@@ -3418,8 +3424,11 @@ if test $_os = Darwin; then
12.1)
MAC_OS_X_VERSION_MAX_ALLOWED="120100"
;;
+12.3)
+MAC_OS_X_VERSION_MAX_ALLOWED="120300"
+;;
*)
-AC_MSG_ERROR([with-macosx-version-max-allowed
$with_macosx_version_max_allowed is not a supported value, supported values are
10.10--12.1])
+AC_MSG_ERROR([with-macosx-version-max-allowed
$with_macosx_version_max_allowed is not a supported value, supported values are
10.10--12.3])
;;
esac
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - filter/source
filter/source/svg/presentation_engine.js |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 772ef157a20efd3243e6d05825a88d4cbd55b67a
Author: Tor Lillqvist
AuthorDate: Mon Mar 28 14:51:43 2022 +0300
Commit: Tor Lillqvist
CommitDate: Mon Mar 28 15:58:40 2022 +0200
Make slideshow touch gestures work again in the mobile apps
Need to s/lool/cool/ here, too.
Change-Id: Ib6762f196ca2b1c2e8735c6ff3e591164d34fb0b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132202
Tested-by: Tor Lillqvist
Reviewed-by: Tor Lillqvist
diff --git a/filter/source/svg/presentation_engine.js
b/filter/source/svg/presentation_engine.js
index 0babb0083cc8..0a8eb73e7c12 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -18622,8 +18622,8 @@ SlideShow.prototype.exitSlideShowInApp = function()
{
if (window.webkit !== undefined &&
window.webkit.messageHandlers !== undefined &&
-window.webkit.messageHandlers.lool !== undefined)
-window.webkit.messageHandlers.lool.postMessage('EXITSLIDESHOW', '*');
+window.webkit.messageHandlers.cool !== undefined)
+window.webkit.messageHandlers.cool.postMessage('EXITSLIDESHOW', '*');
}
SlideShow.prototype.displaySlide = function( nNewSlide, bSkipSlideTransition )
[Libreoffice-commits] core.git: filter/source
filter/source/svg/presentation_engine.js |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e889c9b8bfafec4c89af899eb0c4df52d897
Author: Tor Lillqvist
AuthorDate: Mon Mar 28 14:51:43 2022 +0300
Commit: Tor Lillqvist
CommitDate: Mon Mar 28 15:50:00 2022 +0200
Make slideshow touch gestures work again in the mobile apps
Need to s/lool/cool/ here, too.
Change-Id: Ib6762f196ca2b1c2e8735c6ff3e591164d34fb0b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132204
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/filter/source/svg/presentation_engine.js
b/filter/source/svg/presentation_engine.js
index 636fc3a50d37..370bacc5cd72 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -18622,8 +18622,8 @@ SlideShow.prototype.exitSlideShowInApp = function()
{
if (window.webkit !== undefined &&
window.webkit.messageHandlers !== undefined &&
-window.webkit.messageHandlers.lool !== undefined)
-window.webkit.messageHandlers.lool.postMessage('EXITSLIDESHOW', '*');
+window.webkit.messageHandlers.cool !== undefined)
+window.webkit.messageHandlers.cool.postMessage('EXITSLIDESHOW', '*');
}
SlideShow.prototype.displaySlide = function( nNewSlide, bSkipSlideTransition )
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac
configure.ac | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
New commits:
commit d626eeb9f6038829064e73d194dde517d2a7eed9
Author: Tor Lillqvist
AuthorDate: Mon Mar 14 23:43:35 2022 +0200
Commit: Tor Lillqvist
CommitDate: Mon Mar 28 15:05:56 2022 +0200
Accept macOS SDK 12.3
Change-Id: Ice469236dd79675b6fad6f7c5a244888200fea8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131565
Tested-by: Tor Lillqvist
Reviewed-by: Tor Lillqvist
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131975
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132197
diff --git a/configure.ac b/configure.ac
index dfb99a1abbc4..53aa28c939ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3136,7 +3136,7 @@ if test $_os = Darwin; then
# higher than or equal to the minimum required should be found.
AC_MSG_CHECKING([what macOS SDK to use])
-for _macosx_sdk in ${with_macosx_sdk-12.1 12.0 11.3 11.1 11.0 10.15 10.14
10.13}; do
+for _macosx_sdk in ${with_macosx_sdk-12.3 12.1 12.0 11.3 11.1 11.0 10.15
10.14 10.13}; do
MACOSX_SDK_PATH=`xcrun --sdk macosx${_macosx_sdk} --show-sdk-path 2>
/dev/null`
if test -d "$MACOSX_SDK_PATH"; then
with_macosx_sdk="${_macosx_sdk}"
@@ -3180,8 +3180,11 @@ if test $_os = Darwin; then
12.1)
MACOSX_SDK_VERSION=120100
;;
+12.3)
+MACOSX_SDK_VERSION=120300
+;;
*)
-AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported
value, supported values are 10.13--12.1])
+AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported
value, supported values are 10.13--12.3])
;;
esac
@@ -3255,8 +3258,11 @@ if test $_os = Darwin; then
12.1)
MAC_OS_X_VERSION_MIN_REQUIRED="120100"
;;
+12.3)
+MAC_OS_X_VERSION_MIN_REQUIRED="120300"
+;;
*)
-AC_MSG_ERROR([with-macosx-version-min-required
$with_macosx_version_min_required is not a supported value, supported values
are 10.10--12.1])
+AC_MSG_ERROR([with-macosx-version-min-required
$with_macosx_version_min_required is not a supported value, supported values
are 10.10--12.3])
;;
esac
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 70d1afa83d1b014c642632fa7ca5d2f3e4d90721 Author: Tor Lillqvist AuthorDate: Tue Mar 15 10:13:34 2022 +0200 Commit: Tor Lillqvist CommitDate: Mon Mar 28 15:04:18 2022 +0200 Accept iOS SDK 15.4 Change-Id: I53efea3dcc7308f2189d331a9f5ec52d0e610b42 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131581 Tested-by: Jenkins Reviewed-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132196 Tested-by: Tor Lillqvist diff --git a/configure.ac b/configure.ac index bac228a112bd..dfb99a1abbc4 100644 --- a/configure.ac +++ b/configure.ac @@ -3438,8 +3438,8 @@ dnl === if test $_os = iOS; then AC_MSG_CHECKING([what iOS SDK to use]) -current_sdk_ver=15.2 -older_sdk_vers="15.0 14.5 14.0" +current_sdk_ver=15.4 +older_sdk_vers="15.2 15.0 14.5" if test "$enable_ios_simulator" = "yes"; then platform=iPhoneSimulator versionmin=-mios-simulator-version-min=12.2
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac
configure.ac | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 1d875592eb4a2ca78b94c959f1acbc3552db608f
Author: Tor Lillqvist
AuthorDate: Mon Mar 14 23:43:35 2022 +0200
Commit: Xisco Fauli
CommitDate: Wed Mar 23 15:48:16 2022 +0100
Accept macOS SDK 12.3
Change-Id: Ice469236dd79675b6fad6f7c5a244888200fea8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131565
Tested-by: Tor Lillqvist
Reviewed-by: Tor Lillqvist
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131975
Tested-by: Jenkins
diff --git a/configure.ac b/configure.ac
index adc7c2800488..d5c7cb76c917 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3270,7 +3270,7 @@ if test $_os = Darwin; then
# The SDK in the currently selected Xcode should be found.
AC_MSG_CHECKING([what macOS SDK to use])
-for macosx_sdk in 12.1 12.0 11.3 11.1 11.0 10.15 10.14 10.13; do
+for macosx_sdk in 12.3 12.1 12.0 11.3 11.1 11.0 10.15 10.14 10.13; do
MACOSX_SDK_PATH=`xcrun --sdk macosx${macosx_sdk} --show-sdk-path 2>
/dev/null`
if test -d "$MACOSX_SDK_PATH"; then
break
@@ -3312,6 +3312,9 @@ if test $_os = Darwin; then
12.1)
MACOSX_SDK_VERSION=120100
;;
+12.3)
+MACOSX_SDK_VERSION=120300
+;;
*)
AC_MSG_ERROR([macOS SDK $macosx_sdk is not supported])
;;
@@ -3381,8 +3384,11 @@ if test $_os = Darwin; then
12.1)
MAC_OS_X_VERSION_MIN_REQUIRED="120100"
;;
+12.3)
+MAC_OS_X_VERSION_MIN_REQUIRED="120300"
+;;
*)
-AC_MSG_ERROR([with-macosx-version-min-required
$with_macosx_version_min_required is not a supported value, supported values
are 10.12--12.1])
+AC_MSG_ERROR([with-macosx-version-min-required
$with_macosx_version_min_required is not a supported value, supported values
are 10.13--12.3])
;;
esac
Re: Hi (Formats supported by LibreOffice).
> Why is LO focussing on both MS formats and ODF? The answer is very simple: The people developing it are focussing (to some extent) on that, because that is what they want to work on. Or what their customers pay them to work on. There is no central LO organisation that would decide what others (companies or individuals) should work on. You are very welcome to join and start working on ODF only, for instance. (But you are not welcome to join and start removing code for MS formats.) --tml
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - vcl/unx
vcl/unx/generic/print/genpspgraphics.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit bd568636bfe85d1f72b93227adb501a959068213 Author: Tor Lillqvist AuthorDate: Tue Mar 8 14:29:54 2022 +0200 Commit: Tor Lillqvist CommitDate: Tue Mar 22 13:08:12 2022 +0100 Trust the family name in the font file if necessary Change-Id: I3598179bf85ba3acdaca6058982ba5bf81e68288 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131249 Tested-by: Jenkins CollaboraOffice Reviewed-by: Tor Lillqvist diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx index 8a53b52d3ee1..3074033df235 100644 --- a/vcl/unx/generic/print/genpspgraphics.cxx +++ b/vcl/unx/generic/print/genpspgraphics.cxx @@ -644,7 +644,8 @@ bool GenPspGraphics::AddTempDevFontHelper( PhysicalFontCollection* pFontCollecti // prepare font data psp::FastPrintFontInfo aInfo; rMgr.getFontFastInfo( elem, aInfo ); -aInfo.m_aFamilyName = rFontName; +if (!rFontName.isEmpty()) +aInfo.m_aFamilyName = rFontName; // inform glyph cache of new font FontAttributes aDFA = GenPspGraphics::Info2FontAttributes( aInfo );
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac
configure.ac | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 38054361895eb0d06a23a704d8b8402139f1bd63
Author: Tor Lillqvist
AuthorDate: Mon Mar 14 23:43:35 2022 +0200
Commit: Tor Lillqvist
CommitDate: Mon Mar 21 11:55:44 2022 +0100
Accept macOS SDK 12.3
Change-Id: Ice469236dd79675b6fad6f7c5a244888200fea8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131565
Tested-by: Tor Lillqvist
Reviewed-by: Tor Lillqvist
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131894
diff --git a/configure.ac b/configure.ac
index e55f8c8564c4..79af091ae68b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3280,7 +3280,7 @@ if test $_os = Darwin; then
# The SDK in the currently selected Xcode should be found.
AC_MSG_CHECKING([what macOS SDK to use])
-for macosx_sdk in 12.1 12.0 11.3 11.1 11.0 10.15 10.14 10.13; do
+for macosx_sdk in 12.3 12.1 12.0 11.3 11.1 11.0 10.15 10.14 10.13; do
MACOSX_SDK_PATH=`xcrun --sdk macosx${macosx_sdk} --show-sdk-path 2>
/dev/null`
if test -d "$MACOSX_SDK_PATH"; then
break
@@ -3322,6 +3322,9 @@ if test $_os = Darwin; then
12.1)
MACOSX_SDK_VERSION=120100
;;
+12.3)
+MACOSX_SDK_VERSION=120300
+;;
*)
AC_MSG_ERROR([macOS SDK $macosx_sdk is not supported])
;;
@@ -3391,8 +3394,11 @@ if test $_os = Darwin; then
12.1)
MAC_OS_X_VERSION_MIN_REQUIRED="120100"
;;
+12.3)
+MAC_OS_X_VERSION_MIN_REQUIRED="120300"
+;;
*)
-AC_MSG_ERROR([with-macosx-version-min-required
$with_macosx_version_min_required is not a supported value, supported values
are 10.12--12.1])
+AC_MSG_ERROR([with-macosx-version-min-required
$with_macosx_version_min_required is not a supported value, supported values
are 10.12--12.3])
;;
esac
@@ -3459,8 +3465,11 @@ if test $_os = Darwin; then
12.1)
MAC_OS_X_VERSION_MAX_ALLOWED="120100"
;;
+12.3)
+MAC_OS_X_VERSION_MAX_ALLOWED="120300"
+;;
*)
-AC_MSG_ERROR([with-macosx-version-max-allowed
$with_macosx_version_max_allowed is not a supported value, supported values are
10.12--12.1])
+AC_MSG_ERROR([with-macosx-version-max-allowed
$with_macosx_version_max_allowed is not a supported value, supported values are
10.12--12.3])
;;
esac
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.4-59'
Tag 'cp-6.4-59' created by Andras Timar at 2022-03-15 17:16 + cp-6.4-59 Changes since cp-6.4-48: Tor Lillqvist (1): Add missing mobile-specific Impress German translations --- source/de/sd/messages.po | 37 + 1 file changed, 37 insertions(+) ---
[Libreoffice-commits] core.git: configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 85adfa77911acb072a1a31f9e021e7a1707a2544 Author: Tor Lillqvist AuthorDate: Tue Mar 15 10:13:34 2022 +0200 Commit: Tor Lillqvist CommitDate: Tue Mar 15 10:42:38 2022 +0100 Accept iOS SDK 15.4 Change-Id: I53efea3dcc7308f2189d331a9f5ec52d0e610b42 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131581 Tested-by: Jenkins Reviewed-by: Tor Lillqvist diff --git a/configure.ac b/configure.ac index f577a45423c7..1e26c8be4225 100644 --- a/configure.ac +++ b/configure.ac @@ -3660,8 +3660,8 @@ dnl === if test $_os = iOS; then AC_MSG_CHECKING([what iOS SDK to use]) -current_sdk_ver=15.2 -older_sdk_vers="15.0 14.5" +current_sdk_ver=15.4 +older_sdk_vers="15.2 15.0 14.5" if test "$enable_ios_simulator" = "yes"; then platform=iPhoneSimulator versionmin=-mios-simulator-version-min=13.6
[Libreoffice-commits] core.git: configure.ac
configure.ac | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 3733772279ba8968f18a9f73a3294f43aebe53ac
Author: Tor Lillqvist
AuthorDate: Mon Mar 14 23:43:35 2022 +0200
Commit: Tor Lillqvist
CommitDate: Tue Mar 15 07:58:29 2022 +0100
Accept macOS SDK 12.3
Change-Id: Ice469236dd79675b6fad6f7c5a244888200fea8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131565
Tested-by: Tor Lillqvist
Reviewed-by: Tor Lillqvist
diff --git a/configure.ac b/configure.ac
index 4011e8e5a849..f577a45423c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3415,7 +3415,7 @@ if test $_os = Darwin; then
# The SDK in the currently selected Xcode should be found.
AC_MSG_CHECKING([what macOS SDK to use])
-for macosx_sdk in 12.1 12.0 11.3 11.1 11.0 10.15 10.14 10.13; do
+for macosx_sdk in 12.3 12.1 12.0 11.3 11.1 11.0 10.15 10.14 10.13; do
MACOSX_SDK_PATH=`xcrun --sdk macosx${macosx_sdk} --show-sdk-path 2>
/dev/null`
if test -d "$MACOSX_SDK_PATH"; then
break
@@ -3457,6 +3457,9 @@ if test $_os = Darwin; then
12.1)
MACOSX_SDK_VERSION=120100
;;
+12.3)
+MACOSX_SDK_VERSION=120300
+;;
*)
AC_MSG_ERROR([macOS SDK $macosx_sdk is not supported])
;;
@@ -3519,8 +3522,11 @@ if test $_os = Darwin; then
12.1)
MAC_OS_X_VERSION_MIN_REQUIRED="120100"
;;
+12.3)
+MAC_OS_X_VERSION_MIN_REQUIRED="120300"
+;;
*)
-AC_MSG_ERROR([with-macosx-version-min-required
$with_macosx_version_min_required is not a supported value, supported values
are 10.13--12.1])
+AC_MSG_ERROR([with-macosx-version-min-required
$with_macosx_version_min_required is not a supported value, supported values
are 10.13--12.3])
;;
esac
[Libreoffice-commits] core.git: 2 commits - sd/qa svx/source vcl/unx
sd/qa/unit/tiledrendering/tiledrendering.cxx | 16 ++--
svx/source/svdraw/svdxcgv.cxx|5 -
vcl/unx/generic/fontmanager/fontmanager.cxx | 21 -
3 files changed, 6 insertions(+), 36 deletions(-)
New commits:
commit 7545a53f53c786c1124ba750f9339ffc237d6467
Author: Tor Lillqvist
AuthorDate: Mon Mar 14 11:21:35 2022 +0200
Commit: Tor Lillqvist
CommitDate: Mon Mar 14 11:53:22 2022 +0100
unit_online_get_fonts() has not been used by Online since 2017
Change-Id: I7dddb4fd40f219df1969f452c95170bc70caa44f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131524
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx
b/vcl/unx/generic/fontmanager/fontmanager.cxx
index bee1f4d4d92b..eb2b869217b3 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -1141,25 +1141,4 @@ void PrintFontManager::getGlyphWidths( fontID nFont,
CloseTTFont(pTTFont);
}
-/// used by online unit tests via dlopen.
-extern "C" {
-SAL_DLLPUBLIC_EXPORT const char * unit_online_get_fonts(void)
-{
-std::vector< fontID > aFontIDs;
-PrintFontManager = PrintFontManager::get();
-rMgr.getFontList(aFontIDs);
-OStringBuffer aBuf;
-aBuf.append( static_cast(aFontIDs.size()) );
-aBuf.append( " PS fonts.\n" );
-for( auto nId : aFontIDs )
-{
-const OUString& rName = rMgr.getPSName( nId );
-aBuf.append( OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ) );
-aBuf.append( "\n" );
-}
-static OString aResult = aBuf.makeStringAndClear();
-return aResult.getStr();
-}
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 9630bbc6df8bbff2c853e07be93579a96cc7cdbb
Author: Mert Tumer
AuthorDate: Wed Jan 19 14:23:52 2022 +0300
Commit: Mert Tumer
CommitDate: Mon Mar 14 11:53:10 2022 +0100
lok: Set pasted text rect pos to 0, 0
Rect size change according to the length of the text
however, this can make the text inserted in the negative coordinates
and half of it becomes invisible.
Signed-off-by: Mert Tumer
Change-Id: Ibd4e6164c21088205efecf024c1888c55ac33f0e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128603
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131519
Tested-by: Jenkins
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index d5972c459e92..8a4da8dbf301 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -2469,21 +2469,9 @@ void SdTiledRenderingTest::testPasteTextOnSlide()
SdrTextObj* pTextObj = dynamic_cast(pObject);
CPPUNIT_ASSERT(pTextObj);
CPPUNIT_ASSERT_EQUAL(SdrObjKind::Text, pTextObj->GetObjIdentifier());
-// This test is unreliable: it gives alternating results for the following
coordinates.
-// As a compromise, instead of disabling it altogether, we allow for both
sets of values.
const Point aPos = pTextObj->GetLastBoundRect().TopLeft();
-if (aPos.getX() < 1)
-{
-// We get this with 'make CppunitTest_sd_tiledrendering'
-CPPUNIT_ASSERT_DOUBLES_EQUAL(static_cast(6739),
aPos.getX(), 100);
-CPPUNIT_ASSERT_DOUBLES_EQUAL(static_cast(6822),
aPos.getY(), 100);
-}
-else
-{
-// We get this with 'make check'
-CPPUNIT_ASSERT_DOUBLES_EQUAL(static_cast(12990),
aPos.getX(), 100);
-CPPUNIT_ASSERT_DOUBLES_EQUAL(static_cast(7393),
aPos.getY(), 100);
-}
+CPPUNIT_ASSERT_EQUAL(static_cast(0), aPos.getX());
+CPPUNIT_ASSERT_EQUAL(static_cast(0), aPos.getY());
}
void SdTiledRenderingTest::testTdf115873()
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 513eb39c7996..a9b720f300d8 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -50,6 +50,7 @@
#include
#include
#include
+#include
using namespace com::sun::star;
@@ -406,7 +407,9 @@ void SdrExchangeView::ImpPasteObject(SdrObject* pObj,
SdrObjList& rLst, const Po
nSizY /= aDstFr.GetNumerator();
tools::Long xs=nSizX;
tools::Long ys=nSizY;
-Point aPos(rCenter.X()-xs/2,rCenter.Y()-ys/2);
+// set the pos to 0, 0 for online case
+bool isLOK = comphelper::LibreOfficeKit::isActive();
+Point aPos(isLOK ? 0 : rCenter.X()-xs/2, isLOK ? 0 : rCenter.Y()-ys/2);
tools::Rectangle aR(aPos.X(),aPos.Y(),aPos.X()+xs,aPos.Y()+ys);
pObj->SetLogicRect(aR);
rLst.InsertObject(pObj, SAL_MAX_SIZE);
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/generic/print/genpspgraphics.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 376588d3c6c8b83c663f350a7b2db499682e6a80 Author: Tor Lillqvist AuthorDate: Tue Mar 8 14:29:54 2022 +0200 Commit: Tor Lillqvist CommitDate: Thu Mar 10 11:00:43 2022 +0100 Trust the family name in the font file if necessary in AddTempDevFontHelper() If the passed in font name is empty, use the one that has been read from the font file. Seems like a reasonable thing to do, and I have a use for this small improvement coming. Change-Id: I3598179bf85ba3acdaca6058982ba5bf81e68288 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131300 Tested-by: Jenkins Reviewed-by: Tor Lillqvist diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx index da0a406dea0b..f903b30c6204 100644 --- a/vcl/unx/generic/print/genpspgraphics.cxx +++ b/vcl/unx/generic/print/genpspgraphics.cxx @@ -253,7 +253,8 @@ bool GenPspGraphics::AddTempDevFontHelper( vcl::font::PhysicalFontCollection* pF // prepare font data psp::FastPrintFontInfo aInfo; rMgr.getFontFastInfo( elem, aInfo ); -aInfo.m_aFamilyName = rFontName; +if (!rFontName.isEmpty()) +aInfo.m_aFamilyName = rFontName; // inform glyph cache of new font FontAttributes aDFA = GenPspGraphics::Info2FontAttributes( aInfo );
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - sw/inc
sw/inc/textboxhelper.hxx |1 + 1 file changed, 1 insertion(+) New commits: commit cdfa0328047bbc3905ee8b541f326cccf802f05f Author: Tor Lillqvist AuthorDate: Wed Mar 9 17:59:53 2022 +0200 Commit: Tor Lillqvist CommitDate: Wed Mar 9 17:59:53 2022 +0200 Fix build error: include Change-Id: I4bb31565096cd4cb3dbb910b638e5003ce6d9724 diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx index aa1940b5dd60..eb7a9430b2f8 100644 --- a/sw/inc/textboxhelper.hxx +++ b/sw/inc/textboxhelper.hxx @@ -11,6 +11,7 @@ #define INCLUDED_SW_INC_TEXTBOXHELPER_HXX #include +#include #include #include
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.4-58'
Tag 'cp-6.4-58' created by Andras Timar at 2022-03-09 15:59 + cp-6.4-58 Changes since cp-6.4-48: Tor Lillqvist (1): Add missing mobile-specific Impress German translations --- source/de/sd/messages.po | 37 + 1 file changed, 37 insertions(+) ---
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/ios vcl/source
vcl/ios/DataFlavorMapping.cxx|2 +-
vcl/source/treelist/transfer.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit b05c1a717861c6f0353581dc6a0aa894693be538
Author: Tor Lillqvist
AuthorDate: Thu Dec 16 19:24:20 2021 +0200
Commit: Tor Lillqvist
CommitDate: Wed Mar 9 12:21:53 2022 +0200
Fix iOS compilation after recent changes to Sequence
Change-Id: I73c519174029766a3a2f61f9ad93fd63589b8184
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126957
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/vcl/ios/DataFlavorMapping.cxx b/vcl/ios/DataFlavorMapping.cxx
index 6a3815cf7eb3..05abf2b8a6f9 100644
--- a/vcl/ios/DataFlavorMapping.cxx
+++ b/vcl/ios/DataFlavorMapping.cxx
@@ -559,7 +559,7 @@ DataFlavorMapper::typesArrayToFlavorSequence(NSArray*
types) const
if (isValidFlavor(oOOFlavor))
{
flavors.realloc(flavors.getLength() + 1);
-flavors[flavors.getLength() - 1] = oOOFlavor;
+flavors.getArray()[flavors.getLength() - 1] = oOOFlavor;
SAL_INFO("vcl.ios.clipboard",
"Mapped " << [sysFormat UTF8String] << " to " <<
oOOFlavor.MimeType);
}
diff --git a/vcl/source/treelist/transfer.cxx b/vcl/source/treelist/transfer.cxx
index 81c99653578f..6875154d5ba3 100644
--- a/vcl/source/treelist/transfer.cxx
+++ b/vcl/source/treelist/transfer.cxx
@@ -666,7 +666,7 @@ bool TransferableHelper::SetBitmapEx( const BitmapEx&
rBitmapEx, const DataFlavo
#ifdef IOS
// Use faster compression on slow devices
aFilterData.realloc(aFilterData.getLength() + 1);
-aFilterData[aFilterData.getLength() - 1].Name = "Compression";
+aFilterData.getArray()[aFilterData.getLength() - 1].Name =
"Compression";
// We "know" that this gets passed to zlib's deflateInit2_(). 1
means best speed. For a
// typical 15 megapixel image from a DSLR, we are talking about a
difference of 17 s for
@@ -675,7 +675,7 @@ bool TransferableHelper::SetBitmapEx( const BitmapEx&
rBitmapEx, const DataFlavo
// Sure, the best would be to not have to re-encode the image at
all, but have access to
// the original JPEG or PNG when there is a such.
-aFilterData[aFilterData.getLength() - 1].Value <<= 1;
+aFilterData.getArray()[aFilterData.getLength() - 1].Value <<= 1;
#endif
vcl::PNGWriter aPNGWriter(rBitmapEx, );
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/unx/fontmanager.hxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit ba2f243d684fce905b1dc8871f57c64008471405 Author: Tor Lillqvist AuthorDate: Tue Mar 8 10:59:01 2022 +0200 Commit: Tor Lillqvist CommitDate: Tue Mar 8 11:09:56 2022 +0100 Make comment less misleading Change-Id: I608abe994cc8a67c295450d836d8c423026b85d9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131175 Tested-by: Tor Lillqvist Reviewed-by: Tor Lillqvist diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx index 40294209ba97..7f0faf239f15 100644 --- a/vcl/inc/unx/fontmanager.hxx +++ b/vcl/inc/unx/fontmanager.hxx @@ -58,8 +58,7 @@ typedef int fontID; /* * the difference between FastPrintFontInfo and PrintFontInfo * is that the information in FastPrintFontInfo can usually - * be gathered without opening either the font file, they are - * gathered from fonts.dir alone. + * be gathered from fontconfig results. * if only FastPrintFontInfo is gathered and PrintFontInfo * on demand and for less fonts, then performance in startup * increases considerably
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.4-57'
Tag 'cp-6.4-57' created by Andras Timar at 2022-03-07 22:15 + cp-6.4-57 Changes since cp-6.4-48: Tor Lillqvist (1): Add missing mobile-specific Impress German translations --- source/de/sd/messages.po | 37 + 1 file changed, 37 insertions(+) ---
[Libreoffice-commits] core.git: bin/find-can-be-private-symbols.functions.results vcl/inc vcl/unx
bin/find-can-be-private-symbols.functions.results |2 +-
vcl/inc/unx/fontmanager.hxx |2 +-
vcl/unx/generic/fontmanager/fontconfig.cxx|4 +---
vcl/unx/generic/fontmanager/fontmanager.cxx |6 +-
4 files changed, 4 insertions(+), 10 deletions(-)
New commits:
commit 4618de024845573e33324539a7b455cd274a5fc3
Author: Tor Lillqvist
AuthorDate: Mon Mar 7 11:33:49 2022 +0200
Commit: Tor Lillqvist
CommitDate: Mon Mar 7 11:47:32 2022 +0100
Drop useless parameter
The parameter to PrintFontManager::countFontconfigFonts() was only
written to since babf6d5e53516e80e8e3f2485796ebfaeb20e9c1.
Change-Id: Ie206fdbd620f1cfc6402c1d02709c3b653140c85
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131097
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/bin/find-can-be-private-symbols.functions.results
b/bin/find-can-be-private-symbols.functions.results
index 2039061f1477..137b54d7a903 100644
--- a/bin/find-can-be-private-symbols.functions.results
+++ b/bin/find-can-be-private-symbols.functions.results
@@ -21124,7 +21124,7 @@ psp::PrintFontManager::analyzeFontFile(int,
rtl::OString const&, char const*) co
psp::PrintFontManager::analyzeSfntFamilyName(void const*,
std::vector >&)
psp::PrintFontManager::analyzeSfntFile(psp::PrintFontManager::PrintFont&) const
psp::PrintFontManager::convertSfntName(void*)
-psp::PrintFontManager::countFontconfigFonts(std::unordered_map, std::equal_to,
std::allocator > >&)
+psp::PrintFontManager::countFontconfigFonts()
psp::PrintFontManager::createFontSubset(FontSubsetInfo&, int, rtl::OUString
const&, unsigned short const*, unsigned char const*, int*, int)
psp::PrintFontManager::deinitFontconfig()
psp::PrintFontManager::fillPrintFontInfo(psp::PrintFontManager::PrintFont
const&, psp::FastPrintFontInfo&)
diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
index d16eb30fb185..40294209ba97 100644
--- a/vcl/inc/unx/fontmanager.hxx
+++ b/vcl/inc/unx/fontmanager.hxx
@@ -186,7 +186,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
called from initialize()
*/
static void initFontconfig();
-void countFontconfigFonts( std::unordered_map&
o_rVisitedPaths );
+void countFontconfigFonts();
/* deinitialize fontconfig
*/
static void deinitFontconfig();
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx
b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 3c0f8052bd6e..4546de18162a 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -569,7 +569,7 @@ namespace
}
}
-void PrintFontManager::countFontconfigFonts( std::unordered_map&
o_rVisitedPaths )
+void PrintFontManager::countFontconfigFonts()
{
int nFonts = 0;
FontCfgWrapper& rWrapper = FontCfgWrapper::get();
@@ -637,8 +637,6 @@ void PrintFontManager::countFontconfigFonts(
std::unordered_map& o
OString aDir, aBase, aOrgPath( reinterpret_cast(file) );
splitPath( aOrgPath, aDir, aBase );
-o_rVisitedPaths[aDir] = 1;
-
int nDirID = getDirectoryAtom( aDir );
SAL_INFO("vcl.fonts.detail", "file " << aBase << " not cached");
// not known, analyze font file to get attributes
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx
b/vcl/unx/generic/fontmanager/fontmanager.cxx
index 86b5b1b435e3..bee1f4d4d92b 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -713,11 +713,7 @@ void PrintFontManager::initialize()
} while( nIndex >= 0 );
}
-// protect against duplicate paths
-std::unordered_map< OString, int > visited_dirs;
-
-// Don't search directories that fontconfig already did
-countFontconfigFonts( visited_dirs );
+countFontconfigFonts();
#if OSL_DEBUG_LEVEL > 1
aStep1 = times( );
[Libreoffice-commits] core.git: include/unotools
include/unotools/VersionConfig.hxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 6c17a51c0f6f2bf9e8c1132a2d1c96edb404e522
Author: Tor Lillqvist
AuthorDate: Tue Mar 1 15:09:15 2022 +0200
Commit: Mike Kaganski
CommitDate: Tue Mar 1 16:34:52 2022 +0100
Quick build fix: Add missing #include
Change-Id: Ib36aa807c3fbe0678adaaea0d202163d2ac70022
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130791
Tested-by: Mike Kaganski
Reviewed-by: Mike Kaganski
diff --git a/include/unotools/VersionConfig.hxx
b/include/unotools/VersionConfig.hxx
index a16e9f0e0b29..f3ed8315640f 100644
--- a/include/unotools/VersionConfig.hxx
+++ b/include/unotools/VersionConfig.hxx
@@ -12,6 +12,8 @@
#include
#include
+#include
+
namespace utl
{
/** This method is called when there's a need to determine if the
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.4-56'
Tag 'cp-6.4-56' created by Andras Timar at 2022-02-21 11:17 + cp-6.4-56 Changes since cp-6.4-48: Tor Lillqvist (1): Add missing mobile-specific Impress German translations --- source/de/sd/messages.po | 37 + 1 file changed, 37 insertions(+) ---
Re: Question about LibreOffice installation
> Let's say I downloaded the MSI package of libreoffice, is there a way to > select what products I need to install ? for example just the "LibreImpress" ? Impress, Calc, Writer etc are not separate products. --tml
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/layout.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 2b58a0979f9206cfca6d78cb2f3d5e65cd735f8b
Author: Tor Lillqvist
AuthorDate: Tue Jan 25 16:57:09 2022 +0200
Commit: Tor Lillqvist
CommitDate: Wed Feb 16 22:27:02 2022 +0100
Add sanity check to avoid potential crash in the Collabora Online server
Make sure some coordinates don't become huge negative numbers. This
doesn't fix the unknown root cause of course.
There already was such a sanity check here in this branch, but for
Android only. I now made it cross-platform.
Let's use the same Change-Id as in the corresponding commit in the
co-2021 branch.
Change-Id: I28e343271b3f80ac203b52db1be58d2add89eecd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128932
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130051
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index da259ec40c63..995ae09a0c9e 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -283,10 +283,11 @@ void VclBox::setAllocation(const Size )
// Though the dialogs are rendered in javascript for LOK Android some widgets
like weld::DrawingArea
// is sent as bitmap but it is rendered from only the visible part
// when it gets negative, it shrinks instead of expands and it becomes
invisible
-#if HAVE_FEATURE_ANDROID_LOK
if (nExtraSpace < 0)
+{
+SAL_WARN("vcl.layout", "nExtraSpace went negative, setting to
zero");
nExtraSpace = 0;
-#endif
+}
}
//Split into those we pack from the start onwards, and those we pack from
the end backwards
[Libreoffice-commits] core.git: include/LibreOfficeKit
include/LibreOfficeKit/LibreOfficeKitEnums.h |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit a6760a0fc4461ba58c9ddb089c7ceb8c962f5dc5
Author: Tor Lillqvist
AuthorDate: Wed Feb 16 11:10:25 2022 +0200
Commit: Tor Lillqvist
CommitDate: Wed Feb 16 20:30:07 2022 +0100
Don't confusingly use the term "gesture" for plain old mouse events
"Gesture" is a term typically used for finger input on touch
devices. The LibreOfficeKitMouseEventType type is for traditional
mouse events.
Change-Id: Id14ab725567546e33f3dd1277fb4380b9f81d59b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129985
Tested-by: Tor Lillqvist
Reviewed-by: Tor Lillqvist
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 006713447aed..d15e0e5a70ba 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -941,11 +941,11 @@ static inline const char* lokCallbackTypeToString(int
nType)
typedef enum
{
-/// A pressed gesture has started.
+/// A mouse button has been pressed down.
LOK_MOUSEEVENT_MOUSEBUTTONDOWN,
-/// A pressed gesture has finished.
+/// A mouse button has been let go.
LOK_MOUSEEVENT_MOUSEBUTTONUP,
-/// A change has happened during a press gesture.
+/// The mouse has moved while a button is pressed.
LOK_MOUSEEVENT_MOUSEMOVE
}
LibreOfficeKitMouseEventType;
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source
vcl/source/window/layout.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 6e1282e134e2ad5c64126744150ea4de5622b132
Author: Tor Lillqvist
AuthorDate: Tue Jan 25 16:57:09 2022 +0200
Commit: Tor Lillqvist
CommitDate: Wed Feb 16 16:40:49 2022 +0200
Add sanity check to avoid potential crash in the Collabora Online server
Make sure some coordinates don't become huge negative numbers. This
doesn't fix the unknown root cause of course.
There already was such a sanity check here in this branch, but for
Android only. I now made it cross-platform.
Let's use the same Change-Id as in the corresponding commit in the
co-2021 branch.
Change-Id: I28e343271b3f80ac203b52db1be58d2add89eecd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128932
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index da259ec40c63..995ae09a0c9e 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -283,10 +283,11 @@ void VclBox::setAllocation(const Size )
// Though the dialogs are rendered in javascript for LOK Android some widgets
like weld::DrawingArea
// is sent as bitmap but it is rendered from only the visible part
// when it gets negative, it shrinks instead of expands and it becomes
invisible
-#if HAVE_FEATURE_ANDROID_LOK
if (nExtraSpace < 0)
+{
+SAL_WARN("vcl.layout", "nExtraSpace went negative, setting to
zero");
nExtraSpace = 0;
-#endif
+}
}
//Split into those we pack from the start onwards, and those we pack from
the end backwards
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit a4ddc0ae5bd6b5a70a5441969a9c4c196b044cd6 Author: Tor Lillqvist AuthorDate: Thu Dec 16 19:29:07 2021 +0200 Commit: Andras Timar CommitDate: Sun Feb 13 23:45:27 2022 +0100 Accept iOS SDK 15.2 Change-Id: I42182f86673586ce48905bdda3281ef4499263a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126958 Tested-by: Jenkins Reviewed-by: Tor Lillqvist diff --git a/configure.ac b/configure.ac index eaab62102bdc..633311f0b9f9 100644 --- a/configure.ac +++ b/configure.ac @@ -3567,8 +3567,8 @@ dnl === if test $_os = iOS; then AC_MSG_CHECKING([what iOS SDK to use]) -current_sdk_ver=15.0 -older_sdk_vers="14.5" +current_sdk_ver=15.2 +older_sdk_vers="15.0 14.5" if test "$enable_ios_simulator" = "yes"; then platform=iPhoneSimulator versionmin=-mios-simulator-version-min=13.6
[Libreoffice-commits] translations.git: Changes to 'refs/tags/co-6.4-55'
Tag 'co-6.4-55' created by Andras Timar at 2022-02-11 06:07 + co-6.4-55 Changes since cp-6.4-48: Tor Lillqvist (1): Add missing mobile-specific Impress German translations --- source/de/sd/messages.po | 37 + 1 file changed, 37 insertions(+) ---
Re: Wants to join your community
> I am Ansari Danish . I am a computer science student and wants to start open > source Contribution. And I only knew some intermediate level of java and > nothing more. So wants to be a part of your community for kickstarting my > Career… Thanks you for your honesty. Then I suggest you choose to join the community of something that actually is based on Java. LibreOffice is not. --tml
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.4-55'
Tag 'cp-6.4-55' created by Andras Timar at 2022-02-07 14:37 + cp-6.4-55 Changes since cp-6.4-48: Tor Lillqvist (1): Add missing mobile-specific Impress German translations --- source/de/sd/messages.po | 37 + 1 file changed, 37 insertions(+) ---
[Libreoffice-commits] core.git: include/vcl sd/source vcl/source
include/vcl/pdfread.hxx| 20 +++-
sd/source/ui/view/sdview4.cxx |6 ++
vcl/source/filter/ipdf/pdfread.cxx |9 +++--
vcl/source/pdf/PdfConfig.cxx |5 -
4 files changed, 36 insertions(+), 4 deletions(-)
New commits:
commit 266e6b76763d16bcb1dcf67bab2478a7d2d7b8fc
Author: Tor Lillqvist
AuthorDate: Wed Feb 2 16:29:34 2022 +0200
Commit: Miklos Vajna
CommitDate: Thu Feb 3 14:43:53 2022 +0100
Make inserted or pasted PDF sharper on macOS
When inserting a PDF file as an image or pasting PDF data from the
clipboard on a Retina iMac the resulting rendered image did not look
sharp.
Using a surprisingly large extra scaling factor helps. The exact
reasons for this are unknown. It isn't enough to use a scaling factor
of just 2 (which is the HiDI ("Retina") scale factor on my iMac).
Possibly the fuzziness is related to what Pdfium uses to render text.
Also, look at CountDPIScaleFactor() in vcl/source/window/window.cxx.
The GetDPIScaleFactor() function lies on macOS even more than it does
on other platforms. It claims that the DPI scale percentage is always
100. But in fact most Macs nowadays have a Retina display so it would
make more sense, in theory, to at least always return 200 instead.
That wouldn't be any more wrong. But that causes regressions in the UI
rendering, like needlessly large icons in the toolbars.
Change-Id: Idc694f742c4ac32a5a134f8d206cf4eee467c39a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129369
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/vcl/pdfread.hxx b/include/vcl/pdfread.hxx
index 084bd3f913b5..72508a548293 100644
--- a/include/vcl/pdfread.hxx
+++ b/include/vcl/pdfread.hxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -42,6 +42,24 @@ importPdfVectorGraphicData(SvStream& rStream,
/// Imports a PDF stream into rGraphic.
VCL_DLLPUBLIC bool ImportPDF(SvStream& rStream, Graphic& rGraphic);
+// When inserting a PDF file as an image or pasting PDF data from the
clipboard, at least on a
+// Retina iMac, the resulting rendered image does not look sharp without this
surprisingly large
+// extra scaling factor. Exact reasons unknown. And it isn't enough to have it
be just 2 (which is
+// the actual Retina factor on my iMac). Possibly the fuzziness is related to
what Pdfium uses to
+// render text.
+
+// Also, look at CountDPIScaleFactor() in vcl/source/window/window.cxx. The
GetDPIScaleFactor() API
+// lies on macOS even more than it does on other platforms, it claims that the
DPI scale factor is
+// always 1. But in fact most Macs nowadays have a HiDPI ("Retina") display.
But we can't just "fix"
+// things by making GetDPIScaleFactor() always return 2 on macOS, even if that
wouldn't be any more
+// wrong, because that then causes other regressions that I have no time to
look into now.
+
+#ifdef MACOSX
+constexpr int PDF_INSERT_MAGIC_SCALE_FACTOR = 8;
+#else
+constexpr int PDF_INSERT_MAGIC_SCALE_FACTOR = 1;
+#endif
+
struct PDFGraphicAnnotation
{
OUString maAuthor;
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 80a653b7b9c8..5b7d5387d2c8 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -30,6 +30,8 @@
#include
#include
#include
+#include
+#include
#include
#include
#include
@@ -197,6 +199,10 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic,
sal_Int8& rAction,
}
sal_Int32 nPreferredDPI = mrDoc.getImagePreferredDPI();
+
+if (rGraphic.GetGfxLink().GetType() == GfxLinkType::NativePdf &&
nPreferredDPI == 0 && vcl::PDF_INSERT_MAGIC_SCALE_FACTOR > 1)
+nPreferredDPI = Application::GetDefaultDevice()->GetDPIX() *
vcl::PDF_INSERT_MAGIC_SCALE_FACTOR;
+
if (nPreferredDPI > 0)
{
auto nWidth = o3tl::convert(aSizePixel.Width() /
double(nPreferredDPI), o3tl::Length::in, o3tl::Length::mm100);
diff --git a/vcl/source/filter/ipdf/pdfread.cxx
b/vcl/source/filter/ipdf/pdfread.cxx
index a69d10c7cafc..0780e1c9baaa 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include
+#include
#include
#include
@@ -156,8 +158,11 @@ size_t RenderPDFBitmaps(const void* pBuffer, int nSize,
std::vector& r
}
// Returned unit is points, convert that to pixel.
-const size_t nPageWidth = pointToPixel(nPageWidthPoints,
fResolutionDPI);
-const size_t nPageHeight = pointToPixel(nPageHeightPoints,
[Libreoffice-commits] core.git: osx/soffice.xcodeproj
osx/soffice.xcodeproj/project.pbxproj | 24
1 file changed, 24 insertions(+)
New commits:
commit 79e8c5dfa992c2b14320844f625d7ddb07b2cfd1
Author: Tor Lillqvist
AuthorDate: Wed Feb 2 12:16:13 2022 +0200
Commit: Tor Lillqvist
CommitDate: Wed Feb 2 15:53:04 2022 +0100
Add some source files for debugging convenience
Change-Id: If54e8ed6c41afcaaeb6b629ffae447de7240a61f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129368
Tested-by: Tor Lillqvist
Reviewed-by: Tor Lillqvist
diff --git a/osx/soffice.xcodeproj/project.pbxproj
b/osx/soffice.xcodeproj/project.pbxproj
index dd1708e0f94a..ec10b807a1ec 100644
--- a/osx/soffice.xcodeproj/project.pbxproj
+++ b/osx/soffice.xcodeproj/project.pbxproj
@@ -1092,6 +1092,14 @@
BEDCC93E2460830C00FB02BD /* optjava.hxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = optjava.hxx;
path = ../cui/source/options/optjava.hxx; sourceTree = ""; };
BEDCC93F2460830C00FB02BD /* optbasic.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = optbasic.cxx;
path = ../cui/source/options/optbasic.cxx; sourceTree = ""; };
BEDCC9402460830D00FB02BD /* doclinkdialog.hxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name =
doclinkdialog.hxx; path = ../cui/source/options/doclinkdialog.hxx; sourceTree =
""; };
+ BEE3519127A98CEF00F6B5CB /* DummyPDFiumLibrary.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
DummyPDFiumLibrary.cxx; path = ../vcl/source/pdf/DummyPDFiumLibrary.cxx;
sourceTree = ""; };
+ BEE3519227A98CEF00F6B5CB /* XmpMetadata.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
XmpMetadata.cxx; path = ../vcl/source/pdf/XmpMetadata.cxx; sourceTree =
""; };
+ BEE3519327A98CEF00F6B5CB /* PdfConfig.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = PdfConfig.cxx;
path = ../vcl/source/pdf/PdfConfig.cxx; sourceTree = ""; };
+ BEE3519427A98CEF00F6B5CB /* PDFiumTools.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
PDFiumTools.cxx; path = ../vcl/source/pdf/PDFiumTools.cxx; sourceTree =
""; };
+ BEE3519527A98CEF00F6B5CB /* Matrix3.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Matrix3.cxx;
path = ../vcl/source/pdf/Matrix3.cxx; sourceTree = ""; };
+ BEE3519627A98CEF00F6B5CB /* PDFiumLibrary.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
PDFiumLibrary.cxx; path = ../vcl/source/pdf/PDFiumLibrary.cxx; sourceTree =
""; };
+ BEE3519727A98CEF00F6B5CB /* ExternalPDFStreams.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
ExternalPDFStreams.cxx; path = ../vcl/source/pdf/ExternalPDFStreams.cxx;
sourceTree = ""; };
+ BEE3519827A98CEF00F6B5CB /* ResourceDict.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
ResourceDict.cxx; path = ../vcl/source/pdf/ResourceDict.cxx; sourceTree =
""; };
/* End PBXFileReference section */
/* Begin PBXGroup section */
@@ -1860,6 +1868,7 @@
BEB0730D27A1A25E00F75C00 /* filter */,
BE82C3C818C86D8B0050EB79 /* gdi */,
BE60B5761DB7D76C00D3E1E4 /* osx */,
+ BEE3519027A98CC900F6B5CB /* pdf */,
BE2DAD29182FABD200A4D2F7 /* quartz */,
BE0264A923797594008D3E52 /* treelist */,
BE2DACF9182FAB3800A4D2F7 /* window */,
@@ -2746,6 +2755,21 @@
name = options;
sourceTree = "";
};
+ BEE3519027A98CC900F6B5CB /* pdf */ = {
+ isa = PBXGroup;
+ children = (
+ BEE3519127A98CEF00F6B5CB /*
DummyPDFiumLibrary.cxx */,
+ BEE3519727A98CEF00F6B5CB /*
ExternalPDFStreams.cxx */,
+ BEE3519527A98CEF00F6B5CB /* Matrix3.cxx */,
+ BEE3519327A98CEF00F6B5CB /* PdfConfig.cxx */,
+ BEE3519627A98CEF00F6B5CB /* PDFiumLibrary.cxx
*/,
+ BEE3519427A98CEF00F6B5CB /* PDFiumTools.cxx */,
+ BEE3519827A98CEF00F6B5CB /* ResourceDict.cxx */,
+ BEE3519227A98CEF00F6B5CB /* XmpMetadata.cxx */,
+ );
+ name = pdf;
+ sourceTree = "";
+ };
/* End PBXGroup section */
/* Begin PBXLegacyTarget section */
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |1 +
writerfilter/source/dmapper/GraphicImport.cxx |5 +
writerfilter/source/dmapper/GraphicImport.hxx |2 ++
3 files changed, 8 insertions(+)
New commits:
commit 0453a2ff5d51181dd3036b10a4a2d2eeef7981be
Author: Tor Lillqvist
AuthorDate: Mon Jan 24 16:48:04 2022 +0200
Commit: Xisco Fauli
CommitDate: Thu Jan 27 17:09:49 2022 +0100
Take layoutInCell into consideration when placing graphic in table
Set our IsFollowingTextFlow property accordingly.
Thanks to Miklos for doing most of the work.
Change-Id: I67d214d6ed41c19dcb2f3ad2db9be94ca77c5842
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128880
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
(cherry picked from commit 9aa90da7e03b4b0806b27451665b7c41b8836bc0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128966
Reviewed-by: Xisco Fauli
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 19868ae74d78..fd4a720bb656 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -7390,6 +7390,7 @@ void DomainMapper_Impl::ImportGraphic(const
writerfilter::Reference< Properties
{
uno::Reference xEmbeddedProps(m_xEmbedded,
uno::UNO_QUERY);
xEmbeddedProps->setPropertyValue("AnchorType",
uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
+xEmbeddedProps->setPropertyValue("IsFollowingTextFlow",
uno::makeAny(m_pGraphicImport->GetLayoutInCell()));
uno::Reference xShapeProps(xShape,
uno::UNO_QUERY);
xEmbeddedProps->setPropertyValue("HoriOrient",
xShapeProps->getPropertyValue("HoriOrient"));
xEmbeddedProps->setPropertyValue("HoriOrientPosition",
xShapeProps->getPropertyValue("HoriOrientPosition"));
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index bb3b2077e4aa..4fe5712b591f 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -474,6 +474,11 @@ com::sun::star::awt::Point
GraphicImport::GetGraphicObjectPosition() const
return (com::sun::star::awt::Point(m_pImpl->nLeftPosition,
m_pImpl->nTopPosition));
}
+bool GraphicImport::GetLayoutInCell() const
+{
+return m_pImpl->bLayoutInCell;
+}
+
void GraphicImport::handleWrapTextValue(sal_uInt32 nVal)
{
switch (nVal)
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx
b/writerfilter/source/dmapper/GraphicImport.hxx
index 7ca4e09ed30d..3ff83de5b713 100644
--- a/writerfilter/source/dmapper/GraphicImport.hxx
+++ b/writerfilter/source/dmapper/GraphicImport.hxx
@@ -100,6 +100,8 @@ public:
com::sun::star::awt::Point GetGraphicObjectPosition() const;
+bool GetLayoutInCell() const;
+
private:
// Properties
virtual void lcl_attribute(Id Name, Value & val) override;
[Libreoffice-commits] core.git: osx/soffice.xcodeproj
osx/soffice.xcodeproj/project.pbxproj | 188 +-
1 file changed, 187 insertions(+), 1 deletion(-)
New commits:
commit f343d3ac4abcf974d2223b866aae17e7fe2f416a
Author: Tor Lillqvist
AuthorDate: Thu Jan 27 16:16:23 2022 +0200
Commit: Tor Lillqvist
CommitDate: Thu Jan 27 15:54:35 2022 +0100
Add more source files for debugging convenience
Change-Id: I2b4cc77d1d7a873c3a3549a8132fd8a1d90525cc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129048
Tested-by: Tor Lillqvist
Reviewed-by: Tor Lillqvist
diff --git a/osx/soffice.xcodeproj/project.pbxproj
b/osx/soffice.xcodeproj/project.pbxproj
index 0bfa12dbbf0f..dd1708e0f94a 100644
--- a/osx/soffice.xcodeproj/project.pbxproj
+++ b/osx/soffice.xcodeproj/project.pbxproj
@@ -774,6 +774,79 @@
BEB0734B27A2948900F75C00 /* fuolbull.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fuolbull.cxx;
path = ../sd/source/ui/func/fuolbull.cxx; sourceTree = ""; };
BEB0734C27A2948900F75C00 /* fudspord.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fudspord.cxx;
path = ../sd/source/ui/func/fudspord.cxx; sourceTree = ""; };
BEB0734D27A2948900F75C00 /* futxtatt.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = futxtatt.cxx;
path = ../sd/source/ui/func/futxtatt.cxx; sourceTree = ""; };
+ BEB0735027A2B98200F75C00 /* IndexedPropertyValuesContainer.cxx
*/ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
IndexedPropertyValuesContainer.cxx; path =
../../../comphelper/source/container/IndexedPropertyValuesContainer.cxx;
sourceTree = ""; };
+ BEB0735127A2B98200F75C00 /* containermultiplexer.cxx */ = {isa
= PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
containermultiplexer.cxx; path =
../../../comphelper/source/container/containermultiplexer.cxx; sourceTree =
""; };
+ BEB0735227A2B98200F75C00 /* interfacecontainer2.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
interfacecontainer2.cxx; path =
../../../comphelper/source/container/interfacecontainer2.cxx; sourceTree =
""; };
+ BEB0735327A2B98200F75C00 /* namecontainer.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
namecontainer.cxx; path =
../../../comphelper/source/container/namecontainer.cxx; sourceTree = "";
};
+ BEB0735427A2B98200F75C00 /* embeddedobjectcontainer.cxx */ =
{isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
embeddedobjectcontainer.cxx; path =
../../../comphelper/source/container/embeddedobjectcontainer.cxx; sourceTree =
""; };
+ BEB0735527A2B98200F75C00 /* enumhelper.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
enumhelper.cxx; path = ../../../comphelper/source/container/enumhelper.cxx;
sourceTree = ""; };
+ BEB0735627A2B98200F75C00 /* NamedPropertyValuesContainer.cxx */
= {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
NamedPropertyValuesContainer.cxx; path =
../../../comphelper/source/container/NamedPropertyValuesContainer.cxx;
sourceTree = ""; };
+ BEB0735727A2B98200F75C00 /* enumerablemap.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
enumerablemap.cxx; path =
../../../comphelper/source/container/enumerablemap.cxx; sourceTree = "";
};
+ BEB0735827A2B98200F75C00 /* container.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = container.cxx;
path = ../../../comphelper/source/container/container.cxx; sourceTree =
""; };
+ BEB0735A27A2BAC900F75C00 /* xmleohlp.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xmleohlp.cxx;
path = ../svx/source/xml/xmleohlp.cxx; sourceTree = ""; };
+ BEB0735B27A2BAC900F75C00 /* xmlexport.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xmlexport.cxx;
path = ../svx/source/xml/xmlexport.cxx; sourceTree = ""; };
+ BEB0735C27A2BAC900F75C00 /* xmlxtimp.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xmlxtimp.cxx;
path = ../svx/source/xml/xmlxtimp.cxx; sourceTree = ""; };
+ BEB0735D27A2BAC900F75C00 /* xmlgrhlp.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xmlgrhlp.cxx;
path = ../svx/source/xml/xmlgrhlp.cxx; sourceTree = ""; };
+ BEB0735E27A2BAC900F75C00 /* xmlxtexp.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xmlxtexp.cxx;
path = ../svx/source/xml/xmlxtexp.cxx; sourceT
[Libreoffice-commits] core.git: osx/soffice.xcodeproj
osx/soffice.xcodeproj/project.pbxproj | 146 ++
1 file changed, 146 insertions(+)
New commits:
commit 0b18b6b85de4088280f0be88016424562b207c9d
Author: Tor Lillqvist
AuthorDate: Thu Jan 27 11:38:28 2022 +0200
Commit: Tor Lillqvist
CommitDate: Thu Jan 27 13:15:39 2022 +0100
Add more source files for debugging convenience
Change-Id: If2f1d379e8e8694a3519d20eb3f425c0bbd381e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129032
Tested-by: Tor Lillqvist
Reviewed-by: Tor Lillqvist
diff --git a/osx/soffice.xcodeproj/project.pbxproj
b/osx/soffice.xcodeproj/project.pbxproj
index 7c38c37538f7..0bfa12dbbf0f 100644
--- a/osx/soffice.xcodeproj/project.pbxproj
+++ b/osx/soffice.xcodeproj/project.pbxproj
@@ -713,6 +713,67 @@
BEACEEE1257FC853001BAABA /* StylesPreviewWindow.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
StylesPreviewWindow.cxx; path = ../svx/source/tbxctrls/StylesPreviewWindow.cxx;
sourceTree = ""; };
BEACEEE2257FC853001BAABA /* fontworkgallery.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
fontworkgallery.cxx; path = ../svx/source/tbxctrls/fontworkgallery.cxx;
sourceTree = ""; };
BEACEEE3257FC853001BAABA /* tbxcolor.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tbxcolor.cxx;
path = ../svx/source/tbxctrls/tbxcolor.cxx; sourceTree = ""; };
+ BEB0730F27A1A29800F75C00 /* pdfdocument.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
pdfdocument.cxx; path = ../vcl/source/filter/ipdf/pdfdocument.cxx; sourceTree =
""; };
+ BEB0731027A1A29800F75C00 /* pdfread.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pdfread.cxx;
path = ../vcl/source/filter/ipdf/pdfread.cxx; sourceTree = ""; };
+ BEB0731327A2948700F75C00 /* fupoor.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fupoor.cxx;
path = ../sd/source/ui/func/fupoor.cxx; sourceTree = ""; };
+ BEB0731427A2948700F75C00 /* undopage.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = undopage.cxx;
path = ../sd/source/ui/func/undopage.cxx; sourceTree = ""; };
+ BEB0731527A2948700F75C00 /* fuscale.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fuscale.cxx;
path = ../sd/source/ui/func/fuscale.cxx; sourceTree = ""; };
+ BEB0731627A2948700F75C00 /* fuconuno.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fuconuno.cxx;
path = ../sd/source/ui/func/fuconuno.cxx; sourceTree = ""; };
+ BEB0731727A2948700F75C00 /* fusldlg.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fusldlg.cxx;
path = ../sd/source/ui/func/fusldlg.cxx; sourceTree = ""; };
+ BEB0731827A2948700F75C00 /* futransf.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = futransf.cxx;
path = ../sd/source/ui/func/futransf.cxx; sourceTree = ""; };
+ BEB0731927A2948700F75C00 /* fuexecuteinteraction.cxx */ = {isa
= PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
fuexecuteinteraction.cxx; path = ../sd/source/ui/func/fuexecuteinteraction.cxx;
sourceTree = ""; };
+ BEB0731A27A2948700F75C00 /* fuconcs.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fuconcs.cxx;
path = ../sd/source/ui/func/fuconcs.cxx; sourceTree = ""; };
+ BEB0731B27A2948700F75C00 /* fuchar.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fuchar.cxx;
path = ../sd/source/ui/func/fuchar.cxx; sourceTree = ""; };
+ BEB0731C27A2948700F75C00 /* futext.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = futext.cxx;
path = ../sd/source/ui/func/futext.cxx; sourceTree = ""; };
+ BEB0731D27A2948700F75C00 /* fumeasur.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fumeasur.cxx;
path = ../sd/source/ui/func/fumeasur.cxx; sourceTree = ""; };
+ BEB0731E27A2948800F75C00 /* fuzoom.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fuzoom.cxx;
path = ../sd/source/ui/func/fuzoom.cxx; sourceTree = ""; };
+ BEB0731F27A2948800F75C00 /* fuhhconv.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fuhhconv.cxx;
path = ../sd/source/ui/func/fuhhconv.cxx; sourceTree = ""; };
+ BEB0732027A2948800F75C00 /* fucon3d.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourceco
[Libreoffice-commits] core.git: vcl/osx
vcl/osx/OSXTransferable.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 9a828b4d1fcd5bfa471df404dc40fe3ddfccfbb9
Author: Tor Lillqvist
AuthorDate: Thu Jan 27 11:37:47 2022 +0200
Commit: Tor Lillqvist
CommitDate: Thu Jan 27 13:14:26 2022 +0100
Add a SAL_INFO listing types on pasteboard
Change-Id: I6b1fa8da47f1140fc42287b05ee8d2afe5ee5d68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129031
Tested-by: Tor Lillqvist
Reviewed-by: Tor Lillqvist
diff --git a/vcl/osx/OSXTransferable.cxx b/vcl/osx/OSXTransferable.cxx
index f3ed1ec83fae..493d5b44cc9a 100644
--- a/vcl/osx/OSXTransferable.cxx
+++ b/vcl/osx/OSXTransferable.cxx
@@ -19,6 +19,7 @@
#include
+#include
#include
#include
@@ -30,7 +31,8 @@
#include "DataFlavorMapping.hxx"
-using namespace osl;
+#include
+
using namespace cppu;
using namespace com::sun::star::uno;
using namespace com::sun::star::datatransfer;
@@ -161,6 +163,9 @@ void OSXTransferable::initClipboardItemList()
static_cast(this));
}
+ SAL_INFO("vcl.macos.clipboard", "Types on pasteboard: " <<
NSStringArrayToOUString(pboardFormats));
+
+
mFlavorList = mDataFlavorMapper->typesArrayToFlavorSequence(pboardFormats);
}
[Libreoffice-commits] core.git: writerfilter/qa
writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx | 18
++
writerfilter/qa/cppunittests/dmapper/data/layout-in-cell-2.docx |binary
2 files changed, 18 insertions(+)
New commits:
commit 0101c7918bb735d796bc1bc0d1705f995e41ee98
Author: Tor Lillqvist
AuthorDate: Wed Jan 26 13:02:06 2022 +0200
Commit: Miklos Vajna
CommitDate: Thu Jan 27 11:53:52 2022 +0100
Add simple unit test for recent fix to take layoutInCell into consideration
... when a graphic is in table row.
The test just checks that the IsFollowingTextFlow property gets set as
true, it doesn't check that the table row height actually is correct
or that the result looks correct.
Change-Id: Ia6feec2b2a9bbff6e130f9542c15106750ff415d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128982
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
b/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
index 2f9faefab55f..a20c8490501b 100644
--- a/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
@@ -388,6 +388,24 @@ CPPUNIT_TEST_FIXTURE(Test, testLayoutInCellWrapnoneColumn)
CPPUNIT_ASSERT(xShape->getPropertyValue("IsFollowingTextFlow") >>=
bFollowingTextFlow);
CPPUNIT_ASSERT(!bFollowingTextFlow);
}
+
+CPPUNIT_TEST_FIXTURE(Test, testLayoutInCellOfHraphics)
+{
+// Given a file with a table, then a shape anchored inside the cell:
+OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) +
"layout-in-cell-2.docx";
+
+// When loading that document:
+getComponent() = loadFromDesktop(aURL);
+
+// Then make sure the cell obeys the layoutInCell:
+uno::Reference
xDrawPageSupplier(getComponent(), uno::UNO_QUERY);
+uno::Reference xDrawPage =
xDrawPageSupplier->getDrawPage();
+uno::Reference xShape(xDrawPage->getByIndex(1),
uno::UNO_QUERY);
+uno::Reference xNamedShape(xShape, uno::UNO_QUERY);
+bool bFollowingTextFlow = false;
+CPPUNIT_ASSERT(xShape->getPropertyValue("IsFollowingTextFlow") >>=
bFollowingTextFlow);
+CPPUNIT_ASSERT(bFollowingTextFlow);
+}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/qa/cppunittests/dmapper/data/layout-in-cell-2.docx
b/writerfilter/qa/cppunittests/dmapper/data/layout-in-cell-2.docx
new file mode 100644
index ..5b6926460c80
Binary files /dev/null and
b/writerfilter/qa/cppunittests/dmapper/data/layout-in-cell-2.docx differ
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |1 +
writerfilter/source/dmapper/GraphicImport.cxx |5 +
writerfilter/source/dmapper/GraphicImport.hxx |2 ++
3 files changed, 8 insertions(+)
New commits:
commit 4cf82386aba021585a011979d4f3e23b2d49b55c
Author: Tor Lillqvist
AuthorDate: Mon Jan 24 16:48:04 2022 +0200
Commit: Miklos Vajna
CommitDate: Wed Jan 26 10:57:40 2022 +0100
Take layoutInCell into consideration when placing graphic in table
Set our IsFollowingTextFlow property accordingly.
Thanks to Miklos for doing most of the work.
Change-Id: I67d214d6ed41c19dcb2f3ad2db9be94ca77c5842
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128880
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128912
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 33ab5c6853fa..cf5b22ccadd9 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -6859,6 +6859,7 @@ void DomainMapper_Impl::ImportGraphic(const
writerfilter::Reference< Properties
{
uno::Reference xEmbeddedProps(m_xEmbedded,
uno::UNO_QUERY);
xEmbeddedProps->setPropertyValue("AnchorType",
uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
+xEmbeddedProps->setPropertyValue("IsFollowingTextFlow",
uno::makeAny(m_pGraphicImport->GetLayoutInCell()));
uno::Reference xShapeProps(xShape,
uno::UNO_QUERY);
xEmbeddedProps->setPropertyValue("HoriOrient",
xShapeProps->getPropertyValue("HoriOrient"));
xEmbeddedProps->setPropertyValue("HoriOrientPosition",
xShapeProps->getPropertyValue("HoriOrientPosition"));
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index 5f4e2a1d60c0..3d9c1c08448c 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -456,6 +456,11 @@ com::sun::star::awt::Point
GraphicImport::GetGraphicObjectPosition() const
return (com::sun::star::awt::Point(m_pImpl->nLeftPosition,
m_pImpl->nTopPosition));
}
+bool GraphicImport::GetLayoutInCell() const
+{
+return m_pImpl->bLayoutInCell;
+}
+
void GraphicImport::handleWrapTextValue(sal_uInt32 nVal)
{
switch (nVal)
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx
b/writerfilter/source/dmapper/GraphicImport.hxx
index 9ea3984db23b..c69d5db086e3 100644
--- a/writerfilter/source/dmapper/GraphicImport.hxx
+++ b/writerfilter/source/dmapper/GraphicImport.hxx
@@ -100,6 +100,8 @@ public:
com::sun::star::awt::Point GetGraphicObjectPosition() const;
+bool GetLayoutInCell() const;
+
private:
// Properties
virtual void lcl_attribute(Id Name, Value & val) override;
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.4-54'
Tag 'cp-6.4-54' created by Andras Timar at 2022-01-25 20:55 + cp-6.4-54 Changes since cp-6.4-48: Tor Lillqvist (1): Add missing mobile-specific Impress German translations --- source/de/sd/messages.po | 37 + 1 file changed, 37 insertions(+) ---
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/source
vcl/source/window/layout.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 7e0eefac2fc6203fa7e853cd4049457f1d3b377b
Author: Tor Lillqvist
AuthorDate: Tue Jan 25 16:57:09 2022 +0200
Commit: Andras Timar
CommitDate: Tue Jan 25 21:33:45 2022 +0100
Add sanity check to avoid potential crash in the Collabora Online server
Make sure some coordinates don't become huge negative numbers. This
doesn't fix the unknown root cause of course.
I could not actually reproduce the crash with a server based on this
branch, though. There already was such a sanity check here in this
branch, but for Android only. I now made it cross-platform.
Let's use the same Change-Id as in the corresponding commit in the
co-2021 branch.
Change-Id: I28e343271b3f80ac203b52db1be58d2add89eecd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128932
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index edebff002f8f..5c7a9d1e4355 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -267,10 +267,11 @@ void VclBox::setAllocation(const Size )
// Though the dialogs are rendered in javascript for LOK Android some widgets
like weld::DrawingArea
// is sent as bitmap but it is rendered from only the visible part
// when it gets negative, it shrinks instead of expands and it becomes
invisible
-#if HAVE_FEATURE_ANDROID_LOK
if (nExtraSpace < 0)
+{
+SAL_WARN("vcl.layout", "nExtraSpace went negative, setting to
zero");
nExtraSpace = 0;
-#endif
+}
}
//Split into those we pack from the start onwards, and those we pack from
the end backwards
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |1 +
writerfilter/source/dmapper/GraphicImport.cxx |5 +
writerfilter/source/dmapper/GraphicImport.hxx |2 ++
3 files changed, 8 insertions(+)
New commits:
commit 9aa90da7e03b4b0806b27451665b7c41b8836bc0
Author: Tor Lillqvist
AuthorDate: Mon Jan 24 16:48:04 2022 +0200
Commit: Tor Lillqvist
CommitDate: Tue Jan 25 09:22:18 2022 +0100
Take layoutInCell into consideration when placing graphic in table
Set our IsFollowingTextFlow property accordingly.
Thanks to Miklos for doing most of the work.
Change-Id: I67d214d6ed41c19dcb2f3ad2db9be94ca77c5842
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128880
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 57ffccbac8f6..f0902918e0ff 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -7457,6 +7457,7 @@ void DomainMapper_Impl::ImportGraphic(const
writerfilter::Reference< Properties
{
uno::Reference xEmbeddedProps(m_xEmbedded,
uno::UNO_QUERY);
xEmbeddedProps->setPropertyValue("AnchorType",
uno::makeAny(text::TextContentAnchorType_AT_CHARACTER));
+xEmbeddedProps->setPropertyValue("IsFollowingTextFlow",
uno::makeAny(m_pGraphicImport->GetLayoutInCell()));
uno::Reference xShapeProps(xShape,
uno::UNO_QUERY);
xEmbeddedProps->setPropertyValue("HoriOrient",
xShapeProps->getPropertyValue("HoriOrient"));
xEmbeddedProps->setPropertyValue("HoriOrientPosition",
xShapeProps->getPropertyValue("HoriOrientPosition"));
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index bb3b2077e4aa..4fe5712b591f 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -474,6 +474,11 @@ com::sun::star::awt::Point
GraphicImport::GetGraphicObjectPosition() const
return (com::sun::star::awt::Point(m_pImpl->nLeftPosition,
m_pImpl->nTopPosition));
}
+bool GraphicImport::GetLayoutInCell() const
+{
+return m_pImpl->bLayoutInCell;
+}
+
void GraphicImport::handleWrapTextValue(sal_uInt32 nVal)
{
switch (nVal)
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx
b/writerfilter/source/dmapper/GraphicImport.hxx
index 57c3dbef906a..93be2df3f601 100644
--- a/writerfilter/source/dmapper/GraphicImport.hxx
+++ b/writerfilter/source/dmapper/GraphicImport.hxx
@@ -100,6 +100,8 @@ public:
com::sun::star::awt::Point GetGraphicObjectPosition() const;
+bool GetLayoutInCell() const;
+
private:
// Properties
virtual void lcl_attribute(Id Name, Value & val) override;
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - include/tools
include/tools/json_writer.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 440467e0c6c9118b58d608748dc03da4ff909b09
Author: Tor Lillqvist
AuthorDate: Mon Jan 24 19:41:39 2022 +0200
Commit: Andras Timar
CommitDate: Mon Jan 24 20:39:42 2022 +0100
Fix MSVC warning C4309: 'initializing': truncation of constant value
Change-Id: I71e47fa48fd4aea334a95dab8e2321c889b28a89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128881
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/include/tools/json_writer.hxx b/include/tools/json_writer.hxx
index 318faef70fee..3017c2d72e47 100644
--- a/include/tools/json_writer.hxx
+++ b/include/tools/json_writer.hxx
@@ -101,7 +101,7 @@ private:
}
// overflow validation in debug mode
-static constexpr char JSON_WRITER_DEBUG_MARKER = 0xde;
+static constexpr char JSON_WRITER_DEBUG_MARKER = static_cast(0xde);
inline void addValidationMark()
{
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - vcl/source
vcl/source/window/layout.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 78a2a55d87a1c9d65953332f3226e7a64921ce78
Author: Tor Lillqvist
AuthorDate: Wed Jan 19 11:12:27 2022 +0200
Commit: Tor Lillqvist
CommitDate: Wed Jan 19 11:39:59 2022 +0100
Fix typo in SAL_WARN() call
Change-Id: Idce259d582101901f6a9abf553c58039d05c694f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128593
Tested-by: Tor Lillqvist
Reviewed-by: Tor Lillqvist
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index cb89f0f5fee2..774f7990b95e 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -645,7 +645,7 @@ void VclButtonBox::setAllocation(const Size )
tools::Long nExtraSpace = nAllocPrimaryDimension -
nMainPrimaryDimension;
if (nExtraSpace < 0)
{
-SAL_WARN("vcl.layout", "nExtra space went negative,
setting to zero");
+SAL_WARN("vcl.layout", "nExtraSpace went negative, setting
to zero");
nExtraSpace = 0;
}
nExtraSpace += (aReq.m_aMainGroupDimensions.size()-1) *
nSpacing;
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - vcl/source
vcl/source/window/layout.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 06aaa1c81b2e927f575abd4d2a6e0d134f459aa5
Author: Tor Lillqvist
AuthorDate: Tue Jan 18 15:33:04 2022 +0200
Commit: Tor Lillqvist
CommitDate: Wed Jan 19 10:11:25 2022 +0100
Add sanity check to avoid crash in the Collabora Online server
Make sure some coordinates don't become huge negative numbers. This
doesn't fix the unknown root cause of course.
Change-Id: I28e343271b3f80ac203b52db1be58d2add89eecd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128558
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 0018971e0f5c..cb89f0f5fee2 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -643,6 +643,11 @@ void VclButtonBox::setAllocation(const Size )
tools::Long nMainPrimaryDimension = getPrimaryDimension(
addSpacing(aReq.m_aMainGroupSize,
aReq.m_aMainGroupDimensions.size()));
tools::Long nExtraSpace = nAllocPrimaryDimension -
nMainPrimaryDimension;
+if (nExtraSpace < 0)
+{
+SAL_WARN("vcl.layout", "nExtra space went negative,
setting to zero");
+nExtraSpace = 0;
+}
nExtraSpace += (aReq.m_aMainGroupDimensions.size()-1) *
nSpacing;
nSpacing = nExtraSpace/(aReq.m_aMainGroupDimensions.size()+1);
setPrimaryCoordinate(aMainGroupPos, nSpacing);
[Libreoffice-commits] core.git: configure.ac
configure.ac |1 - 1 file changed, 1 deletion(-) New commits: commit 439df74885ba9c24db3a1d417744acf4b3b6c48f Author: Tor Lillqvist AuthorDate: Wed May 19 14:18:56 2021 +0300 Commit: Tor Lillqvist CommitDate: Wed Jan 12 14:14:12 2022 +0100 We do want scripting on iOS, too The native-code.py script unconditionally generates references to that now. Change-Id: Ib0ca1e994af15597f8a191ccdd32d95efca063da Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115796 Tested-by: Jenkins CollaboraOffice Reviewed-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118897 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128317 Tested-by: Tor Lillqvist diff --git a/configure.ac b/configure.ac index 16ae752e0b86..de2ff85defcc 100644 --- a/configure.ac +++ b/configure.ac @@ -986,7 +986,6 @@ ios*) # iOS enable_coinmp=no enable_lpsolve=no enable_extension_integration=no -enable_scripting=no enable_xmlhelp=no with_ppds=no if test "$enable_ios_simulator" = "yes"; then
Re: No Full Screen in MacOS
> (A bug report would be a good start in any way with proper STR) See for instance https://bugs.documentfoundation.org/show_bug.cgi?id=103157 and the bugs it points to. The full-screen concept in LO and how it is or isn't connected to a full-screen concept on each windowing environment is a mess. The core problem is that the macOS concept of "full-screen" is not a state that LibreOffice would have any API for. (Just expanding the window to be as large as possible is not the same thing.) LibreOffice has its own separate full-screen concept, with its own UI to get out of it. Ideally, that should not exist on macOS but instead the system full-screen concept should be used. (Differently on each windowing system, and probably on Linux differently on GNOME and KDE, for instance.) But it is tedious work to implement and nobody has been interested/funded to do it. And probably the LO UX people would want to be involved, too. There was a quick and dirty attempt to take the macOS real full-screen thing into use many years ago (2014 or so) but it was buggy and was reverted. (That attempt is what the above meta-bug's initial comment refers to with "as currently implemented".) --tml
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - basic/qa basic/source officecfg/registry
basic/qa/basic_coverage/test_types_conversion.vb | 15 ++
basic/source/inc/rtlproto.hxx |1
basic/source/runtime/methods1.cxx | 13 +
basic/source/runtime/stdobj.cxx |1
officecfg/registry/schema/org/openoffice/Office/Scripting.xcs | 24 ++
5 files changed, 43 insertions(+), 11 deletions(-)
New commits:
commit c9b5378656bf7c4caf165ccda1026842cf582bbf
Author: Tor Lillqvist
AuthorDate: Thu Dec 9 13:11:53 2021 +0200
Commit: Andras Timar
CommitDate: Fri Jan 7 10:05:34 2022 +0100
Make the LibreOffice6FloatingPointMode thing work like in the master branch
Add an Expert Configurtion setting to turn it on in addition to
checking an environment variable.
Don't expose the check as a Basic function.
Change-Id: I6c7f3e85d63ce79f83a0747a00d05e14e559792f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126580
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/basic/qa/basic_coverage/test_types_conversion.vb
b/basic/qa/basic_coverage/test_types_conversion.vb
index 68b28b1afc0a..4899b3f90fc8 100644
--- a/basic/qa/basic_coverage/test_types_conversion.vb
+++ b/basic/qa/basic_coverage/test_types_conversion.vb
@@ -11,6 +11,21 @@ Dim nTotalCount As Integer
Dim nPassCount As Integer
Dim nFailCount As Integer
+' See LibreOffice6FloatingPointMode in basic/source/runtime/methods1.cxx
+Function LibreOffice6FloatingPointMode() As Boolean
+Dim bMode As Boolean
+bMode = Environ("LIBREOFFICE6FLOATINGPOINTMODE") <> ""
+If (Not bMode) Then
+ Dim oConfigProvider As Object, aNodePath(0) As New
com.sun.star.beans.PropertyValue, oRegistryKey As Object
+ oConfigProvider =
createUnoService("com.sun.star.configuration.ConfigurationProvider")
+ aNodePath(0).Name = "nodepath"
+ aNodePath(0).Value =
"org.openoffice.Office.Scripting/Basic/Compatibility"
+ oRegistryKey =
oConfigProvider.createInstanceWithArguments("com.sun.star.configuration.ConfigurationAccess",
aNodePath)
+ bMode =
oRegistryKey.getPropertyValue("UseLibreOffice6FloatingPointConversion")
+End If
+LibreOffice6FloatingPointMode = bMode
+End Function
+
' For the following tests the en-US (English - United States) locale is
required
Function doUnitTest() As Integer
nTotalCount = 0
diff --git a/basic/source/inc/rtlproto.hxx b/basic/source/inc/rtlproto.hxx
index 93eed13bd17c..55abc086379e 100644
--- a/basic/source/inc/rtlproto.hxx
+++ b/basic/source/inc/rtlproto.hxx
@@ -352,7 +352,6 @@ extern void SbRtl_CDateFromUnoDateTime(StarBASIC * pBasic,
SbxArray & rPar, bool
extern void SbRtl_CDateToIso(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
extern void SbRtl_CDateFromIso(StarBASIC * pBasic, SbxArray & rPar, bool
bWrite);
extern void SbRtl_CompatibilityMode(StarBASIC * pBasic, SbxArray & rPar, bool
bWrite);
-extern void SbRtl_LibreOffice6FloatingPointMode(StarBASIC * pBasic, SbxArray &
rPar, bool bWrite);
extern void SbRtl_CDec(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
extern void SbRtl_Partition(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
// Fong
diff --git a/basic/source/runtime/methods1.cxx
b/basic/source/runtime/methods1.cxx
index 3d0c378765c8..27442c8c7ef0 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -59,6 +59,9 @@
#include
#include
#include
+
+#include
+
#include
using namespace comphelper;
@@ -2972,15 +2975,7 @@ bool LibreOffice6FloatingPointMode()
{
static bool bMode = std::getenv("LIBREOFFICE6FLOATINGPOINTMODE") !=
nullptr;
-return bMode;
-}
-
-void SbRtl_LibreOffice6FloatingPointMode(StarBASIC *, SbxArray & rPar, bool)
-{
-if ( rPar.Count32() != 1 )
-StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
-
-rPar.Get32(0)->PutBool( LibreOffice6FloatingPointMode() );
+return bMode ||
officecfg::Office::Scripting::Basic::Compatibility::UseLibreOffice6FloatingPointConversion::get();
}
void SbRtl_Input(StarBASIC *, SbxArray & rPar, bool)
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index c491bf1be227..b2627748915a 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -147,7 +147,6 @@ static Methods aMethods[] = {
{ "expression", SbxVARIANT, 0,nullptr,0 },
{ "CompatibilityMode", SbxBOOL, 1 | FUNCTION_, RTLNAME(CompatibilityMode),0},
{ "bEnable", SbxBOOL, 0,nullptr,0 },
-{ "LibreOffice6FloatingPointMode", SbxBOOL, 0 | FUNCTION_,
RTLNAME(LibreOffice6FloatingPointMode),0},
{ "ConvertFromUrl", SbxSTRING,1 | FUNCTION_, RTLNAME(ConvertFromUrl),0 },
{ "Url", SbxSTRING, 0,nullptr,0 },
{ "Conv
[Libreoffice-commits] core.git: sd/inc sd/source
sd/inc/bitmaps.hlst | 16 ++--
sd/source/ui/controller/displaymodecontroller.cxx |8 +++---
sd/source/ui/controller/slidelayoutcontroller.cxx | 28 +++---
sd/source/ui/dlg/sdpreslt.cxx |2 -
sd/source/ui/sidebar/LayoutMenu.cxx | 24 +-
5 files changed, 39 insertions(+), 39 deletions(-)
New commits:
commit 568293d7ce6d96ba71ae8c2d591b6cf237e31db1
Author: Tor Lillqvist
AuthorDate: Thu Jan 6 15:03:05 2022 +0200
Commit: Tor Lillqvist
CommitDate: Thu Jan 6 20:22:44 2022 +0100
It's called a slide, not a foil
Change-Id: I8b5b062faf9d2728c729384bbdafead00d5bf917
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128042
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/sd/inc/bitmaps.hlst b/sd/inc/bitmaps.hlst
index 5b3ae7851897..9e66e87dd032 100644
--- a/sd/inc/bitmaps.hlst
+++ b/sd/inc/bitmaps.hlst
@@ -26,13 +26,13 @@ inline constexpr OUStringLiteral BMP_LAYOUT_HEAD06 =
u"sd/res/layout_head06.png"
inline constexpr OUStringLiteral BMP_LAYOUT_TEXTONLY =
u"sd/res/layout_textonly.png";
inline constexpr OUStringLiteral BMP_LAYOUT_VERTICAL01 =
u"sd/res/layout_vertical01.png";
inline constexpr OUStringLiteral BMP_LAYOUT_VERTICAL02 =
u"sd/res/layout_vertical02.png";
-inline constexpr OUStringLiteral BMP_FOIL_NONE = u"sd/res/foilnone.png";
-inline constexpr OUStringLiteral BMP_FOILH_01 = u"sd/res/foilh01.png";
-inline constexpr OUStringLiteral BMP_FOILH_02 = u"sd/res/foilh02.png";
-inline constexpr OUStringLiteral BMP_FOILH_03 = u"sd/res/foilh03.png";
-inline constexpr OUStringLiteral BMP_FOILH_04 = u"sd/res/foilh04.png";
-inline constexpr OUStringLiteral BMP_FOILH_06 = u"sd/res/foilh06.png";
-inline constexpr OUStringLiteral BMP_FOILH_09 = u"sd/res/foilh09.png";
+inline constexpr OUStringLiteral BMP_SLIDE_NONE = u"sd/res/foilnone.png";
+inline constexpr OUStringLiteral BMP_SLIDEH_01 = u"sd/res/foilh01.png";
+inline constexpr OUStringLiteral BMP_SLIDEH_02 = u"sd/res/foilh02.png";
+inline constexpr OUStringLiteral BMP_SLIDEH_03 = u"sd/res/foilh03.png";
+inline constexpr OUStringLiteral BMP_SLIDEH_04 = u"sd/res/foilh04.png";
+inline constexpr OUStringLiteral BMP_SLIDEH_06 = u"sd/res/foilh06.png";
+inline constexpr OUStringLiteral BMP_SLIDEH_09 = u"sd/res/foilh09.png";
inline constexpr OUStringLiteral BMP_DISPLAYMODE_SLIDE =
u"sd/res/displaymode_slide.png";
inline constexpr OUStringLiteral BMP_DISPLAYMODE_OUTLINE =
u"sd/res/displaymode_outline.png";
inline constexpr OUStringLiteral BMP_DISPLAYMODE_NOTES =
u"sd/res/displaymode_notes.png";
@@ -56,7 +56,7 @@ inline constexpr OUStringLiteral BMP_PLACEHOLDER_MOVIE_LARGE
= u"sd/res/placehol
inline constexpr OUStringLiteral BMP_PLACEHOLDER_MOVIE_LARGE_HOVER =
u"sd/res/placeholder_movie_large_hover.png";
inline constexpr OUStringLiteral BMP_PLACEHOLDER_TABLE_LARGE =
u"sd/res/placeholder_table_large.png";
inline constexpr OUStringLiteral BMP_PLACEHOLDER_TABLE_LARGE_HOVER =
u"sd/res/placeholder_table_large_hover.png";
-inline constexpr OUStringLiteral BMP_FOILN_01 = u"sd/res/foiln01.png";
+inline constexpr OUStringLiteral BMP_SLIDEN_01 = u"sd/res/foiln01.png";
inline constexpr OUStringLiteral BMP_PAGE = u"sd/res/page.png";
inline constexpr OUStringLiteral BMP_PAGE_EXCLUDED = u"sd/res/pageexcl.png";
inline constexpr OUStringLiteral BMP_PAGEOBJS_EXCLUDED =
u"sd/res/pagobjex.png";
diff --git a/sd/source/ui/controller/displaymodecontroller.cxx
b/sd/source/ui/controller/displaymodecontroller.cxx
index 7c29a03659b6..81ad2d19e477 100644
--- a/sd/source/ui/controller/displaymodecontroller.cxx
+++ b/sd/source/ui/controller/displaymodecontroller.cxx
@@ -70,7 +70,7 @@ private:
DECL_LINK(SelectValueSetHdl, ValueSet*, void);
};
-struct snewfoil_value_info
+struct snew_slide_value_info
{
sal_uInt16 mnId;
OUString msBmpResId;
@@ -80,7 +80,7 @@ struct snewfoil_value_info
}
-const snewfoil_value_info editmodes[] =
+const snew_slide_value_info editmodes[] =
{
{1,
BMP_DISPLAYMODE_SLIDE,
@@ -101,7 +101,7 @@ const snewfoil_value_info editmodes[] =
{0, "", {}, "" }
};
-const snewfoil_value_info mastermodes[] =
+const snew_slide_value_info mastermodes[] =
{
{5,
BMP_DISPLAYMODE_SLIDE_MASTER,
@@ -119,7 +119,7 @@ const snewfoil_value_info mastermodes[] =
};
-static void fillLayoutValueSet(ValueSet* pValue, const snewfoil_value_info*
pInfo)
+static void fillLayoutValueSet(ValueSet* pValue, const snew_slide_value_info*
pInfo)
{
Size aLayoutItemSize;
for( ; pInfo->mnId; pInfo++ )
diff --git a/sd/source/ui
[Libreoffice-commits] core.git: desktop/Library_sofficeapp.mk desktop/source vcl/source
desktop/Library_sofficeapp.mk|2 +-
desktop/source/lib/init.cxx | 22 ++
vcl/source/components/dtranscomp.cxx |4
3 files changed, 27 insertions(+), 1 deletion(-)
New commits:
commit 6bcf00763402fc0969486e852634b5559fa044ba
Author: Tor Lillqvist
AuthorDate: Tue Jan 4 16:33:16 2022 +0200
Commit: Tor Lillqvist
CommitDate: Thu Jan 6 13:52:00 2022 +0100
We don't want or need any LOKClipboard on iOS
Try to make the code more like in the co-2021 branch, where copy/paste
between Collabora Office and other iOS apps currently works again, in
both directions, both for text and images. Sadly something is broken
or missing either here in core or in online as it doesn't fully work
in a Collabora Office based on the master branch of core, even after
this commit, though.
We use only the system clipboard on iOS. (It is actually called the
"pasteboard" in Apple's operating systems.) The code to interface with
the system clipboard is in vcl. It has worked fine to copy and paste
between the Collabora Office iOS app and other iOS apps without any
LOKClipboard being involved. If LOKClipboard is used it doesn't work
at all.
Change-Id: I0d3b4e3eabe17b633390e071701225e1d356a75a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128037
Reviewed-by: Tor Lillqvist
Tested-by: Tor Lillqvist
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index c9785eb059cf..d10c4f3c3403 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -132,7 +132,7 @@ ifneq ($(filter $(OS),ANDROID iOS MACOSX WNT),)
$(eval $(call gb_Library_add_exception_objects,sofficeapp,\
desktop/source/lib/init \
desktop/source/lib/lokinteractionhandler \
- $(if $(filter-out $(OS),IOS), \
+ $(if $(filter-out $(OS),iOS), \
desktop/source/lib/lokclipboard) \
$(if $(filter $(OS),ANDROID), \
desktop/source/lib/lokandroid) \
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index fc43e606d7bb..407c1c0ebf33 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2352,7 +2352,9 @@ static void doc_destroy(LibreOfficeKitDocument *pThis)
SolarMutexGuard aGuard;
+#ifndef IOS
LOKClipboardFactory::releaseClipboardForView(-1);
+#endif
LibLODocument_Impl *pDocument = static_cast(pThis);
delete pDocument;
@@ -4706,6 +4708,18 @@ static int doc_getClipboard(LibreOfficeKitDocument*
pThis,
size_t **pOutSizes,
char ***pOutStreams)
{
+#ifdef IOS
+(void) pThis;
+(void) pMimeTypes;
+(void) pOutCount;
+(void) pOutMimeTypes;
+(void) pOutSizes;
+(void) pOutStreams;
+
+assert(!"doc_getClipboard should not be called on iOS");
+
+return 0;
+#else
comphelper::ProfileZone aZone("doc_getClipboard");
SolarMutexGuard aGuard;
@@ -4782,6 +4796,7 @@ static int doc_getClipboard(LibreOfficeKitDocument* pThis,
}
return 1;
+#endif
}
static int doc_setClipboard(LibreOfficeKitDocument* pThis,
@@ -5529,7 +5544,9 @@ static void doc_destroyView(SAL_UNUSED_PARAMETER
LibreOfficeKitDocument* pThis,
SolarMutexGuard aGuard;
SetLastExceptionMsg();
+#ifndef IOS
LOKClipboardFactory::releaseClipboardForView(nId);
+#endif
SfxLokHelper::destroyView(nId);
@@ -5796,6 +5813,7 @@ static void doc_postWindow(LibreOfficeKitDocument*
/*pThis*/, unsigned nLOKWindo
}
else if (nAction == LOK_WINDOW_PASTE)
{
+#ifndef IOS
OUString aMimeType;
css::uno::Sequence aData;
std::vector
aArgs(jsonToPropertyValuesVector(pData));
@@ -5817,6 +5835,10 @@ static void doc_postWindow(LibreOfficeKitDocument*
/*pThis*/, unsigned nLOKWindo
}
else
SetLastExceptionMsg("Window command 'paste': wrong parameters.");
+#else
+(void) pData;
+assert(!"doc_postWindow() with LOK_WINDOW_PASTE should not be called
on iOS");
+#endif
}
}
diff --git a/vcl/source/components/dtranscomp.cxx
b/vcl/source/components/dtranscomp.cxx
index 645e50625ba3..acd03cc01912 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -416,6 +416,9 @@ Reference< XInterface > SalInstance::CreateClipboard( const
Sequence< Any >& arg
throw css::lang::IllegalArgumentException(
"non-empty SalInstance::CreateClipboard arguments", {}, -1);
}
+#ifdef IOS
+return Reference< XInterface >( static_cast(new
vcl::GenericClipboard()) );
+#else
if (comphelper::LibreOfficeKit::isActive()) {
// In LOK, each document view shall have its own clipboard instance,
and the way that
// (happens to?) work is that apparently this function is called a
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - desktop/Library_sofficeapp.mk desktop/source postprocess/Rdb_services.mk solenv/bin vcl/source
desktop/Library_sofficeapp.mk|6 --
desktop/source/lib/init.cxx | 22 ++
postprocess/Rdb_services.mk |5 +++--
solenv/bin/native-code.py|2 +-
vcl/source/components/dtranscomp.cxx |4
vcl/source/treelist/transfer2.cxx|5 +
6 files changed, 39 insertions(+), 5 deletions(-)
New commits:
commit cde6577dcb9c94aca7605790d34c83a5ff62edad
Author: Tor Lillqvist
AuthorDate: Tue Jan 4 16:33:16 2022 +0200
Commit: Aron Budea
CommitDate: Wed Jan 5 22:54:22 2022 +0100
We don't want or need any LOKClipboard on iOS
We use only the system clipboard on iOS. (It is actually called the
"pasteboard" in Apple's operating systems.) The code to interface with
the system clipboard is in vcl. It has worked fine to copy and paste
between the Collabora Office iOS app and other iOS apps without any
LOKClipboard being involved. If LOKClipboard is used it doesn't work
at all.
Change-Id: I0d3b4e3eabe17b633390e071701225e1d356a75a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127968
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Aron Budea
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 91f992e4501f..ab4fde902a18 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -156,11 +156,13 @@ ifneq ($(filter $(OS),ANDROID iOS MACOSX WNT),)
$(eval $(call gb_Library_add_exception_objects,sofficeapp,\
desktop/source/lib/init \
desktop/source/lib/lokinteractionhandler \
- desktop/source/lib/lokclipboard \
+ $(if $(filter-out $(OS),iOS), \
+ desktop/source/lib/lokclipboard) \
$(if $(filter $(OS),ANDROID), \
desktop/source/lib/lokandroid) \
))
-$(eval $(call gb_Library_set_componentfile,sofficeapp,desktop/lokclipboard))
+$(if $(filter-out $(OS),iOS), \
+ $(eval $(call
gb_Library_set_componentfile,sofficeapp,desktop/lokclipboard)))
else
ifeq ($(USING_X11),TRUE)
$(eval $(call gb_Library_add_exception_objects,sofficeapp,\
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 22523ecc2227..1ef25f2c5dc6 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2380,7 +2380,9 @@ static void doc_destroy(LibreOfficeKitDocument *pThis)
SolarMutexGuard aGuard;
+#ifndef IOS
LOKClipboardFactory::releaseClipboardForView(-1);
+#endif
LibLODocument_Impl *pDocument = static_cast(pThis);
delete pDocument;
@@ -4749,6 +4751,18 @@ static int doc_getClipboard(LibreOfficeKitDocument*
pThis,
size_t **pOutSizes,
char ***pOutStreams)
{
+#ifdef IOS
+(void) pThis;
+(void) pMimeTypes;
+(void) pOutCount;
+(void) pOutMimeTypes;
+(void) pOutSizes;
+(void) pOutStreams;
+
+assert(!"doc_getClipboard should not be called on iOS");
+
+return 0;
+#else
comphelper::ProfileZone aZone("doc_getClipboard");
SolarMutexGuard aGuard;
@@ -4825,6 +4839,7 @@ static int doc_getClipboard(LibreOfficeKitDocument* pThis,
}
return 1;
+#endif
}
static int doc_setClipboard(LibreOfficeKitDocument* pThis,
@@ -5572,7 +5587,9 @@ static void doc_destroyView(SAL_UNUSED_PARAMETER
LibreOfficeKitDocument* pThis,
SolarMutexGuard aGuard;
SetLastExceptionMsg();
+#ifndef IOS
LOKClipboardFactory::releaseClipboardForView(nId);
+#endif
SfxLokHelper::destroyView(nId);
@@ -5844,6 +5861,7 @@ static void doc_postWindow(LibreOfficeKitDocument*
/*pThis*/, unsigned nLOKWindo
}
else if (nAction == LOK_WINDOW_PASTE)
{
+#ifndef IOS
OUString aMimeType;
css::uno::Sequence aData;
std::vector
aArgs(jsonToPropertyValuesVector(pData));
@@ -5865,6 +5883,10 @@ static void doc_postWindow(LibreOfficeKitDocument*
/*pThis*/, unsigned nLOKWindo
}
else
SetLastExceptionMsg("Window command 'paste': wrong parameters.");
+#else
+(void) pData;
+assert(!"doc_postWindow() with LOK_WINDOW_PASTE should not be called
on iOS");
+#endif
}
}
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 75cbc02a4004..f54447ccd148 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -341,8 +341,9 @@ endif
# lokclipboard.component
ifneq ($(filter $(OS),ANDROID iOS MACOSX WNT),)
-$(eval $(call gb_Rdb_add_components,services,\
- desktop/lokclipboard))
+$(if $(filter-out $(OS),iOS), \
+ $(eval $(call gb_Rdb_add_components,services,\
+ desktop/lokclipboard)))
else
ifeq ($(USING_X11),TRUE)
$(eval $(call gb_Rdb_add_components,services,\
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 4fa814e7ee64..027781914d89 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/htmlexport/xhtmlexport.cxx | 16
sw/qa/extras/odfexport/data/tdf146264.odt |binary
2 files changed, 16 insertions(+)
New commits:
commit 6bfeb2290c585e0e5fe982dde6ac57e4afca2e2f
Author: Tor Lillqvist
AuthorDate: Tue Jan 4 12:03:23 2022 +0200
Commit: Tor Lillqvist
CommitDate: Tue Jan 4 17:08:42 2022 +0100
tdf#146264: Add unit test
Make sure the text is not duplicated in the output.
Change-Id: I1600d18f0921d2ab2cb67898bc02b68f0f9b36c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127935
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/sw/qa/extras/htmlexport/xhtmlexport.cxx
b/sw/qa/extras/htmlexport/xhtmlexport.cxx
index b03f184818fd..9f5b26745f5b 100644
--- a/sw/qa/extras/htmlexport/xhtmlexport.cxx
+++ b/sw/qa/extras/htmlexport/xhtmlexport.cxx
@@ -54,6 +54,22 @@ DECLARE_HTMLEXPORT_TEST(testTdf131812, "tdf131812.odt")
!= -1);
}
+DECLARE_HTMLEXPORT_TEST(testTdf146264, "tdf146264.odt")
+{
+SvStream* pStream = maTempFile.GetStream(StreamMode::READ);
+CPPUNIT_ASSERT(pStream);
+sal_uInt64 nLength = pStream->TellEnd();
+OString aStream(read_uInt8s_ToOString(*pStream, nLength));
+sal_Int32 nFirstHello = aStream.indexOf("Hello");
+CPPUNIT_ASSERT(nFirstHello > 0);
+if (nFirstHello > 0)
+{
+sal_Int32 nSecondHello = aStream.indexOf("Hello", nFirstHello + 1);
+constexpr sal_Int32 nMinusOne = -1;
+CPPUNIT_ASSERT_EQUAL(nMinusOne, nSecondHello);
+}
+}
+
DECLARE_HTMLEXPORT_TEST(testTdf118637, "tdf118637.odt")
{
SvStream* pStream = maTempFile.GetStream(StreamMode::READ);
diff --git a/sw/qa/extras/odfexport/data/tdf146264.odt
b/sw/qa/extras/odfexport/data/tdf146264.odt
new file mode 100644
index ..941c7db74fb0
Binary files /dev/null and b/sw/qa/extras/odfexport/data/tdf146264.odt differ
[Libreoffice-commits] core.git: extensions/source sc/source vcl/quartz
extensions/source/ole/unoobjw.cxx |3 ---
sc/source/core/tool/calcconfig.cxx |2 --
vcl/quartz/salgdi.cxx |1 -
3 files changed, 6 deletions(-)
New commits:
commit 31808345ffd97dfe9d542eae17fadb98148b29c6
Author: Tor Lillqvist
AuthorDate: Tue Jan 4 13:03:28 2022 +0200
Commit: Tor Lillqvist
CommitDate: Tue Jan 4 13:40:42 2022 +0100
Drop also commented-out obfuscated SAL_DEBUG calls
Change-Id: I7bc8ee2e5e989e41fcc0b6f96c5b2b8f151cdd3d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127937
Tested-by: Tor Lillqvist
Reviewed-by: Tor Lillqvist
diff --git a/extensions/source/ole/unoobjw.cxx
b/extensions/source/ole/unoobjw.cxx
index 034d7cec62a1..28286bddb1e3 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -2375,9 +2375,7 @@ Sink::Call( const OUString& Method, Sequence< Any >&
Arguments )
aDispParams.rgvarg[j].vt |= VT_BYREF;
break;
case VT_BOOL:
-// SAL_ DEBUG("===> VT_BOOL is initially " <<
(int)aDispParams.rgvarg[j].boolVal);
aDispParams.rgvarg[j].byref = new
VARIANT_BOOL(aDispParams.rgvarg[j].boolVal);
-// SAL_ DEBUG(" byref=" <<
aDispParams.rgvarg[j].byref);
aDispParams.rgvarg[j].vt |= VT_BYREF;
break;
default:
@@ -2443,7 +2441,6 @@ Sink::Call( const OUString& Method, Sequence< Any >&
Arguments )
case VT_BYREF|VT_BOOL:
{
VARIANT_BOOL *pBool =
static_cast(aDispParams.rgvarg[j].byref);
-// SAL_ DEBUG("===> VT_BOOL: byref is now " <<
aDispParams.rgvarg[j].byref << ", " << (int)*pBool);
ArgumentsRange[nIncomingArgIndex] <<= (*pBool !=
VARIANT_FALSE);
delete pBool;
}
diff --git a/sc/source/core/tool/calcconfig.cxx
b/sc/source/core/tool/calcconfig.cxx
index adb51efdf1ff..f1673e0ebe68 100644
--- a/sc/source/core/tool/calcconfig.cxx
+++ b/sc/source/core/tool/calcconfig.cxx
@@ -95,8 +95,6 @@ ScCalcConfig::ScCalcConfig() :
mbHasStringRefSyntax(false)
{
setOpenCLConfigToDefault();
-
-// SAL _DEBUG(__FILE__ ":" << __LINE__ << ": ScCalcConfig::ScCalcConfig():
" << *this);
}
void ScCalcConfig::setOpenCLConfigToDefault()
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index 9928cc4df3a2..51ffda669832 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -252,7 +252,6 @@ SalGraphicsImpl* AquaSalGraphics::GetImpl() const
void AquaSalGraphics::SetTextColor( Color nColor )
{
maShared.maTextColor = nColor;
-// SAL_ DEBUG(std::hex << nColor << std::dec << "={" <<
maShared.maTextColor.GetRed() << ", " << maShared.maTextColor.GetGreen() << ",
" << maShared.maTextColor.GetBlue() << ", " << maShared.maTextColor.GetAlpha()
<< "}");
}
void AquaSalGraphics::GetFontMetric(ImplFontMetricDataRef& rxFontMetric, int
nFallbackLevel)
[Libreoffice-commits] core.git: filter/source
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 19 +++ 1 file changed, 15 insertions(+), 4 deletions(-) New commits: commit 11d2a2f5d260bb27d0e67f90579ca761cb2250ea Author: Tor Lillqvist AuthorDate: Wed Dec 29 13:53:54 2021 +0200 Commit: Tor Lillqvist CommitDate: Mon Jan 3 18:05:50 2022 +0100 tdf#146264: Add a somewhat questionable hack to fix the issue Seems to work but probably has unintended side-effects. Change-Id: I33c6c78757d84fbb59176788a28645691f87b781 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127683 Tested-by: Jenkins Reviewed-by: Tor Lillqvist diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index 5195c3177651..430b834b3cca 100644 --- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -1,4 +1,4 @@ - + + + + + + @@ -898,11 +904,13 @@ + + @@ -946,6 +954,7 @@ + @@ -1030,6 +1039,7 @@ + @@ -2551,6 +2561,7 @@ +
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - desktop/Library_sofficeapp.mk postprocess/Rdb_services.mk
desktop/Library_sofficeapp.mk |6 ++ postprocess/Rdb_services.mk |5 ++--- 2 files changed, 4 insertions(+), 7 deletions(-) New commits: commit 9e01294adb5dfc71beae502be7bc754acfa0bdfd Author: Tor Lillqvist AuthorDate: Mon Dec 20 12:04:38 2021 +0200 Commit: Tor Lillqvist CommitDate: Wed Dec 22 13:16:34 2021 +0100 The value for $(OS) when building for iOS is "iOS", not "IOS" But we probably do want to compile lokclipboard.cxx for iOS, as otherwise the iOS app when built from the master branch of online and this branch of core will not link, as init.cxx contains unconditional references to stuff from lokclipboard.cxx. As such it would make sense to put all references to lokclipboard stuff inside #ifndef IOS, because we don't need to and don't want to use any own LOKClipboard in the iOS app. We use the system clipboard, using code in vcl/ios. Once that is done, lokclipboard.cxx can be dropped for iOS. For the postprocess/Rdb_services.mk, make it do what it de facto did always anyway (as $(OS) never was "IOS"). Change-Id: I7445157108f51cb6e54c62c44bae593cae69d792 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127146 Tested-by: Jenkins CollaboraOffice Reviewed-by: Tor Lillqvist diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index d66be2519821..91f992e4501f 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -156,13 +156,11 @@ ifneq ($(filter $(OS),ANDROID iOS MACOSX WNT),) $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ desktop/source/lib/init \ desktop/source/lib/lokinteractionhandler \ - $(if $(filter-out $(OS),IOS), \ - desktop/source/lib/lokclipboard) \ + desktop/source/lib/lokclipboard \ $(if $(filter $(OS),ANDROID), \ desktop/source/lib/lokandroid) \ )) -$(if $(filter-out $(OS),IOS), \ -$(eval $(call gb_Library_set_componentfile,sofficeapp,desktop/lokclipboard))) +$(eval $(call gb_Library_set_componentfile,sofficeapp,desktop/lokclipboard)) else ifeq ($(USING_X11),TRUE) $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 78c74ba0047e..75cbc02a4004 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -341,9 +341,8 @@ endif # lokclipboard.component ifneq ($(filter $(OS),ANDROID iOS MACOSX WNT),) -$(if $(filter-out $(OS),IOS), \ -$(eval $(call gb_Rdb_add_components,services,\ - desktop/lokclipboard))) +$(eval $(call gb_Rdb_add_components,services,\ + desktop/lokclipboard)) else ifeq ($(USING_X11),TRUE) $(eval $(call gb_Rdb_add_components,services,\
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.4-53'
Tag 'cp-6.4-53' created by Andras Timar at 2021-12-21 15:23 + cp-6.4-53 Changes since cp-6.4-48: Tor Lillqvist (1): Add missing mobile-specific Impress German translations --- source/de/sd/messages.po | 37 + 1 file changed, 37 insertions(+) ---
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - 20 commits - chart2/source download.lst external/libjpeg-turbo external/libodfgen external/openldap external/postgresql include/vcl
chart2/source/tools/InternalDataProvider.cxx
|7 +
download.lst
| 14 +-
external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk
|1
external/libjpeg-turbo/c76f4a08263b0cea40d2967560ac7c21f6959079.patch.1
| 38 ++
external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1
| 58 --
external/libodfgen/ExternalProject_libodfgen.mk
|4
external/libodfgen/Library_odfgen.mk
|3
external/libodfgen/UnpackedTarball_libodfgen.mk
|8 -
external/libodfgen/c++11.patch
| 44 ---
external/libodfgen/libodfgen-bundled-soname.patch.0
|5
external/openldap/openldap-2.4.44.patch.1
| 12 ++
external/postgresql/UnpackedTarball_postgresql.mk
|3
external/postgresql/arm64.patch.1
| 53 +
include/vcl/RawBitmap.hxx
|4
lotuswordpro/source/filter/lwpfribptr.cxx
| 35 +++---
lotuswordpro/source/filter/lwpfribptr.hxx
|4
sc/source/core/tool/interpr1.cxx
|2
solenv/flatpak-manifest.in
|7 -
svtools/source/svhtml/parhtml.cxx
|6 -
sw/qa/core/data/ww5/pass/ooo37322-1-WW2.doc
|binary
sw/qa/core/data/ww8/pass/ofz34749-1.doc
|binary
sw/qa/core/data/ww8/pass/ofz38011-1.doc
|binary
sw/source/core/text/itrform2.cxx
|4
sw/source/core/undo/undobj.cxx
| 11 +
sw/source/filter/ww8/ww8par.cxx
| 13 +-
sw/source/filter/ww8/ww8par.hxx
| 12 +-
sw/source/filter/ww8/ww8par2.cxx
|9 +
sw/source/filter/ww8/ww8par6.cxx
|3
tools/source/generic/poly.cxx
|2
vcl/unx/generic/printer/cpdmgr.cxx
| 49
30 files changed, 234 insertions(+), 177 deletions(-)
New commits:
commit eef7146a78eb02223c3e36a0c5660c480b93bbac
Author: Tor Lillqvist
AuthorDate: Wed Nov 10 13:36:43 2021 +0200
Commit: Andras Timar
CommitDate: Tue Dec 21 11:29:32 2021 +0100
Add forward declaration to openldap to fix compilation with current Xcode
For some reason the warning about this undeclared function is treated
as an error by the Clang version in current Xcode, at least for me,
even if openldap isn't compiled with -Werror.
Change-Id: Ic8479ca63031319ce55c6fb9d95132019ae82cae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124959
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/external/openldap/openldap-2.4.44.patch.1
b/external/openldap/openldap-2.4.44.patch.1
index 0d3cf5b70c3f..317ef9a62e56 100644
--- a/external/openldap/openldap-2.4.44.patch.1
+++ b/external/openldap/openldap-2.4.44.patch.1
@@ -1,3 +1,4 @@
+-*- Mode: diff -*-
--- openldap.org/configure
+++ openldap/configure
@@ -15735,7 +15735,7 @@
@@ -52,6 +53,17 @@
#undef NSS_VERSION_INT
#define NSS_VERSION_INT ((NSS_VMAJOR << 24) | (NSS_VMINOR << 16) | \
+--- openldap.org/libraries/libldap/tls2.c
openldap.org/libraries/libldap/tls2.c
+@@ -80,6 +80,8 @@
+ { BER_BVNULL, BER_BVNULL }
+ };
+
++int ldap_pvt_tls_check_hostname( LDAP *ld, void *s, const char *name_in );
++
+ #ifdef HAVE_TLS
+
+ void
--- openldap.org/Makefile.in
+++ openldap/Makefile.in
@@ -13,7 +13,7 @@
commit adc89cf8122d4b888c4afd51fe148108b9e26c8e
Author: Michael Stahl
AuthorDate: Tue Nov 16 14:41:57 2021 +0100
Commit: Andras Timar
CommitDate: Tue Dec 21 11:29:31 2021 +0100
postgresql: upgrade to release 13.5
Fixes CVE-2021-23222.
Change-Id: I4e16fcc60c634382a864f66b211d0e0170a06db0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125308
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/download.lst b/download.lst
index 9f2f2824d484..5c8a0a91adbf 100644
--- a/download.lst
+++ b/
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 81fb5106e05fa6d7c8faa3eb9ffdae4bee5a7dd8 Author: Tor Lillqvist AuthorDate: Thu Dec 16 19:29:07 2021 +0200 Commit: Tor Lillqvist CommitDate: Tue Dec 21 11:21:04 2021 +0100 Accept iOS SDK 15.2 Change-Id: I42182f86673586ce48905bdda3281ef4499263a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126958 Tested-by: Jenkins Reviewed-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127143 Tested-by: Jenkins CollaboraOffice Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127216 diff --git a/configure.ac b/configure.ac index 880b132274f7..d0023e71213b 100644 --- a/configure.ac +++ b/configure.ac @@ -3162,8 +3162,8 @@ dnl === if test $_os = iOS; then AC_MSG_CHECKING([what iOS SDK to use]) -current_sdk_ver=15.0 -older_sdk_vers="14.5 14.0" +current_sdk_ver=15.2 +older_sdk_vers="15.0 14.5 14.0" if test "$enable_ios_simulator" = "yes"; then platform=iPhoneSimulator versionmin=-mios-simulator-version-min=12.2
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 18d8a0524d30ffa04b024ad665a7e4468a86e966 Author: Tor Lillqvist AuthorDate: Thu Dec 16 19:29:07 2021 +0200 Commit: Tor Lillqvist CommitDate: Mon Dec 20 12:57:17 2021 +0100 Accept iOS SDK 15.2 Change-Id: I42182f86673586ce48905bdda3281ef4499263a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126958 Tested-by: Jenkins Reviewed-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127143 Tested-by: Jenkins CollaboraOffice diff --git a/configure.ac b/configure.ac index c68e60d07796..6a2d58cec530 100644 --- a/configure.ac +++ b/configure.ac @@ -3419,8 +3419,8 @@ dnl === if test $_os = iOS; then AC_MSG_CHECKING([what iOS SDK to use]) -current_sdk_ver=15.0 -older_sdk_vers="14.5 14.0" +current_sdk_ver=15.2 +older_sdk_vers="15.0 14.5 14.0" if test "$enable_ios_simulator" = "yes"; then platform=iPhoneSimulator versionmin=-mios-simulator-version-min=12.2
[Libreoffice-commits] core.git: configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 00ba09e5675fd30032d0fba38212dcad1a696e73 Author: Tor Lillqvist AuthorDate: Thu Dec 16 19:29:07 2021 +0200 Commit: Tor Lillqvist CommitDate: Thu Dec 16 21:30:32 2021 +0100 Accept iOS SDK 15.2 Change-Id: I42182f86673586ce48905bdda3281ef4499263a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126958 Tested-by: Jenkins Reviewed-by: Tor Lillqvist diff --git a/configure.ac b/configure.ac index 91905c22a74a..22f53a7c2b2c 100644 --- a/configure.ac +++ b/configure.ac @@ -3539,8 +3539,8 @@ dnl === if test $_os = iOS; then AC_MSG_CHECKING([what iOS SDK to use]) -current_sdk_ver=15.0 -older_sdk_vers="14.5" +current_sdk_ver=15.2 +older_sdk_vers="15.0 14.5" if test "$enable_ios_simulator" = "yes"; then platform=iPhoneSimulator versionmin=-mios-simulator-version-min=13.6
[Libreoffice-commits] core.git: vcl/ios vcl/source
vcl/ios/DataFlavorMapping.cxx|2 +-
vcl/source/treelist/transfer.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit e84dcee44aa7cdd340ee22d528afe14abebba994
Author: Tor Lillqvist
AuthorDate: Thu Dec 16 19:24:20 2021 +0200
Commit: Tor Lillqvist
CommitDate: Thu Dec 16 21:30:15 2021 +0100
Fix iOS compilation after recent changes to Sequence
Change-Id: I73c519174029766a3a2f61f9ad93fd63589b8184
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126957
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/vcl/ios/DataFlavorMapping.cxx b/vcl/ios/DataFlavorMapping.cxx
index 6a3815cf7eb3..05abf2b8a6f9 100644
--- a/vcl/ios/DataFlavorMapping.cxx
+++ b/vcl/ios/DataFlavorMapping.cxx
@@ -559,7 +559,7 @@ DataFlavorMapper::typesArrayToFlavorSequence(NSArray*
types) const
if (isValidFlavor(oOOFlavor))
{
flavors.realloc(flavors.getLength() + 1);
-flavors[flavors.getLength() - 1] = oOOFlavor;
+flavors.getArray()[flavors.getLength() - 1] = oOOFlavor;
SAL_INFO("vcl.ios.clipboard",
"Mapped " << [sysFormat UTF8String] << " to " <<
oOOFlavor.MimeType);
}
diff --git a/vcl/source/treelist/transfer.cxx b/vcl/source/treelist/transfer.cxx
index 260e3ba65613..23a865a0a3f0 100644
--- a/vcl/source/treelist/transfer.cxx
+++ b/vcl/source/treelist/transfer.cxx
@@ -668,7 +668,7 @@ bool TransferableHelper::SetBitmapEx( const BitmapEx&
rBitmapEx, const DataFlavo
#ifdef IOS
// Use faster compression on slow devices
aFilterData.realloc(aFilterData.getLength() + 1);
-aFilterData[aFilterData.getLength() - 1].Name = "Compression";
+aFilterData.getArray()[aFilterData.getLength() - 1].Name =
"Compression";
// We "know" that this gets passed to zlib's deflateInit2_(). 1
means best speed. For a
// typical 15 megapixel image from a DSLR, we are talking about a
difference of 17 s for
@@ -677,7 +677,7 @@ bool TransferableHelper::SetBitmapEx( const BitmapEx&
rBitmapEx, const DataFlavo
// Sure, the best would be to not have to re-encode the image at
all, but have access to
// the original JPEG or PNG when there is a such.
-aFilterData[aFilterData.getLength() - 1].Value <<= 1;
+aFilterData.getArray()[aFilterData.getLength() - 1].Value <<= 1;
#endif
vcl::PNGWriter aPNGWriter(rBitmapEx, );
[Libreoffice-commits] core.git: filter/source
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit b824634cbdc7bcacb0b67b8b1bcd17846273e85a Author: Tor Lillqvist AuthorDate: Thu Dec 16 11:30:19 2021 +0200 Commit: Tor Lillqvist CommitDate: Thu Dec 16 12:53:55 2021 +0100 Fix typos Change-Id: I837a135f6c94c9dbdd91c5642b92aa48800118f1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126909 Tested-by: Jenkins Reviewed-by: Tor Lillqvist diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index 52b0cd90f058..5195c3177651 100644 --- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -522,7 +522,7 @@ - + @@ -816,7 +816,7 @@ Next 'div' added for floating. @@ -828,7 +828,7 @@ - +
[Libreoffice-commits] core.git: filter/source
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) New commits: commit 30e474a7e5bba6cebb7b082abd7ae8dc8d8bf8b0 Author: Tor Lillqvist AuthorDate: Wed Dec 15 12:58:16 2021 +0200 Commit: Tor Lillqvist CommitDate: Wed Dec 15 12:35:37 2021 +0100 s/2DO/TODO/ Also s/4now/for now/ . Change-Id: I170c912e09435fb33532eb51ee0c15e6a0e85460 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126854 Tested-by: Tor Lillqvist Reviewed-by: Tor Lillqvist diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index 033f3200c846..52b0cd90f058 100644 --- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -341,7 +341,7 @@ A surrounding 'div' element taking over the image style solves that problem, but the div is invalid as child of a paragraph Therefore the paragraph has to be exchanged with a HTML div element --> - + @@ -388,7 +388,7 @@ - @@ -401,7 +401,7 @@ - @@ -430,7 +430,7 @@ - + @@ -497,7 +497,7 @@ - + @@ -1687,7 +1687,7 @@ - @@ -1998,7 +1998,7 @@ - + @@ -2269,7 +2269,7 @@ - + @@ -2524,7 +2524,7 @@ - +
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - vcl/inc vcl/source
vcl/inc/printdlg.hxx |1 +
vcl/source/window/printdlg.cxx | 13 +
2 files changed, 6 insertions(+), 8 deletions(-)
New commits:
commit 85fb61fbbf3ee5b786e73a66ec1e1ce06500bbcc
Author: Tor Lillqvist
AuthorDate: Sat Dec 4 21:53:45 2021 +0200
Commit: Justin Luth
CommitDate: Sat Dec 11 07:39:02 2021 +0100
Revert "tdf#145354: Ensure displayed paper name matches displayed paper ..."
It causes tdf#146045.
This reverts commit 65081542d2dabdf17820d62abdc5a22d3734e52d
Change-Id: Id980701b1a823c8bf7cfb57e0b32cf5d672c3bfa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126373
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
(cherry picked from commit d2ca15952de167b6236139d53f6757a7c0d22d0a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126526
Reviewed-by: Justin Luth
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index d2ce1670a845..21aab3667d4e 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -65,6 +65,7 @@ namespace vcl
virtual void Resize() override;
void setPreview( const GDIMetaFile&, const Size& i_rPaperSize,
+ std::u16string_view i_rPaperName,
const OUString& i_rNoPageString,
sal_Int32 i_nDPIX, sal_Int32 i_nDPIY,
bool i_bGreyscale
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 12aa14628887..46cb72752bbf 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -207,6 +207,7 @@ bool PrintDialog::PrintPreviewWindow::Command( const
CommandEvent& rEvt )
void PrintDialog::PrintPreviewWindow::setPreview( const GDIMetaFile&
i_rNewPreview,
const Size& i_rOrigSize,
+ std::u16string_view
i_rPaperName,
const OUString&
i_rReplacement,
sal_Int32 i_nDPIX,
sal_Int32 i_nDPIY,
@@ -234,18 +235,12 @@ void PrintDialog::PrintPreviewWindow::setPreview( const
GDIMetaFile& i_rNewPrevi
OUStringBuffer aBuf;
aBuf.append( aNumText + " " );
aBuf.appendAscii( eUnit == MapUnit::MapMM ? "mm" : "in" );
-
-// Look up the paper name from the dimensions
-PaperInfo aPaperInfoFromSize(i_rOrigSize.getWidth(),
i_rOrigSize.getHeight());
-aPaperInfoFromSize.doSloppyFit( true );
-
-if (aPaperInfoFromSize.getPaper() != PAPER_USER)
+if( !i_rPaperName.empty() )
{
aBuf.append( " (" );
-aBuf.append( Printer::GetPaperName(aPaperInfoFromSize.getPaper()) );
+aBuf.append( i_rPaperName );
aBuf.append( ')' );
}
-
maHorzText = aBuf.makeStringAndClear();
aNumText = rLocWrap.getNum( aLogicPaperSize.Height(), nDigits );
@@ -959,6 +954,7 @@ void PrintDialog::preparePreview( bool i_bMayUseCache )
if ( !hasPreview() )
{
mxPreview->setPreview( aMtf, aCurPageSize,
+Printer::GetPaperName( mePaper ),
maNoPreviewStr,
aPrt->GetDPIX(), aPrt->GetDPIY(),
aPrt->GetPrinterOptions().IsConvertToGreyscales()
@@ -994,6 +990,7 @@ void PrintDialog::preparePreview( bool i_bMayUseCache )
}
mxPreview->setPreview( aMtf, aCurPageSize,
+Printer::GetPaperName( mePaper ),
nPages > 0 ? OUString() : maNoPageStr,
aPrt->GetDPIX(), aPrt->GetDPIY(),
aPrt->GetPrinterOptions().IsConvertToGreyscales()
[Libreoffice-commits] core.git: basic/qa basic/source officecfg/registry
basic/qa/basic_coverage/test_types_conversion.bas | 30 --
basic/source/inc/rtlproto.hxx |1
basic/source/runtime/methods1.cxx | 10 +++
basic/source/sbx/sbxbool.cxx |3 -
basic/source/sbx/sbxbyte.cxx |3 -
basic/source/sbx/sbxchar.cxx |3 -
basic/source/sbx/sbxdbl.cxx |3 -
basic/source/sbx/sbxint.cxx |7 +-
basic/source/sbx/sbxlng.cxx |3 -
basic/source/sbx/sbxscan.cxx |3 -
basic/source/sbx/sbxsng.cxx |3 -
basic/source/sbx/sbxuint.cxx |3 -
basic/source/sbx/sbxulng.cxx |3 -
basic/source/sbx/sbxvalue.cxx |5 +
basic/source/sbx/sbxvar.cxx |5 +
officecfg/registry/schema/org/openoffice/Office/Scripting.xcs | 26
16 files changed, 90 insertions(+), 21 deletions(-)
New commits:
commit 47aabde053a1472dc32770da29d68c8de5bd7919
Author: Tor Lillqvist
AuthorDate: Thu Dec 2 12:37:07 2021 +0200
Commit: Mike Kaganski
CommitDate: Thu Dec 9 12:06:49 2021 +0100
Make the tdf#97983 changes to BASIC optional
If you want to keep the string to floating point conversion semantics
in BASIC as they were in LibreOffice 6, you can either set the
LIBREOFFICE6FLOATINGPOINTMODE environment variable to some non-empty
value, or set the org.openoffice.Office.Scripting/Basic/Compatibility/
UseLibreOffice6FloatingPointConversion flag in the Expert
Configuration. (Or use a registry modification file with that effect.)
Adapt the relevant unit test accordingly. Thanks to Mike Kaganski for
showing how to access the setting in the LibreOffice registry from
Basic.
Change-Id: I13d6d5d834e1bb81ef8df489db2b1da79f01dfc5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125756
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/basic/qa/basic_coverage/test_types_conversion.bas
b/basic/qa/basic_coverage/test_types_conversion.bas
index 1b923ad8c197..2d931145336c 100644
--- a/basic/qa/basic_coverage/test_types_conversion.bas
+++ b/basic/qa/basic_coverage/test_types_conversion.bas
@@ -11,6 +11,21 @@ Dim nTotalCount As Integer
Dim nPassCount As Integer
Dim nFailCount As Integer
+' See LibreOffice6FloatingPointMode in basic/source/runtime/methods1.cxx
+Function LibreOffice6FloatingPointMode() As Boolean
+Dim bMode As Boolean
+bMode = Environ("LIBREOFFICE6FLOATINGPOINTMODE") <> ""
+If (Not bMode) Then
+ Dim oConfigProvider As Object, aNodePath(0) As New
com.sun.star.beans.PropertyValue, oRegistryKey As Object
+ oConfigProvider =
createUnoService("com.sun.star.configuration.ConfigurationProvider")
+ aNodePath(0).Name = "nodepath"
+ aNodePath(0).Value =
"org.openoffice.Office.Scripting/Basic/Compatibility"
+ oRegistryKey =
oConfigProvider.createInstanceWithArguments("com.sun.star.configuration.ConfigurationAccess",
aNodePath)
+ bMode =
oRegistryKey.getPropertyValue("UseLibreOffice6FloatingPointConversion")
+End If
+LibreOffice6FloatingPointMode = bMode
+End Function
+
' For the following tests the en-US (English - United States) locale is
required
Function doUnitTest() As String
nTotalCount = 0
@@ -39,10 +54,17 @@ Function doUnitTest() As String
nVal = " -123.456 "
AssertTest(nVal = -123.456)
-' Wrong decimal separator (interpreted as group separator)
-StartTest()
-nVal = " -123,456 "
-AssertTest(nVal = -123456)
+If LibreOffice6FloatingPointMode() Then
+' Wrong decimal separator (and not even interpreted as group separator)
+ StartTest()
+nVal = " -123,45 "
+AssertTest(nVal = -123)
+Else
+' Wrong decimal separator (interpreted as group separator)
+StartTest()
+nVal = " -123,456 "
+AssertTest(nVal = -123456)
+End If
If ((nFailCount > 0) Or (nPassCount <> nTotalCount)) Then
doUnitTest = "FAIL"
diff --git a/basic/source/inc/rtlproto.hxx b/basic/source/inc/rtlproto.hxx
index b20fa9afab45..06f0bd8b0c30 100644
--- a/basic/source/inc/rtlproto.hxx
+++ b/basic/source/inc/rtlproto.hxx
@@ -354,6 +354,7 @@ extern void SbRtl_CDec(StarBASIC * pBasic, SbxArray & rPar,
bool bWrite);
extern void SbRtl_Partition(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
+extern bool LibreOffice6FloatingPointMode();
extern double Now_Impl();
extern void Wait_Impl( bool bDurationBased, SbxArray& rPar
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/schema/org/openoffice/Inet.xcs | 16 officecfg/registry/schema/org/openoffice/Office/Calc.xcs | 134 -- officecfg/registry/schema/org/openoffice/Office/Chart.xcs |2 officecfg/registry/schema/org/openoffice/Office/Common.xcs | 248 - officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs |4 officecfg/registry/schema/org/openoffice/Office/Draw.xcs | 120 -- officecfg/registry/schema/org/openoffice/Office/Impress.xcs| 149 --- officecfg/registry/schema/org/openoffice/Office/Java.xcs | 16 officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs | 40 officecfg/registry/schema/org/openoffice/Office/Writer.xcs | 447 -- officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs | 106 -- officecfg/registry/schema/org/openoffice/Setup.xcs |6 officecfg/registry/schema/org/openoffice/UserProfile.xcs | 32 13 files changed, 1320 deletions(-) New commits: commit 16072fc3eaf222d59e7bf156174f49d829b79e86 Author: Tor Lillqvist AuthorDate: Wed Dec 8 12:09:19 2021 +0200 Commit: Tor Lillqvist CommitDate: Wed Dec 8 13:10:36 2021 +0100 Bin pointless comments telling where some settings were in ancient times And some of the comments didn't even tell that, but were just idiotic copypasta, as in: . Change-Id: I71b889d1905f9291f920e8219f5648e63da3586e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126530 Tested-by: Jenkins Reviewed-by: Tor Lillqvist diff --git a/officecfg/registry/schema/org/openoffice/Inet.xcs b/officecfg/registry/schema/org/openoffice/Inet.xcs index 76d5d2ed0912..a236e0f92697 100644 --- a/officecfg/registry/schema/org/openoffice/Inet.xcs +++ b/officecfg/registry/schema/org/openoffice/Inet.xcs @@ -27,8 +27,6 @@ Contains Internet-related configurations (servers, proxies, etc.). - - Enumerates the names of servers that do not require any proxies. @@ -37,8 +35,6 @@ - - Specifies the type of proxy selection. @@ -62,8 +58,6 @@ - - Specifies the name of the FTP proxy server. @@ -72,8 +66,6 @@ - - Specifies the port of the FTP proxy server. @@ -92,8 +84,6 @@ - - Specifies the name of the HTTP proxy server. @@ -102,8 +92,6 @@ - - Specifies the port of the HTTP proxy server. @@ -122,8 +110,6 @@ - - Specifies the name of the HTTPS proxy server. @@ -132,8 +118,6 @@ - - Specifies the port of the HTTPS proxy server. diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index 84545054859a..39a7ec03a703 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -68,8 +68,6 @@ - - Specifies the Euro currency conversion rates and possibly other unit conversion rules for the CONVERT function. @@ -84,8 +82,6 @@ Specifies which contents are displayed in a spreadsheet. - - Indicates whether formulas instead of results are displayed in the cells. @@ -94,8 +90,6 @@ false - - Indicates whether numbers containing the 0 value are shown. @@ -104,8 +98,6 @@ true - - Indicates whether comments are marked. @@ -114,8 +106,6 @@ true - - Indicates whether all values are highlighted in the sheet (text black, numbers blue, others green). @@ -124,8 +114,6 @@ false - - Indicates whether anchor icons are displayed next to selected graphics in the document. @@ -134,8 +122,6 @@ true - - Indicates whether text overflow is marked via a small triangle. @@ -144,8 +130,6 @@ true - - Indicates whether objects and graphics are shown, hidden or replaced by a placeholder. @@ -171,8 +155,6 @@ 0
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.4-52'
Tag 'cp-6.4-52' created by Andras Timar at 2021-12-08 11:16 + cp-6.4-52 Changes since cp-6.4-48: Tor Lillqvist (1): Add missing mobile-specific Impress German translations --- source/de/sd/messages.po | 37 + 1 file changed, 37 insertions(+) ---
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sc/qa
sc/qa/unit/scshapetest.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 35c4abc1b209b40a936c62bdff0b055856851ef1
Author: Tor Lillqvist
AuthorDate: Tue Oct 19 12:55:18 2021 +0300
Commit: Tor Lillqvist
CommitDate: Tue Dec 7 16:52:31 2021 +0100
Bump tolerance from 30 to 40 to make this test pass on my Mac
Assuming that the original 30 was just an arbitrary number that
happened to work on the developer's machine, and for reasons a
slightly larger tolerance is needed on mine.
Change-Id: I08fe883dbe2eb88b7903019a71b689b539b085a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123810
Tested-by: Jenkins
Reviewed-by: Regina Henschel
Reviewed-by: Tor Lillqvist
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126476
diff --git a/sc/qa/unit/scshapetest.cxx b/sc/qa/unit/scshapetest.cxx
index 5586cdb954f2..cc5a04ea63e4 100644
--- a/sc/qa/unit/scshapetest.cxx
+++ b/sc/qa/unit/scshapetest.cxx
@@ -245,7 +245,7 @@ void ScShapeTest::testTdf144242_OpenBezier_noSwapWH()
pObj = lcl_getSdrObjectWithAssert(rDoc2, 0);
tools::Rectangle aSnapRect(pObj->GetSnapRect());
// Without fix in place width and height were swapped
-lcl_AssertRectEqualWithTolerance("Reload: wrong pos and size",
aExpectRect, aSnapRect, 30);
+lcl_AssertRectEqualWithTolerance("Reload: wrong pos and size",
aExpectRect, aSnapRect, 40);
pDocSh->DoClose();
}
@@ -285,7 +285,7 @@ void ScShapeTest::testTdf144242_Line_noSwapWH()
pObj = lcl_getSdrObjectWithAssert(rDoc2, 0);
tools::Rectangle aSnapRect(pObj->GetSnapRect());
// Without fix in place width and height were swapped
-lcl_AssertRectEqualWithTolerance("Reload: wrong pos and size",
aExpectRect, aSnapRect, 30);
+lcl_AssertRectEqualWithTolerance("Reload: wrong pos and size",
aExpectRect, aSnapRect, 40);
pDocSh->DoClose();
}
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/printdlg.hxx |1 +
vcl/source/window/printdlg.cxx | 13 +
2 files changed, 6 insertions(+), 8 deletions(-)
New commits:
commit d2ca15952de167b6236139d53f6757a7c0d22d0a
Author: Tor Lillqvist
AuthorDate: Sat Dec 4 21:53:45 2021 +0200
Commit: Tor Lillqvist
CommitDate: Mon Dec 6 12:55:35 2021 +0100
Revert "tdf#145354: Ensure displayed paper name matches displayed paper ..."
It causes tdf#146045.
This reverts commit 65081542d2dabdf17820d62abdc5a22d3734e52d
Change-Id: Id980701b1a823c8bf7cfb57e0b32cf5d672c3bfa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126373
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index d2ce1670a845..21aab3667d4e 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -65,6 +65,7 @@ namespace vcl
virtual void Resize() override;
void setPreview( const GDIMetaFile&, const Size& i_rPaperSize,
+ std::u16string_view i_rPaperName,
const OUString& i_rNoPageString,
sal_Int32 i_nDPIX, sal_Int32 i_nDPIY,
bool i_bGreyscale
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 12aa14628887..46cb72752bbf 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -207,6 +207,7 @@ bool PrintDialog::PrintPreviewWindow::Command( const
CommandEvent& rEvt )
void PrintDialog::PrintPreviewWindow::setPreview( const GDIMetaFile&
i_rNewPreview,
const Size& i_rOrigSize,
+ std::u16string_view
i_rPaperName,
const OUString&
i_rReplacement,
sal_Int32 i_nDPIX,
sal_Int32 i_nDPIY,
@@ -234,18 +235,12 @@ void PrintDialog::PrintPreviewWindow::setPreview( const
GDIMetaFile& i_rNewPrevi
OUStringBuffer aBuf;
aBuf.append( aNumText + " " );
aBuf.appendAscii( eUnit == MapUnit::MapMM ? "mm" : "in" );
-
-// Look up the paper name from the dimensions
-PaperInfo aPaperInfoFromSize(i_rOrigSize.getWidth(),
i_rOrigSize.getHeight());
-aPaperInfoFromSize.doSloppyFit( true );
-
-if (aPaperInfoFromSize.getPaper() != PAPER_USER)
+if( !i_rPaperName.empty() )
{
aBuf.append( " (" );
-aBuf.append( Printer::GetPaperName(aPaperInfoFromSize.getPaper()) );
+aBuf.append( i_rPaperName );
aBuf.append( ')' );
}
-
maHorzText = aBuf.makeStringAndClear();
aNumText = rLocWrap.getNum( aLogicPaperSize.Height(), nDigits );
@@ -959,6 +954,7 @@ void PrintDialog::preparePreview( bool i_bMayUseCache )
if ( !hasPreview() )
{
mxPreview->setPreview( aMtf, aCurPageSize,
+Printer::GetPaperName( mePaper ),
maNoPreviewStr,
aPrt->GetDPIX(), aPrt->GetDPIY(),
aPrt->GetPrinterOptions().IsConvertToGreyscales()
@@ -994,6 +990,7 @@ void PrintDialog::preparePreview( bool i_bMayUseCache )
}
mxPreview->setPreview( aMtf, aCurPageSize,
+Printer::GetPaperName( mePaper ),
nPages > 0 ? OUString() : maNoPageStr,
aPrt->GetDPIX(), aPrt->GetDPIY(),
aPrt->GetPrinterOptions().IsConvertToGreyscales()
[Libreoffice-commits] translations.git: Changes to 'refs/tags/co-6.4-51'
Tag 'co-6.4-51' created by Andras Timar at 2021-12-06 10:25 + co-6.4-51 Changes since cp-6.4-48: Tor Lillqvist (1): Add missing mobile-specific Impress German translations --- source/de/sd/messages.po | 37 + 1 file changed, 37 insertions(+) ---
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - basic/qa basic/source
basic/qa/basic_coverage/test_types_conversion.vb | 15 +++
basic/source/inc/rtlproto.hxx|2 ++
basic/source/runtime/methods1.cxx| 15 +++
basic/source/runtime/stdobj.cxx |1 +
basic/source/sbx/sbxbool.cxx |3 ++-
basic/source/sbx/sbxbyte.cxx |3 ++-
basic/source/sbx/sbxchar.cxx |3 ++-
basic/source/sbx/sbxdbl.cxx |3 ++-
basic/source/sbx/sbxint.cxx |7 ---
basic/source/sbx/sbxlng.cxx |3 ++-
basic/source/sbx/sbxscan.cxx |3 ++-
basic/source/sbx/sbxsng.cxx |3 ++-
basic/source/sbx/sbxuint.cxx |3 ++-
basic/source/sbx/sbxulng.cxx |3 ++-
basic/source/sbx/sbxvalue.cxx|5 +++--
basic/source/sbx/sbxvar.cxx |5 +++--
16 files changed, 57 insertions(+), 20 deletions(-)
New commits:
commit d3ecf88b2820edfab0b5bba6fca5790d9ea7505e
Author: Tor Lillqvist
AuthorDate: Thu Dec 2 12:37:07 2021 +0200
Commit: Andras Timar
CommitDate: Sat Dec 4 21:54:56 2021 +0100
Make the tdf#97983 changes to BASIC optional based on an environment
variable
If you want to keep the string to floating point conversion semantics
in BASIC as they were in LibreOffice 6, set the
LIBREOFFICE6FLOATINGPOINTMODE environment variable to some non-empty
value.
Change-Id: I13d6d5d834e1bb81ef8df489db2b1da79f01dfc5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125803
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/basic/qa/basic_coverage/test_types_conversion.vb
b/basic/qa/basic_coverage/test_types_conversion.vb
index 0868f4d3e50a..68b28b1afc0a 100644
--- a/basic/qa/basic_coverage/test_types_conversion.vb
+++ b/basic/qa/basic_coverage/test_types_conversion.vb
@@ -39,10 +39,17 @@ Function doUnitTest() As Integer
nVal = " -123.456 "
AssertTest(nVal = -123.456)
-' Wrong decimal separator (interpreted as group separator)
-StartTest()
-nVal = " -123,456 "
-AssertTest(nVal = -123456)
+If LibreOffice6FloatingPointMode() Then
+' Wrong decimal separator (and not even interpreted as group separator)
+ StartTest()
+nVal = " -123,45 "
+AssertTest(nVal = -123)
+Else
+' Wrong decimal separator (interpreted as group separator)
+StartTest()
+nVal = " -123,456 "
+AssertTest(nVal = -123456)
+End If
If ((nFailCount > 0) Or (nPassCount <> nTotalCount)) Then
doUnitTest = 0
diff --git a/basic/source/inc/rtlproto.hxx b/basic/source/inc/rtlproto.hxx
index 2d0cb78f84b7..93eed13bd17c 100644
--- a/basic/source/inc/rtlproto.hxx
+++ b/basic/source/inc/rtlproto.hxx
@@ -352,10 +352,12 @@ extern void SbRtl_CDateFromUnoDateTime(StarBASIC *
pBasic, SbxArray & rPar, bool
extern void SbRtl_CDateToIso(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
extern void SbRtl_CDateFromIso(StarBASIC * pBasic, SbxArray & rPar, bool
bWrite);
extern void SbRtl_CompatibilityMode(StarBASIC * pBasic, SbxArray & rPar, bool
bWrite);
+extern void SbRtl_LibreOffice6FloatingPointMode(StarBASIC * pBasic, SbxArray &
rPar, bool bWrite);
extern void SbRtl_CDec(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
extern void SbRtl_Partition(StarBASIC * pBasic, SbxArray & rPar, bool bWrite);
// Fong
+extern bool LibreOffice6FloatingPointMode();
extern double Now_Impl();
extern void Wait_Impl( bool bDurationBased, SbxArray& rPar );
diff --git a/basic/source/runtime/methods1.cxx
b/basic/source/runtime/methods1.cxx
index 2f9b6ff7b655..3d0c378765c8 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -2968,6 +2968,21 @@ void SbRtl_CompatibilityMode(StarBASIC *, SbxArray &
rPar, bool)
rPar.Get32(0)->PutBool( bEnabled );
}
+bool LibreOffice6FloatingPointMode()
+{
+static bool bMode = std::getenv("LIBREOFFICE6FLOATINGPOINTMODE") !=
nullptr;
+
+return bMode;
+}
+
+void SbRtl_LibreOffice6FloatingPointMode(StarBASIC *, SbxArray & rPar, bool)
+{
+if ( rPar.Count32() != 1 )
+StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
+
+rPar.Get32(0)->PutBool( LibreOffice6FloatingPointMode() );
+}
+
void SbRtl_Input(StarBASIC *, SbxArray & rPar, bool)
{
// 2 parameters needed
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index b2627748915a..c491bf1be227 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -147,6 +147,7 @@ static Methods aMethods[] = {
{ "expression", SbxVARIANT, 0,nullptr,0 },
{ "CompatibilityMode", SbxBOOL, 1 | FUNCTION_, RTLNAME
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.4-51'
Tag 'cp-6.4-51' created by Andras Timar at 2021-12-02 14:57 + cp-6.4-51 Changes since cp-6.4-48: Tor Lillqvist (1): Add missing mobile-specific Impress German translations --- source/de/sd/messages.po | 37 + 1 file changed, 37 insertions(+) ---
[Libreoffice-commits] core.git: basic/source
basic/source/inc/rtlproto.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d37341ea988a8e213d7acafdeef0d6af76ba8b58 Author: Tor Lillqvist AuthorDate: Thu Dec 2 11:24:35 2021 +0200 Commit: Tor Lillqvist CommitDate: Thu Dec 2 11:26:28 2021 +0200 Bin pointless comment Change-Id: I173dbfc93fabbacacc1a68189b7a50cd993f1caa diff --git a/basic/source/inc/rtlproto.hxx b/basic/source/inc/rtlproto.hxx index 0bc7ac24a4ec..b20fa9afab45 100644 --- a/basic/source/inc/rtlproto.hxx +++ b/basic/source/inc/rtlproto.hxx @@ -352,7 +352,7 @@ extern void SbRtl_CDateFromIso(StarBASIC * pBasic, SbxArray & rPar, bool bWrite) extern void SbRtl_CompatibilityMode(StarBASIC * pBasic, SbxArray & rPar, bool bWrite); extern void SbRtl_CDec(StarBASIC * pBasic, SbxArray & rPar, bool bWrite); -extern void SbRtl_Partition(StarBASIC * pBasic, SbxArray & rPar, bool bWrite); // Fong +extern void SbRtl_Partition(StarBASIC * pBasic, SbxArray & rPar, bool bWrite); extern double Now_Impl(); extern void Wait_Impl( bool bDurationBased, SbxArray& rPar );
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 5 commits - download.lst external/openldap external/postgresql RepositoryExternal.mk solenv/flatpak-manifest.in
Rebased ref, commits from common ancestor:
commit bda68f9cbaa63bf1adcca3b9d88c7ae16ceeb573
Author: Tor Lillqvist
AuthorDate: Wed Nov 10 13:36:43 2021 +0200
Commit: Andras Timar
CommitDate: Mon Nov 29 15:24:58 2021 +0100
Add forward declaration to openldap to fix compilation with current Xcode
For some reason the warning about this undeclared function is treated
as an error by the Clang version in current Xcode, at least for me,
even if openldap isn't compiled with -Werror.
Change-Id: Ic8479ca63031319ce55c6fb9d95132019ae82cae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124959
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/external/openldap/openldap-2.4.44.patch.1
b/external/openldap/openldap-2.4.44.patch.1
index 0d3cf5b70c3f..317ef9a62e56 100644
--- a/external/openldap/openldap-2.4.44.patch.1
+++ b/external/openldap/openldap-2.4.44.patch.1
@@ -1,3 +1,4 @@
+-*- Mode: diff -*-
--- openldap.org/configure
+++ openldap/configure
@@ -15735,7 +15735,7 @@
@@ -52,6 +53,17 @@
#undef NSS_VERSION_INT
#define NSS_VERSION_INT ((NSS_VMAJOR << 24) | (NSS_VMINOR << 16) | \
+--- openldap.org/libraries/libldap/tls2.c
openldap.org/libraries/libldap/tls2.c
+@@ -80,6 +80,8 @@
+ { BER_BVNULL, BER_BVNULL }
+ };
+
++int ldap_pvt_tls_check_hostname( LDAP *ld, void *s, const char *name_in );
++
+ #ifdef HAVE_TLS
+
+ void
--- openldap.org/Makefile.in
+++ openldap/Makefile.in
@@ -13,7 +13,7 @@
commit 95e769b3848aa84c9c1960eef39d682ece631715
Author: Michael Stahl
AuthorDate: Tue Nov 16 14:41:57 2021 +0100
Commit: Andras Timar
CommitDate: Mon Nov 29 15:24:48 2021 +0100
postgresql: upgrade to release 13.5
Fixes CVE-2021-23222.
Change-Id: I4e16fcc60c634382a864f66b211d0e0170a06db0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125308
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/download.lst b/download.lst
index 90a070010620..c5564512a189 100644
--- a/download.lst
+++ b/download.lst
@@ -232,8 +232,8 @@ export LIBPNG_SHA256SUM :=
505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201f
export LIBPNG_TARBALL := libpng-1.6.37.tar.xz
export POPPLER_SHA256SUM :=
016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3
export POPPLER_TARBALL := poppler-21.01.0.tar.xz
-export POSTGRESQL_SHA256SUM :=
12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f
-export POSTGRESQL_TARBALL := postgresql-13.1.tar.bz2
+export POSTGRESQL_SHA256SUM :=
9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3
+export POSTGRESQL_TARBALL := postgresql-13.5.tar.bz2
export PYTHON_SHA256SUM :=
f8d82e7572c86ec9d55c8627aae5040124fd2203af400c383c821b980306ee6b
export PYTHON_TARBALL := Python-3.7.10.tar.xz
export QRCODEGEN_SHA256SUM :=
fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a
commit e0857f89bc1e304fdb0a60b30d58b91e90699bd4
Author: Michael Stahl
AuthorDate: Wed Feb 3 18:59:41 2021 +0100
Commit: Andras Timar
CommitDate: Mon Nov 29 15:24:34 2021 +0100
postgresql: try to cargo-cult MSBuild arguments
Extremely unclear to me whether these are useful or necessary,
but the other MSBuild ones have them.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110385
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit bbc5cc71fd1723db8cb5020f83db5cafc0f8a52a)
Change-Id: Iacdd1a1e326bd9ae7c918f5b143495f613ff41d1
diff --git a/external/postgresql/ExternalProject_postgresql.mk
b/external/postgresql/ExternalProject_postgresql.mk
index 001c3f961ac8..9df01cae9ef3 100644
--- a/external/postgresql/ExternalProject_postgresql.mk
+++ b/external/postgresql/ExternalProject_postgresql.mk
@@ -24,7 +24,10 @@ $(eval $(call gb_ExternalProject_use_nmake,postgresql,build))
$(call gb_ExternalProject_get_state_target,postgresql,build) :
$(call gb_ExternalProject_run,build,\
- MSBFLAGS=/p:Platform=$(if $(filter
X86_64,$(CPUNAME)),x64,Win32) \
+ MSBFLAGS="/p:Platform=$(if $(filter
X86_64,$(CPUNAME)),x64,Win32) \
+ $(if $(filter 150,$(VCVER)),/p:PlatformToolset=v141
/p:VisualStudioVersion=15.0 /ToolsVersion:15.0) \
+ $(if $(filter 160,$(VCVER)),/p:PlatformToolset=v142
/p:VisualStudioVersion=16.0 /ToolsVersion:Current) \
+ $(if $(filter
10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))" \
$(PERL) build.pl $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)
libpq \
,src/tools/msvc)
commit 0210d0a638c7bdbf099cf25803ab3f7806a7c422
Author: Thorsten Behrens
AuthorDate: Sun Mar 14 02:24:59 2021 +0100
Commit: Andras Timar
CommitDate: Mon Nov 29 15:24:05 2021 +0100
Fix ARM64 build after postgres upgrade to 13.1
Change-Id: I12bdda6aedd9b7b15423f997fe8c6910d9c9e9d5
Reviewed-on: https://gerrit.libreoffi
