[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - javaunohelper/pom.juh.xml jurt/pom.jurt.xml ridljar/pom.ridl.xml unoil/pom.unoil.xml
javaunohelper/pom.juh.xml | 10 ++ jurt/pom.jurt.xml | 10 ++ ridljar/pom.ridl.xml | 10 ++ unoil/pom.unoil.xml | 10 ++ 4 files changed, 40 insertions(+) New commits: commit b99fb41679c5ab4074a0bc23dc25e475b87e1c22 Author: Rene Engelhard AuthorDate: Thu Jul 16 21:06:03 2020 +0200 Commit: Thorsten Behrens CommitDate: Tue Aug 18 09:00:52 2020 +0200 add dependency to juh,jurt,ridl,unoil poms They are dummies now and empty (except Class-Path:). Thus maven should pull in libreoffice.jar, too Change-Id: I63753deddceef6480fd4f5122b4892b707a9dd20 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98929 Tested-by: Jenkins Reviewed-by: David Ostrovsky (cherry picked from commit c6cec621aa19ff09b82044f91228c4a08df6bbb7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100352 Reviewed-by: Thorsten Behrens diff --git a/javaunohelper/pom.juh.xml b/javaunohelper/pom.juh.xml index 6bf4cd98bb86..8bfcbab80eb3 100644 --- a/javaunohelper/pom.juh.xml +++ b/javaunohelper/pom.juh.xml @@ -8,6 +8,16 @@ Java UNO helper https://www.libreoffice.org + + + +org.libreoffice +libreoffice +@version@ + + + + Mozilla Public License, Version 2.0 diff --git a/jurt/pom.jurt.xml b/jurt/pom.jurt.xml index 881153959244..4db9ff575714 100644 --- a/jurt/pom.jurt.xml +++ b/jurt/pom.jurt.xml @@ -8,6 +8,16 @@ Java Uno Runtime https://www.libreoffice.org + + + +org.libreoffice +libreoffice +@version@ + + + + Mozilla Public License, Version 2.0 diff --git a/ridljar/pom.ridl.xml b/ridljar/pom.ridl.xml index 9a90d30e6c9a..9990dd45e23c 100644 --- a/ridljar/pom.ridl.xml +++ b/ridljar/pom.ridl.xml @@ -8,6 +8,16 @@ Types for the Java Uno typesystem https://www.libreoffice.org + + + +org.libreoffice +libreoffice +@version@ + + + + Mozilla Public License, Version 2.0 diff --git a/unoil/pom.unoil.xml b/unoil/pom.unoil.xml index 819b704980c0..9991ed572d85 100644 --- a/unoil/pom.unoil.xml +++ b/unoil/pom.unoil.xml @@ -8,6 +8,16 @@ Maps IDL into java classes definitions https://www.libreoffice.org + + + +org.libreoffice +libreoffice +@version@ + + + + Mozilla Public License, Version 2.0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/CppunitTest_sw_core_undo.mk sw/Module_sw.mk sw/qa sw/source
sw/CppunitTest_sw_core_undo.mk | 74 +
sw/Module_sw.mk|1
sw/qa/core/undo/data/textbox-cut-save.docx |binary
sw/qa/core/undo/undo.cxx | 55 +
sw/source/core/undo/undobj1.cxx| 13 +
5 files changed, 143 insertions(+)
New commits:
commit b784ee4feb554987eff1c7fdaff640abb340504d
Author: Miklos Vajna
AuthorDate: Mon Aug 17 21:06:32 2020 +0200
Commit: Miklos Vajna
CommitDate: Tue Aug 18 09:03:45 2020 +0200
tdf#135016 DOCX export: fix unexpected error on save with undo/redo
Regression from commit d379d18666aa42031359ca8eb34b0021960347ae (oox:
import WPS shape with text as shape with textbox, 2014-06-18), then
problem was that when undo restored text deleted by cut, we ended up
with an SwXShape that had no frame format.
Fix the problem by deleting the cached old UNO wrapper after changing
the association between a textbox's shape and text frame.
An alternative would be to handle errors better when the TextBox UNO
property is not of type bool, but that would still lead to silent data
loss, so don't fix the problem that way.
Change-Id: Id45ad292befc746e7c49a3b827c91efd069d29df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100876
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/CppunitTest_sw_core_undo.mk b/sw/CppunitTest_sw_core_undo.mk
new file mode 100644
index ..11593cd9e604
--- /dev/null
+++ b/sw/CppunitTest_sw_core_undo.mk
@@ -0,0 +1,74 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_core_undo))
+
+$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_core_undo))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_core_undo, \
+sw/qa/core/undo/undo \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_core_undo, \
+comphelper \
+cppu \
+cppuhelper \
+sal \
+sfx \
+svxcore \
+sw \
+ swqahelper \
+test \
+unotest \
+utl \
+vcl \
+svt \
+tl \
+svl \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_core_undo,\
+boost_headers \
+libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_core_undo,\
+-I$(SRCDIR)/sw/inc \
+-I$(SRCDIR)/sw/source/core/inc \
+-I$(SRCDIR)/sw/source/uibase/inc \
+-I$(SRCDIR)/sw/qa/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_core_undo,\
+ udkapi \
+ offapi \
+ oovbaapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_core_undo))
+$(eval $(call gb_CppunitTest_use_vcl,sw_core_undo))
+
+$(eval $(call gb_CppunitTest_use_rdb,sw_core_undo,services))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,sw_core_undo,\
+officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_core_undo))
+
+$(eval $(call gb_CppunitTest_use_uiconfigs,sw_core_undo, \
+modules/swriter \
+))
+
+$(eval $(call gb_CppunitTest_use_more_fonts,sw_core_undo))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 66d27573ec98..0df68e21a6f7 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -119,6 +119,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
CppunitTest_sw_core_objectpositioning \
CppunitTest_sw_core_unocore \
CppunitTest_sw_core_crsr \
+CppunitTest_sw_core_undo \
))
ifneq ($(DISABLE_GUI),TRUE)
diff --git a/sw/qa/core/undo/data/textbox-cut-save.docx
b/sw/qa/core/undo/data/textbox-cut-save.docx
new file mode 100644
index ..a1a350d08aac
Binary files /dev/null and b/sw/qa/core/undo/data/textbox-cut-save.docx differ
diff --git a/sw/qa/core/undo/undo.cxx b/sw/qa/core/undo/undo.cxx
new file mode 100644
index ..aeacffc78e9b
--- /dev/null
+++ b/sw/qa/core/undo/undo.cxx
@@ -0,0 +1,55 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+
+#include
+
+#include
+#include
+#include
+#include
+
+char const DATA_DIRECTORY[] = "/sw/qa/core/undo/data/";
+
+/// Covers sw/source/core/undo/ fixes.
+class SwCoreUndoTest : public SwModelTestBase
+{
+};
+
+CPPUNIT_TEST_FIXTURE(SwCoreUndoTest, testTextboxCutSave)
+{
+// Load the document a
Re: Problems with data labels in charts
Hi Regina, On Mon, Aug 17, 2020 at 08:19:37PM +0200, Regina Henschel wrote: > So you suggest to keep the internal structure? > > That would mean, we will get about 18 additional "LabelFoo" properties over > the time for the still missing fill and line properties. That is indeed some cost to be considered. > Then these needs to be done: > A) Implement import of such ODF files, which use the styles of > elements for the fill and line properties of labels, so > that this information goes into the internal "labelFoo" properties. > B) Implement export to ODF, so that it writes the "labelFoo" properties into > the styles of elements, initially in addition to the > loext:labelFoo attributes. > C) Implement a service for the "labelFoo" properties. (Currently they are > not officially available in the API, although they are visible in the Basic > IDE.) > > The problem was not introduced by Gülşah, but this structure was determined > by Kohei Yoshida July 2014 with commit > https://cgit.freedesktop.org/libreoffice/core/commit/?id=f1531cdaaebe706d909dc6ddde439ccb5f4ad36d Ah, thanks for researching that, so it's older. Given it's there since 2014, I think there is benefit in not breaking that. I would rather add the remaining missing LabelFoo properties and keep the existing API working than the other way around. Regards, Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Cannot build libreoffice core.
Hi Chetan, On Mon, Aug 17, 2020 at 07:32:11AM -0700, Chetan Rawat wrote: > 1 warning generated. > mpi/mpcpucache.c:91:15: error: invalid output constraint '=a' in asm > : "=a"(*eax), > ^ > 1 error generated. This is a known problem for now, see the comments at the end of https://gerrit.libreoffice.org/c/core/+/100345 for details. Regards, Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: offapi/type_reference
offapi/type_reference/offapi.idl | 49 ---
1 file changed, 36 insertions(+), 13 deletions(-)
New commits:
commit 1e6dc8e4f746662ed5d1e750019b41b7d3644e5b
Author: Stephan Bergmann
AuthorDate: Tue Aug 18 08:29:29 2020 +0200
Commit: Stephan Bergmann
CommitDate: Tue Aug 18 09:28:42 2020 +0200
Update the reference rdbs to libreoffice-7.0.0.3
LD_LIBRARY_PATH=/data/sbergman/lo-clang/core/instdir/program \
/data/sbergman/lo-clang/core/workdir/LinkTarget/Executable/unoidl-read
--published \
/data/sbergman/lo-7.0/core/instdir/program/types.rdb \
>/data/sbergman/lo-clang/core/udkapi/type_reference/udkapi.idl
* no changes
LD_LIBRARY_PATH=/data/sbergman/lo-clang/core/instdir/program \
/data/sbergman/lo-clang/core/workdir/LinkTarget/Executable/unoidl-read
--published \
/data/sbergman/lo-7.0/core/instdir/program/types.rdb \
/data/sbergman/lo-7.0/core/instdir/program/types/offapi.rdb \
>/data/sbergman/lo-clang/core/offapi/type_reference/offapi.idl
* (XDcoumentHandler getting moved around now is a consequence of this being
the
first fully-automated generation of the file again after the manual
modifications done by the preceding
214e6caf2c503d817c47ebcc419e4f7e33b336ac
"[API CHANGE] remove BasicImport UNO interfaces" and
ebb66ee09b6041cbf755f24e54f2d1a510bbc3d3 "Fixed update of the reference
rdbs
to libreoffice-6.4.0.3-buildfix1".)
Change-Id: I841b6b5a059c78750fa7f02f9276c6b6f86c9afd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100892
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/offapi/type_reference/offapi.idl b/offapi/type_reference/offapi.idl
index 9b6b9d60e34b..c4483f6a86e1 100644
--- a/offapi/type_reference/offapi.idl
+++ b/offapi/type_reference/offapi.idl
@@ -3024,6 +3024,7 @@ module com {
[property, optional] ::com::sun::star::util::Color CharHighlight;
[property, optional] sequence< ::com::sun::star::beans::PropertyValue >
CharInteropGrabBag;
[property, optional] short RubyPosition;
+ [property, optional] short CharTransparence;
};
};
module chart {
@@ -3347,6 +3348,7 @@ module com {
const long BOTTOM_LEFT = 5;
const long BOTTOM_RIGHT = 7;
const long CENTER = 1;
+ const long CUSTOM = 13;
const long INSIDE = 10;
const long LEFT = 4;
const long NEAR_ORIGIN = 12;
@@ -4961,19 +4963,7 @@ module com {
};
module xml {
module sax {
- published interface XAttributeList;
- published interface XLocator;
- published interface XDocumentHandler {
- interface ::com::sun::star::uno::XInterface;
- void startDocument() raises (::com::sun::star::xml::sax::SAXException);
- void endDocument() raises (::com::sun::star::xml::sax::SAXException);
- void startElement([in] string aName, [in]
::com::sun::star::xml::sax::XAttributeList xAttribs) raises
(::com::sun::star::xml::sax::SAXException);
- void endElement([in] string aName) raises
(::com::sun::star::xml::sax::SAXException);
- void characters([in] string aChars) raises
(::com::sun::star::xml::sax::SAXException);
- void ignorableWhitespace([in] string aWhitespaces) raises
(::com::sun::star::xml::sax::SAXException);
- void processingInstruction([in] string aTarget, [in] string aData)
raises (::com::sun::star::xml::sax::SAXException);
- void setDocumentLocator([in] ::com::sun::star::xml::sax::XLocator
xLocator) raises (::com::sun::star::xml::sax::SAXException);
- };
+ published interface XDocumentHandler;
};
};
module document {
@@ -13457,6 +13447,10 @@ module com {
const short AIU_FULLWIDTH_JA = 21;
const short AIU_HALFWIDTH_JA = 22;
const short ARABIC = 4;
+ const short ARABIC_ZERO = 64;
+ const short ARABIC_ZERO3 = 65;
+ const short ARABIC_ZERO4 = 66;
+ const short ARABIC_ZERO5 = 67;
const short BITMAP = 8;
const short CHARS_ARABIC = 31;
const short CHARS_ARABIC_ABJAD = 54;
@@ -13566,6 +13560,11 @@ module com {
sequence< ::com::sun::star::beans::PropertyValue >
getStyleLoaderOptions();
};
};
+ module xml {
+module sax {
+ published interface XDocumentHandler;
+};
+ };
module svg {
/** @deprecated */ published interface XSVGPrinter {
interface ::com::sun::star::uno::XInterface;
@@ -13573,6 +13572,13 @@ module com {
void printPage([in] sequence< byte > aPrintPage);
void endJob();
};
+ };
+ module xml {
+module sax {
+ published interface XDocumentHandler;
+};
+ };
+ module svg {
/** @deprecated */ published interface XSVGWriter {
interface ::com::sun::star::uno::XInterface;
void write([in] ::com::sun::star::xml::sax::XDocumentHandler aHandler,
[in] sequence< byte > aMtf);
@@ -14806,6 +14812,7 @@ module com {
const short PAGE_FRAME = 7;
const short PA
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 7 commits - download.lst external/nss sw/source
download.lst |4 +--
external/nss/ExternalProject_nss.mk |6 ++--
external/nss/UnpackedTarball_nss.mk | 37 ++
external/nss/macos-dlopen.patch.0 | 18 +++---
external/nss/nsinstall.py |7 -
external/nss/nss-3.13.5-zlib-werror.patch |7 +++--
external/nss/nss-win32-make.patch.1 |2 -
external/nss/nss.windows.patch|4 +--
sw/source/core/layout/frmtool.cxx | 11
sw/source/core/txtnode/ndtxt.cxx |9 +++
sw/source/core/undo/undobj.cxx| 12 +
sw/source/filter/ww8/wrtw8nds.cxx | 24 ++-
sw/source/uibase/shells/textsh1.cxx |5 ++--
13 files changed, 93 insertions(+), 53 deletions(-)
New commits:
commit 9b65a3495875b06e8d830e0cbc5456a539ac2a0c
Author: Caolán McNamara
AuthorDate: Fri Aug 14 16:52:23 2020 +0100
Commit: Andras Timar
CommitDate: Tue Aug 18 10:30:07 2020 +0200
tdf#132892 Revert "sw: paragraph-sign: erase metafields ... correctly"
This reverts commit b402d0112a0bb53221b847fa372bfa3f6390a0e2.
Change-Id: I210d2fded01fb952d7384b78240e32d868b08575
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100796
Reviewed-by: Michael Stahl
Tested-by: Jenkins
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 7ca26840207e..b5784d43ce37 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2012,7 +2012,7 @@ void SwTextNode::CopyText( SwTextNode *const pDest,
{
CHECK_SWPHINTS_IF_FRM(this);
CHECK_SWPHINTS(pDest);
-const sal_Int32 nTextStartIdx = rStart.GetIndex();
+sal_Int32 nTextStartIdx = rStart.GetIndex();
sal_Int32 nDestStart = rDestStart.GetIndex(); // remember old Pos
if (pDest->GetDoc()->IsClipBoard() && GetNum())
@@ -2103,6 +2103,7 @@ void SwTextNode::CopyText( SwTextNode *const pDest,
// Fetch end only now, because copying into self updates the start index
// and all attributes
+nTextStartIdx = rStart.GetIndex();
const sal_Int32 nEnd = nTextStartIdx + nLen;
// 2. copy attributes
@@ -2250,10 +2251,8 @@ void SwTextNode::CopyText( SwTextNode *const pDest,
std::reverse(metaFieldRanges.begin(), metaFieldRanges.end());
for (const auto& pair : metaFieldRanges)
{
-const SwIndex aIdx(pDest, std::max(pair.first -
nTextStartIdx, 0));
-const sal_Int32 nCount = pair.second - pair.first;
-if (nCount > 0)
-pDest->EraseText(aIdx, nCount);
+const SwIndex aIdx(pDest, pair.first);
+pDest->EraseText(aIdx, pair.second - pair.first);
}
}
commit 107010759d194dc5ea23952141275424e71c85c8
Author: Caolán McNamara
AuthorDate: Thu Aug 13 15:48:16 2020 +0100
Commit: Andras Timar
CommitDate: Tue Aug 18 10:30:02 2020 +0200
tdf#134439 honor FN_PARAM_PAM arguments
which was dropped by
commit bba8e5aa6d1968e5279b3fe368c0f81145513d04
Date: Thu Mar 1 21:00:24 2018 +0100
tdf#116070: Use a valid PaM when confirming the dialog.
when fixing
commit 34527cec54ca634b831cfa5ac1098c4046818ac3
Date: Tue Jan 16 18:54:19 2018 +0100
lokdialog: Convert the Format -> Paragraph... dialog to async exec.
so, go back to using pPaM instead of rWrtSh.GetCursor but make a copy
of pPaM to avoid the crash of tdf#116070
Change-Id: I0aaaf5173c6be47dd306b77eacbb07d0e1c4eaf1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100528
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/source/uibase/shells/textsh1.cxx
b/sw/source/uibase/shells/textsh1.cxx
index e3adf83242b5..2d9ed1994727 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1085,7 +1085,8 @@ void SwTextShell::Execute(SfxRequest &rReq)
std::shared_ptr pRequest(new SfxRequest(rReq));
rReq.Ignore(); // the 'old' request is not relevant any more
-pDlg->StartExecuteAsync([pDlg, &rWrtSh, pRequest,
nDefDist](sal_Int32 nResult){
+auto xPaM(std::make_shared(*pPaM, nullptr)); //
tdf#134439 make a copy to use at later apply
+pDlg->StartExecuteAsync([pDlg, &rWrtSh, pRequest, nDefDist,
xPaM](sal_Int32 nResult){
if (nResult == RET_OK)
{
// Apply defaults if necessary.
@@ -1115,7 +1116,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
pSet->Put(SfxStringItem(FN_DROP_CHAR_STYLE_NAME,
sCharStyleName));
}
-sw_ParagraphDialogResult(pSet, rWrtSh, *pRequest,
rWrtSh.GetCursor());
+sw_ParagraphDialogResult(pSet, rWrtSh, *pRequest,
xPaM.get());
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - download.lst external/nss
download.lst |4 +-- external/nss/ExternalProject_nss.mk |6 ++--- external/nss/UnpackedTarball_nss.mk | 33 ++ external/nss/nsinstall.py |7 +- external/nss/nss-3.13.5-zlib-werror.patch |7 +++--- external/nss/nss-win32-make.patch.1 |2 - external/nss/nss.windows.patch|4 +-- 7 files changed, 34 insertions(+), 29 deletions(-) New commits: commit 76476ba18dba807edaffaac4b4d14fc73d517547 Author: Michael Stahl AuthorDate: Fri Aug 7 18:57:00 2020 +0200 Commit: Andras Timar CommitDate: Tue Aug 18 10:34:09 2020 +0200 nss: upgrade to release 3.55.0 Fixes CVE-2020-6829, CVE-2020-12400 CVE-2020-12401 CVE-2020-12403. (also CVE-2020-12402 CVE-2020-12399 in older releases since 3.47) * external/nss/nss.nspr-parallel-win-debug_build.patch: remove, merged upstream Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100345 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 495a5944a3d442cfe748a3bb0dcef76f6a961d30) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100420 Reviewed-by: Xisco Fauli (cherry picked from commit 227d30a3a17f2fffb1a166cdc3e2a796bb335214) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100590 Reviewed-by: Caolán McNamara (cherry picked from commit 94cecbfdf3cf01fe3d5658c7edf78696da2a249f) Change-Id: I8b48e25ce68a2327cde1420abdaea8f9e51a7888 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100864 Tested-by: Michael Stahl Reviewed-by: Michael Stahl diff --git a/download.lst b/download.lst index f1a5317b65fd..0b3920275f26 100644 --- a/download.lst +++ b/download.lst @@ -203,8 +203,8 @@ export MYTHES_SHA256SUM := 1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz export NEON_SHA256SUM := db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca export NEON_TARBALL := neon-0.30.2.tar.gz -export NSS_SHA256SUM := 861a4510b7c21516f49a4cfa5b871aa796e4e1ef2dfe949091970e56f9d60cdf -export NSS_TARBALL := nss-3.53-with-nspr-4.25.tar.gz +export NSS_SHA256SUM := ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45 +export NSS_TARBALL := nss-3.55-with-nspr-4.27.tar.gz export ODFGEN_SHA256SUM := 2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2 export ODFGEN_VERSION_MICRO := 6 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2 diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index 92902b2da6bf..2e6e7f80e3ee 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -21,7 +21,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/clang-cl.patch.0 \ external/nss/nss.vs2015.patch \ external/nss/nss.vs2015.pdb.patch \ -external/nss/nss.nspr-parallel-win-debug_build.patch \ $(if $(filter iOS,$(OS)), \ external/nss/nss-ios.patch) \ $(if $(filter ANDROID,$(OS)), \ diff --git a/external/nss/nss.nspr-parallel-win-debug_build.patch b/external/nss/nss.nspr-parallel-win-debug_build.patch deleted file mode 100644 index 86b55e1ccf7f.. --- a/external/nss/nss.nspr-parallel-win-debug_build.patch +++ /dev/null @@ -1,40 +0,0 @@ -Änderung:4866:23940b78e965 -Nutzer: Jan-Marek Glogowski -Datum: Fri May 01 22:50:55 2020 + -Dateien: pr/tests/Makefile.in -Beschreibung: -Bug 290526 Write separate PDBs for test OBJs r=glandium - -Quite often when running a parallel NSS build, I get the following -compiler error message, resulting in a build failure, despite -compiling with the -FS flag: - -.../nss/nspr/pr/tests/zerolen.c: fatal error C1041: -Programmdatenbank "...\nss\nspr\out\pr\tests\vc140.pdb" kann nicht -ge<94>ffnet werden; verwenden Sie /FS, wenn mehrere CL.EXE in -dieselbe .PDB-Datei schreiben. - -The failing source file is always one of the last test object -files. But the actual problem is not the compiler accessing the -PDB file, but the linker already linking the first test -executables accessing the shared PDB; at least that's my guess. - -So instead of using a shared PDB for all test object files, this -uses -Fd$(@:.$(OBJ_SUFFIX)=.pdb) to write a separate PDB for every -test's object file. The linker works fine with the shared OBJ PDB. - -Differential Revision: https://phabricator.services.mozilla.com/D68693 - - -diff -r 219d131499d5 -r 23940b78e965 nss/nspr/pr/tests/Makefile.in a/nss/nspr/pr/tests/Makefile.inMon Feb 10 20:58:42 2020 + -+++ b/nss/nspr/pr/tests/Makefile.inFri May 01 22:50:55 2020 + -@@ -211,6 +211,7 @@ - else - EXTRA_LIBS += ws2_32.lib - LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO -+ CFLAGS += -Fd$(@:.$(OBJ_SUFFIX)=.pdb) - ifdef PROFILE - LDOPTS += -PROFILE -MAP - endif
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/skia
vcl/skia/gdiimpl.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 7fddaa7e4f0d914aad910861ffc236bd8e1b44f9
Author: Mike Kaganski
AuthorDate: Mon Aug 17 17:42:43 2020 +0300
Commit: Caolán McNamara
CommitDate: Tue Aug 18 10:40:51 2020 +0200
Dereference of nullptr
... opening attachment 164348 from tdf#135799
Change-Id: I7d9b38bf34c7120fee39707ed99a0e6e2c2c84e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100878
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit b7b4565473b09c771d5a949c394013956f1c4db7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100804
Reviewed-by: Caolán McNamara
diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 66f3655f9c53..7b69df95936f 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -392,6 +392,8 @@ void SkiaSalGraphicsImpl::checkSurface()
void SkiaSalGraphicsImpl::flushDrawing()
{
+if (!mSurface)
+return;
checkPendingDrawing();
if (mXorMode)
applyXor();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - icon-themes/colibre icon-themes/colibre_svg icon-themes/elementary icon-themes/elementary_svg
icon-themes/colibre/cmd/32/orientation.png |binary icon-themes/colibre/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.png |binary icon-themes/colibre/sw/res/sidebar/pageproppanel/portraitcopy_24x24.png |binary icon-themes/colibre_svg/cmd/32/orientation.svg |2 +- icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.svg |2 +- icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/portraitcopy_24x24.svg |2 +- icon-themes/elementary/cmd/32/orientation.png |binary icon-themes/elementary/cmd/lc_orientation.png |binary icon-themes/elementary/cmd/lc_showsinglepage.png |binary icon-themes/elementary/cmd/sc_orientation.png |binary icon-themes/elementary/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.png |binary icon-themes/elementary/sw/res/sidebar/pageproppanel/columnright_24x24.png |binary icon-themes/elementary/sw/res/sidebar/pageproppanel/documentsizeA3_24x24.png |binary icon-themes/elementary/sw/res/sidebar/pageproppanel/documentsizeA4_24x24.png |binary icon-themes/elementary/sw/res/sidebar/pageproppanel/documentsizeA5_24x24.png |binary icon-themes/elementary/sw/res/sidebar/pageproppanel/documentsizeB4_24x24.png |binary icon-themes/elementary/sw/res/sidebar/pageproppanel/documentsizeB5_24x24.png |binary icon-themes/elementary/sw/res/sidebar/pageproppanel/documentsizeC5_24x24.png |binary icon-themes/elementary/sw/res/sidebar/pageproppanel/documentsize_L_A3_24x24.png |binary icon-themes/elementary/sw/res/sidebar/pageproppanel/documentsize_L_A4_24x24.png |binary icon-themes/elementary/sw/res/sidebar/pageproppanel/documentsize_L_A5_24x24.png |binary icon-themes/elementary/sw/res/sidebar/pageproppanel/documentsize_L_B4_24x24.png |binary icon-themes/elementary/sw/res/sidebar/pageproppanel/documentsize_L_B5_24x24.png |binary icon-themes/elementary/sw/res/sidebar/pageproppanel/documentsize_L_C5_24x24.png |binary icon-themes/elementary/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.png |binary icon-themes/elementary/sw/res/sidebar/pageproppanel/documentsizecopy_24x24.png |binary icon-themes/elementary/sw/res/sidebar/pageproppanel/format_L_copy_24x24.png |binary icon-themes/elementary/sw/res/sidebar/pageproppanel/formatcopy_24x24.png |binary icon-themes/elementary/sw/res/sidebar/pageproppanel/portraitcopy_24x24.png |binary icon-themes/elementary_svg/cmd/32/orientation.svg |2 +- icon-themes/elementary_svg/cmd/lc_orientation.svg |2 +- icon-themes/elementary_svg/cmd/lc_showsinglepage.svg |2 +- icon-themes/elementary_svg/cmd/sc_orientation.svg |2 +- icon-themes/elementary_svg/res/lx03245.svg |1 + icon-themes/elementary_svg/res/lx03246.svg |1 + icon-themes/elementary_svg/res/lx03247.svg |1 + icon-themes/elementary_svg/res/lx03248.svg |1 + icon-themes/elementary_svg/res/lx03249.svg |1 + icon-themes/elementary_svg/res/lx03250.svg |1 + icon-themes/elementary_svg/res/lx03251.svg |1 + icon-themes/elementary_svg/res/lx03255.svg |1 + icon-themes/elementary_svg/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.svg |2 +- icon-themes/elementary_svg/sw/res/sidebar/pageproppanel/columnright_24x24.svg |2 +- icon-themes/elementary_svg/sw/res/sidebar/pageproppanel/documentsizeA3_24x24.svg |2 +- icon-themes/elementary_svg/sw/res/sidebar/pageproppanel/documentsizeA4_24x24.svg |2 +- icon-themes/elementary_svg/sw/res/sidebar/pageproppanel/documentsizeA5_24x24.svg |2 +- icon-themes/elementary_svg/sw/res/sidebar/pageproppanel/documentsizeB4_24x24.svg |2 +- icon-themes/elementary_svg/sw/res/sidebar/pageproppanel/documentsizeB5_24x24.svg |2 +- icon-themes/elementary_svg/sw/res/sidebar/pageproppanel/documentsizeC5_24x24.svg |2 +- icon-themes/elementary_svg/sw/res/sidebar/pageproppanel/documentsize_L_A3_24x24.svg |2 +- icon-themes/elementary_svg/sw/res/sidebar/pageproppanel/documentsize_L_A4_24x24.svg |2 +- icon-themes/elementary_svg/sw/res/sidebar/p
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 3 commits - download.lst external/curl external/nss
download.lst |8 +++--- external/curl/ExternalPackage_curl.mk |2 - external/curl/ExternalProject_curl.mk |1 external/curl/clang-cl.patch.0|4 +-- external/curl/curl-msvc.patch.1 |8 +++--- external/nss/ExternalProject_nss.mk |6 ++--- external/nss/UnpackedTarball_nss.mk | 35 ++ external/nss/nsinstall.py |7 +- external/nss/nss-3.13.5-zlib-werror.patch |7 +++--- external/nss/nss-win32-make.patch.1 |2 - external/nss/nss.windows.patch|4 +-- 11 files changed, 45 insertions(+), 39 deletions(-) New commits: commit 4dc90ac57a0fd10c8f67a959277824df22f9c1ff Author: Michael Stahl AuthorDate: Mon Jun 29 14:00:56 2020 +0200 Commit: Andras Timar CommitDate: Tue Aug 18 10:51:53 2020 +0200 curl: upgrade to release 7.71.0 Fixes CVE-2020-8169, and about 3 other ones that don't affect LO/libcmis. Disable new optional dependencies "ngtcp2" and "quiche". Change-Id: I595ed909c4e792ac3244643511a338b117e7f102 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97406 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit cb0c7e26e5708010b1fe941ae2f66134f31ed876) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97386 Reviewed-by: Thorsten Behrens (cherry picked from commit 43130216127913d30074d3fe99c5706dcce44dee) diff --git a/download.lst b/download.lst index 27c1412e09b4..98c5a6ed32c2 100644 --- a/download.lst +++ b/download.lst @@ -29,8 +29,8 @@ export CPPUNIT_SHA256SUM := 3d569869d27b48860210c758c4f313082103a5e58219a7669b52 export CPPUNIT_TARBALL := cppunit-1.14.0.tar.gz export CT2N_SHA256SUM := 71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3 export CT2N_TARBALL := 1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt -export CURL_SHA256SUM := 7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd -export CURL_TARBALL := curl-7.65.0.tar.xz +export CURL_SHA256SUM := cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772 +export CURL_TARBALL := curl-7.71.0.tar.xz export EBOOK_SHA256SUM := 7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9 export EBOOK_TARBALL := libe-book-0.1.3.tar.xz export EPOXY_SHA256SUM := 1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64 diff --git a/external/curl/ExternalPackage_curl.mk b/external/curl/ExternalPackage_curl.mk index 56c418b6ef0c..8da569e3e0cf 100644 --- a/external/curl/ExternalPackage_curl.mk +++ b/external/curl/ExternalPackage_curl.mk @@ -20,7 +20,7 @@ $(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.4.dyli else ifeq ($(OS),AIX) $(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so,lib/.libs/libcurl.so.4)) else -$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so.4,lib/.libs/libcurl.so.4.5.0)) +$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so.4,lib/.libs/libcurl.so.4.6.0)) endif endif # $(DISABLE_DYNLOADING) diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index 136e50f3a81c..ebcb6068b7c1 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -48,6 +48,7 @@ $(call gb_ExternalProject_get_state_target,curl,build): --without-libidn2 --without-libpsl --without-librtmp \ --without-libssh2 --without-metalink --without-nghttp2 \ --without-libssh --without-brotli \ + --without-ngtcp2 --without-quiche \ --disable-ares \ --disable-dict --disable-file --disable-gopher --disable-imap \ --disable-ldap --disable-ldaps --disable-manual --disable-pop3 \ diff --git a/external/curl/clang-cl.patch.0 b/external/curl/clang-cl.patch.0 index 2f7fe567460c..2fbb10c2a9aa 100755 --- a/external/curl/clang-cl.patch.0 +++ b/external/curl/clang-cl.patch.0 @@ -4,8 +4,8 @@ !ELSE CC_NODEBUG = $(CC) /O2 /DNDEBUG CC_DEBUG= $(CC) /Od /D_DEBUG /RTC1 /Z7 /LDd --CFLAGS = /I. /I ../lib /I../include /nologo /W4 /wd4127 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL $(SOLARINC) -+CFLAGS = /I. /I ../lib /I../include /nologo /W4 /wd4127 /EHsc /DWIN32 /c /DBUILDING_LIBCURL $(SOLARINC) +-CFLAGS = /I. /I ../lib /I../include /nologo /W4 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL $(SOLARINC) ++CFLAGS = /I. /I ../lib /I../include /nologo /W4 /EHsc /DWIN32 /c /DBUILDING_LIBCURL $(SOLARINC) !ENDIF LFLAGS = /nologo /machine:$(MACHINE) diff --git a/external/curl/curl-msvc.patch.1 b/external/curl/curl-msvc.patch.1 index 80160958c99d..a5b79a8e9c49 100644 --- a/external/curl/curl-msvc.patch.1 +++ b/external/curl/curl-msvc.patch.1 @@ -6,8 +6,8 @@ MSVC: using SOLARINC !ELSE CC_NODEBUG
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0-29' - 3 commits - download.lst external/curl external/nss
download.lst |8 +++--- external/curl/ExternalPackage_curl.mk |2 - external/curl/ExternalProject_curl.mk |1 external/curl/clang-cl.patch.0|4 +-- external/curl/curl-msvc.patch.1 |8 +++--- external/nss/ExternalProject_nss.mk |6 ++--- external/nss/UnpackedTarball_nss.mk | 35 ++ external/nss/nsinstall.py |7 +- external/nss/nss-3.13.5-zlib-werror.patch |7 +++--- external/nss/nss-win32-make.patch.1 |2 - external/nss/nss.windows.patch|4 +-- 11 files changed, 45 insertions(+), 39 deletions(-) New commits: commit 1c20ba73b226a640060b072af91d24302214bfd3 Author: Michael Stahl AuthorDate: Fri Aug 7 18:57:00 2020 +0200 Commit: Andras Timar CommitDate: Tue Aug 18 11:14:06 2020 +0200 nss: upgrade to release 3.55.0 Fixes CVE-2020-6829, CVE-2020-12400 CVE-2020-12401 CVE-2020-12403. (also CVE-2020-12402 CVE-2020-12399 in older releases since 3.47) * external/nss/nss.nspr-parallel-win-debug_build.patch: remove, merged upstream Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100345 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 495a5944a3d442cfe748a3bb0dcef76f6a961d30) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100420 Reviewed-by: Xisco Fauli (cherry picked from commit 227d30a3a17f2fffb1a166cdc3e2a796bb335214) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100590 Reviewed-by: Caolán McNamara (cherry picked from commit 94cecbfdf3cf01fe3d5658c7edf78696da2a249f) Change-Id: I8b48e25ce68a2327cde1420abdaea8f9e51a7888 diff --git a/download.lst b/download.lst index 3cee44e75f93..3634e1958e9c 100644 --- a/download.lst +++ b/download.lst @@ -195,8 +195,8 @@ export MYTHES_SHA256SUM := 1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz export NEON_SHA256SUM := db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca export NEON_TARBALL := neon-0.30.2.tar.gz -export NSS_SHA256SUM := 861a4510b7c21516f49a4cfa5b871aa796e4e1ef2dfe949091970e56f9d60cdf -export NSS_TARBALL := nss-3.53-with-nspr-4.25.tar.gz +export NSS_SHA256SUM := ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45 +export NSS_TARBALL := nss-3.55-with-nspr-4.27.tar.gz export ODFGEN_SHA256SUM := 2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2 export ODFGEN_VERSION_MICRO := 6 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2 diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index 92902b2da6bf..2e6e7f80e3ee 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -21,7 +21,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/clang-cl.patch.0 \ external/nss/nss.vs2015.patch \ external/nss/nss.vs2015.pdb.patch \ -external/nss/nss.nspr-parallel-win-debug_build.patch \ $(if $(filter iOS,$(OS)), \ external/nss/nss-ios.patch) \ $(if $(filter ANDROID,$(OS)), \ diff --git a/external/nss/nss.nspr-parallel-win-debug_build.patch b/external/nss/nss.nspr-parallel-win-debug_build.patch deleted file mode 100644 index 86b55e1ccf7f.. --- a/external/nss/nss.nspr-parallel-win-debug_build.patch +++ /dev/null @@ -1,40 +0,0 @@ -Änderung:4866:23940b78e965 -Nutzer: Jan-Marek Glogowski -Datum: Fri May 01 22:50:55 2020 + -Dateien: pr/tests/Makefile.in -Beschreibung: -Bug 290526 Write separate PDBs for test OBJs r=glandium - -Quite often when running a parallel NSS build, I get the following -compiler error message, resulting in a build failure, despite -compiling with the -FS flag: - -.../nss/nspr/pr/tests/zerolen.c: fatal error C1041: -Programmdatenbank "...\nss\nspr\out\pr\tests\vc140.pdb" kann nicht -ge<94>ffnet werden; verwenden Sie /FS, wenn mehrere CL.EXE in -dieselbe .PDB-Datei schreiben. - -The failing source file is always one of the last test object -files. But the actual problem is not the compiler accessing the -PDB file, but the linker already linking the first test -executables accessing the shared PDB; at least that's my guess. - -So instead of using a shared PDB for all test object files, this -uses -Fd$(@:.$(OBJ_SUFFIX)=.pdb) to write a separate PDB for every -test's object file. The linker works fine with the shared OBJ PDB. - -Differential Revision: https://phabricator.services.mozilla.com/D68693 - - -diff -r 219d131499d5 -r 23940b78e965 nss/nspr/pr/tests/Makefile.in a/nss/nspr/pr/tests/Makefile.inMon Feb 10 20:58:42 2020 + -+++ b/nss/nspr/pr/tests/Makefile.inFri May 01 22:50:55 2020 + -@@ -211,6 +211,7 @@ - else - EXTRA_LIBS += ws2_32.lib - LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO -+ CFLA
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/type_reference udkapi/type_reference unoidl/source
offapi/type_reference/offapi.idl | 151 ---
udkapi/type_reference/udkapi.idl | 23 -
unoidl/source/unoidl-read.cxx| 12 +--
3 files changed, 7 insertions(+), 179 deletions(-)
New commits:
commit dcff0c200f25e8f2906901708841d1f680e8cc63
Author: Stephan Bergmann
AuthorDate: Tue Aug 18 10:47:07 2020 +0200
Commit: Stephan Bergmann
CommitDate: Tue Aug 18 11:36:26 2020 +0200
unoidl-read: Avoid redundant redeclarations
...of interfaces for which such a forward declaration has already been
emitted.
Update the reference rdbs accordingly with
LD_LIBRARY_PATH=.../master/instdir/program \
.../master/workdir/LinkTarget/Executable/unoidl-read --published \
.../libreoffice-7.0.0.3/instdir/program/types.rdb \
>.../master/udkapi/type_reference/udkapi.idl
LD_LIBRARY_PATH=.../master/instdir/program \
.../master/workdir/LinkTarget/Executable/unoidl-read --published \
.../libreoffice-7.0.0.3/instdir/program/types.rdb \
.../libreoffice-7.0.0.3/instdir/program/types/offapi.rdb \
>.../master/offapi/type_reference/offapi.idl
Change-Id: I7448ae44d479a8c622f6f534abe6087ce8a8ea32
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100896
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/offapi/type_reference/offapi.idl b/offapi/type_reference/offapi.idl
index c4483f6a86e1..a786a534aaf8 100644
--- a/offapi/type_reference/offapi.idl
+++ b/offapi/type_reference/offapi.idl
@@ -668,7 +668,6 @@ module com {
void setType([in] long nType);
long getType();
};
-published interface XWindowPeer;
};
module graphic {
published interface XGraphic;
@@ -887,7 +886,6 @@ module com {
::com::sun::star::datatransfer::dnd::XDropTarget getDropTarget([in]
::com::sun::star::awt::XWindow window);
::com::sun::star::datatransfer::clipboard::XClipboard getClipboard([in]
string clipboardName);
};
-published interface XFocusListener;
published interface XKeyHandler;
published interface XTopWindow;
published interface XTopWindowListener;
@@ -906,7 +904,6 @@ module com {
void fireFocusLost([in] ::com::sun::star::uno::XInterface source);
};
published interface XMessageBox;
-published interface XWindowPeer;
published interface XMessageBoxFactory {
interface ::com::sun::star::uno::XInterface;
::com::sun::star::awt::XMessageBox createMessageBox([in]
::com::sun::star::awt::XWindowPeer aParent, [in]
::com::sun::star::awt::MessageBoxType eType, [in] long nButtons, [in] string
sTitle, [in] string sMessage);
@@ -915,7 +912,6 @@ module com {
interface ::com::sun::star::uno::XInterface;
void reschedule();
};
-published interface XWindowPeer;
published interface XSystemChildFactory {
interface ::com::sun::star::uno::XInterface;
::com::sun::star::awt::XWindowPeer createSystemChild([in] any Parent,
[in] sequence< byte > ProcessId, [in] short SystemType);
@@ -926,7 +922,6 @@ module com {
CONTAINER = 2,
SIMPLE = 3
};
-published interface XWindowPeer;
published struct WindowDescriptor {
::com::sun::star::awt::WindowClass Type;
string WindowServiceName;
@@ -937,7 +932,6 @@ module com {
};
published interface XDevice;
published interface XRegion;
-published interface XWindowPeer;
published interface XToolkit {
interface ::com::sun::star::uno::XInterface;
::com::sun::star::awt::XWindowPeer getDesktopWindow();
@@ -983,9 +977,6 @@ module com {
BOTTOM = 2
};
};
- module graphic {
-published interface XGraphic;
- };
module awt {
published service UnoControlButtonModel {
service ::com::sun::star::awt::UnoControlModel;
@@ -1031,11 +1022,6 @@ module com {
interface ::com::sun::star::awt::XCheckBox;
interface ::com::sun::star::awt::XLayoutConstrains;
};
- };
- module graphic {
-published interface XGraphic;
- };
- module awt {
published service UnoControlCheckBoxModel {
service ::com::sun::star::awt::UnoControlModel;
[property, optional] short Align;
@@ -1088,8 +1074,6 @@ module com {
interface ::com::sun::star::awt::XLayoutConstrains;
interface ::com::sun::star::awt::XTextLayoutConstrains;
};
-published interface XActionListener;
-published interface XItemListener;
published interface XComboBox {
interface ::com::sun::star::uno::XInterface;
void addItemListener([in] ::com::sun::star::awt::XItemListener l);
@@ -1336,7 +1320,6 @@ module com {
void endDialog([in] long Result);
void setHelpId([in] string Id);
};
-published interface XTopWindowListener;
published interface XTopWindow {
interface ::com::sun::star::uno::XInterface;
void addTopWindowListener([in] ::com::sun::star::awt::XTopWindowListener
xListener);
@@ -1353,11 +1336,6 @@ module com {
[Libreoffice-commits] core.git: jvmfwk/plugins
jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx |2 +-
jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 15914df5f0d857b038ae5580c483541a6c0826fc
Author: Stephan Bergmann
AuthorDate: Tue Aug 18 10:51:20 2020 +0200
Commit: Stephan Bergmann
CommitDate: Tue Aug 18 11:45:52 2020 +0200
Silence new Clang 12 trunk -Werror,-Wstring-concatenation
"suspicious concatenation of string literals in an array initialization;
did you
mean to separate the elements with a comma?"
Change-Id: I83828d8cc6f8ab9b0c1ca8a1c3fb528592c46504
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100897
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
index 8a10d39a89e3..fd2468edf65e 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
@@ -90,7 +90,7 @@ char const* const* OtherInfo::getLibraryPaths(int* size)
"/lib/" JFW_PLUGIN_ARCH "/classic",
"/lib/" JFW_PLUGIN_ARCH "/jrockit",
"/lib/" JFW_PLUGIN_ARCH "/native_threads",
-"/lib/" JFW_PLUGIN_ARCH
+("/lib/" JFW_PLUGIN_ARCH)
};
*size = SAL_N_ELEMENTS(ar);
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index 89731ad15ddc..51d5046c203f 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -82,7 +82,7 @@ char const* const* SunInfo::getLibraryPaths(int* size)
"/lib/" JFW_PLUGIN_ARCH "/client",
"/lib/" JFW_PLUGIN_ARCH "/server",
"/lib/" JFW_PLUGIN_ARCH "/native_threads",
-"/lib/" JFW_PLUGIN_ARCH
+("/lib/" JFW_PLUGIN_ARCH)
};
*size = SAL_N_ELEMENTS(ar);
return ar;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/CalcTileLayer.js |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 6c161540a9ba5942ba052e6c2b8aebed7ec5ef1b
Author: Michael Meeks
AuthorDate: Tue Aug 18 10:39:05 2020 +0100
Commit: Michael Meeks
CommitDate: Tue Aug 18 11:57:37 2020 +0200
Fix annoying exception on calc close with annotations.
Change-Id: Ic9fbdd443419365470137858dac2e5b3de71c9b7
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100906
Tested-by: Jenkins
Reviewed-by: Michael Meeks
diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js
b/loleaflet/src/layer/tile/CalcTileLayer.js
index 337ba0f68..917b08b1d 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -63,9 +63,11 @@ L.CalcTileLayer = (L.Browser.mobile ? L.TileLayer :
L.CanvasTileLayer).extend({
},
clearAnnotations: function () {
- for (var tab in this._annotations) {
- this.hideAnnotations(tab);
- }
+ if (this._map) {
+ for (var tab in this._annotations) {
+ this.hideAnnotations(tab);
+ }
+ } // else during shutdown.
this._annotations = {};
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extras/source
extras/source/shellnew/soffice.odt |binary 1 file changed New commits: commit 3a7a06067e545670ef64367ef602469f507a3df7 Author: Mike Kaganski AuthorDate: Tue Aug 18 12:00:05 2020 +0300 Commit: Mike Kaganski CommitDate: Tue Aug 18 12:04:21 2020 +0200 tdf#133661: make soffice.odt a bare minimal ODT, with no data at all Hopefully this would prevent in the future the sequences like what has happened in the past, when first 9fceed463ba6ab752ef49f40e628a98e21cf525e removed page dimensions, then 2a33c69b16cce539951a796d7afa45c13b097cf6 added them back when trying to provide better font defaults, and then 5d9348b13674baf1d27f406767274e764c758bd5 changed the dimensions from one standard to another... Of course, this is just a simple solution, still not allowing one to use custom templates when using ShellNew functionality. Change-Id: I7b48fedad8ba7f85f8cfdd0f98ccb505c51d1e76 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100899 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/extras/source/shellnew/soffice.odt b/extras/source/shellnew/soffice.odt index be6efc69f714..d2a8dc274c6c 100644 Binary files a/extras/source/shellnew/soffice.odt and b/extras/source/shellnew/soffice.odt differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf123354.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport15.cxx| 22 ++
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 13 +
3 files changed, 31 insertions(+), 4 deletions(-)
New commits:
commit e1aea22f3f4fbf0cc412a8867165a85a3c55f49c
Author: László Németh
AuthorDate: Tue Aug 18 10:54:57 2020 +0200
Commit: László Németh
CommitDate: Tue Aug 18 12:05:52 2020 +0200
tdf#123354 DOCX import: fix ABS formula
Convert ABS(x) to the equivalent, but
working Writer formula SQRT(x POW 2).
Note: this is a temporary conversion, which
supports only 1-level nesting of function calls.
Change-Id: I96ad01dc5ac26160792e6a4cb050e103c2ad7bca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100898
Tested-by: Jenkins
Reviewed-by: László Németh
diff --git a/sw/qa/extras/ooxmlexport/data/tdf123354.docx
b/sw/qa/extras/ooxmlexport/data/tdf123354.docx
new file mode 100644
index ..15c7663c645c
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf123354.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index 85e7097093d0..cd3dc8021f2a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -16,6 +16,8 @@
#include
#include
#include
+#include
+#include
char const DATA_DIRECTORY[] = "/sw/qa/extras/ooxmlexport/data/";
@@ -69,6 +71,26 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf118701,
"tdf118701.docx")
assertXPath(pXmlDoc, "/w:document/w:body/w:p[10]/w:pPr[1]/w:numPr", 1);
}
+DECLARE_OOXMLEXPORT_TEST(testTdf123354, "tdf123354.docx")
+{
+// Tests cell formula ABS(x) to SQRT(x POW 2) conversion
+uno::Reference xTextFieldsSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xFieldsAccess(xTextFieldsSupplier->getTextFields());
+uno::Reference
xFields(xFieldsAccess->createEnumeration());
+
+uno::Reference
xEnumerationAccess1(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("SQRT((-234) POW 2)"),
xEnumerationAccess1->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUString("234"),
xEnumerationAccess1->getPresentation(false).trim());
+
+uno::Reference
xEnumerationAccess2(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("SQRT((SUM()-SUM()*2) POW 2)"),
xEnumerationAccess2->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUString("700035"),
xEnumerationAccess2->getPresentation(false).trim());
+
+uno::Reference
xEnumerationAccess3(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("SQRT(() POW 2)"),
xEnumerationAccess3->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUString("233423"),
xEnumerationAccess3->getPresentation(false).trim());
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf98000_changePageStyle,
"tdf98000_changePageStyle.odt")
{
uno::Reference xModel(mxComponent, uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 1d23295fd759..333f1170ea09 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4259,9 +4259,13 @@ OUString DomainMapper_Impl::convertFieldFormula(const
OUString& input) {
usInput = rmatch4.replaceAll(icu::UnicodeString("<$1:$2>"), status);
/* Fix up user defined names */
-icu::RegexMatcher rmatch5("DEFINED\\s*\\(<([A-Z]+[0-9]+)>\\)", usInput,
rMatcherFlags, status);
+icu::RegexMatcher rmatch5("\\bDEFINED\\s*\\(<([A-Z]+[0-9]+)>\\)", usInput,
rMatcherFlags, status);
usInput = rmatch5.replaceAll(icu::UnicodeString("DEFINED($1)"), status);
+/* Fix up ABS(x) using SQRT(x POW 2) - it supports only 1-level nesting */
+icu::RegexMatcher
rmatch6("\\bABS\\s*(\\(([^()]*|([^()])*\\([^()]*\\)[^()]*)*\\))", usInput,
rMatcherFlags, status);
+usInput = rmatch6.replaceAll(icu::UnicodeString("SQRT($1 POW 2)"), status);
+
return OUString(usInput.getTerminatedBuffer());
}
@@ -4286,6 +4290,10 @@ void DomainMapper_Impl::handleFieldFormula
// we don't copy the = symbol from the command
OUString formula = convertFieldFormula(command.copy(1));
+xFieldProperties->setPropertyValue(getPropertyName(PROP_CONTENT),
uno::makeAny(formula));
+xFieldProperties->setPropertyValue(getPropertyName(PROP_NUMBER_FORMAT),
uno::makeAny(sal_Int32(0)));
+xFieldProperties->setPropertyValue("IsShowFormula", uno::makeAny(false));
+
// grab-bag the original and converted formula
if (getTableManager().isInTable())
{
@@ -4294,9 +4302,6 @@ void DomainMapper_Impl::handleFieldFormula
pPropMap->Insert(PROP_CELL_FORMULA_CONVERTED, uno::makeAny(formula),
true, CELL_GRAB_BAG);
getTableManager().cellProps(pPropMap);
}
-xFieldProperties->setPropertyValue(getPr
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/app/AppDetailView.cxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 15e75a08a237ea372170b3ef826e9efae4323a56
Author: Caolán McNamara
AuthorDate: Mon Aug 17 09:59:29 2020 +0100
Commit: Caolán McNamara
CommitDate: Tue Aug 18 12:17:38 2020 +0200
keep m_nCursorIndex updated with the most recent used entry
so right clicking on the tree keeps current entry selected on re-focus
in
Change-Id: I25ecb11b8fefbff6464e02936b2a669c34c42b8f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100852
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx
b/dbaccess/source/ui/app/AppDetailView.cxx
index 3430d0bebb77..640d5195a4df 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -75,10 +75,10 @@ void OTasksWindow::updateHelpText()
IMPL_LINK(OTasksWindow, onSelected, weld::TreeView&, rTreeView, bool)
{
-int nCurEntry = rTreeView.get_cursor_index();
-assert(nCurEntry != -1 && "OTasksWindow::onSelected: invalid entry!");
+m_nCursorIndex = rTreeView.get_cursor_index();
+assert(m_nCursorIndex != -1 && "OTasksWindow::onSelected: invalid entry!");
URL aCommand;
-aCommand.Complete =
reinterpret_cast(rTreeView.get_id(nCurEntry).toUInt64())->sUNOCommand;
+aCommand.Complete =
reinterpret_cast(rTreeView.get_id(m_nCursorIndex).toUInt64())->sUNOCommand;
getDetailView()->getBorderWin().getView()->getAppController().executeChecked(
aCommand, Sequence< PropertyValue >() );
return true;
@@ -105,6 +105,7 @@ IMPL_LINK_NOARG(OTasksWindow, FocusOutHdl, weld::Widget&,
void)
IMPL_LINK_NOARG(OTasksWindow, OnEntrySelectHdl, weld::TreeView&, void)
{
+m_nCursorIndex = m_xTreeView->get_cursor_index();
updateHelpText();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/browser/unodatbr.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit f1a458a508cd300117338f9005bff82a923c4a60
Author: Caolán McNamara
AuthorDate: Tue Aug 18 10:01:15 2020 +0100
Commit: Caolán McNamara
CommitDate: Tue Aug 18 12:18:10 2020 +0200
we want the child of the node, not the toplevel child
Change-Id: I22be4c4670422ab88e6ebcf9edc21e34db29a0a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100900
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx
b/dbaccess/source/ui/browser/unodatbr.cxx
index 64528dfba415..fe4b836e8fd5 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -2983,13 +2983,13 @@ void
SbaTableQueryBrowser::closeConnection(weld::TreeIter& rDSEntry, bool _bDisp
}
// collapse the query/table container
-std::unique_ptr xContainers(rTreeView.make_iterator());
-if (rTreeView.get_iter_first(*xContainers))
+std::unique_ptr
xContainers(rTreeView.make_iterator(&rDSEntry));
+if (rTreeView.iter_children(*xContainers))
{
do
{
std::unique_ptr
xElements(rTreeView.make_iterator(xContainers.get()));
-if (rTreeView.get_iter_first(*xElements))
+if (rTreeView.iter_children(*xElements))
{
rTreeView.collapse_row(*xContainers);
// and delete their children (they are connection-relative)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/inc dbaccess/Library_dbu.mk dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk include/svtools include/svx sfx2/uiconfig solenv/clang-format svtoo
dbaccess/Library_dbu.mk|2
dbaccess/UIConfig_dbaccess.mk |1
dbaccess/source/ui/app/AppController.cxx | 29 +
dbaccess/source/ui/app/AppController.hxx | 18
dbaccess/source/ui/app/AppControllerDnD.cxx| 83 +++
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 549 ++---
dbaccess/source/ui/app/AppDetailPageHelper.hxx | 87 ++-
dbaccess/source/ui/app/AppDetailView.cxx | 16
dbaccess/source/ui/app/AppDetailView.hxx |9
dbaccess/source/ui/app/AppView.cxx | 10
dbaccess/source/ui/app/AppView.hxx |6
dbaccess/source/ui/app/DocumentInfoPreview.cxx | 67 +--
dbaccess/source/ui/app/DocumentInfoPreview.hxx | 23 -
dbaccess/source/ui/app/templwin.cxx|6
dbaccess/source/ui/browser/dsbrowserDnD.cxx|2
dbaccess/source/ui/browser/unodatbr.cxx| 21
dbaccess/source/ui/control/dbtreelistbox.cxx | 52 +-
dbaccess/source/ui/control/tabletree.cxx | 410 --
dbaccess/source/ui/dlg/adtabdlg.cxx|6
dbaccess/source/ui/dlg/tablespage.cxx |2
dbaccess/source/ui/dlg/tablespage.hxx |2
dbaccess/source/ui/inc/adtabdlg.hxx|2
dbaccess/source/ui/inc/callbacks.hxx | 10
dbaccess/source/ui/inc/dbtreelistbox.hxx | 42 +
dbaccess/source/ui/inc/tabletree.hxx | 122 +
dbaccess/source/ui/inc/unodatbr.hxx|5
dbaccess/uiconfig/ui/dbtreelist.ui |5
dbaccess/uiconfig/ui/detailwindow.ui | 161 +++
include/svx/dbaobjectex.hxx| 20
sfx2/uiconfig/ui/templatepanel.ui |2
solenv/clang-format/excludelist|8
svtools/Library_svt.mk |2
svx/source/fmcomp/dbaobjectex.cxx | 14
33 files changed, 804 insertions(+), 990 deletions(-)
New commits:
commit be3b1a8393ca3e77f31bea5d9caa7271fd53e9e4
Author: Caolán McNamara
AuthorDate: Mon Aug 17 17:28:58 2020 +0100
Commit: Caolán McNamara
CommitDate: Tue Aug 18 12:18:34 2020 +0200
weld OAppDetailPageHelper
Change-Id: I0fa9f21c30bba8f781178b0811f3f7d755af1bb3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100627
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index a1e608df0f8c..1fd2f3c078e1 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -78,7 +78,9 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
dbaccess/source/ui/app/AppSwapWindow \
dbaccess/source/ui/app/AppTitleWindow \
dbaccess/source/ui/app/AppView \
+dbaccess/source/ui/app/DocumentInfoPreview \
dbaccess/source/ui/app/subcomponentmanager \
+dbaccess/source/ui/app/templwin \
dbaccess/source/ui/browser/AsynchronousLink \
dbaccess/source/ui/browser/brwctrlr \
dbaccess/source/ui/browser/brwview \
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 8a4229e02f38..22e3c884b593 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/dbwiztextpage \
dbaccess/uiconfig/ui/deleteallrowsdialog \
dbaccess/uiconfig/ui/designsavemodifieddialog \
+dbaccess/uiconfig/ui/detailwindow \
dbaccess/uiconfig/ui/directsqldialog \
dbaccess/uiconfig/ui/emptypage \
dbaccess/uiconfig/ui/fielddialog \
diff --git a/svtools/inc/templwin.hrc b/dbaccess/inc/templwin.hrc
similarity index 100%
rename from svtools/inc/templwin.hrc
rename to dbaccess/inc/templwin.hrc
diff --git a/dbaccess/source/ui/app/AppController.cxx
b/dbaccess/source/ui/app/AppController.cxx
index 739f7a43be9d..937778bb3302 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -2261,13 +2261,18 @@ IController&
OApplicationController::getCommandController()
return &m_aContextMenuInterceptors;
}
-Any OApplicationController::getCurrentSelection( Control& _rControl ) const
+Any OApplicationController::getCurrentSelection(weld::TreeView& rControl) const
{
Sequence< NamedDatabaseObject > aSelection;
-getContainer()->describeCurrentSelectionForControl( _rControl, aSelection
);
+getContainer()->describeCurrentSelectionForControl(rControl, aSelection);
return makeAny( aSelection );
}
+vcl::Window* OApplicationController::getMenuParent(weld::TreeView& rControl)
const
+{
+return getContainer()->getMenuParent(rControl);
+}
+
bool OApplicationController::requestQuickHelp(const void* /*pUserData*/,
OUString& /*rText*/) const
{
return false;
@@ -2275,6 +2280,7 @@ bool OApplicationController::requestQuickHelp(const void*
/*pUserData*/, OUStrin
bool OApplicationController::requestDrag(const weld::TreeIter& /*rEntry*/)
{
+bool bSucces
[Libreoffice-commits] core.git: compilerplugins/clang dbaccess/source solenv/clang-format svtools/inc svtools/Library_svt.mk svtools/source
compilerplugins/clang/constantparam.booleans.results |4 -
dbaccess/source/ui/app/DocumentInfoPreview.hxx |2
solenv/clang-format/excludelist |2
svtools/Library_svt.mk |1
svtools/inc/svmedit2.hxx | 43 --
svtools/source/edit/svmedit2.cxx | 55 ---
6 files changed, 107 deletions(-)
New commits:
commit 2ff43210210492fb5b656eb60262163c6fe62b64
Author: Caolán McNamara
AuthorDate: Mon Aug 17 12:39:24 2020 +0100
Commit: Caolán McNamara
CommitDate: Tue Aug 18 12:18:59 2020 +0200
remove newly unused ExtMultiLineEdit
Change-Id: If9a1639d28aa7a540f301657387a04309ba82580
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100873
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/compilerplugins/clang/constantparam.booleans.results
b/compilerplugins/clang/constantparam.booleans.results
index 0891a2f691c8..a7997ecceac1 100644
--- a/compilerplugins/clang/constantparam.booleans.results
+++ b/compilerplugins/clang/constantparam.booleans.results
@@ -3398,10 +3398,6 @@ svl/source/passwordcontainer/passwordcontainer.hxx:151
void NamePassRecord::RemovePasswords(signed char)
signed char nStatus
1
-svtools/inc/svmedit2.hxx:36
-void ExtMultiLineEdit::SetAttrib(const class TextAttrib &,unsigned
int,int,int)
-int nStart
-0
svtools/source/control/valueimp.hxx:213
void ValueItemAcc::FireAccessibleEvent(short,const class
com::sun::star::uno::Any &,const class com::sun::star::uno::Any &)
short nEventId
diff --git a/dbaccess/source/ui/app/DocumentInfoPreview.hxx
b/dbaccess/source/ui/app/DocumentInfoPreview.hxx
index 2cacb741937e..44fbbba1d3de 100644
--- a/dbaccess/source/ui/app/DocumentInfoPreview.hxx
+++ b/dbaccess/source/ui/app/DocumentInfoPreview.hxx
@@ -24,8 +24,6 @@
namespace com :: sun :: star :: uno { template class Reference; }
-class ExtMultiLineEdit;
-
namespace com::sun::star {
namespace document { class XDocumentProperties; }
namespace util { struct DateTime; }
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index a33769547967..72626c886579 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -12957,7 +12957,6 @@ svl/source/uno/pathservice.cxx
svl/unx/source/svdde/ddedummy.cxx
svtools/inc/strings.hxx
svtools/inc/svmedit.hxx
-svtools/inc/svmedit2.hxx
svtools/inc/table/defaultinputhandler.hxx
svtools/inc/table/gridtablerenderer.hxx
svtools/inc/table/tablecontrol.hxx
@@ -13024,7 +13023,6 @@ svtools/source/dialogs/prnsetup.cxx
svtools/source/dialogs/restartdialog.cxx
svtools/source/edit/editsyntaxhighlighter.cxx
svtools/source/edit/svmedit.cxx
-svtools/source/edit/svmedit2.cxx
svtools/source/edit/textwindowpeer.cxx
svtools/source/filter/DocumentToGraphicRenderer.cxx
svtools/source/filter/SvFilterOptionsDialog.cxx
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index f094f0ed0cd2..3367324e843a 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -113,7 +113,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/dialogs/ServerDetailsControls \
svtools/source/edit/editsyntaxhighlighter \
svtools/source/edit/svmedit \
-svtools/source/edit/svmedit2 \
svtools/source/edit/textwindowpeer \
svtools/source/filter/SvFilterOptionsDialog \
svtools/source/filter/DocumentToGraphicRenderer \
diff --git a/svtools/inc/svmedit2.hxx b/svtools/inc/svmedit2.hxx
deleted file mode 100644
index 7d45700349a9..
--- a/svtools/inc/svmedit2.hxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_SVTOOLS_SVMEDIT2_HXX
-#define INCLUDED_SVTOOLS_SVMEDIT2_HXX
-
-#include "svmedit.hxx"
-
-class TextAttrib;
-
-class ExtMultiLineEdit final : public MultiLineEdit
-{
-public:
-ExtMultiLineEdit( vcl::Window* pParent, WinBits nWinStyle
);
-
-// methods of TextView
-voidInsertText( const OUSt
[Libreoffice-commits] core.git: vcl/workben
vcl/workben/diffuzzer.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit ed64a526fd7205aa939781dd412784606c904505
Author: Caolán McNamara
AuthorDate: Tue Aug 18 11:25:24 2020 +0100
Commit: Caolán McNamara
CommitDate: Tue Aug 18 12:26:22 2020 +0200
ofz#24942 missing constructor
Change-Id: I481845a3d64cb2ec0749c9a113db09234dc99143
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100912
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/vcl/workben/diffuzzer.cxx b/vcl/workben/diffuzzer.cxx
index c9bc77a16e99..60d1190fc220 100644
--- a/vcl/workben/diffuzzer.cxx
+++ b/vcl/workben/diffuzzer.cxx
@@ -26,6 +26,7 @@ void* com_sun_star_i18n_Collator_get_implementation(void*,
void*);
void* com_sun_star_i18n_NativeNumberSupplier_get_implementation(void*, void*);
void* com_sun_star_i18n_NumberFormatCodeMapper_get_implementation(void*,
void*);
void* com_sun_star_i18n_Transliteration_get_implementation(void*, void*);
+void* i18npool_CalendarImpl_get_implementation(void*, void*);
}
const lib_to_factory_mapping* lo_get_factory_map(void)
@@ -59,6 +60,8 @@ const lib_to_constructor_mapping* lo_get_constructor_map(void)
com_sun_star_i18n_NumberFormatCodeMapper_get_implementation },
{ "com_sun_star_i18n_Transliteration_get_implementation",
com_sun_star_i18n_Transliteration_get_implementation },
+{ "i18npool_CalendarImpl_get_implementation",
+ i18npool_CalendarImpl_get_implementation },
{ 0, 0 } };
return map;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/toolkit solenv/clang-format svtools/inc svtools/Library_svt.mk svtools/source toolkit/inc toolkit/Library_tk.mk toolkit/source
include/toolkit/awt/vclxwindows.hxx | 67 +
solenv/clang-format/excludelist |4
svtools/Library_svt.mk |1
svtools/source/inc/unoiface.hxx | 67 -
svtools/source/uno/unoiface.cxx | 411
toolkit/Library_tk.mk |1
toolkit/inc/controls/svmedit.hxx|5
toolkit/source/awt/vclxtoolkit.cxx |5
toolkit/source/awt/vclxwindows.cxx | 369
toolkit/source/controls/svmedit.cxx |4
10 files changed, 448 insertions(+), 486 deletions(-)
New commits:
commit 643d62d6033033df82a40fa3da754cb107d53e80
Author: Caolán McNamara
AuthorDate: Mon Aug 17 19:54:19 2020 +0100
Commit: Caolán McNamara
CommitDate: Tue Aug 18 12:40:27 2020 +0200
move VCLXMultiLineEdit and MultiLineEdit to toolkit
Change-Id: I9aa4b1efbecb71141647dbf5d8809482be15d266
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100888
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/toolkit/awt/vclxwindows.hxx
b/include/toolkit/awt/vclxwindows.hxx
index d9a11b66f6f0..ba13cd2f7da1 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -47,6 +47,9 @@
#include
#include
#include
+#include
+#include
+#include
#include
#include
#include
@@ -58,6 +61,8 @@
#include
#include
+#include
+
#include
class FormatterBase;
@@ -1363,6 +1368,68 @@ public:
virtual voidGetPropertyIds( std::vector< sal_uInt16 > &aIds ) override
{ return ImplGetPropertyIds( aIds ); }
};
+class VCLXMultiLineEdit : public css::awt::XTextComponent,
+public css::awt::XTextArea,
+public css::awt::XTextLayoutConstrains,
+public VCLXWindow
+{
+private:
+TextListenerMultiplexer maTextListeners;
+LineEnd meLineEndType;
+
+protected:
+voidProcessWindowEvent( const VclWindowEvent&
rVclWindowEvent ) override;
+
+public:
+VCLXMultiLineEdit();
+virtual ~VCLXMultiLineEdit() override;
+
+// css::uno::XInterface
+css::uno::Any SAL_CALL queryInterface( const
css::uno::Type & rType ) override;
+void SAL_CALL acquire() throw() override {
VCLXWindow::acquire(); }
+void SAL_CALL release() throw() override {
VCLXWindow::release(); }
+
+// css::lang::XTypeProvider
+css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+css::uno::Sequence< sal_Int8 > SAL_CALL
getImplementationId() override;
+
+// css::awt::XTextComponent
+void SAL_CALL addTextListener( const css::uno::Reference<
css::awt::XTextListener >& l ) override;
+void SAL_CALL removeTextListener( const css::uno::Reference<
css::awt::XTextListener >& l ) override;
+void SAL_CALL setText( const OUString& aText ) override;
+void SAL_CALL insertText( const css::awt::Selection& Sel, const OUString&
Text ) override;
+OUString SAL_CALL getText( ) override;
+OUString SAL_CALL getSelectedText( ) override;
+void SAL_CALL setSelection( const css::awt::Selection& aSelection )
override;
+css::awt::Selection SAL_CALL getSelection( ) override;
+sal_Bool SAL_CALL isEditable( ) override;
+void SAL_CALL setEditable( sal_Bool bEditable ) override;
+void SAL_CALL setMaxTextLen( sal_Int16 nLen ) override;
+sal_Int16 SAL_CALL getMaxTextLen( ) override;
+
+//XTextArea
+OUString SAL_CALL getTextLines( ) override;
+
+// css::awt::XLayoutConstrains
+css::awt::Size SAL_CALL getMinimumSize( ) override;
+css::awt::Size SAL_CALL getPreferredSize( ) override;
+css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize )
override;
+
+// css::awt::XTextLayoutConstrains
+css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines
) override;
+void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines )
override;
+
+// css::awt::XVclWindowPeer
+void SAL_CALL setProperty( const OUString& PropertyName, const
css::uno::Any& Value ) override;
+css::uno::Any SAL_CALL getProperty( const OUString& PropertyName )
override;
+
+// css::awt::XWindow
+void SAL_CALL setFocus( ) override;
+
+static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+virtual voidGetPropertyIds( std::vector< sal_uInt16 > &aIds ) override
{ return ImplGetPropertyIds( aIds ); }
+};
+
#endif // INCLUDED_TOOLKIT_AWT_VCLXWINDOWS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 72626c886579..93532dfb4d12 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -12956,7 +12956,6 @@ svl/source/undo/undo.cxx
svl/source/uno/pathservice.cxx
svl/
[Libreoffice-commits] core.git: basctl/Library_basctl.mk basctl/source include/svtools solenv/clang-format svtools/Library_svt.mk svtools/source
basctl/Library_basctl.mk |1 +
basctl/source/basicide/baside2b.cxx |5 ++---
basctl/source/basicide/textwindowpeer.cxx |6 +++---
basctl/source/basicide/textwindowpeer.hxx |5 ++---
solenv/clang-format/excludelist |4 ++--
svtools/Library_svt.mk|1 -
6 files changed, 10 insertions(+), 12 deletions(-)
New commits:
commit 660e82ee8c97a2ad9b31fdcc817ce9543119ec09
Author: Caolán McNamara
AuthorDate: Mon Aug 17 20:26:51 2020 +0100
Commit: Caolán McNamara
CommitDate: Tue Aug 18 12:40:51 2020 +0200
move TextWindowPeer to its only user
Change-Id: I16cc2f75c3e639915c90edc626829e455bda4383
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100889
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk
index 98f04c83e31c..f874dfe9cc54 100644
--- a/basctl/Library_basctl.mk
+++ b/basctl/Library_basctl.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_Library_add_exception_objects,basctl,\
basctl/source/basicide/ObjectCatalog \
basctl/source/basicide/sbxitem \
basctl/source/basicide/scriptdocument \
+ basctl/source/basicide/textwindowpeer \
basctl/source/basicide/uiobject \
basctl/source/basicide/unomodel \
basctl/source/dlged/dlgedclip \
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index 7771b8acff3e..44ee68bfa38b 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -55,16 +55,15 @@
#include
#include
#include
-#include
#include
#include
#include
#include
#include
#include
+#include "textwindowpeer.hxx"
#include "uiobject.hxx"
-
namespace basctl
{
@@ -2053,7 +2052,7 @@ EditorWindow::GetComponentInterface(bool bCreate)
if (!pEditEngine)
CreateEditEngine();
-xPeer = svt::createTextWindowPeer(*GetEditView());
+xPeer = createTextWindowPeer(*GetEditView());
SetComponentInterface(xPeer);
}
return xPeer;
diff --git a/svtools/source/edit/textwindowpeer.cxx
b/basctl/source/basicide/textwindowpeer.cxx
similarity index 93%
rename from svtools/source/edit/textwindowpeer.cxx
rename to basctl/source/basicide/textwindowpeer.cxx
index f0291a8a84c7..eb42c896a192 100644
--- a/svtools/source/edit/textwindowpeer.cxx
+++ b/basctl/source/basicide/textwindowpeer.cxx
@@ -25,14 +25,14 @@
#include
#include
#include
-#include
#include
#include
#include
+#include "textwindowpeer.hxx"
namespace {
-class TextWindowPeer: public VCLXWindow {
+class TextWindowPeer final : public VCLXWindow {
public:
explicit TextWindowPeer(TextView & view);
@@ -62,7 +62,7 @@ TextWindowPeer::CreateAccessibleContext() {
}
-css::uno::Reference svt::createTextWindowPeer(
+css::uno::Reference basctl::createTextWindowPeer(
TextView & view)
{
return new TextWindowPeer(view);
diff --git a/include/svtools/textwindowpeer.hxx
b/basctl/source/basicide/textwindowpeer.hxx
similarity index 90%
rename from include/svtools/textwindowpeer.hxx
rename to basctl/source/basicide/textwindowpeer.hxx
index 6edc665c6b31..c5f87048d88f 100644
--- a/include/svtools/textwindowpeer.hxx
+++ b/basctl/source/basicide/textwindowpeer.hxx
@@ -23,16 +23,15 @@
#include
#include
-#include
namespace com::sun::star::awt {
class XWindowPeer;
}
class TextView;
-namespace svt {
+namespace basctl {
-css::uno::Reference SVT_DLLPUBLIC createTextWindowPeer(
+css::uno::Reference createTextWindowPeer(
TextView & view);
}
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 93532dfb4d12..bd6df84c5b3d 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -264,6 +264,8 @@ basctl/source/basicide/moduldlg.hxx
basctl/source/basicide/register.cxx
basctl/source/basicide/sbxitem.cxx
basctl/source/basicide/scriptdocument.cxx
+basctl/source/basicide/textwindowpeer.hxx
+basctl/source/basicide/textwindowpeer.cxx
basctl/source/basicide/unomodel.cxx
basctl/source/basicide/unomodel.hxx
basctl/source/dlged/dlged.cxx
@@ -6617,7 +6619,6 @@ include/svtools/svparser.hxx
include/svtools/svtdllapi.h
include/svtools/tabbar.hxx
include/svtools/templatefoldercache.hxx
-include/svtools/textwindowpeer.hxx
include/svtools/toolbarmenu.hxx
include/svtools/toolboxcontroller.hxx
include/svtools/unitconv.hxx
@@ -13021,7 +13022,6 @@ svtools/source/dialogs/insdlg.cxx
svtools/source/dialogs/prnsetup.cxx
svtools/source/dialogs/restartdialog.cxx
svtools/source/edit/editsyntaxhighlighter.cxx
-svtools/source/edit/textwindowpeer.cxx
svtools/source/filter/DocumentToGraphicRenderer.cxx
svtools/source/filter/SvFilterOptionsDialog.cxx
svtools/source/filter/exportdialog.cxx
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 0cb98dd8dde7..47c645802000 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@
[Libreoffice-commits] core.git: sd/source
sd/source/ui/annotations/annotationtag.cxx|2 ++
sd/source/ui/annotations/annotationwindow.cxx | 13 +
sd/source/ui/annotations/annotationwindow.hxx |4 ++--
3 files changed, 9 insertions(+), 10 deletions(-)
New commits:
commit a2d97135411d566b0b1f3d47af7912c8412cee7f
Author: Caolán McNamara
AuthorDate: Tue Aug 18 10:23:27 2020 +0100
Commit: Caolán McNamara
CommitDate: Tue Aug 18 12:56:41 2020 +0200
annotation label doesn't need to be a MultiLine edit, FixedText is enough
Change-Id: Ib5db02be9d29f0ba21bf4295be8cf81be2cb409b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100905
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sd/source/ui/annotations/annotationtag.cxx
b/sd/source/ui/annotations/annotationtag.cxx
index f4b0d66a5563..6d918775f73d 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -20,6 +20,8 @@
#include
#include
+#include
+
#include
#include
#include
diff --git a/sd/source/ui/annotations/annotationwindow.cxx
b/sd/source/ui/annotations/annotationwindow.cxx
index fab5c58679f0..472b9deacd72 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -268,19 +268,16 @@ void AnnotationWindow::InitControls()
mpTextWindow->SetPointer(PointerStyle::Text);
// window control for author and date
-mpMeta = VclPtr::Create(this,0);
-mpMeta->SetReadOnly();
-mpMeta->SetRightToLeft(AllSettings::GetLayoutRTL());
-mpMeta->AlwaysDisableInput(true);
+mpMeta = VclPtr::Create(this);
mpMeta->SetCallHandlersOnInputDisabled(true);
// we should leave this setting alone, but for this we need a better
layout algo
// with variable meta size height
AllSettings aSettings = mpMeta->GetSettings();
StyleSettings aStyleSettings = aSettings.GetStyleSettings();
-vcl::Font aFont = aStyleSettings.GetFieldFont();
+vcl::Font aFont = aStyleSettings.GetLabelFont();
aFont.SetFontHeight(8);
-aStyleSettings.SetFieldFont(aFont);
+aStyleSettings.SetLabelFont(aFont);
aSettings.SetStyleSettings(aStyleSettings);
mpMeta->SetSettings(aSettings);
@@ -343,7 +340,7 @@ void AnnotationWindow::Rescale()
mpTextWindow->SetMapMode( aMode );
if ( mpMeta )
{
-vcl::Font aFont(
mpMeta->GetSettings().GetStyleSettings().GetFieldFont() );
+vcl::Font aFont(
mpMeta->GetSettings().GetStyleSettings().GetLabelFont() );
sal_Int32 nHeight = long(aFont.GetFontHeight() * aMode.GetScaleY());
aFont.SetFontHeight( nHeight );
mpMeta->SetControlFont( aFont );
@@ -541,7 +538,7 @@ void AnnotationWindow::SetColor()
mpMeta->SetControlBackground(maColor);
AllSettings aSettings = mpMeta->GetSettings();
StyleSettings aStyleSettings = aSettings.GetStyleSettings();
-aStyleSettings.SetFieldTextColor( bHighContrast ? maColorLight :
maColorDark);
+aStyleSettings.SetLabelTextColor( bHighContrast ? maColorLight :
maColorDark);
aSettings.SetStyleSettings(aStyleSettings);
mpMeta->SetSettings(aSettings);
diff --git a/sd/source/ui/annotations/annotationwindow.hxx
b/sd/source/ui/annotations/annotationwindow.hxx
index aa28144bd1d2..0db64ef309a9 100644
--- a/sd/source/ui/annotations/annotationwindow.hxx
+++ b/sd/source/ui/annotations/annotationwindow.hxx
@@ -22,7 +22,7 @@
#include
#include
-#include
+#include
#include
#include
@@ -81,7 +81,7 @@ class AnnotationWindow : public FloatingWindow
boolmbProtected;
boolmbMouseOverButton;
VclPtr mpTextWindow;
-VclPtr mpMeta;
+VclPtr mpMeta;
::tools::Rectangle maRectMetaButton;
basegfx::B2DPolygon maPopupTriangle;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src
loleaflet/src/control/Control.JSDialogBuilder.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b4ea674a998bf28186d57cd83e6b108cc7ceb917
Author: Tor Lillqvist
AuthorDate: Tue Aug 18 13:46:44 2020 +0300
Commit: Tor Lillqvist
CommitDate: Tue Aug 18 13:08:22 2020 +0200
Guard against TypeError: null is not an object
Change-Id: I9a7c708bf753891d54ce8da91b2e9aaeb352cd45
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100913
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 7f515566d..fc3cf6644 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -480,7 +480,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
if (builder.wizard && data.enabled !== 'false') {
$(sectionTitle).click(function(event, data) {
builder.wizard.goLevelDown(contentDiv,
data);
- if (contentNode.onshow)
+ if (contentNode && contentNode.onshow)
contentNode.onshow();
});
} else {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: jvmfwk/plugins
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 1b006f8aaa7fd2dd9394f8a74f85999e58fb2310
Author: Stephan Bergmann
AuthorDate: Tue Aug 18 11:12:10 2020 +0200
Commit: Stephan Bergmann
CommitDate: Tue Aug 18 13:29:22 2020 +0200
Add missing punctuation/spaces to error messages
Change-Id: I4be46342b24a5993df74dbd047d88842a8df0412
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100901
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index abe47b567832..acd5af590dff 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -682,7 +682,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
OString sSymbol = OUStringToOString(
sSymbolCreateJava, osl_getThreadTextEncoding());
fprintf(stderr,"[Java framework]sunjavaplugin" SAL_DLLEXTENSION
-"Java runtime library: %s does not export symbol %s !\n",
+": Java runtime library: %s does not export symbol %s !\n",
sLib.getStr(), sSymbol.getStr());
return javaPluginError::VmCreationFailed;
}
@@ -796,13 +796,13 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
if( err < 0)
{
fprintf(stderr,"[Java framework] sunjavaplugin" SAL_DLLEXTENSION
-"Can not create Java Virtual Machine, %" SAL_PRIdINT32
"\n", sal_Int32(err));
+": Can not create Java Virtual Machine, %" SAL_PRIdINT32
"\n", sal_Int32(err));
errorcode = javaPluginError::VmCreationFailed;
}
else if( err > 0)
{
fprintf(stderr,"[Java framework] sunjavaplugin" SAL_DLLEXTENSION
-"Can not create JavaVirtualMachine, abort handler was
called.\n");
+": Can not create JavaVirtualMachine, abort handler was
called.\n");
errorcode = javaPluginError::VmCreationFailed;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source include/svtools solenv/clang-format svtools/Library_svt.mk svtools/source
dbaccess/source/ui/control/sqledit.cxx| 173 +++-
dbaccess/source/ui/dlg/directsql.cxx |4
dbaccess/source/ui/inc/sqledit.hxx| 23 ++-
include/svtools/editsyntaxhighlighter.hxx | 55 ---
solenv/clang-format/excludelist |2
svtools/Library_svt.mk|1
svtools/source/edit/editsyntaxhighlighter.cxx | 180 --
7 files changed, 181 insertions(+), 257 deletions(-)
New commits:
commit 4b97463059e9a616f9eedf142e73d49fc874d4d6
Author: Caolán McNamara
AuthorDate: Tue Aug 18 10:35:32 2020 +0100
Commit: Caolán McNamara
CommitDate: Tue Aug 18 13:50:01 2020 +0200
merge OSqlEdit and MultiLineEditSyntaxHighlight
Change-Id: Ie3e38afd976620068c644809c4a88cd3809759a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100907
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/dbaccess/source/ui/control/sqledit.cxx
b/dbaccess/source/ui/control/sqledit.cxx
index ccbe210afd5f..aa1745369edd 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -32,11 +32,14 @@
#include
#include
#include
-#include
#include
#include
#include
+#include
#include
+#include
+#include
+#include
using namespace dbaui;
@@ -65,12 +68,15 @@ private:
OSqlEdit & editor_;
};
-OSqlEdit::OSqlEdit( OQueryTextView* pParent ) :
-MultiLineEditSyntaxHighlight( pParent, WB_LEFT | WB_VSCROLL | WB_BORDER )
-,m_pView(pParent)
-,m_bAccelAction( false )
-,m_bStopTimer(false )
+OSqlEdit::OSqlEdit(OQueryTextView* pParent)
+: VclMultiLineEdit(pParent, WB_LEFT | WB_VSCROLL | WB_BORDER)
+, aHighlighter(HighlighterLanguage::SQL)
+, m_pView(pParent)
+, m_bAccelAction( false )
+, m_bStopTimer(false )
{
+EnableUpdateData(300);
+
SetHelpId( HID_CTL_QRYSQLEDIT );
SetModifyHdl( LINK(this, OSqlEdit, ModifyHdl) );
@@ -103,6 +109,148 @@ OSqlEdit::OSqlEdit( OQueryTextView* pParent ) :
EnableFocusSelectionHide( false );
}
+void OSqlEdit::DoBracketHilight(sal_uInt16 nKey)
+{
+TextSelection aCurrentPos = GetTextView()->GetSelection();
+sal_Int32 nStartPos = aCurrentPos.GetStart().GetIndex();
+const sal_uInt32 nStartPara = aCurrentPos.GetStart().GetPara();
+sal_uInt16 nCount = 0;
+int nChar = -1;
+
+switch (nKey)
+{
+case '\'': // no break
+case '"':
+{
+nChar = nKey;
+break;
+}
+case '}' :
+{
+nChar = '{';
+break;
+}
+case ')':
+{
+nChar = '(';
+break;
+}
+case ']':
+{
+nChar = '[';
+break;
+}
+}
+
+if (nChar == -1)
+return;
+
+sal_uInt32 nPara = nStartPara;
+do
+{
+if (nPara == nStartPara && nStartPos == 0)
+continue;
+
+OUString aLine( GetTextEngine()->GetText( nPara ) );
+
+if (aLine.isEmpty())
+continue;
+
+for (sal_Int32 i = (nPara==nStartPara) ? nStartPos-1 :
aLine.getLength()-1; i>0; --i)
+{
+if (aLine[i] == nChar)
+{
+if (!nCount)
+{
+GetTextEngine()->SetAttrib( TextAttribFontWeight(
WEIGHT_ULTRABOLD ), nPara, i, i+1 );
+GetTextEngine()->SetAttrib( TextAttribFontColor(
Color(0,0,0) ), nPara, i, i+1 );
+GetTextEngine()->SetAttrib( TextAttribFontWeight(
WEIGHT_ULTRABOLD ), nStartPara, nStartPos, nStartPos );
+GetTextEngine()->SetAttrib( TextAttribFontColor(
Color(0,0,0) ), nStartPara, nStartPos, nStartPos );
+return;
+}
+else
+--nCount;
+}
+if (aLine[i] == nKey)
+++nCount;
+}
+} while (nPara--);
+}
+
+bool OSqlEdit::PreNotify( NotifyEvent& rNEvt )
+{
+if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
+DoBracketHilight(rNEvt.GetKeyEvent()->GetCharCode());
+
+return VclMultiLineEdit::PreNotify(rNEvt);
+}
+
+Color OSqlEdit::GetSyntaxHighlightColor(const svtools::ColorConfig&
rColorConfig, HighlighterLanguage eLanguage, TokenType aToken)
+{
+Color aColor;
+switch (eLanguage)
+{
+case HighlighterLanguage::SQL:
+{
+switch (aToken)
+{
+case TokenType::Identifier: aColor =
rColorConfig.GetColorValue(svtools::SQLIDENTIFIER).nColor; break;
+case TokenType::Number: aColor =
rColorConfig.GetColorValue(svtools::SQLNUMBER).nColor; break;
+case TokenType::String: aColor =
rColorConfig.GetColorValue(svtools::SQLSTRING).nColor; break;
+case TokenType::Operator: aColor =
rColorConfig.GetColorValue(svtools::SQLOPERATOR).nColor; break;
+case Toke
GSoC Blurry Shadow Weekly Update
Hello, I have submitted a small patch [1] to let the shadow blur supported in the presentation mode tdf#134052. It was delayed because the transparency didn't work correctly with the blur effect on the shape. Thanks to Mike Kaganski, it works well now. Also, I am working on a new preview class that will be able to draw the shadow blur in the preview of area dialog. [1]: https://gerrit.libreoffice.org/c/core/+/100861 Regards, Ahmad ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
GSoC Report Week 11 (Yusuf Keten)
Hello, Here is my report which includes the progress in the 11th week. https://yusufketen.com/post/2020-08-17-libreoffice-gsoc-week-11-report/ I'm waiting for all your feedback. Best regards, Yusuf Keten ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_dark_svg icon-themes/sifr_svg
icon-themes/sifr/cmd/32/ar/linenumberingdialog.png |binary icon-themes/sifr/cmd/32/linenumberingdialog.png |binary icon-themes/sifr/cmd/ar/lc_linenumberingdialog.png |binary icon-themes/sifr/cmd/ar/sc_linenumberingdialog.png |binary icon-themes/sifr/cmd/lc_linenumberingdialog.png |binary icon-themes/sifr/cmd/sc_linenumberingdialog.png |binary icon-themes/sifr/links.txt |6 +++--- icon-themes/sifr_dark/cmd/32/ar/linenumberingdialog.png |binary icon-themes/sifr_dark/cmd/32/linenumberingdialog.png|binary icon-themes/sifr_dark/cmd/ar/lc_linenumberingdialog.png |binary icon-themes/sifr_dark/cmd/ar/sc_linenumberingdialog.png |binary icon-themes/sifr_dark/cmd/lc_linenumberingdialog.png|binary icon-themes/sifr_dark/cmd/sc_linenumberingdialog.png|binary icon-themes/sifr_dark/links.txt |6 +++--- icon-themes/sifr_dark_svg/cmd/32/ar/linenumberingdialog.svg |1 + icon-themes/sifr_dark_svg/cmd/32/linenumberingdialog.svg|1 + icon-themes/sifr_dark_svg/cmd/ar/lc_linenumberingdialog.svg |2 +- icon-themes/sifr_dark_svg/cmd/ar/sc_linenumberingdialog.svg |2 +- icon-themes/sifr_dark_svg/cmd/lc_linenumberingdialog.svg|2 +- icon-themes/sifr_dark_svg/cmd/sc_linenumberingdialog.svg|2 +- icon-themes/sifr_svg/cmd/32/ar/linenumberingdialog.svg |1 + icon-themes/sifr_svg/cmd/32/linenumberingdialog.svg |1 + icon-themes/sifr_svg/cmd/ar/lc_linenumberingdialog.svg |2 +- icon-themes/sifr_svg/cmd/ar/sc_linenumberingdialog.svg |2 +- icon-themes/sifr_svg/cmd/lc_linenumberingdialog.svg |2 +- icon-themes/sifr_svg/cmd/sc_linenumberingdialog.svg |2 +- 26 files changed, 18 insertions(+), 14 deletions(-) New commits: commit cff430c6ba8a85faaf6e15abd26eceafb493ed9c Author: Rizal Muttaqin AuthorDate: Tue Aug 18 16:41:33 2020 +0700 Commit: Rizal Muttaqin CommitDate: Tue Aug 18 14:22:35 2020 +0200 Sifr: tdf#135872, missing Line Numbering icon Change-Id: Ic44d598b7f7c66f45dbf1e4e419f6f76e13c7f6c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100910 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/sifr/cmd/32/ar/linenumberingdialog.png b/icon-themes/sifr/cmd/32/ar/linenumberingdialog.png new file mode 100644 index ..e13c7689663b Binary files /dev/null and b/icon-themes/sifr/cmd/32/ar/linenumberingdialog.png differ diff --git a/icon-themes/sifr/cmd/32/linenumberingdialog.png b/icon-themes/sifr/cmd/32/linenumberingdialog.png new file mode 100644 index ..c9609a0e9234 Binary files /dev/null and b/icon-themes/sifr/cmd/32/linenumberingdialog.png differ diff --git a/icon-themes/sifr/cmd/ar/lc_linenumberingdialog.png b/icon-themes/sifr/cmd/ar/lc_linenumberingdialog.png index 1a4e98ba941f..bdc3b598e011 100644 Binary files a/icon-themes/sifr/cmd/ar/lc_linenumberingdialog.png and b/icon-themes/sifr/cmd/ar/lc_linenumberingdialog.png differ diff --git a/icon-themes/sifr/cmd/ar/sc_linenumberingdialog.png b/icon-themes/sifr/cmd/ar/sc_linenumberingdialog.png index 6a9c5aa15f0a..99c3fd666ea0 100644 Binary files a/icon-themes/sifr/cmd/ar/sc_linenumberingdialog.png and b/icon-themes/sifr/cmd/ar/sc_linenumberingdialog.png differ diff --git a/icon-themes/sifr/cmd/lc_linenumberingdialog.png b/icon-themes/sifr/cmd/lc_linenumberingdialog.png index 1f3913772e33..bdf92deeed9f 100644 Binary files a/icon-themes/sifr/cmd/lc_linenumberingdialog.png and b/icon-themes/sifr/cmd/lc_linenumberingdialog.png differ diff --git a/icon-themes/sifr/cmd/sc_linenumberingdialog.png b/icon-themes/sifr/cmd/sc_linenumberingdialog.png index 7d5526fb40c7..91fdd9619175 100644 Binary files a/icon-themes/sifr/cmd/sc_linenumberingdialog.png and b/icon-themes/sifr/cmd/sc_linenumberingdialog.png differ diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt index e96fcc4f52a3..5a83cfe88bfd 100644 --- a/icon-themes/sifr/links.txt +++ b/icon-themes/sifr/links.txt @@ -129,7 +129,7 @@ cmd/32/inserttextframe.png cmd/32/insertframe.png cmd/32/inserttimefield.png cmd/32/timefield.png cmd/32/inserttimefieldfix.png cmd/32/timefield.png cmd/32/insobjctrl.png cmd/32/adddirect.png -cmd/32/linenumberingdialog.png cmd/32/linenumberdialog.png +cmd/32/linenumberdialog.png cmd/32/linenumberingdialog.png cmd/32/numberingmenu.png cmd/32/outlinebullet.png cmd/32/paragraphmenu.png cmd/32/paragraphdialog.png cmd/32/shapesmenu.png cmd/32/basicshapes.pentagon.png @@ -186,7 +186,7 @@ cmd/lc_inserttextframe.png cmd/lc_insertframe.png cmd/lc_inserttimefield.png cmd/lc_timefield.png cmd/lc_inserttimefieldfix.png cmd/lc_timefield.png cmd/lc_insobjctrl.png cmd/lc_adddirect.png -cmd/lc_linenumberingdialog.png cmd/lc_linenumberdialog.png +cmd/lc_linenumberdialog.png cmd/lc_linenumberingdialog.png cmd/lc_numberingmenu.png cmd/lc_ou
[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg icon-themes/colibre icon-themes/colibre_svg icon-themes/elementary icon-th
icon-themes/breeze/cmd/32/ar/linenumberingdialog.png |binary icon-themes/breeze/cmd/32/linenumberingdialog.png |binary icon-themes/breeze/cmd/ar/lc_linenumberingdialog.png |binary icon-themes/breeze/cmd/ar/sc_showsinglepage.png |binary icon-themes/breeze/cmd/lc_linenumberingdialog.png |binary icon-themes/breeze/cmd/sc_showsinglepage.png |binary icon-themes/breeze/links.txt |5 icon-themes/breeze_dark/cmd/32/ar/linenumberingdialog.png |binary icon-themes/breeze_dark/cmd/32/linenumberingdialog.png|binary icon-themes/breeze_dark/cmd/ar/lc_linenumberingdialog.png |binary icon-themes/breeze_dark/cmd/ar/sc_showsinglepage.png |binary icon-themes/breeze_dark/cmd/lc_linenumberingdialog.png|binary icon-themes/breeze_dark/cmd/sc_showsinglepage.png |binary icon-themes/breeze_dark/links.txt |5 icon-themes/breeze_dark_svg/cmd/32/ar/linenumberingdialog.svg |2 icon-themes/breeze_dark_svg/cmd/32/linenumberingdialog.svg|2 icon-themes/breeze_dark_svg/cmd/ar/lc_linenumberingdialog.svg |2 icon-themes/breeze_dark_svg/cmd/ar/sc_showsinglepage.svg |1 icon-themes/breeze_dark_svg/cmd/lc_linenumberingdialog.svg|2 icon-themes/breeze_dark_svg/cmd/sc_showsinglepage.svg |2 icon-themes/breeze_svg/cmd/32/ar/linenumberingdialog.svg |2 icon-themes/breeze_svg/cmd/32/linenumberingdialog.svg |2 icon-themes/breeze_svg/cmd/ar/lc_linenumberingdialog.svg |2 icon-themes/breeze_svg/cmd/ar/sc_showsinglepage.svg |1 icon-themes/breeze_svg/cmd/lc_linenumberingdialog.svg |2 icon-themes/breeze_svg/cmd/sc_showsinglepage.svg |2 icon-themes/colibre/cmd/32/ar/linenumberingdialog.png |binary icon-themes/colibre/cmd/32/linenumberingdialog.png|binary icon-themes/colibre/cmd/ar/lc_linenumberingdialog.png |binary icon-themes/colibre/cmd/ar/sc_linenumberdialog.png|binary icon-themes/colibre/cmd/lc_linenumberingdialog.png|binary icon-themes/colibre/cmd/sc_linenumberdialog.png |binary icon-themes/colibre_svg/cmd/32/ar/linenumberingdialog.svg |2 icon-themes/colibre_svg/cmd/32/linenumberingdialog.svg|2 icon-themes/colibre_svg/cmd/ar/lc_linenumberingdialog.svg |2 icon-themes/colibre_svg/cmd/ar/sc_linenumberdialog.svg|2 icon-themes/colibre_svg/cmd/lc_linenumberingdialog.svg|2 icon-themes/colibre_svg/cmd/sc_linenumberdialog.svg |2 icon-themes/elementary/cmd/32/ar/linenumberingdialog.png |binary icon-themes/elementary/cmd/32/linenumberingdialog.png |binary icon-themes/elementary/cmd/ar/lc_linenumberingdialog.png |binary icon-themes/elementary/cmd/ar/sc_linenumberingdialog.png |binary icon-themes/elementary/cmd/lc_linenumberingdialog.png |binary icon-themes/elementary/cmd/sc_linenumberingdialog.png |binary icon-themes/elementary_svg/cmd/32/ar/linenumberingdialog.svg |2 icon-themes/elementary_svg/cmd/32/linenumberingdialog.svg |2 icon-themes/elementary_svg/cmd/ar/lc_linenumberingdialog.svg |2 icon-themes/elementary_svg/cmd/ar/sc_linenumberingdialog.svg |2 icon-themes/elementary_svg/cmd/lc_linenumberingdialog.svg |2 icon-themes/elementary_svg/cmd/sc_linenumberingdialog.svg |2 icon-themes/sukapura/cmd/32/ar/linenumberingdialog.png|binary icon-themes/sukapura/cmd/32/linenumberingdialog.png |binary icon-themes/sukapura/cmd/ar/lc_linenumberingdialog.png|binary icon-themes/sukapura/cmd/ar/sc_linenumberingdialog.png|binary icon-themes/sukapura/cmd/lc_linenumberingdialog.png |binary icon-themes/sukapura/cmd/sc_linenumberingdialog.png |binary icon-themes/sukapura/fpicker/res/fp015.png|binary icon-themes/sukapura_svg/cmd/32/ar/linenumberingdialog.svg|2 icon-themes/sukapura_svg/cmd/32/linenumberingdialog.svg |2 icon-themes/sukapura_svg/cmd/ar/lc_linenumberingdialog.svg|2 icon-themes/sukapura_svg/cmd/ar/sc_linenumberingdialog.svg|2 icon-themes/sukapura_svg/cmd/lc_linenumberingdialog.svg |2 icon-themes/sukapura_svg/cmd/sc_linenumberingdialog.svg |2 icon-themes/sukapura_svg/fpicker/res/fp015.svg| 87 -- 64 files changed, 39 insertions(+), 116 deletions(-) New commits: commit e98694bd787ead49b08e8490999cae0122626d40 Author: Rizal Muttaqin AuthorDate: Tue Aug 18 18:43:38 2020 +0700 Commit: Rizal Muttaqin CommitDate: Tue Aug 18 14:42:34 2020 +0200 Update Line Numbering icons Change-Id: Ib0f4595b7a9fe3f60e272bdd998609f510af03db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100914 Tested-by: Jenkins R
[Libreoffice-commits] core.git: compilerplugins/clang desktop/source include/editeng include/vcl sd/source svtools/source sw/inc sw/source vcl/inc vcl/source writerfilter/source xmloff/inc
compilerplugins/clang/unusedvarsglobal.cxx | 968 +++
compilerplugins/clang/unusedvarsglobal.py| 118 +
compilerplugins/clang/unusedvarsglobal.untouched.results | 280
desktop/source/splash/unxsplash.hxx |4
include/editeng/flditem.hxx |1
include/vcl/EnumContext.hxx |1
sd/source/ui/inc/MasterPageObserver.hxx |2
sd/source/ui/sidebar/PanelFactory.cxx|2
svtools/source/control/inettbc.cxx |2
sw/inc/calc.hxx |1
sw/inc/poolfmt.hxx |1
sw/inc/swtypes.hxx |4
sw/inc/viewsh.hxx|1
sw/source/filter/ww8/rtfsdrexport.cxx|2
sw/source/uibase/inc/initui.hxx | 10
sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx|1
vcl/inc/driverblocklist.hxx |1
vcl/source/window/EnumContext.cxx|1
writerfilter/source/dmapper/DomainMapperTableHandler.cxx |1
writerfilter/source/dmapper/TagLogger.hxx|2
xmloff/inc/PageMasterStyleMap.hxx|2
xmloff/inc/XMLChartPropertySetMapper.hxx |2
22 files changed, 1366 insertions(+), 41 deletions(-)
New commits:
commit 16d9d1d1122bbf9f6dc0748b41826a59a8551716
Author: Noel Grandin
AuthorDate: Mon Aug 17 21:41:33 2020 +0200
Commit: Noel Grandin
CommitDate: Tue Aug 18 14:48:51 2020 +0200
new loplugin:unusedvarsglobal
I copied and modified the unusedfields plugin to find unused
variables.
Change-Id: I18ed6daa202da70a2e564e4fe4760aed7ce070ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100891
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/compilerplugins/clang/unusedvarsglobal.cxx
b/compilerplugins/clang/unusedvarsglobal.cxx
new file mode 100644
index ..e5ca57c4ba5a
--- /dev/null
+++ b/compilerplugins/clang/unusedvarsglobal.cxx
@@ -0,0 +1,968 @@
+/* -*- 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/.
+ */
+
+#if !defined _WIN32 //TODO, #include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "config_clang.h"
+
+#include "plugin.hxx"
+#include "compat.hxx"
+#include "check.hxx"
+
+#if CLANG_VERSION >= 11
+#include "clang/AST/ParentMapContext.h"
+#endif
+
+/**
+This performs two analyses:
+ (1) look for unused fields
+ (2) look for fields that are write-only
+
+We dmp a list of calls to methods, and a list of field definitions.
+Then we will post-process the 2 lists and find the set of unused methods.
+
+Be warned that it produces around 5G of log file.
+
+The process goes something like this:
+ $ make check
+ $ make FORCE_COMPILE_ALL=1 COMPILER_PLUGIN_TOOL='UnusedVarsGlobal' check
+ $ ./compilerplugins/clang/UnusedVarsGlobal.py
+
+and then
+ $ for dir in *; do make FORCE_COMPILE_ALL=1 UPDATE_FILES=$dir
COMPILER_PLUGIN_TOOL='UnusedVarsGlobalremove' $dir; done
+to auto-remove the method declarations
+
+Note that the actual process may involve a fair amount of undoing, hand
editing, and general messing around
+to get it to work :-)
+
+*/
+
+namespace
+{
+struct MyVarInfo
+{
+std::string fieldName;
+std::string fieldType;
+std::string sourceLocation;
+};
+bool operator<(const MyVarInfo& lhs, const MyVarInfo& rhs)
+{
+return std::tie(lhs.sourceLocation, lhs.fieldName)
+ < std::tie(rhs.sourceLocation, rhs.fieldName);
+}
+
+// try to limit the voluminous output a little
+static std::set readFromSet;
+static std::set writeToSet;
+static std::set definitionSet;
+
+/**
+ * Wrap the different kinds of callable and callee objects in the clang AST so
I can define methods that handle everything.
+ */
+class CallerWrapper
+{
+const CallExpr* m_callExpr;
+const CXXConstructExpr* m_cxxConstructExpr;
+
+public:
+CallerWrapper(const CallExpr* callExpr)
+: m_callExpr(callExpr)
+, m_cxxConstructExpr(nullptr)
+{
+}
+CallerWrapper(const CXXConstructExpr* cxxConstructExpr)
+: m_callExpr(nullptr)
+, m_cxxConstructExpr(cxxConstructExpr)
+{
+}
+unsigned getNumArgs() const
+{
+return m_callExpr ? m_callExpr->getNumArgs() :
m_cxxConstructExpr->getNumArgs();
+}
+const Expr* getArg(unsigned i) const
+{
+return m_callExpr ? m_callExpr->getArg(i) :
m_cxxConstructExpr->getArg(i
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/native-code.py |1 +
1 file changed, 1 insertion(+)
New commits:
commit b1b1b8f8c1afc35589c3fc7a713def39f71ede97
Author: Michael Weghorn
AuthorDate: Tue Aug 18 13:47:28 2020 +0200
Commit: Michael Weghorn
CommitDate: Tue Aug 18 14:58:31 2020 +0200
tdf#135432 native-code: Add missing include for locales
While commit ed8bce1909f658d8e3d950f374931242f91ba811
("fix i18n constructors and android scripts", 2020-08-12)
had added the missing constructors to the native-code.py
script after commit 155c056b1d4674d5ff73bbb5e1ad1dcd1e6aae36
("i18npool: create instances with uno constructors",
2020-07-29), the include for the header containing the
corresponding 'WITH_LOCALE_*' defines was missing,
so expressions like
#if WITH_LOCALE_ALL || WITH_LOCALE_ja
always evaluated to 0, effectively always keeping the
constructors from actually being included.
Therefore, add the missing 'config_locales.h' include.
Change-Id: Icb00e058cc67a6aedac825c122c151c222f40b43
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100915
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index d0ebd3147d42..b3a7828460d0 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -809,6 +809,7 @@ print ("""/*
#include
#include
#include
+#include
#include
#include
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src
loleaflet/src/control/Control.Menubar.js | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit 9fcd0ec196a3acfbb5486566878bcf7eac6e8839
Author: Andras Timar
AuthorDate: Tue Aug 18 14:17:38 2020 +0200
Commit: Andras Timar
CommitDate: Tue Aug 18 15:22:04 2020 +0200
polyfill endsWidth for IE11
Change-Id: I4a2d3af2ccffdc7dcd79ff24e00c909bc57d365e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100807
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index bb868473f..4fe7ba101 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -1387,6 +1387,16 @@ L.Control.Menubar = L.Control.extend({
if (menuItem.drawing === false && this._map.getDocType() ===
'drawing')
return false;
+ // polyfill endsWidth for IE11
+ if (!String.prototype.endsWith) {
+ String.prototype.endsWith = function(search, thisLen) {
+ if (thisLen === undefined || thisLen >
this.length) {
+ thisLen = this.length;
+ }
+ return this.substring(thisLen - search.length,
thisLen) === search;
+ };
+ }
+
if (menuItem.id === 'downloadas-odg' &&
!this._map['wopi'].BaseFileName.endsWith('.odg'))
return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/nss
external/nss/UnpackedTarball_nss.mk |1 + external/nss/nss-bz1646594.patch.1 | 15 +++ 2 files changed, 16 insertions(+) New commits: commit c7d1bb119d88faaafb53d65ad8907ede97d89c8c Author: Michael Stahl AuthorDate: Tue Aug 18 14:36:33 2020 +0200 Commit: Michael Stahl CommitDate: Tue Aug 18 15:38:45 2020 +0200 nss: fix Android build Change-Id: I8d6704a00ee70c1cb397f8f12dac8050f24f44be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100917 Tested-by: Michael Stahl Reviewed-by: Michael Stahl diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index beb9afe11890..4aaa70fc2131 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/nss.vs2015.patch \ external/nss/nss.vs2015.pdb.patch \ external/nss/nss.bzmozilla1238154.patch \ + external/nss/nss-bz1646594.patch.1 \ external/nss/macos-dlopen.patch.0 \ external/nss/nss.getopt.patch.0 \ $(if $(filter iOS,$(OS)), \ diff --git a/external/nss/nss-bz1646594.patch.1 b/external/nss/nss-bz1646594.patch.1 new file mode 100644 index ..e6c75922a7dc --- /dev/null +++ b/external/nss/nss-bz1646594.patch.1 @@ -0,0 +1,15 @@ +regression from https://bugzilla.mozilla.org/show_bug.cgi?id=1646594 + +--- nss/nss/coreconf/arch.mk.orig2 2020-08-18 14:33:21.295252404 +0200 nss/nss/coreconf/arch.mk 2020-08-18 14:33:46.360320806 +0200 +@@ -116,8 +116,10 @@ + OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE)) + endif + KERNEL = Linux ++ifneq ($(OS_TARGET),Android) + include $(CORE_DEPTH)/coreconf/Linux.mk + endif ++endif + + # Since all uses of OS_ARCH that follow affect only userland, we can + # merge other Glibc systems with Linux here. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - vcl/inc vcl/source
vcl/inc/impgraph.hxx| 11 ++-
vcl/source/gdi/impgraph.cxx | 19 ---
2 files changed, 14 insertions(+), 16 deletions(-)
New commits:
commit b7cceae9a87b1ec0f1d919fa6344ddf18cf87e1d
Author: Tomaž Vajngerl
AuthorDate: Tue Aug 18 15:41:25 2020 +0200
Commit: Tomaž Vajngerl
CommitDate: Tue Aug 18 15:41:25 2020 +0200
ImpGraphic: rename Impl{Read,Write}Embedded - used only in swapping
ImplReadEmbedded and ImplWriteEmbedded are used when swapping only
so rename it to swapInContent and swapOutContent.
In addition change the swapInFromStream to accept SvStream by
reference and not pointer.
Change-Id: I2c555c436fe5eb6583d83382a2da278f4890ee08
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index 8b3cc14b7f2d..a581f48b47f6 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -167,15 +167,16 @@ private:
sal_uInt32 ImplGetAnimationLoopCount() const;
private:
+// swapping methods
+bool swapInFromStream(SvStream& rStream);
+
+bool swapInContent(SvStream& rStream);
+bool swapOutContent(SvStream& rStream);
+// end swapping
std::shared_ptr& ImplGetContext() { return mpContext;}
voidImplSetContext( const std::shared_ptr&
pReader );
voidImplSetDummyContext( bool value ) { mbDummyContext =
value; }
-boolImplReadEmbedded( SvStream& rIStream );
-boolImplWriteEmbedded( SvStream& rOStream );
-
-boolswapInFromStream(SvStream* pIStm);
-
boolImplIsDummyContext() const { return mbDummyContext; }
voidImplSetLink( const std::shared_ptr& );
std::shared_ptr ImplGetSharedGfxLink() const;
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index c40a344ba1da..f1e25248b2f3 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -1129,7 +1129,7 @@ void ImpGraphic::ImplSetContext( const
std::shared_ptr& pReader )
mbDummyContext = false;
}
-bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm )
+bool ImpGraphic::swapInContent(SvStream& rIStm)
{
ensureAvailable();
@@ -1263,7 +1263,7 @@ bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm )
return bRet;
}
-bool ImpGraphic::ImplWriteEmbedded( SvStream& rOStm )
+bool ImpGraphic::swapOutContent(SvStream& rOStm)
{
ensureAvailable();
@@ -1366,7 +1366,7 @@ bool ImpGraphic::swapOut()
xOutputStream->SetCompressMode(SvStreamCompressFlags::NATIVE);
xOutputStream->SetBufferSize(GRAPHIC_STREAMBUFSIZE);
-if (!xOutputStream->GetError() && ImplWriteEmbedded(*xOutputStream))
+if (!xOutputStream->GetError() && swapOutContent(*xOutputStream))
{
xOutputStream->Flush();
bResult = !xOutputStream->GetError();
@@ -1458,7 +1458,7 @@ bool ImpGraphic::swapIn()
xIStm->SetVersion( SOFFICE_FILEFORMAT_50 );
xIStm->SetCompressMode( SvStreamCompressFlags::NATIVE );
-bRet = swapInFromStream(xIStm.get());
+bRet = swapInFromStream(*xIStm);
xIStm.reset();
if (mpSwapFile)
setOriginURL(mpSwapFile->getOriginURL());
@@ -1473,16 +1473,13 @@ bool ImpGraphic::swapIn()
return bRet;
}
-bool ImpGraphic::swapInFromStream(SvStream* xIStm)
+bool ImpGraphic::swapInFromStream(SvStream& rStream)
{
bool bRet = false;
-if( !xIStm )
-return false;
-
-xIStm->SetBufferSize( GRAPHIC_STREAMBUFSIZE );
+rStream.SetBufferSize(GRAPHIC_STREAMBUFSIZE);
-if( xIStm->GetError() )
+if (rStream.GetError())
return false;
//keep the swap file alive, because its quite possibly the backing storage
@@ -1496,7 +1493,7 @@ bool ImpGraphic::swapInFromStream(SvStream* xIStm)
bool bDummyContext = mbDummyContext;
mbDummyContext = false;
-bRet = ImplReadEmbedded( *xIStm );
+bRet = swapInContent(rStream);
//restore ownership of the swap file and context
mpSwapFile = std::move(xSwapFile);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source chart2/source compilerplugins/clang cui/source desktop/source sc/source sd/source sfx2/source svtools/source svx/source sw/source tools/source vbahelper/so
basic/source/classes/sbunoobj.cxx|4 --
chart2/source/tools/ObjectIdentifier.cxx | 12 +++
compilerplugins/clang/unusedvarsglobal.cxx |4 ++
compilerplugins/clang/unusedvarsglobal.py| 31 ++-
cui/source/dialogs/about.cxx |4 +-
cui/source/options/optdict.cxx |6 +--
cui/source/tabpages/autocdlg.cxx |5 +--
desktop/source/lib/init.cxx |9 ++---
sc/source/core/data/stlpool.cxx |2 -
sc/source/filter/oox/querytablebuffer.cxx|7 +---
sc/source/filter/xml/xmlexprt.cxx|4 +-
sc/source/ui/app/inputhdl.cxx|5 +--
sc/source/ui/pagedlg/areasdlg.cxx|7 +---
sd/source/core/drawdoc4.cxx |2 -
sd/source/core/stlpool.cxx |4 +-
sd/source/ui/view/sdview3.cxx|5 +--
sfx2/source/view/classificationhelper.cxx|5 +--
svtools/source/dialogs/prnsetup.cxx |2 -
svx/source/dialog/imapwnd.cxx|3 -
svx/source/gallery2/galbrws2.cxx |3 -
sw/source/filter/html/swhtml.cxx |3 +
tools/source/inet/inetmime.cxx |4 --
vbahelper/source/vbahelper/vbacommandbarcontrols.cxx |5 +--
xmloff/source/text/txtparai.cxx |4 --
24 files changed, 77 insertions(+), 63 deletions(-)
New commits:
commit 65ae6af9f460b1a28f3e07480347ff7f90adae38
Author: Noel Grandin
AuthorDate: Tue Aug 18 09:43:04 2020 +0200
Commit: Noel Grandin
CommitDate: Tue Aug 18 16:02:25 2020 +0200
loplugin:unusedvarsglobal
tackle some read-only vars.
Mark some of them const to make it obvious they are not really used, and
to make the constantparam plugin see more data.
Change-Id: Ia25927745866746aa1aa9d5affd5857ad9f9ee24
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100895
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/basic/source/classes/sbunoobj.cxx
b/basic/source/classes/sbunoobj.cxx
index f004cce017d8..be4a5f52afa8 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -3690,9 +3690,7 @@ SbUnoServiceCtor::~SbUnoServiceCtor()
SbxInfo* SbUnoServiceCtor::GetInfo()
{
-SbxInfo* pRet = nullptr;
-
-return pRet;
+return nullptr;
}
diff --git a/chart2/source/tools/ObjectIdentifier.cxx
b/chart2/source/tools/ObjectIdentifier.cxx
index 2b7628f7a0ab..c2979f13f5b3 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -311,10 +311,10 @@ OUString
ObjectIdentifier::createClassifiedIdentifierForObject(
OUString aRet;
enum ObjectType eObjectType = OBJECTTYPE_UNKNOWN;
-OUString aObjectID;
+const OUString aObjectID;
OUString aParentParticle;
-OUString aDragMethodServiceName;
-OUString aDragParameterString;
+const OUString aDragMethodServiceName;
+const OUString aDragParameterString;
try
{
@@ -393,10 +393,10 @@ OUString
ObjectIdentifier::createClassifiedIdentifierForObject(
OUString aRet;
enum ObjectType eObjectType = OBJECTTYPE_UNKNOWN;
-OUString aObjectID;
+const OUString aObjectID;
OUString aParentParticle;
-OUString aDragMethodServiceName;
-OUString aDragParameterString;
+const OUString aDragMethodServiceName;
+const OUString aDragParameterString;
try
{
diff --git a/compilerplugins/clang/unusedvarsglobal.cxx
b/compilerplugins/clang/unusedvarsglobal.cxx
index e5ca57c4ba5a..4619bd3617c5 100644
--- a/compilerplugins/clang/unusedvarsglobal.cxx
+++ b/compilerplugins/clang/unusedvarsglobal.cxx
@@ -243,6 +243,8 @@ bool UnusedVarsGlobal::VisitVarDecl(const VarDecl* varDecl)
return true;
if (varDecl->isConstexpr())
return true;
+if (varDecl->isExceptionVariable())
+return true;
if (!varDecl->getLocation().isValid() || ignoreLocation(varDecl))
return true;
// ignore stuff that forms part of the stable URE interface
@@ -267,6 +269,8 @@ bool UnusedVarsGlobal::VisitDeclRefExpr(const DeclRefExpr*
declRefExpr)
return true;
if (varDecl->isConstexpr())
return true;
+if (varDecl->isExceptionVariable())
+return true;
varDecl = varDecl->getCanonicalDecl();
if (!varDecl->getLocation().isValid() || ignoreLocation(varDecl))
return true;
diff --git a/compilerplugins/clang/unusedvarsglobal.py
b/compilerplugins/clang/unusedvarsglobal.py
index 1231edf9bd18..cfc83ad7e8f4 100755
--- a/compilerplugins/clang/unusedvarsglobal.py
+++ b/compilerplugins/clang/unusedvarsglobal.py
@@ -65,7 +65,13 @@ for d in definitionSet:
continue
if vartype in ["OpenCLInitialZone", "p
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_dark_svg icon-themes/sifr_svg
icon-themes/sifr/cmd/32/ar/linenumberingdialog.png |binary icon-themes/sifr/cmd/32/linenumberingdialog.png |binary icon-themes/sifr/cmd/ar/lc_linenumberingdialog.png |binary icon-themes/sifr/cmd/ar/sc_linenumberingdialog.png |binary icon-themes/sifr/cmd/lc_linenumberingdialog.png |binary icon-themes/sifr/cmd/sc_linenumberingdialog.png |binary icon-themes/sifr/links.txt |6 +++--- icon-themes/sifr_dark/cmd/32/ar/linenumberingdialog.png |binary icon-themes/sifr_dark/cmd/32/linenumberingdialog.png|binary icon-themes/sifr_dark/cmd/ar/lc_linenumberingdialog.png |binary icon-themes/sifr_dark/cmd/ar/sc_linenumberingdialog.png |binary icon-themes/sifr_dark/cmd/lc_linenumberingdialog.png|binary icon-themes/sifr_dark/cmd/sc_linenumberingdialog.png|binary icon-themes/sifr_dark/links.txt |6 +++--- icon-themes/sifr_dark_svg/cmd/32/ar/linenumberingdialog.svg |1 + icon-themes/sifr_dark_svg/cmd/32/linenumberingdialog.svg|1 + icon-themes/sifr_dark_svg/cmd/ar/lc_linenumberingdialog.svg |2 +- icon-themes/sifr_dark_svg/cmd/ar/sc_linenumberingdialog.svg |2 +- icon-themes/sifr_dark_svg/cmd/lc_linenumberingdialog.svg|2 +- icon-themes/sifr_dark_svg/cmd/sc_linenumberingdialog.svg|2 +- icon-themes/sifr_svg/cmd/32/ar/linenumberingdialog.svg |1 + icon-themes/sifr_svg/cmd/32/linenumberingdialog.svg |1 + icon-themes/sifr_svg/cmd/ar/lc_linenumberingdialog.svg |2 +- icon-themes/sifr_svg/cmd/ar/sc_linenumberingdialog.svg |2 +- icon-themes/sifr_svg/cmd/lc_linenumberingdialog.svg |2 +- icon-themes/sifr_svg/cmd/sc_linenumberingdialog.svg |2 +- 26 files changed, 18 insertions(+), 14 deletions(-) New commits: commit da4b25dc11cfa22885ff260a4bdf99ec32f617f9 Author: Rizal Muttaqin AuthorDate: Tue Aug 18 16:41:33 2020 +0700 Commit: Rizal Muttaqin CommitDate: Tue Aug 18 16:03:34 2020 +0200 Sifr: tdf#135872, missing Line Numbering icon Change-Id: Ic44d598b7f7c66f45dbf1e4e419f6f76e13c7f6c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100910 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin (cherry picked from commit cff430c6ba8a85faaf6e15abd26eceafb493ed9c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100808 diff --git a/icon-themes/sifr/cmd/32/ar/linenumberingdialog.png b/icon-themes/sifr/cmd/32/ar/linenumberingdialog.png new file mode 100644 index ..e13c7689663b Binary files /dev/null and b/icon-themes/sifr/cmd/32/ar/linenumberingdialog.png differ diff --git a/icon-themes/sifr/cmd/32/linenumberingdialog.png b/icon-themes/sifr/cmd/32/linenumberingdialog.png new file mode 100644 index ..c9609a0e9234 Binary files /dev/null and b/icon-themes/sifr/cmd/32/linenumberingdialog.png differ diff --git a/icon-themes/sifr/cmd/ar/lc_linenumberingdialog.png b/icon-themes/sifr/cmd/ar/lc_linenumberingdialog.png index 1a4e98ba941f..bdc3b598e011 100644 Binary files a/icon-themes/sifr/cmd/ar/lc_linenumberingdialog.png and b/icon-themes/sifr/cmd/ar/lc_linenumberingdialog.png differ diff --git a/icon-themes/sifr/cmd/ar/sc_linenumberingdialog.png b/icon-themes/sifr/cmd/ar/sc_linenumberingdialog.png index 6a9c5aa15f0a..99c3fd666ea0 100644 Binary files a/icon-themes/sifr/cmd/ar/sc_linenumberingdialog.png and b/icon-themes/sifr/cmd/ar/sc_linenumberingdialog.png differ diff --git a/icon-themes/sifr/cmd/lc_linenumberingdialog.png b/icon-themes/sifr/cmd/lc_linenumberingdialog.png index 1f3913772e33..bdf92deeed9f 100644 Binary files a/icon-themes/sifr/cmd/lc_linenumberingdialog.png and b/icon-themes/sifr/cmd/lc_linenumberingdialog.png differ diff --git a/icon-themes/sifr/cmd/sc_linenumberingdialog.png b/icon-themes/sifr/cmd/sc_linenumberingdialog.png index 7d5526fb40c7..91fdd9619175 100644 Binary files a/icon-themes/sifr/cmd/sc_linenumberingdialog.png and b/icon-themes/sifr/cmd/sc_linenumberingdialog.png differ diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt index e96fcc4f52a3..5a83cfe88bfd 100644 --- a/icon-themes/sifr/links.txt +++ b/icon-themes/sifr/links.txt @@ -129,7 +129,7 @@ cmd/32/inserttextframe.png cmd/32/insertframe.png cmd/32/inserttimefield.png cmd/32/timefield.png cmd/32/inserttimefieldfix.png cmd/32/timefield.png cmd/32/insobjctrl.png cmd/32/adddirect.png -cmd/32/linenumberingdialog.png cmd/32/linenumberdialog.png +cmd/32/linenumberdialog.png cmd/32/linenumberingdialog.png cmd/32/numberingmenu.png cmd/32/outlinebullet.png cmd/32/paragraphmenu.png cmd/32/paragraphdialog.png cmd/32/shapesmenu.png cmd/32/basicshapes.pentagon.png @@ -186,7 +186,7 @@ cmd/lc_inserttextframe.png cmd/lc_insertframe.png cmd/lc_inserttimefield.png cmd/lc_timefield.png cmd/lc_inserttimefieldfix.png cmd/lc_timefield.png cmd/lc_insobjctrl.png cmd/lc_adddirect.png -cmd/lc_linenumber
[Libreoffice-commits] core.git: icon-themes/elementary
icon-themes/elementary/links.txt | 10 +- icon-themes/elementary/res/lx03245.png |binary icon-themes/elementary/res/lx03246.png |binary icon-themes/elementary/res/lx03247.png |binary icon-themes/elementary/res/lx03248.png |binary icon-themes/elementary/res/lx03249.png |binary icon-themes/elementary/res/lx03250.png |binary icon-themes/elementary/res/lx03251.png |binary icon-themes/elementary/res/lx03255.png |binary 9 files changed, 1 insertion(+), 9 deletions(-) New commits: commit c0fb40ddbf82c60052bab41f9ad1e9647ddc99a8 Author: Rizal Muttaqin AuthorDate: Tue Aug 18 07:21:57 2020 +0700 Commit: Rizal Muttaqin CommitDate: Tue Aug 18 16:04:22 2020 +0200 elementary: tdf#134887 Use different icons for extra large Change-Id: I84582058033761d6cd5a175fa4da508c97a6866e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100909 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt index e7fe9793788f..a41d113a7b54 100644 --- a/icon-themes/elementary/links.txt +++ b/icon-themes/elementary/links.txt @@ -1989,24 +1989,16 @@ res/lx03227.png res/odg_32_8.png res/lx03228.png res/otg_32_8.png res/lx03239.png cmd/32/dbrelationdesign.png res/lx03243.png res/lx03123.png -res/lx03245.png res/odb_24_8.png res/lx03245_32.png res/odb_32_8.png -res/lx03246.png res/odg_24_8.png res/lx03246_32.png res/odg_32_8.png -res/lx03247.png res/odf_24_8.png res/lx03247_32.png res/odf_32_8.png -res/lx03248.png res/odm_24_8.png res/lx03248_32.png res/odm_32_8.png -res/lx03249.png res/odp_24_8.png res/lx03249_32.png res/odp_32_8.png -res/lx03250.png res/ods_24_8.png res/lx03250_32.png res/ods_32_8.png -res/lx03251.png res/odt_24_8.png res/lx03251_32.png res/odt_32_8.png res/lx03252.png res/otg_32_8.png res/lx03253.png res/otp_32_8.png res/lx03254.png res/ots_32_8.png -res/lx03255.png res/ott_24_8.png res/lx03255_32.png res/ott_32_8.png res/lx03256.png cmd/lc_insertplugin.png res/mainapp_32.png res/mainapp_32_8.png @@ -2466,7 +2458,7 @@ cmd/32/addtextbox.png cmd/32/insertfixedtext.png cmd/lc_addtextbox.png cmd/lc_insertfixedtext.png cmd/sc_addtextbox.png cmd/sc_insertfixedtext.png -# Edit menu +# Edit menu # === cmd/32/authoritiesentrydialog.png cmd/32/dbviewaliases.png cmd/32/changesmenu.png cmd/32/accepttrackedchange.png diff --git a/icon-themes/elementary/res/lx03245.png b/icon-themes/elementary/res/lx03245.png new file mode 100644 index ..ab1c7c34de00 Binary files /dev/null and b/icon-themes/elementary/res/lx03245.png differ diff --git a/icon-themes/elementary/res/lx03246.png b/icon-themes/elementary/res/lx03246.png new file mode 100644 index ..986ecafb8fc7 Binary files /dev/null and b/icon-themes/elementary/res/lx03246.png differ diff --git a/icon-themes/elementary/res/lx03247.png b/icon-themes/elementary/res/lx03247.png new file mode 100644 index ..b701132d2717 Binary files /dev/null and b/icon-themes/elementary/res/lx03247.png differ diff --git a/icon-themes/elementary/res/lx03248.png b/icon-themes/elementary/res/lx03248.png new file mode 100644 index ..9d1e612d4ee0 Binary files /dev/null and b/icon-themes/elementary/res/lx03248.png differ diff --git a/icon-themes/elementary/res/lx03249.png b/icon-themes/elementary/res/lx03249.png new file mode 100644 index ..8e3d0469b26d Binary files /dev/null and b/icon-themes/elementary/res/lx03249.png differ diff --git a/icon-themes/elementary/res/lx03250.png b/icon-themes/elementary/res/lx03250.png new file mode 100644 index ..89edb9d1c1fe Binary files /dev/null and b/icon-themes/elementary/res/lx03250.png differ diff --git a/icon-themes/elementary/res/lx03251.png b/icon-themes/elementary/res/lx03251.png new file mode 100644 index ..e312d00f7159 Binary files /dev/null and b/icon-themes/elementary/res/lx03251.png differ diff --git a/icon-themes/elementary/res/lx03255.png b/icon-themes/elementary/res/lx03255.png new file mode 100644 index ..bf697f41783f Binary files /dev/null and b/icon-themes/elementary/res/lx03255.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.Menubar.js | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit f6db27343ff9eabe484a07382b2f67f5193ff63c
Author: Andras Timar
AuthorDate: Tue Aug 18 14:17:38 2020 +0200
Commit: Andras Timar
CommitDate: Tue Aug 18 16:18:41 2020 +0200
polyfill endsWidth for IE11
Change-Id: I4a2d3af2ccffdc7dcd79ff24e00c909bc57d365e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100916
Tested-by: Jenkins
Reviewed-by: Andras Timar
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index c6b20a6ff..5ea9a8500 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -1437,6 +1437,16 @@ L.Control.Menubar = L.Control.extend({
if (menuItem.drawing === false && this._map.getDocType() ===
'drawing')
return false;
+ // polyfill endsWidth for IE11
+ if (!String.prototype.endsWith) {
+ String.prototype.endsWith = function(search, thisLen) {
+ if (thisLen === undefined || thisLen >
this.length) {
+ thisLen = this.length;
+ }
+ return this.substring(thisLen - search.length,
thisLen) === search;
+ };
+ }
+
if (menuItem.id === 'downloadas-odg' &&
!this._map['wopi'].BaseFileName.endsWith('.odg'))
return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac | 43 +++ 1 file changed, 43 insertions(+) New commits: commit a88e477346361665311eb2310e84023ce8a2fe59 Author: Luboš Luňák AuthorDate: Mon Aug 17 14:40:52 2020 +0200 Commit: Luboš Luňák CommitDate: Tue Aug 18 16:24:28 2020 +0200 make --enable-ccache affect also CLANG_CC/CXX Change-Id: I743ef8cc00eb605ee20da5d9524a5a46ed841e3b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100865 Tested-by: Jenkins Reviewed-by: Luboš Luňák diff --git a/configure.ac b/configure.ac index ce2cdec3be4c..62052bb63a58 100644 --- a/configure.ac +++ b/configure.ac @@ -11489,6 +11489,49 @@ if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE; then CXX="$save_CXX" fi fi +# +# prefix CLANG_CC/CLANG_CXX with ccache if needed +# +if test "$CCACHE" != "" -a -n "$CLANG_CC" -a -n "$CLANG_CXX"; then +AC_MSG_CHECKING([whether $CLANG_CC is already ccached]) +AC_LANG_PUSH([C]) +save_CC="$CC" +CC="$CLANG_CC" +save_CFLAGS=$CFLAGS +CFLAGS="$CFLAGS --ccache-skip -O2" +dnl an empty program will do, we're checking the compiler flags +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], + [use_ccache=yes], [use_ccache=no]) +if test $use_ccache = yes; then +AC_MSG_RESULT([yes]) +else +CLANG_CC="$CCACHE $CLANG_CC" +AC_MSG_RESULT([no]) +fi +CFLAGS=$save_CFLAGS +CC=$save_CC +AC_LANG_POP([C]) + +AC_MSG_CHECKING([whether $CLANG_CXX is already ccached]) +AC_LANG_PUSH([C++]) +save_CXX="$CXX" +CXX="$CLANG_CXX" +save_CXXFLAGS=$CXXFLAGS +CXXFLAGS="$CXXFLAGS --ccache-skip -O2" +dnl an empty program will do, we're checking the compiler flags +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], + [use_ccache=yes], [use_ccache=no]) +if test $use_ccache = yes; then +AC_MSG_RESULT([yes]) +else +CLANG_CXX="$CCACHE $CLANG_CXX" +AC_MSG_RESULT([no]) +fi +CXXFLAGS=$save_CXXFLAGS +CXX=$save_CXX +AC_LANG_POP([C++]) +fi + AC_SUBST(CLANG_CC) AC_SUBST(CLANG_CXX) AC_SUBST(CLANG_CXXFLAGS_INTRINSICS_SSE2) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - 160 commits - accessibility/source avmedia/source basctl/Library_basctl.mk basctl/source basegfx/source basic/qa basic/source bridge
Rebased ref, commits from common ancestor:
commit 237dc0caf4464efa3d2dd7cc84531c9ae748a348
Author: Tomaž Vajngerl
AuthorDate: Tue Aug 18 16:39:41 2020 +0200
Commit: Tomaž Vajngerl
CommitDate: Tue Aug 18 16:39:50 2020 +0200
rename stream variable in swapInContent, swapIn
Change-Id: I7e055c3347682f09ffd2f6b0e287d3d12c22ec46
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 8c608e4ec301..a6650201ade0 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -1133,7 +1133,7 @@ void ImpGraphic::ImplSetContext( const
std::shared_ptr& pReader )
mbDummyContext = false;
}
-bool ImpGraphic::swapInContent(SvStream& rIStm)
+bool ImpGraphic::swapInContent(SvStream& rStream)
{
ensureAvailable();
@@ -1142,28 +1142,28 @@ bool ImpGraphic::swapInContent(SvStream& rIStm)
sal_uInt32 nId;
sal_Int32 nType;
sal_Int32 nPageIndex = -1;
-const SvStreamEndian nOldFormat = rIStm.GetEndian();
+const SvStreamEndian nOldFormat = rStream.GetEndian();
boolbRet = false;
-rIStm.SetEndian( SvStreamEndian::LITTLE );
-rIStm.ReadUInt32( nId );
+rStream.SetEndian( SvStreamEndian::LITTLE );
+rStream.ReadUInt32( nId );
// check version
if( GRAPHIC_FORMAT_50 == nId )
{
// read new style header
-VersionCompat aCompat( rIStm, StreamMode::READ );
+VersionCompat aCompat( rStream, StreamMode::READ );
-rIStm.ReadInt32( nType );
+rStream.ReadInt32( nType );
sal_Int32 nLen;
-rIStm.ReadInt32( nLen );
-TypeSerializer aSerializer(rIStm);
+rStream.ReadInt32( nLen );
+TypeSerializer aSerializer(rStream);
aSerializer.readSize(aSize);
-ReadMapMode( rIStm, aMapMode );
+ReadMapMode( rStream, aMapMode );
if (aCompat.GetVersion() >= 2)
{
-rIStm.ReadInt32(nPageIndex);
+rStream.ReadInt32(nPageIndex);
}
}
else
@@ -1173,12 +1173,12 @@ bool ImpGraphic::swapInContent(SvStream& rIStm)
sal_Int32 nMapMode, nScaleNumX, nScaleDenomX;
sal_Int32 nScaleNumY, nScaleDenomY, nOffsX, nOffsY;
-rIStm.SeekRel( -4 );
+rStream.SeekRel( -4 );
sal_Int32 nLen;
-rIStm.ReadInt32( nType ).ReadInt32( nLen ).ReadInt32( nWidth
).ReadInt32( nHeight );
-rIStm.ReadInt32( nMapMode ).ReadInt32( nScaleNumX ).ReadInt32(
nScaleDenomX ).ReadInt32( nScaleNumY );
-rIStm.ReadInt32( nScaleDenomY ).ReadInt32( nOffsX ).ReadInt32( nOffsY
);
+rStream.ReadInt32( nType ).ReadInt32( nLen ).ReadInt32( nWidth
).ReadInt32( nHeight );
+rStream.ReadInt32( nMapMode ).ReadInt32( nScaleNumX ).ReadInt32(
nScaleDenomX ).ReadInt32( nScaleNumY );
+rStream.ReadInt32( nScaleDenomY ).ReadInt32( nOffsX ).ReadInt32(
nOffsY );
// swapped
if( nType > 100 )
@@ -1229,8 +1229,8 @@ bool ImpGraphic::swapInContent(SvStream& rIStm)
if( meType == GraphicType::Bitmap || meType ==
GraphicType::GdiMetafile )
{
-ReadImpGraphic( rIStm, *this );
-bRet = rIStm.GetError() == ERRCODE_NONE;
+ReadImpGraphic(rStream, *this);
+bRet = rStream.GetError() == ERRCODE_NONE;
}
else if( sal::static_int_cast(meType) >= SYS_WINMETAFILE
&& sal::static_int_cast(meType) <= SYS_MACMETAFILE
)
@@ -1250,10 +1250,10 @@ bool ImpGraphic::swapInContent(SvStream& rIStm)
break;
}
-if( nType && GraphicConverter::Import( rIStm, aSysGraphic,
nCvtType ) == ERRCODE_NONE )
+if( nType && GraphicConverter::Import(rStream, aSysGraphic,
nCvtType) == ERRCODE_NONE )
{
*this = ImpGraphic( aSysGraphic.GetGDIMetaFile() );
-bRet = rIStm.GetError() == ERRCODE_NONE;
+bRet = rStream.GetError() == ERRCODE_NONE;
}
else
meType = GraphicType::Default;
@@ -1270,7 +1270,7 @@ bool ImpGraphic::swapInContent(SvStream& rIStm)
else
bRet = true;
-rIStm.SetEndian( nOldFormat );
+rStream.SetEndian( nOldFormat );
return bRet;
}
@@ -1459,22 +1459,22 @@ bool ImpGraphic::swapIn()
if( !aSwapURL.isEmpty() )
{
-std::unique_ptr xIStm;
+std::unique_ptr xStream;
try
{
-xIStm = ::utl::UcbStreamHelper::CreateStream( aSwapURL,
StreamMode::READWRITE | StreamMode::SHARE_DENYWRITE );
+xStream = ::utl::UcbStreamHelper::CreateStream( aSwapURL,
StreamMode::READWRITE | StreamMode::SHARE_DENYWRITE );
}
catch( const css::uno::Exception& )
{
}
-if( xIStm )
+if (xStream)
{
-xIStm->SetVersion( SOFFICE_FILEFORMAT_50 );
-xIStm->SetCompressMode( SvStreamCo
[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - 17 commits - basic/source chart2/source compilerplugins/clang configure.ac cui/source desktop/source drawinglayer/CppunitTest_drawin
Rebased ref, commits from common ancestor:
commit 2a7a580687a48fad87e7d74d85a322b0a85d0dbc
Author: Tomaž Vajngerl
AuthorDate: Tue Aug 18 16:39:41 2020 +0200
Commit: Tomaž Vajngerl
CommitDate: Tue Aug 18 16:43:11 2020 +0200
rename stream variable in swapInContent, swapIn
Change-Id: I7e055c3347682f09ffd2f6b0e287d3d12c22ec46
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 8c608e4ec301..a6650201ade0 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -1133,7 +1133,7 @@ void ImpGraphic::ImplSetContext( const
std::shared_ptr& pReader )
mbDummyContext = false;
}
-bool ImpGraphic::swapInContent(SvStream& rIStm)
+bool ImpGraphic::swapInContent(SvStream& rStream)
{
ensureAvailable();
@@ -1142,28 +1142,28 @@ bool ImpGraphic::swapInContent(SvStream& rIStm)
sal_uInt32 nId;
sal_Int32 nType;
sal_Int32 nPageIndex = -1;
-const SvStreamEndian nOldFormat = rIStm.GetEndian();
+const SvStreamEndian nOldFormat = rStream.GetEndian();
boolbRet = false;
-rIStm.SetEndian( SvStreamEndian::LITTLE );
-rIStm.ReadUInt32( nId );
+rStream.SetEndian( SvStreamEndian::LITTLE );
+rStream.ReadUInt32( nId );
// check version
if( GRAPHIC_FORMAT_50 == nId )
{
// read new style header
-VersionCompat aCompat( rIStm, StreamMode::READ );
+VersionCompat aCompat( rStream, StreamMode::READ );
-rIStm.ReadInt32( nType );
+rStream.ReadInt32( nType );
sal_Int32 nLen;
-rIStm.ReadInt32( nLen );
-TypeSerializer aSerializer(rIStm);
+rStream.ReadInt32( nLen );
+TypeSerializer aSerializer(rStream);
aSerializer.readSize(aSize);
-ReadMapMode( rIStm, aMapMode );
+ReadMapMode( rStream, aMapMode );
if (aCompat.GetVersion() >= 2)
{
-rIStm.ReadInt32(nPageIndex);
+rStream.ReadInt32(nPageIndex);
}
}
else
@@ -1173,12 +1173,12 @@ bool ImpGraphic::swapInContent(SvStream& rIStm)
sal_Int32 nMapMode, nScaleNumX, nScaleDenomX;
sal_Int32 nScaleNumY, nScaleDenomY, nOffsX, nOffsY;
-rIStm.SeekRel( -4 );
+rStream.SeekRel( -4 );
sal_Int32 nLen;
-rIStm.ReadInt32( nType ).ReadInt32( nLen ).ReadInt32( nWidth
).ReadInt32( nHeight );
-rIStm.ReadInt32( nMapMode ).ReadInt32( nScaleNumX ).ReadInt32(
nScaleDenomX ).ReadInt32( nScaleNumY );
-rIStm.ReadInt32( nScaleDenomY ).ReadInt32( nOffsX ).ReadInt32( nOffsY
);
+rStream.ReadInt32( nType ).ReadInt32( nLen ).ReadInt32( nWidth
).ReadInt32( nHeight );
+rStream.ReadInt32( nMapMode ).ReadInt32( nScaleNumX ).ReadInt32(
nScaleDenomX ).ReadInt32( nScaleNumY );
+rStream.ReadInt32( nScaleDenomY ).ReadInt32( nOffsX ).ReadInt32(
nOffsY );
// swapped
if( nType > 100 )
@@ -1229,8 +1229,8 @@ bool ImpGraphic::swapInContent(SvStream& rIStm)
if( meType == GraphicType::Bitmap || meType ==
GraphicType::GdiMetafile )
{
-ReadImpGraphic( rIStm, *this );
-bRet = rIStm.GetError() == ERRCODE_NONE;
+ReadImpGraphic(rStream, *this);
+bRet = rStream.GetError() == ERRCODE_NONE;
}
else if( sal::static_int_cast(meType) >= SYS_WINMETAFILE
&& sal::static_int_cast(meType) <= SYS_MACMETAFILE
)
@@ -1250,10 +1250,10 @@ bool ImpGraphic::swapInContent(SvStream& rIStm)
break;
}
-if( nType && GraphicConverter::Import( rIStm, aSysGraphic,
nCvtType ) == ERRCODE_NONE )
+if( nType && GraphicConverter::Import(rStream, aSysGraphic,
nCvtType) == ERRCODE_NONE )
{
*this = ImpGraphic( aSysGraphic.GetGDIMetaFile() );
-bRet = rIStm.GetError() == ERRCODE_NONE;
+bRet = rStream.GetError() == ERRCODE_NONE;
}
else
meType = GraphicType::Default;
@@ -1270,7 +1270,7 @@ bool ImpGraphic::swapInContent(SvStream& rIStm)
else
bRet = true;
-rIStm.SetEndian( nOldFormat );
+rStream.SetEndian( nOldFormat );
return bRet;
}
@@ -1459,22 +1459,22 @@ bool ImpGraphic::swapIn()
if( !aSwapURL.isEmpty() )
{
-std::unique_ptr xIStm;
+std::unique_ptr xStream;
try
{
-xIStm = ::utl::UcbStreamHelper::CreateStream( aSwapURL,
StreamMode::READWRITE | StreamMode::SHARE_DENYWRITE );
+xStream = ::utl::UcbStreamHelper::CreateStream( aSwapURL,
StreamMode::READWRITE | StreamMode::SHARE_DENYWRITE );
}
catch( const css::uno::Exception& )
{
}
-if( xIStm )
+if (xStream)
{
-xIStm->SetVersion( SOFFICE_FILEFORMAT_50 );
-xIStm->SetCompressMode( SvStreamCo
Re: Cannot build libreoffice core.
On 18.08.20 09:26, Miklos Vajna wrote: Hi Chetan, On Mon, Aug 17, 2020 at 07:32:11AM -0700, Chetan Rawat wrote: 1 warning generated. mpi/mpcpucache.c:91:15: error: invalid output constraint '=a' in asm : "=a"(*eax), ^ 1 error generated. This is a known problem for now, see the comments at the end of https://gerrit.libreoffice.org/c/core/+/100345 for details. should be fixed now on master with https://cgit.freedesktop.org/libreoffice/core/commit/?id=c7d1bb119d88faaafb53d65ad8907ede97d89c8c ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - external/nss
external/nss/UnpackedTarball_nss.mk |1 + external/nss/nss-android.patch.1| 10 +- external/nss/nss-bz1646594.patch.1 | 15 +++ 3 files changed, 21 insertions(+), 5 deletions(-) New commits: commit 4538706e36f56e607cfd232f81dd2b5e988d279d Author: Michael Stahl AuthorDate: Tue Aug 18 14:36:33 2020 +0200 Commit: Miklos Vajna CommitDate: Tue Aug 18 17:35:56 2020 +0200 nss: fix Android build [ And also fix up external/nss/nss-android.patch.1, which was broken by commit 9770f350d2eb8719a1a8f70f4e5cecb70583e25a. ] Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100917 Tested-by: Michael Stahl Reviewed-by: Michael Stahl (cherry picked from commit c7d1bb119d88faaafb53d65ad8907ede97d89c8c) Change-Id: I8d6704a00ee70c1cb397f8f12dac8050f24f44be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100929 Tested-by: Miklos Vajna Reviewed-by: Miklos Vajna diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index 1cad5852fa89..8fa1edd530cc 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -22,6 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/nss.vs2015.patch \ external/nss/nss.vs2015.pdb.patch \ external/nss/nss.bzmozilla1238154.patch \ + external/nss/nss-bz1646594.patch.1 \ external/nss/macos-dlopen.patch.0 \ $(if $(filter iOS,$(OS)), \ external/nss/nss-ios.patch) \ diff --git a/external/nss/nss-android.patch.1 b/external/nss/nss-android.patch.1 index 368b7a23668b..73882e61f3f6 100644 --- a/external/nss/nss-android.patch.1 +++ b/external/nss/nss-android.patch.1 @@ -59,17 +59,17 @@ diff -ur nss.org/nss/Makefile nss/nss/Makefile install_nspr: build_nspr $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) install nss/nss/lib/ckfw/builtins/manifest.mn.orig 2019-11-26 15:18:22.185985193 +0100 -+++ nss/nss/lib/ckfw/builtins/manifest.mn 2019-11-26 15:18:29.281982387 +0100 +--- nss/nss/lib/ckfw/builtins/manifest.mn 2019-11-26 15:18:22.185985193 +0100 nss/nss/lib/ckfw/builtins/manifest.mn 2020-08-18 18:04:29.151889733 +0300 @@ -5,7 +5,7 @@ CORE_DEPTH = ../../.. --DIRS = testlib +-DIRS = . testlib +DIRS = - MODULE = nss - MAPFILE = $(OBJDIR)/nssckbi.def + testlib: . + diff -ur nss/nss/coreconf/arch.mk nss/nss/coreconf/arch.mk --- nss/nss/coreconf/arch.mk 2019-11-01 10:29:44.933245745 +0100 +++ nss/nss/coreconf/arch.mk 2019-11-01 10:32:04.347181076 +0100 diff --git a/external/nss/nss-bz1646594.patch.1 b/external/nss/nss-bz1646594.patch.1 new file mode 100644 index ..e6c75922a7dc --- /dev/null +++ b/external/nss/nss-bz1646594.patch.1 @@ -0,0 +1,15 @@ +regression from https://bugzilla.mozilla.org/show_bug.cgi?id=1646594 + +--- nss/nss/coreconf/arch.mk.orig2 2020-08-18 14:33:21.295252404 +0200 nss/nss/coreconf/arch.mk 2020-08-18 14:33:46.360320806 +0200 +@@ -116,8 +116,10 @@ + OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE)) + endif + KERNEL = Linux ++ifneq ($(OS_TARGET),Android) + include $(CORE_DEPTH)/coreconf/Linux.mk + endif ++endif + + # Since all uses of OS_ARCH that follow affect only userland, we can + # merge other Glibc systems with Linux here. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg icon-themes/colibre icon-themes/colibre_svg ico
icon-themes/breeze/cmd/32/ar/linenumberingdialog.png |binary icon-themes/breeze/cmd/32/linenumberingdialog.png |binary icon-themes/breeze/cmd/ar/lc_linenumberingdialog.png |binary icon-themes/breeze/cmd/ar/sc_showsinglepage.png |binary icon-themes/breeze/cmd/lc_linenumberingdialog.png |binary icon-themes/breeze/cmd/sc_showsinglepage.png |binary icon-themes/breeze/links.txt |5 icon-themes/breeze_dark/cmd/32/ar/linenumberingdialog.png |binary icon-themes/breeze_dark/cmd/32/linenumberingdialog.png|binary icon-themes/breeze_dark/cmd/ar/lc_linenumberingdialog.png |binary icon-themes/breeze_dark/cmd/ar/sc_showsinglepage.png |binary icon-themes/breeze_dark/cmd/lc_linenumberingdialog.png|binary icon-themes/breeze_dark/cmd/sc_showsinglepage.png |binary icon-themes/breeze_dark/links.txt |5 icon-themes/breeze_dark_svg/cmd/32/ar/linenumberingdialog.svg |2 icon-themes/breeze_dark_svg/cmd/32/linenumberingdialog.svg|2 icon-themes/breeze_dark_svg/cmd/ar/lc_linenumberingdialog.svg |2 icon-themes/breeze_dark_svg/cmd/ar/sc_showsinglepage.svg |1 icon-themes/breeze_dark_svg/cmd/lc_linenumberingdialog.svg|2 icon-themes/breeze_dark_svg/cmd/sc_showsinglepage.svg |2 icon-themes/breeze_svg/cmd/32/ar/linenumberingdialog.svg |2 icon-themes/breeze_svg/cmd/32/linenumberingdialog.svg |2 icon-themes/breeze_svg/cmd/ar/lc_linenumberingdialog.svg |2 icon-themes/breeze_svg/cmd/ar/sc_showsinglepage.svg |1 icon-themes/breeze_svg/cmd/lc_linenumberingdialog.svg |2 icon-themes/breeze_svg/cmd/sc_showsinglepage.svg |2 icon-themes/colibre/cmd/32/ar/linenumberingdialog.png |binary icon-themes/colibre/cmd/32/linenumberingdialog.png|binary icon-themes/colibre/cmd/ar/lc_linenumberingdialog.png |binary icon-themes/colibre/cmd/ar/sc_linenumberdialog.png|binary icon-themes/colibre/cmd/lc_linenumberingdialog.png|binary icon-themes/colibre/cmd/sc_linenumberdialog.png |binary icon-themes/colibre_svg/cmd/32/ar/linenumberingdialog.svg |2 icon-themes/colibre_svg/cmd/32/linenumberingdialog.svg|2 icon-themes/colibre_svg/cmd/ar/lc_linenumberingdialog.svg |2 icon-themes/colibre_svg/cmd/ar/sc_linenumberdialog.svg|2 icon-themes/colibre_svg/cmd/lc_linenumberingdialog.svg|2 icon-themes/colibre_svg/cmd/sc_linenumberdialog.svg |2 icon-themes/elementary/cmd/32/ar/linenumberingdialog.png |binary icon-themes/elementary/cmd/32/linenumberingdialog.png |binary icon-themes/elementary/cmd/ar/lc_linenumberingdialog.png |binary icon-themes/elementary/cmd/ar/sc_linenumberingdialog.png |binary icon-themes/elementary/cmd/lc_linenumberingdialog.png |binary icon-themes/elementary/cmd/sc_linenumberingdialog.png |binary icon-themes/elementary_svg/cmd/32/ar/linenumberingdialog.svg |2 icon-themes/elementary_svg/cmd/32/linenumberingdialog.svg |2 icon-themes/elementary_svg/cmd/ar/lc_linenumberingdialog.svg |2 icon-themes/elementary_svg/cmd/ar/sc_linenumberingdialog.svg |2 icon-themes/elementary_svg/cmd/lc_linenumberingdialog.svg |2 icon-themes/elementary_svg/cmd/sc_linenumberingdialog.svg |2 icon-themes/sukapura/cmd/32/ar/linenumberingdialog.png|binary icon-themes/sukapura/cmd/32/linenumberingdialog.png |binary icon-themes/sukapura/cmd/ar/lc_linenumberingdialog.png|binary icon-themes/sukapura/cmd/ar/sc_linenumberingdialog.png|binary icon-themes/sukapura/cmd/lc_linenumberingdialog.png |binary icon-themes/sukapura/cmd/sc_linenumberingdialog.png |binary icon-themes/sukapura/fpicker/res/fp015.png|binary icon-themes/sukapura_svg/cmd/32/ar/linenumberingdialog.svg|2 icon-themes/sukapura_svg/cmd/32/linenumberingdialog.svg |2 icon-themes/sukapura_svg/cmd/ar/lc_linenumberingdialog.svg|2 icon-themes/sukapura_svg/cmd/ar/sc_linenumberingdialog.svg|2 icon-themes/sukapura_svg/cmd/lc_linenumberingdialog.svg |2 icon-themes/sukapura_svg/cmd/sc_linenumberingdialog.svg |2 icon-themes/sukapura_svg/fpicker/res/fp015.svg| 87 -- 64 files changed, 39 insertions(+), 116 deletions(-) New commits: commit a54fae002b3be54877b25aefe9f8bbecfd68b088 Author: Rizal Muttaqin AuthorDate: Tue Aug 18 18:43:38 2020 +0700 Commit: Rizal Muttaqin CommitDate: Tue Aug 18 17:49:05 2020 +0200 Update Line Numbering icons Change-Id: Ib0f4595b7a9fe3f60e272bdd998609f510af03db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100809 Tested-by: Jenkins R
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/headless vcl/inc
vcl/headless/svpinst.cxx | 23 ++-
vcl/inc/headless/svpinst.hxx |2 ++
2 files changed, 20 insertions(+), 5 deletions(-)
New commits:
commit 985922fe1a5dfd9ce02f7d24c4083d9d69544951
Author: Michael Meeks
AuthorDate: Mon Aug 17 19:57:58 2020 +0100
Commit: Miklos Vajna
CommitDate: Tue Aug 18 18:07:29 2020 +0200
headless: don't allow the system to set subpixel rendering eg.
Change-Id: Id62c03938c88d70dabda6111b8a7cca3b175e31f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100875
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 3b921af90c26..6ff536926829 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -44,11 +44,12 @@
#include
#include
#ifdef IOS
-#include
-#include
-#include
+# include
+# include
+# include
#else
-#include
+# include
+# include
#endif
#include
@@ -267,6 +268,19 @@ cairo_surface_t* get_underlying_cairo_surface(const
VirtualDevice& rDevice)
return
static_cast(rDevice.mpVirDev.get())->GetSurface();
}
+const cairo_font_options_t* SvpSalInstance::GetCairoFontOptions()
+{
+static cairo_font_options_t *gOptions = nullptr;
+#ifndef IOS
+if (!gOptions)
+{
+gOptions = cairo_font_options_create();
+cairo_font_options_set_antialias(gOptions, CAIRO_ANTIALIAS_GRAY);
+}
+#endif
+return gOptions;
+}
+
#endif
SalTimer* SvpSalInstance::CreateSalTimer()
@@ -604,7 +618,6 @@ OpenGLContext* SvpSalInstance::CreateOpenGLContext()
return nullptr;
}
-
#endif
SvpSalTimer::~SvpSalTimer()
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index 04e4de84cad7..a9d630a735ee 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -177,6 +177,8 @@ public:
virtual voidAddToRecentDocumentList(const OUString& rFileUrl,
const OUString& rMimeType, const OUString& rDocumentService) override;
virtual std::unique_ptr CreatePrintGraphics() override;
+
+virtual const cairo_font_options_t* GetCairoFontOptions() override;
};
inline void SvpSalInstance::registerFrame( SalFrame* pFrame )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sfx2/source sw/source
sfx2/source/inet/inettbc.cxx| 10 ---
sw/source/uibase/dbui/dbmgr.cxx | 109 +---
2 files changed, 15 insertions(+), 104 deletions(-)
New commits:
commit 64aa52d85fccaa9154c4fcb1686cc8a047ae4e2a
Author: Noel Grandin
AuthorDate: Tue Aug 18 15:56:50 2020 +0200
Commit: Noel Grandin
CommitDate: Tue Aug 18 18:17:19 2020 +0200
remove dead code
since
commit 5be98eba1fddb559194066c511b53412009c2d5d
Date: Thu Mar 27 10:29:38 2003 +
MWS_SRX644: migrate branch mws_srx644 -> HEAD
found by loplugin:unusedvarsglobal
Change-Id: I0184e9157caaa7d7d9d58ff20fb8d9293ab0d604
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100925
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index 17dd5de0b61c..822374bc1cc3 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -120,7 +120,6 @@ SvtURLBox* SfxURLToolBoxControl_Impl::GetURLBox() const
void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName ) const
{
OUString aName;
-OUString aFilter;
INetURLObject aObj( rName );
if ( aObj.GetProtocol() == INetProtocol::NotValid )
@@ -151,15 +150,6 @@ void SfxURLToolBoxControl_Impl::OpenURL( const OUString&
rName ) const
aArgs[1].Name = "FileName";
aArgs[1].Value <<= aName;
-if ( !aFilter.isEmpty() )
-{
-aArgs.realloc( 4 );
-aArgs[2].Name = "FilterOptions";
-aArgs[2].Value <<= OUString();
-aArgs[3].Name = "FilterName";
-aArgs[3].Value <<= aFilter;
-}
-
SfxURLToolBoxControl_Impl::ExecuteInfo* pExecuteInfo = new
SfxURLToolBoxControl_Impl::ExecuteInfo;
pExecuteInfo->xDispatch = xDispatch;
pExecuteInfo->aTargetURL= aTargetURL;
commit b138878a934be25183f4d2b3da437cc0035eb8b6
Author: Noel Grandin
AuthorDate: Tue Aug 18 09:19:12 2020 +0200
Commit: Noel Grandin
CommitDate: Tue Aug 18 18:17:10 2020 +0200
remove dead code in SwDBManager::ImportDBEntry
Found by loplugin:unusedvarsglobal
I traced this back to
commit 751a98ff97ba8e61d31e8d109c64f2172a820229
Date: Thu Sep 27 10:31:02 2007 +
INTEGRATION: CWS swwarnings (1.114.42); FILE MERGED
where the code looked like
uno::Reference xCols = xColsSupp->getColumns();
String sFormatStr( lcl_GetDBInsertMode( *pImpl->pMergeData ));
but lcl_GetDBInsertMode looked like
inline String lcl_GetDBInsertMode( const SwDBData& rData )
{
return aEmptyStr;
}
So I guess this is a remnant of some unimplemented feature
Change-Id: Ic058d8703d60c9829099daba4fed32c16a6e1589
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100894
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 7b6cc8578016..cf1150f72a55 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -125,11 +125,6 @@
using namespace ::com::sun::star;
using namespace sw;
-#define DB_SEP_SPACE0
-#define DB_SEP_TAB 1
-#define DB_SEP_RETURN 2
-#define DB_SEP_NEWLINE 3
-
namespace {
void lcl_emitEvent(SfxEventHintId nEventId, sal_Int32 nStrId, SfxObjectShell*
pDocShell)
@@ -595,37 +590,6 @@ void SwDBManager::ImportFromConnection( SwWrtShell* pSh )
pSh->EndAllAction();
}
-static OUString lcl_FindColumn(const OUString& sFormatStr,sal_uInt16
&nUsedPos, sal_uInt8 &nSeparator)
-{
-OUStringBuffer sReturn;
-sal_uInt16 nLen = sFormatStr.getLength();
-nSeparator = 0xff;
-while(nUsedPos < nLen && nSeparator == 0xff)
-{
-sal_Unicode cCurrent = sFormatStr[nUsedPos];
-switch(cCurrent)
-{
-case ',':
-nSeparator = DB_SEP_SPACE;
-break;
-case ';':
-nSeparator = DB_SEP_RETURN;
-break;
-case ':':
-nSeparator = DB_SEP_TAB;
-break;
-case '#':
-nSeparator = DB_SEP_NEWLINE;
-break;
-default:
-sReturn.append(cCurrent);
-}
-nUsedPos++;
-
-}
-return sReturn.makeStringAndClear();
-}
-
void SwDBManager::ImportDBEntry(SwWrtShell* pSh)
{
if(!m_pImpl->pMergeData || m_pImpl->pMergeData->bEndOfDB)
@@ -633,65 +597,22 @@ void SwDBManager::ImportDBEntry(SwWrtShell* pSh)
uno::Reference< sdbcx::XColumnsSupplier > xColsSupp(
m_pImpl->pMergeData->xResultSet, uno::UNO_QUERY );
uno::Reference xCols = xColsSupp->getColumns();
-OUString sFormatStr;
-sal_uInt16 nFormatLen = sFormatStr.getLength();
-if( nFormatLen )
-{
-const char cSpace = ' ';
-const char cTab = '\t';
-sal_uInt16 nUsedPos = 0;
-sal_uInt8 nSeparator;
-OUString sColumn = lcl_FindColumn(sFo
[Libreoffice-commits] core.git: sdext/source
sdext/source/minimizer/optimizerdialogcontrols.cxx | 45 -
1 file changed, 10 insertions(+), 35 deletions(-)
New commits:
commit 73f9d308337ce54d724f46e96e6505c45f445f26
Author: Noel Grandin
AuthorDate: Tue Aug 18 16:01:19 2020 +0200
Commit: Noel Grandin
CommitDate: Tue Aug 18 18:17:35 2020 +0200
remove dead code
since
commit e22c431e24b4a83ddc928f7703b13a9a109c1b8e
Date: Fri May 11 13:01:25 2007 +
initial version
found by loplugin:unusedvarsglobal
Change-Id: I7ae07c25fadc4cac4c176c763fe886c0df02a235
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100926
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx
b/sdext/source/minimizer/optimizerdialogcontrols.cxx
index 5c6ad0dd4cb4..a7e139c33f24 100644
--- a/sdext/source/minimizer/optimizerdialogcontrols.cxx
+++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx
@@ -638,7 +638,6 @@ void OptimizerDialog::UpdateControlStatesPage4()
// taking care of deleted slides
sal_Int32 nDeletedSlides = 0;
-OUString aCustomShowName;
if ( getControlProperty( "CheckBox3Pg3", "State" ) >>= nInt16 )
{
if ( nInt16 )
@@ -661,44 +660,20 @@ void OptimizerDialog::UpdateControlStatesPage4()
}
}
}
-if ( !aCustomShowName.isEmpty() )
-{
-std::vector< Reference< XDrawPage > > vNonUsedPageList;
-PageCollector::CollectNonCustomShowPages( mxController->getModel(),
aCustomShowName, vNonUsedPageList );
-nDeletedSlides += vNonUsedPageList.size();
-}
if ( GetConfigProperty( TK_DeleteHiddenSlides, false ) )
{
-if ( !aCustomShowName.isEmpty() )
-{
-std::vector< Reference< XDrawPage > > vUsedPageList;
-PageCollector::CollectCustomShowPages( mxController->getModel(),
aCustomShowName, vUsedPageList );
-for( const auto& rxPage : vUsedPageList )
-{
-Reference< XPropertySet > xPropSet( rxPage, UNO_QUERY_THROW );
-bool bVisible = true;
-if ( xPropSet->getPropertyValue( "Visible" ) >>= bVisible )
-{
-if (!bVisible )
-nDeletedSlides++;
-}
-}
-}
-else
+Reference< XDrawPagesSupplier > xDrawPagesSupplier(
mxController->getModel(), UNO_QUERY_THROW );
+Reference< XDrawPages > xDrawPages(
xDrawPagesSupplier->getDrawPages(), UNO_SET_THROW );
+for( sal_Int32 i = 0; i < xDrawPages->getCount(); i++ )
{
-Reference< XDrawPagesSupplier > xDrawPagesSupplier(
mxController->getModel(), UNO_QUERY_THROW );
-Reference< XDrawPages > xDrawPages(
xDrawPagesSupplier->getDrawPages(), UNO_SET_THROW );
-for( sal_Int32 i = 0; i < xDrawPages->getCount(); i++ )
-{
-Reference< XDrawPage > xDrawPage( xDrawPages->getByIndex( i ),
UNO_QUERY_THROW );
-Reference< XPropertySet > xPropSet( xDrawPage, UNO_QUERY_THROW
);
+Reference< XDrawPage > xDrawPage( xDrawPages->getByIndex( i ),
UNO_QUERY_THROW );
+Reference< XPropertySet > xPropSet( xDrawPage, UNO_QUERY_THROW );
-bool bVisible = true;
-if ( xPropSet->getPropertyValue( "Visible" ) >>= bVisible )
-{
-if (!bVisible )
-nDeletedSlides++;
-}
+bool bVisible = true;
+if ( xPropSet->getPropertyValue( "Visible" ) >>= bVisible )
+{
+if (!bVisible )
+nDeletedSlides++;
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - oox/source
oox/source/ppt/pptshape.cxx | 13 +
1 file changed, 13 insertions(+)
New commits:
commit 103eb18195f370bd654fa5333147923b1a0958f8
Author: Gülşah Köse
AuthorDate: Sat Aug 8 00:34:37 2020 +0300
Commit: Gülşah Köse
CommitDate: Tue Aug 18 19:00:37 2020 +0200
tdf#133015 Inherit numCol from placeholder.
Change-Id: I402a40be7e8899ca017996f2bf77a2fb884b9462
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100372
Tested-by: Jenkins
Reviewed-by: Gülşah Köse
(cherry picked from commit 33696b2820ce3c8b21b753d2c2bf92345ecb9276)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100356
Tested-by: Jenkins CollaboraOffice
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index eaad8c40c095..88277219d0b0 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -231,6 +231,19 @@ void PPTShape::addShape(
{
if (TextBodyPtr pTextBody = getTextBody())
{
+// If slide shape has not numCol but placeholder has we should
inherit from placeholder.
+if (pTextBody->getTextProperties().mnNumCol == 1 &&
+mnSubType &&
+getSubTypeIndex().has() &&
+rSlidePersist.getMasterPersist())
+{
+oox::drawingml::ShapePtr pPlaceholder =
PPTShape::findPlaceholderByIndex(
+
getSubTypeIndex().get(),
+
rSlidePersist.getMasterPersist()->getShapes()->getChildren());
+if (pPlaceholder && pPlaceholder->getTableProperties())
+pTextBody->getTextProperties().mnNumCol =
pPlaceholder->getTableProperties()->getTableGrid().size();
+}
+
sal_Int32 nNumCol = pTextBody->getTextProperties().mnNumCol;
if (nNumCol > 1)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/qa chart2/source offapi/com oox/source
chart2/qa/extras/chart2export.cxx |2 +-
chart2/source/model/main/DataSeriesProperties.cxx |7 +++
chart2/source/model/main/DataSeriesProperties.hxx |3 ++-
chart2/source/view/charttypes/VSeriesPlotter.cxx |3 ++-
offapi/com/sun/star/chart2/DataSeries.idl |7 +++
oox/source/drawingml/chart/seriescontext.cxx |6 +-
oox/source/drawingml/chart/seriesconverter.cxx|2 +-
oox/source/export/chartexport.cxx |6 --
oox/source/token/properties.txt |2 +-
9 files changed, 30 insertions(+), 8 deletions(-)
New commits:
commit 5d67d70b26706ce8a08612c12a68821f984210a2
Author: Balazs Varga
AuthorDate: Wed Jul 8 11:06:38 2020 +0200
Commit: László Németh
CommitDate: Tue Aug 18 19:01:21 2020 +0200
tdf#134563 Add UNO API for custom leader lines
If its ShowCustomLeaderLines=true, data series uses leader
lines for labels with custom alignment.
Add also OOXML import/export of custom data series setting.
Change-Id: I8e6f7cb457c38b84aa40c917e69704862262a96e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98323
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index f9b2651a922c..754768880054 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -2373,7 +2373,7 @@ void Chart2ExportTest::testLeaderLines()
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open
XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc,
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[1]/c:dLbls/c:extLst/c:ext/c15:showLeaderLines",
"val", "1");
-assertXPath(pXmlDoc,
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[2]/c:dLbls/c:extLst/c:ext/c15:showLeaderLines",
"val", "1");
+assertXPath(pXmlDoc,
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[2]/c:dLbls/c:extLst/c:ext/c15:showLeaderLines",
"val", "0");
}
void Chart2ExportTest::testNumberFormatExportPPTX()
diff --git a/chart2/source/model/main/DataSeriesProperties.cxx
b/chart2/source/model/main/DataSeriesProperties.cxx
index 5d0cb777e151..d85d264753c1 100644
--- a/chart2/source/model/main/DataSeriesProperties.cxx
+++ b/chart2/source/model/main/DataSeriesProperties.cxx
@@ -69,6 +69,12 @@ void DataSeriesProperties::AddPropertiesToVector(
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID );
+rOutProperties.emplace_back( "ShowCustomLeaderLines",
+ PROP_DATASERIES_SHOW_CUSTOM_LEADERLINES,
+ cppu::UnoType::get(),
+ beans::PropertyAttribute::BOUND
+ | beans::PropertyAttribute::MAYBEDEFAULT );
+
// add properties of service DataPointProperties
DataPointProperties::AddPropertiesToVector( rOutProperties );
}
@@ -80,6 +86,7 @@ void DataSeriesProperties::AddDefaultsToMap(
PropertyHelper::setPropertyValueDefault( rOutMap,
PROP_DATASERIES_VARY_COLORS_BY_POINT, false );
PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap,
PROP_DATASERIES_ATTACHED_AXIS_INDEX, 0 );
PropertyHelper::setPropertyValueDefault( rOutMap,
PROP_DATASERIES_SHOW_LEGEND_ENTRY, true );
+PropertyHelper::setPropertyValueDefault( rOutMap,
PROP_DATASERIES_SHOW_CUSTOM_LEADERLINES, true );
// PROP_DATASERIES_ATTRIBUTED_DATA_POINTS has no default
diff --git a/chart2/source/model/main/DataSeriesProperties.hxx
b/chart2/source/model/main/DataSeriesProperties.hxx
index e20602baf45f..6bc058201466 100644
--- a/chart2/source/model/main/DataSeriesProperties.hxx
+++ b/chart2/source/model/main/DataSeriesProperties.hxx
@@ -35,7 +35,8 @@ namespace chart::DataSeriesProperties
PROP_DATASERIES_VARY_COLORS_BY_POINT,
PROP_DATASERIES_ATTACHED_AXIS_INDEX,
PROP_DATASERIES_SHOW_LEGEND_ENTRY,
-PROP_DATASERIES_DELETED_LEGEND_ENTRIES
+PROP_DATASERIES_DELETED_LEGEND_ENTRIES,
+PROP_DATASERIES_SHOW_CUSTOM_LEADERLINES
};
void AddPropertiesToVector(
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 14b322e8f587..8f7dcbb59a1d 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -702,7 +702,8 @@ uno::Reference< drawing::XShape >
VSeriesPlotter::createDataLabel( const uno::Re
if( aRelPos.X != -1 )
{
xTextShape->setPosition(aRelPos);
-if(
!m_xChartTypeModel->getChartType().equalsIgnoreAsciiCase(CHART2_SERVICE_NAME_CHARTTYPE_PIE)
)
+if(
!m_xChartTypeModel->getChartType().equalsIgnoreAsciiCase(CHART2_SERVICE_NAME_CHARTTYPE_PIE)
&&
+rDataSeries.getPropertiesOfSeries()->getPropertyValue(
"ShowCustomLeaderLines" ).get())
{
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - external/nss
external/nss/UnpackedTarball_nss.mk |1 + external/nss/nss-bz1646594.patch.1 | 15 +++ 2 files changed, 16 insertions(+) New commits: commit 01243e85c0796e8049db3b4365b53c7306886851 Author: Michael Stahl AuthorDate: Tue Aug 18 14:36:33 2020 +0200 Commit: Thorsten Behrens CommitDate: Tue Aug 18 19:40:38 2020 +0200 nss: fix Android build Change-Id: I8d6704a00ee70c1cb397f8f12dac8050f24f44be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100917 Tested-by: Michael Stahl Reviewed-by: Michael Stahl (cherry picked from commit c7d1bb119d88faaafb53d65ad8907ede97d89c8c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100931 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index 1cad5852fa89..8fa1edd530cc 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -22,6 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/nss.vs2015.patch \ external/nss/nss.vs2015.pdb.patch \ external/nss/nss.bzmozilla1238154.patch \ + external/nss/nss-bz1646594.patch.1 \ external/nss/macos-dlopen.patch.0 \ $(if $(filter iOS,$(OS)), \ external/nss/nss-ios.patch) \ diff --git a/external/nss/nss-bz1646594.patch.1 b/external/nss/nss-bz1646594.patch.1 new file mode 100644 index ..e6c75922a7dc --- /dev/null +++ b/external/nss/nss-bz1646594.patch.1 @@ -0,0 +1,15 @@ +regression from https://bugzilla.mozilla.org/show_bug.cgi?id=1646594 + +--- nss/nss/coreconf/arch.mk.orig2 2020-08-18 14:33:21.295252404 +0200 nss/nss/coreconf/arch.mk 2020-08-18 14:33:46.360320806 +0200 +@@ -116,8 +116,10 @@ + OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE)) + endif + KERNEL = Linux ++ifneq ($(OS_TARGET),Android) + include $(CORE_DEPTH)/coreconf/Linux.mk + endif ++endif + + # Since all uses of OS_ARCH that follow affect only userland, we can + # merge other Glibc systems with Linux here. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - external/nss
external/nss/UnpackedTarball_nss.mk |1 + external/nss/nss-bz1646594.patch.1 | 15 +++ 2 files changed, 16 insertions(+) New commits: commit 4a63149950f8a69245a61195ba7006a4921776b9 Author: Michael Stahl AuthorDate: Tue Aug 18 14:36:33 2020 +0200 Commit: Thorsten Behrens CommitDate: Tue Aug 18 19:40:29 2020 +0200 nss: fix Android build Change-Id: I8d6704a00ee70c1cb397f8f12dac8050f24f44be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100917 Tested-by: Michael Stahl Reviewed-by: Michael Stahl (cherry picked from commit c7d1bb119d88faaafb53d65ad8907ede97d89c8c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100930 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index 1cad5852fa89..8fa1edd530cc 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -22,6 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/nss.vs2015.patch \ external/nss/nss.vs2015.pdb.patch \ external/nss/nss.bzmozilla1238154.patch \ + external/nss/nss-bz1646594.patch.1 \ external/nss/macos-dlopen.patch.0 \ $(if $(filter iOS,$(OS)), \ external/nss/nss-ios.patch) \ diff --git a/external/nss/nss-bz1646594.patch.1 b/external/nss/nss-bz1646594.patch.1 new file mode 100644 index ..e6c75922a7dc --- /dev/null +++ b/external/nss/nss-bz1646594.patch.1 @@ -0,0 +1,15 @@ +regression from https://bugzilla.mozilla.org/show_bug.cgi?id=1646594 + +--- nss/nss/coreconf/arch.mk.orig2 2020-08-18 14:33:21.295252404 +0200 nss/nss/coreconf/arch.mk 2020-08-18 14:33:46.360320806 +0200 +@@ -116,8 +116,10 @@ + OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE)) + endif + KERNEL = Linux ++ifneq ($(OS_TARGET),Android) + include $(CORE_DEPTH)/coreconf/Linux.mk + endif ++endif + + # Since all uses of OS_ARCH that follow affect only userland, we can + # merge other Glibc systems with Linux here. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Physics Based Animation Effects - Week 11 Report
Hello everyone, Sorry for the delay, just published my report on status of the project at: https://quwex.com/gsoc20-week11/ There are some example animation effect presets in there - so I'd appreciate it if you could give them a look and let me know what you think :) Best regards, Sarper ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] help.git: help3xsl/online_transform.xsl
help3xsl/online_transform.xsl | 131 +++--- 1 file changed, 85 insertions(+), 46 deletions(-) New commits: commit e533cf2da5ca5ee26b8bd9fd5eed002509309970 Author: Olivier Hallot AuthorDate: Mon Aug 17 09:30:39 2020 -0300 Commit: Olivier Hallot CommitDate: Tue Aug 18 19:45:34 2020 +0200 Improve schema.org for online Help Changed to schema.org/SoftwareApplication Change-Id: Ib5457aaf237153de18a100b9604bfe7ef29dd292 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100862 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index 21d37d1b4..c6e2ee1bb 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -157,14 +157,8 @@ -http://schema.org/TechArticle";> - - - - - - - + + @@ -213,7 +207,22 @@ - +http://schema.org/SoftwareApplication";> + + + + + + + + + + + + +https://www.libreoffice.org/download/license/"/> + + @@ -237,7 +246,12 @@ -https://www.libreoffice.org/imprint"; target="_blank">Impressum (Legal Info) | https://www.libreoffice.org/privacy"; target="_blank">Privacy Policy | https://www.documentfoundation.org/statutes.pdf"; target="_blank">Statutes (non-binding English translation) - https://www.documentfoundation.org/satzung.pdf"; target="_blank">Satzung (binding German version) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the https://www.libreoffice.org/download/license/"; target="_blank">Mozilla Public License v2.0. “LibreOffice” and “The Document Foundation” are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our https://wiki.documentfoundation.org/TradeMark_Policy"; target="_blank">trademark policy. LibreOffice was based on OpenOffice.org. +http://schema.org/Organization";> + + + +https://www.libreoffice.org/imprint"/> +https://www.libreoffice.org/imprint"; target="_blank">Impressum (Legal Info) | https://www.libreoffice.org/privacy"; target="_blank">Privacy Policy | https://www.documentfoundation.org/statutes.pdf"; target="_blank">Statutes (non-binding English translation) - https://www.documentfoundation.org/satzung.pdf"; target="_blank">Satzung (binding German version) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the https://www.libreoffice.org/download/license/"; target="_blank">Mozilla Public License v2.0. “LibreOffice” and “The Document Foundation” are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our https://wiki.documentfoundation.org/TradeMark_Policy"; tar get="_blank">trademark policy. LibreOffice was based on OpenOffice.org. Help content debug info: @@ -416,49 +430,24 @@ - + - - - - - - - - - - - - - + - - - - - - - - - - - - - + - + - - + @@ -756,12 +745,14 @@ - + + - + + @@ -879,6 +870,41 @@ + + + + +http://schema.org/HowToStep";> + + + + +http://schema.org/ItemListUnordered";> + + + + + + + + + + +http://schema.org/HowToSection";> + + + + + + + +http://schema.org/ItemList";> + + + + + + @@ -1001,9 +1027,6 @@ - -articleSection - @@ -1156,6 +1179,22 @@ + + + + + +
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit aba1c1700ecf6160bf0dd0e16cc86b73123e6de6 Author: Olivier Hallot AuthorDate: Tue Aug 18 14:45:34 2020 -0300 Commit: Gerrit Code Review CommitDate: Tue Aug 18 19:45:34 2020 +0200 Update git submodules * Update helpcontent2 from branch 'master' to e533cf2da5ca5ee26b8bd9fd5eed002509309970 - Improve schema.org for online Help Changed to schema.org/SoftwareApplication Change-Id: Ib5457aaf237153de18a100b9604bfe7ef29dd292 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100862 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 94dcf7ef3fdb..e533cf2da5ca 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 94dcf7ef3fdb4f4722d2cc3d3d8a5713bf45d7b3 +Subproject commit e533cf2da5ca5ee26b8bd9fd5eed002509309970 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - vcl/source
vcl/source/gdi/impgraph.cxx | 16 1 file changed, 12 insertions(+), 4 deletions(-) New commits: commit a36b071fa5eb7e21de622648e4c23ca6af9dc87b Author: Tomaž Vajngerl AuthorDate: Tue Aug 18 19:50:25 2020 +0200 Commit: Tomaž Vajngerl CommitDate: Tue Aug 18 19:50:25 2020 +0200 ImpGraphic::swapOutContent: remove chaning when writing to stream Change-Id: I6f4428e0054c4697f7a15e2f318dc114d38dade0 diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index a6650201ade0..8000bf178c9d 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -1173,12 +1173,20 @@ bool ImpGraphic::swapInContent(SvStream& rStream) sal_Int32 nMapMode, nScaleNumX, nScaleDenomX; sal_Int32 nScaleNumY, nScaleDenomY, nOffsX, nOffsY; -rStream.SeekRel( -4 ); +rStream.SeekRel(-4); sal_Int32 nLen; -rStream.ReadInt32( nType ).ReadInt32( nLen ).ReadInt32( nWidth ).ReadInt32( nHeight ); -rStream.ReadInt32( nMapMode ).ReadInt32( nScaleNumX ).ReadInt32( nScaleDenomX ).ReadInt32( nScaleNumY ); -rStream.ReadInt32( nScaleDenomY ).ReadInt32( nOffsX ).ReadInt32( nOffsY ); +rStream.ReadInt32(nType); +rStream.ReadInt32(nLen); +rStream.ReadInt32(nWidth); +rStream.ReadInt32(nHeight); +rStream.ReadInt32(nMapMode); +rStream.ReadInt32(nScaleNumX); +rStream.ReadInt32(nScaleDenomX); +rStream.ReadInt32(nScaleNumY); +rStream.ReadInt32(nScaleDenomY); +rStream.ReadInt32(nOffsX); +rStream.ReadInt32(nOffsY); // swapped if( nType > 100 ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.LokDialog.js | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 46e996c76f8f03b4ff8c55f15a3375a1d76fae48
Author: gokaysatir
AuthorDate: Thu Aug 13 20:37:32 2020 +0300
Commit: Henry Castro
CommitDate: Tue Aug 18 19:52:41 2020 +0200
loleaflet: Make sure lokchild window is not rendered off screen.
Change-Id: Ib1d8c045750aeb653d8b1d1e962711e5da1705fe
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100683
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/src/control/Control.LokDialog.js
b/loleaflet/src/control/Control.LokDialog.js
index 40e422e02..e9440b15f 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -1562,6 +1562,14 @@ L.Control.LokDialog = L.Control.extend({
var newLeft = window.innerWidth - width - 20;
L.DomUtil.setStyle(canvas, 'left', newLeft + 'px');
}
+ // Also, make sure child is not trimmed on bottom.
+ var top = parseInt(canvas.style.top);
+ var height = this._dialogs[parentId].childheight;
+ var bottomPos = top + height;
+ if (bottomPos > window.innerHeight) {
+ var newTop = top - height - 20;
+ L.DomUtil.setStyle(canvas, 'top', newTop + 'px');
+ }
// The image is rendered per the HiDPI scale we used
// while requesting rendering the image. Here we
@@ -1674,7 +1682,7 @@ L.Control.LokDialog = L.Control.extend({
var grandParentID = dialogContainer.parentNode.id;
if (grandParentID.includes('sidebar-panel'))
{
- // This is a sidebar.
+ // floatingCanvas is a child window of a sidebar.
L.DomUtil.setStyle(floatingCanvas, 'left',
(containerLeft + left) + 'px');
L.DomUtil.setStyle(floatingCanvas, 'top', (containerTop
+ top) + 'px');
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Enabling Calc macro recording
All, In Calc, I notice the option to enable macro recording at Tools > Options > LibreOffice > Advanced is entitled "Enable macro recording (may be limited)". Can anybody advise what to "(may be limited)" caveat refers to? Regards, Steve Fanning ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/toolkit
include/toolkit/awt/vclxwindows.hxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 12bb15fce78dc27fe046cecf6984c4f45b364e51 Author: Andrea Gelmini AuthorDate: Tue Aug 18 14:44:10 2020 +0200 Commit: Julien Nabet CommitDate: Tue Aug 18 20:03:21 2020 +0200 Removed duplicated includes Change-Id: I61861d87449f83cb3a1efe8a2cf0345864c2f1db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100918 Reviewed-by: Julien Nabet Tested-by: Jenkins diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx index ba13cd2f7da1..492df058e3e6 100644 --- a/include/toolkit/awt/vclxwindows.hxx +++ b/include/toolkit/awt/vclxwindows.hxx @@ -48,8 +48,6 @@ #include #include #include -#include -#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/gla11y
bin/gla11y |1 - 1 file changed, 1 deletion(-) New commits: commit f7e38a073cb1c92b503735b1da94d7be45926727 Author: Andrea Gelmini AuthorDate: Tue Aug 18 15:02:39 2020 +0200 Commit: Julien Nabet CommitDate: Tue Aug 18 20:02:41 2020 +0200 Fix typo in code Change-Id: I7a9b2dccc118395494cf39cfa64867c09a358c31 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100869 Reviewed-by: Julien Nabet Tested-by: Jenkins diff --git a/bin/gla11y b/bin/gla11y index 01c339696cf1..7883a6233199 100755 --- a/bin/gla11y +++ b/bin/gla11y @@ -90,7 +90,6 @@ widgets_ignored = widgets_toplevel + [ 'GtkSearchBar', 'GtkHeaderBar', 'GtkStack', -'GtkStackSwticher', 'GtkPopover', 'GtkPopoverMenu', 'GtkActionBar', ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bridges/source dbaccess/source drawinglayer/source
bridges/source/cpp_uno/gcc3_linux_mips64/call.s|2 +-
dbaccess/source/ui/browser/genericcontroller.cxx |4 ++--
dbaccess/source/ui/browser/unodatbr.cxx|4 ++--
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit d44a5250a4996bcfb2c66b8510f8a01a5888dd9f
Author: Andrea Gelmini
AuthorDate: Tue Aug 18 14:58:32 2020 +0200
Commit: Julien Nabet
CommitDate: Tue Aug 18 20:05:00 2020 +0200
Fix typos
Change-Id: I9d55e4478d8cf3047b4ccac88e06fdc87e68e6ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100871
Reviewed-by: Julien Nabet
Tested-by: Jenkins
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips64/call.s
b/bridges/source/cpp_uno/gcc3_linux_mips64/call.s
index 8f73a0557eb1..eb83eef46365 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips64/call.s
+++ b/bridges/source/cpp_uno/gcc3_linux_mips64/call.s
@@ -49,7 +49,7 @@ privateSnippetExecutor:
sd $a5,56($sp)
sd $a6,64($sp)
sd $a7,72($sp)
-// Load arguemtns
+// Load arguments
// a0=index
move $a0,$v0
// a1=offset
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx
b/dbaccess/source/ui/browser/genericcontroller.cxx
index a53ade551795..4c12a3ae7b51 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -872,7 +872,7 @@ sal_Bool SAL_CALL
OGenericUnoController::supportsService(const OUString& Service
void OGenericUnoController::startConnectionListening(const Reference<
XConnection >& _rxConnection)
{
-// we have to remove ourself before dispoing the connection
+// we have to remove ourself before disposing the connection
Reference< XComponent > xComponent(_rxConnection, UNO_QUERY);
if (xComponent.is())
xComponent->addEventListener(static_cast(this));
@@ -880,7 +880,7 @@ void OGenericUnoController::startConnectionListening(const
Reference< XConnectio
void OGenericUnoController::stopConnectionListening(const Reference<
XConnection >& _rxConnection)
{
-// we have to remove ourself before dispoing the connection
+// we have to remove ourself before disposing the connection
Reference< XComponent > xComponent(_rxConnection, UNO_QUERY);
if (xComponent.is())
xComponent->removeEventListener(static_cast(this));
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx
b/dbaccess/source/ui/browser/unodatbr.cxx
index 2d448bbcf1a0..46ea151072a4 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -240,7 +240,7 @@ void SAL_CALL SbaTableQueryBrowser::disposing()
if (getBrowserView())
{
-// Need to do some cleaup of the data pointed to the tree view entries
before we remove the treeview
+// Need to do some cleanup of the data pointed to the tree view
entries before we remove the treeview
clearTreeModel();
m_pTreeView = nullptr;
getBrowserView()->setTreeView(nullptr);
@@ -3389,7 +3389,7 @@ int SbaTableQueryBrowser::OnTreeEntryCompare(const
weld::TreeIter& rLHS, const w
// we want the table entry and the end so we have to do a check
if (isContainer(rRHS))
{
-// don't use getEntryType (directly or indirecly) for the LHS:
+// don't use getEntryType (directly or indirectly) for the LHS:
// LHS is currently being inserted, so it is not "completely valid" at
the moment
const EntryType eRight = getEntryType(rRHS);
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 73fb76012889..d20efe5eb01f 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -681,7 +681,7 @@ VclMetafileProcessor2D::~VclMetafileProcessor2D()
Only used in goodies\source\filter.vcl\ieps\ieps.cxx and
svx\source\xml\xmlgrhlp.cxx to
hold the original EPS which was imported in the same MetaFile as first 2
entries. Only
used to export the original again (if exists).
-Not necessary to support with MetaFuleRenderer.
+Not necessary to support with MetaFileRenderer.
XTEXT_SCROLLRECT, XTEXT_PAINTRECT
Currently used to get extra MetaFile infos using GraphicExporter which
again uses
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source unodevtools/source unotools/source vcl/osx vcl/source wizards/com xmloff/source
dbaccess/source/ui/app/AppController.hxx|
4 ++--
unodevtools/source/skeletonmaker/cppcompskeleton.cxx|
2 +-
unotools/source/config/securityoptions.cxx |
2 +-
vcl/osx/DragSource.cxx |
2 +-
vcl/source/filter/igif/gifread.cxx |
2 +-
vcl/source/outdev/text.cxx |
2 +-
wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java |
4 ++--
xmloff/source/style/xmlexppr.cxx|
4 ++--
xmloff/source/text/txtflde.cxx |
2 +-
9 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit a7e0e800c5d1d13db81963b5295b21fb2bfd3ad7
Author: Andrea Gelmini
AuthorDate: Tue Aug 18 15:53:07 2020 +0200
Commit: Julien Nabet
CommitDate: Tue Aug 18 20:09:04 2020 +0200
Fix typos
Change-Id: I85a91d24943430b42217ac91611f182059d8ec69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100919
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/dbaccess/source/ui/app/AppController.hxx
b/dbaccess/source/ui/app/AppController.hxx
index 7acd97773b28..490b4232a7ea 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -224,10 +224,10 @@ namespace dbaui
/// copies the current object into clipboard
rtl::Reference copyObject();
-/// fills rExchange with current object if its a Table or Query
+/// fills rExchange with current object if it's a Table or Query
bool copySQLObject(ODataClipboard& rExchange);
-/// fills rExchange with current object if its a Form or Report
+/// fills rExchange with current object if it's a Form or Report
bool copyDocObject(svx::OComponentTransferable& rExchange);
/// returns the nameaccess
diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
index 2888af65f42e..b1fc3ac33035 100644
--- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
+++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
@@ -1091,7 +1091,7 @@ void generateCalcAddin(ProgramOptions const & options,
}
// if backwardcompatible==true the AddIn service needs to be added to the
-// supported service list, the necessary intefaces are mapped to the add-in
+// supported service list, the necessary interfaces are mapped to the
add-in
// configuration. Since OO.org 2.0.4 this is obsolete and the add-in is
// taken from the configuration from Calc directly, this simplifies the
// add-in code
diff --git a/unotools/source/config/securityoptions.cxx
b/unotools/source/config/securityoptions.cxx
index 36aa85b3ac8c..6a99a87ca207 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.cxx
@@ -556,7 +556,7 @@ void SvtSecurityOptions_Impl::Notify( const Sequence<
OUString >& seqPropertyNam
// Safe impossible cases.
// We need values from ALL notified configuration keys.
DBG_ASSERT( !(seqPropertyNames.getLength()!=seqValues.getLength()),
"SvtSecurityOptions_Impl::Notify()\nI miss some values of configuration
keys!\n" );
-// Step over list of property names and get right value from coreesponding
value list to set it on internal members!
+// Step over list of property names and get right value from corresponding
value list to set it on internal members!
sal_Int32 nCount = seqPropertyNames.getLength();
for( sal_Int32 nProperty = 0; nProperty < nCount; ++nProperty )
SetProperty( GetHandle( seqPropertyNames[ nProperty ] ), seqValues[
nProperty ], seqRO[ nProperty ] );
diff --git a/vcl/osx/DragSource.cxx b/vcl/osx/DragSource.cxx
index bfe990d73c8f..bcb4cb43543a 100644
--- a/vcl/osx/DragSource.cxx
+++ b/vcl/osx/DragSource.cxx
@@ -306,7 +306,7 @@ unsigned int DragSource::getSupportedDragOperations(bool
isLocal) const
{
// Support NSDragOperation generic which means we can
// decide which D&D operation to choose. We map
- // NSDragOperationGenric to DNDConstants::ACTION_DEFAULT
+ // NSDragOperationGeneric to DNDConstants::ACTION_DEFAULT
// in SystemToOfficeDragActions to signal this and
// use it in DropTarget::determineDropAction
srcActions |= NSDragOperationGeneric;
diff --git a/vcl/source/filter/igif/gifread.cxx
b/vcl/source/filter/igif/gifread.cxx
index f2ad9bd1132c..ddbf7ae0aea6 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -496,7 +496,7 @@ bool GIFReader::ReadLocalHeader()
// if we could read everything, we will create the local image;
// if the global colour table is valid for the imag
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sd/qa
sd/qa/unit/data/pptx/multicol.pptx |binary
sd/qa/unit/import-tests.cxx| 29 +
2 files changed, 29 insertions(+)
New commits:
commit 91f298fa883e173125e4cb1fd3fc862530d1bfad
Author: Gülşah Köse
AuthorDate: Tue Aug 11 00:43:49 2020 +0300
Commit: Gülşah Köse
CommitDate: Tue Aug 18 20:29:59 2020 +0200
tdf#133015 Add test for multicolumn textboxes.
Change-Id: I92d6af17313fb5a4a27fc8768b8f3fbe64db1816
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100452
Tested-by: Jenkins
Reviewed-by: Gülşah Köse
(cherry picked from commit 6e99f606baad33d6e662ecb21964f3d11b562750)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100366
Tested-by: Jenkins CollaboraOffice
diff --git a/sd/qa/unit/data/pptx/multicol.pptx
b/sd/qa/unit/data/pptx/multicol.pptx
new file mode 100644
index ..3590d84c1a6b
Binary files /dev/null and b/sd/qa/unit/data/pptx/multicol.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 793f99c6cd8f..85fac6becdd1 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -141,6 +141,7 @@ public:
void testPredefinedTableStyle();
void testBnc591147();
void testCreationDate();
+void testMultiColTexts();
void testBnc584721_1();
void testBnc584721_2();
void testBnc584721_4();
@@ -249,6 +250,7 @@ public:
CPPUNIT_TEST(testPredefinedTableStyle);
CPPUNIT_TEST(testBnc591147);
CPPUNIT_TEST(testCreationDate);
+CPPUNIT_TEST(testMultiColTexts);
CPPUNIT_TEST(testBnc584721_1);
CPPUNIT_TEST(testBnc584721_2);
CPPUNIT_TEST(testBnc584721_4);
@@ -913,6 +915,33 @@ void SdImportTest::testCreationDate()
xDocShRef->DoClose();
}
+void SdImportTest::testMultiColTexts()
+{
+sd::DrawDocShellRef xDocShRef = loadURL(
m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/multicol.pptx"), PPTX );
+const SdrPage *pPage = GetPage( 1, xDocShRef );
+
+sdr::table::SdrTableObj *pTableObj =
dynamic_cast(pPage->GetObj(0));
+CPPUNIT_ASSERT( pTableObj );
+
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), pTableObj->getRowCount());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), pTableObj->getColumnCount());
+
+sdr::table::SdrTableObj *pMasterTableObj =
dynamic_cast(pPage->TRG_GetMasterPage().GetObj(0));
+CPPUNIT_ASSERT( pMasterTableObj );
+
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), pMasterTableObj->getRowCount());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), pMasterTableObj->getColumnCount());
+
+uno::Reference< table::XCellRange > xTable(pMasterTableObj->getTable(),
uno::UNO_QUERY_THROW);
+uno::Reference< beans::XPropertySet > xCell;
+xCell.set(xTable->getCellByPosition(0, 0), uno::UNO_QUERY_THROW);
+uno::Reference xParagraph(getParagraphFromShape(0,
xCell));
+uno::Reference xRun( getRunFromParagraph (0, xParagraph
) );
+OUString sText = xRun->getString();
+
+CPPUNIT_ASSERT_EQUAL(OUString(""), sText); //We don't import master table
text for multicolumn case.
+}
+
void SdImportTest::testPredefinedTableStyle()
{
// 073A0DAA-6AF3-43AB-8588-CEC1D06C72B9 (Medium Style 2)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Enabling Calc macro recording
It may not record input from a dialog. As an example, if you import a CSV file, I think that it does not remember the parameters that you used for the import. The macro it produces does not use commands that directly modify the underlying object model but instead build an object to encapsulate each call and send that object. This can make it more difficult to modify the created macro. On Tuesday, August 18, 2020 14:00 EDT, "Steve (GMail)" wrote: All, In Calc, I notice the option to enable macro recording at Tools > Options > LibreOffice > Advanced is entitled "Enable macro recording (may be limited)". Can anybody advise what to "(may be limited)" caveat refers to? Regards, Steve Fanning ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re[2]: Enabling Calc macro recording
Thanks Andrew. I feel a need to put a brief clarification in Chapter 12 of the 7.0 Calc Guide. Regards, Steve -- Original Message -- From: "Andrew Pitonyak" To: "Steve (GMail)" Cc: "Development List" Sent: 18/08/2020 19:31:34 Subject: Re: Enabling Calc macro recording It may not record input from a dialog. As an example, if you import a CSV file, I think that it does not remember the parameters that you used for the import. The macro it produces does not use commands that directly modify the underlying object model but instead build an object to encapsulate each call and send that object. This can make it more difficult to modify the created macro. On Tuesday, August 18, 2020 14:00 EDT, "Steve (GMail)" wrote: All, In Calc, I notice the option to enable macro recording at Tools > Options > LibreOffice > Advanced is entitled "Enable macro recording (may be limited)". Can anybody advise what to "(may be limited)" caveat refers to? Regards, Steve Fanning ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/DocumentContentOperationsManager.cxx | 31
sw/source/uibase/utlui/content.cxx | 59
2 files changed, 31 insertions(+), 59 deletions(-)
New commits:
commit 54691ea52a91491ae251473c83b61f9adaf0b581
Author: Jim Raykowski
AuthorDate: Sun Aug 16 11:23:57 2020 -0800
Commit: Jim Raykowski
CommitDate: Tue Aug 18 21:12:12 2020 +0200
Improve location of unfold fold code use in outline move
Change-Id: I299f871c4d6e06f63efaf80e04cb668c52ae8543
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100829
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 695057d342c2..0049560c4047 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -89,6 +89,9 @@
#include
#include
+#include
+#include
+#include
using namespace ::com::sun::star::i18n;
@@ -2431,6 +2434,27 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM&
rPaM, SwPosition& rPos,
bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange,
SwNodeIndex& rPos,
SwMoveFlags eMvFlags )
{
+std::vector aFoldedOutlineNdsArray;
+SwWrtShell* pWrtShell = dynamic_cast(m_rDoc.GetEditShell());
+if (pWrtShell && pWrtShell->GetViewOptions() &&
pWrtShell->GetViewOptions()->IsShowOutlineContentVisibilityButton())
+{
+// unfold all folded outline content
+SwOutlineNodes rOutlineNds = m_rDoc.GetNodes().GetOutLineNds();
+for (SwOutlineNodes::size_type nPos = 0; nPos < rOutlineNds.size();
++nPos)
+{
+SwNode* pNd = rOutlineNds[nPos];
+if (pNd->IsTextNode()) // should always be true
+{
+bool bOutlineContentVisibleAttr = true;
+
pNd->GetTextNode()->GetAttrOutlineContentVisible(bOutlineContentVisibleAttr);
+if (!bOutlineContentVisibleAttr)
+{
+aFoldedOutlineNdsArray.push_back(pNd);
+pWrtShell->ToggleOutlineContentVisibility(nPos);
+}
+}
+}
+}
// Moves all Nodes to the new position.
// Bookmarks are moved too (currently without Undo support).
@@ -2556,6 +2580,13 @@ bool DocumentContentOperationsManager::MoveNodeRange(
SwNodeRange& rRange, SwNod
m_rDoc.GetFootnoteIdxs().UpdateAllFootnote();
}
+if (pWrtShell && pWrtShell->GetViewOptions() &&
pWrtShell->GetViewOptions()->IsShowOutlineContentVisibilityButton())
+{
+// fold all outlines that were folded before move
+for (SwNode* pNd : aFoldedOutlineNdsArray)
+pWrtShell->ToggleOutlineContentVisibility(pNd, true);
+}
+
m_rDoc.getIDocumentState().SetModified();
return true;
}
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index 061c164cdf1e..cf7329ee267f 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -2772,7 +2772,6 @@ void SwContentTree::ExecCommand(const OString& rCmd, bool
bOutlineWithChildren)
SwOutlineNodes::difference_type nDirLast = bUp ? -1 : 1;
bool bStartedAction = false;
-std::vector aFoldedOutlineNdsArray;
for (auto const& pCurrentEntry : selected)
{
assert(pCurrentEntry && lcl_IsContent(*pCurrentEntry, *m_xTreeView));
@@ -2794,28 +2793,6 @@ void SwContentTree::ExecCommand(const OString& rCmd,
bool bOutlineWithChildren)
if (!bStartedAction)
{
pShell->StartAllAction();
-if (bUpDown)
-{
-if
(pShell->GetViewOptions()->IsShowOutlineContentVisibilityButton())
-{
-// unfold all folded outline content
-SwOutlineNodes rOutlineNds =
pShell->GetDoc()->GetNodes().GetOutLineNds();
-for (SwOutlineNodes::size_type nPos = 0; nPos <
rOutlineNds.size(); ++nPos)
-{
-SwNode* pNd = rOutlineNds[nPos];
-if (pNd->IsTextNode()) // should always be true
-{
-bool bOutlineContentVisibleAttr = true;
-
pNd->GetTextNode()->GetAttrOutlineContentVisible(bOutlineContentVisibleAttr);
-if (!bOutlineContentVisibleAttr)
-{
-aFoldedOutlineNdsArray.push_back(pNd);
-pShell->ToggleOutlineContentVisibility(nPos);
-}
-}
-}
-}
-}
pShell->StartUndo(bLeftRight ? SwUndoId::OUTLINE_LR :
SwUndoId::OUTLINE_UD);
bStartedAction = true;
}
@@ -2987,15 +2964,6 @@ void S
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src
loleaflet/src/control/Control.LokDialog.js |5 +
1 file changed, 5 insertions(+)
New commits:
commit e07f47d2486a07826bfa025cd2d47b267474848c
Author: gokaysatir
AuthorDate: Wed Aug 12 17:20:54 2020 +0300
Commit: Aron Budea
CommitDate: Tue Aug 18 21:49:03 2020 +0200
loleaflet: Prevent sidebar from opening when file is on read only mode.
This patch is for preventing sidebar from being launched when:
* Document is on read only mode (No need for an editor bar when doc is
read-only).
* Also the main reason for this patch was to hide Sidebar when revision
history is open (NC).
Change-Id: I4d78c65a7e8f39b0827b9e23ecc24fcd9520fef8
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100601
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
(cherry picked from commit eb8e075ce02e54da4f5eca86157919001978cda0)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100933
Reviewed-by: Aron Budea
diff --git a/loleaflet/src/control/Control.LokDialog.js
b/loleaflet/src/control/Control.LokDialog.js
index 57b5fdc95..117ae0873 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -1009,6 +1009,11 @@ L.Control.LokDialog = L.Control.extend({
},
_launchSidebar: function(id, width, height) {
+ // In read-only mode, we don't need to show sidebar. This if
clause prevents sidebar from opening also when revision history is open.
+ if (this._map.isPermissionReadOnly()) {
+ return;
+ }
+
console.log('_launchSidebar: start: id: ' + id + ', width: ' +
width + ', height: ' + height);
if ((window.mode.isMobile() || window.mode.isTablet())
&& !this._map.isPermissionEdit())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/qa oox/source
oox/qa/unit/data/graphic-stroke.pptx |binary
oox/qa/unit/vml.cxx | 32 +++
oox/source/drawingml/graphicshapecontext.cxx |2 +
oox/source/vml/vmlshape.cxx | 15
4 files changed, 49 insertions(+)
New commits:
commit b2d834d6727626f070bb4dde3e1c65da1169f729
Author: Miklos Vajna
AuthorDate: Tue Aug 18 17:43:57 2020 +0200
Commit: Miklos Vajna
CommitDate: Tue Aug 18 21:51:22 2020 +0200
tdf#132555 PPTX VML import: handle stroke properties of image shapes
ComplexShape::implConvertAndInsert() returns early in the graphic object
shape case, so stroke model is not applied at all.
Also fix a problem in ShapeBase::finalizeFragmentImport(), where the
shape type had no stroke, but the shape itself had, and the later should
win.
The warning in OleObjectGraphicDataContext::onCreateContext() now points
out that is ignored as a child of ,
which probably should be addressed at some stage, but it's not required
to fix the missing stroke.
Change-Id: I4ab43b4c6d40d9f43caad22b85f5b885fa8b4ef1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100952
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/oox/qa/unit/data/graphic-stroke.pptx
b/oox/qa/unit/data/graphic-stroke.pptx
new file mode 100644
index ..f4465476fcc6
Binary files /dev/null and b/oox/qa/unit/data/graphic-stroke.pptx differ
diff --git a/oox/qa/unit/vml.cxx b/oox/qa/unit/vml.cxx
index 089d61085b74..d43d2d5645ae 100644
--- a/oox/qa/unit/vml.cxx
+++ b/oox/qa/unit/vml.cxx
@@ -11,8 +11,10 @@
#include
#include
+#include
#include
#include
+#include
#include
using namespace ::com::sun::star;
@@ -109,6 +111,36 @@ CPPUNIT_TEST_FIXTURE(OoxVmlTest,
testShapeNonAutosizeWithText)
CPPUNIT_ASSERT_EQUAL(static_cast(5398),
xShape->getSize().Width);
}
+CPPUNIT_TEST_FIXTURE(OoxVmlTest, testGraphicStroke)
+{
+load("graphic-stroke.pptx");
+uno::Reference
xDrawPagesSupplier(getComponent(), uno::UNO_QUERY);
+uno::Reference
xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0),
+ uno::UNO_QUERY);
+
+uno::Reference xShape;
+for (sal_Int32 i = 0; i < xDrawPage->getCount(); ++i)
+{
+uno::Reference xInfo(xDrawPage->getByIndex(i),
uno::UNO_QUERY);
+if (!xInfo->supportsService("com.sun.star.drawing.GraphicObjectShape"))
+{
+continue;
+}
+
+xShape.set(xInfo, uno::UNO_QUERY);
+break;
+}
+CPPUNIT_ASSERT(xShape.is());
+
+drawing::LineStyle eLineStyle{};
+xShape->getPropertyValue("LineStyle") >>= eLineStyle;
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 1
+// - Actual : 0
+// i.e. line style was NONE, not SOLID.
+CPPUNIT_ASSERT_EQUAL(drawing::LineStyle_SOLID, eLineStyle);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/graphicshapecontext.cxx
b/oox/source/drawingml/graphicshapecontext.cxx
index 39a090bf43c4..61d96b583c67 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -226,6 +226,8 @@ ContextHandlerRef
OleObjectGraphicDataContext::onCreateContext( sal_Int32 nEleme
return new GraphicShapeContext( *this, mpMasterShapePtr,
mpShapePtr );
break;
}
+SAL_WARN("oox", "OleObjectGraphicDataContext::onCreateContext: unhandled
element: "
+<< getBaseToken(nElement));
return nullptr;
}
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index b6fe01b08347..f22a98576a16 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -292,7 +292,15 @@ void ShapeBase::finalizeFragmentImport()
if (aType[ 0 ] == '#')
aType = aType.copy(1);
if( const ShapeType* pShapeType = mrDrawing.getShapes().getShapeTypeById(
aType ) )
+{
+// Make sure that the stroke props from maTypeModel have priority over
the stroke props from
+// the shape type.
+StrokeModel aMergedStrokeModel;
+
aMergedStrokeModel.assignUsed(pShapeType->getTypeModel().maStrokeModel);
+aMergedStrokeModel.assignUsed(maTypeModel.maStrokeModel);
maTypeModel.assignUsed( pShapeType->getTypeModel() );
+maTypeModel.maStrokeModel = aMergedStrokeModel;
+}
else {
// Temporary fix, shapetype not found if referenced from different
substream
// FIXME: extend scope of ShapeContainer to store all shapetypes from
the document
@@ -1346,6 +1354,13 @@ Reference< XShape > ComplexShape::implConvertAndInsert(
const Reference< XShapes
// AS_CHARACTER shape: vertical orientation default is bottom, MSO
default is top.
if ( maTypeModel.maPosition != "absolute" && maTypeMod
[Libreoffice-commits] core.git: desktop/source
desktop/source/lib/init.cxx |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 06bed3046b4ca62a50566f42d3a7079f0b563935
Author: Mert Tumer
AuthorDate: Mon Aug 17 11:40:38 2020 +0300
Commit: Andras Timar
CommitDate: Tue Aug 18 22:29:25 2020 +0200
Fix hyperlink popup does not show up
The popup does not show up when double clicking
same cell after first one when the cell has a
hyperlink. This is because LOK_CALLBACK_INVALIDATE
_VISIBLE_CURSOR message is filtered out when it
is duplicate and hyperlink is inside this callback.
Selecting different cell after editing one does not
make calc to send another invalidate cursor message
because it is only sent if the selected cell is being
edited. This confuses the ui experience, so this patch
prevents the callback from being filtered out
if only it contains a hyperlink. If there is not a hyperlink
on the cursor position the duplicate callbacks will still
be filtered out.
Signed-off-by: Mert Tumer
Change-Id: Ibca0887b7d49633e476bc63d08bc0b7cc309d710
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100851
Tested-by: Jenkins
Reviewed-by: Andras Timar
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 78f152166acd..beb35b4e5fcc 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1546,10 +1546,15 @@ void CallbackFlushHandler::queue(const int type, const
char* data)
case LOK_CALLBACK_CALC_FUNCTION_LIST:
case LOK_CALLBACK_JSDIALOG:
{
+// deleting the duplicate of visible cursor message can cause
hyperlink popup not to show up on second/or more click on the same place.
+// If the hyperlink is not empty we can bypass that to show
the popup
+const bool hyperLinkException = type ==
LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR &&
+payload.find("\"hyperlink\":\"\"") == std::string::npos &&
+payload.find("\"hyperlink\": {}") == std::string::npos;
const int nViewId = lcl_getViewId(payload);
removeAll(
-[type, nViewId] (const queue_type::value_type& elem) {
-return (elem.Type == type && nViewId ==
lcl_getViewId(elem));
+[type, nViewId, hyperLinkException] (const
queue_type::value_type& elem) {
+return (elem.Type == type && nViewId ==
lcl_getViewId(elem) && !hyperLinkException);
}
);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - desktop/source
desktop/source/lib/init.cxx |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 021d17006c970bbd784bc3a5474d56fff02fdca0
Author: Mert Tumer
AuthorDate: Mon Aug 17 11:40:38 2020 +0300
Commit: Andras Timar
CommitDate: Tue Aug 18 23:01:25 2020 +0200
Fix hyperlink popup does not show up
The popup does not show up when double clicking
same cell after first one when the cell has a
hyperlink. This is because LOK_CALLBACK_INVALIDATE
_VISIBLE_CURSOR message is filtered out when it
is duplicate and hyperlink is inside this callback.
Selecting different cell after editing one does not
make calc to send another invalidate cursor message
because it is only sent if the selected cell is being
edited. This confuses the ui experience, so this patch
prevents the callback from being filtered out
if only it contains a hyperlink. If there is not a hyperlink
on the cursor position the duplicate callbacks will still
be filtered out.
Signed-off-by: Mert Tumer
Change-Id: Ibca0887b7d49633e476bc63d08bc0b7cc309d710
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100851
Tested-by: Jenkins
Reviewed-by: Andras Timar
(cherry picked from commit 06bed3046b4ca62a50566f42d3a7079f0b563935)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100934
Tested-by: Jenkins CollaboraOffice
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 02bf19602150..4d96e34333ea 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1554,10 +1554,15 @@ void CallbackFlushHandler::queue(const int type, const
char* data)
case LOK_CALLBACK_CALC_FUNCTION_LIST:
case LOK_CALLBACK_JSDIALOG:
{
+// deleting the duplicate of visible cursor message can cause
hyperlink popup not to show up on second/or more click on the same place.
+// If the hyperlink is not empty we can bypass that to show
the popup
+const bool hyperLinkException = type ==
LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR &&
+payload.find("\"hyperlink\":\"\"") == std::string::npos &&
+payload.find("\"hyperlink\": {}") == std::string::npos;
const int nViewId = lcl_getViewId(payload);
removeAll(
-[type, nViewId] (const queue_type::value_type& elem) {
-return (elem.Type == type && nViewId ==
lcl_getViewId(elem));
+[type, nViewId, hyperLinkException] (const
queue_type::value_type& elem) {
+return (elem.Type == type && nViewId ==
lcl_getViewId(elem) && !hyperLinkException);
}
);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
GSoC "Extending the UITest framework" Week (11) Report
Hello all, Here is my Week (11) report: https://ahmedelshreifgsoc20.blogspot.com/2020/08/week-11-report.html waiting for all your feedback. Thanks, Ahmed ElShreif ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re[2]: Enabling Calc macro recording
I guess if it will end up in the documentation, I should be more specific and not just go from memory! The most versatile method to manipulate an LO document is to get the internal UNO objects and manipulate them. Using the model provides significant control, but you must understand much about the different services and interfaces. Another method, which requires very little understanding of the LO internals, is to use a UNO dispatcher. The macro recorder uses the dispatcher for all commands. The dispatcher requires (1) the command to dispatch such as ".uno:Undo", (2) arguments that control the dispatch, and (3) an object capable of performing the dispatch. When writing your own macros, it is usually better to use the object model rather than the dispatcher. That said, some things are best handled by the dispatcher; for example, controlling the clipboard. The problem with using the macro recorder are that: 1. The dispatches are not documented and are stated to be subject to change; although I have not seen them change over time. 2. The recorder ignores some values from dialogs that are opened while recording a macro. It is possible, therefore, that you will record a complicated macro that will not actually playback everything that you did. One example is CSV import, the generated macro does nothing. I just verified that this is true. Side note, my book OOME, which is available as a free download, contains a macro that will enumerate the supported dispatches. Last time I ran it, it generated over 300,000 rows of dispatch commands. On Tuesday, August 18, 2020 14:40 EDT, "Steve (GMail)" wrote: Thanks Andrew. I feel a need to put a brief clarification in Chapter 12 of the 7.0 Calc Guide. Regards, Steve -- Original Message --From: "Andrew Pitonyak" To: "Steve (GMail)" Cc: "Development List" Sent: 18/08/2020 19:31:34Subject: Re: Enabling Calc macro recording It may not record input from a dialog. As an example, if you import a CSV file, I think that it does not remember the parameters that you used for the import. The macro it produces does not use commands that directly modify the underlying object model but instead build an object to encapsulate each call and send that object. This can make it more difficult to modify the created macro. On Tuesday, August 18, 2020 14:00 EDT, "Steve (GMail)" wrote: All, In Calc, I notice the option to enable macro recording at Tools > Options > LibreOffice > Advanced is entitled "Enable macro recording (may be limited)". Can anybody advise what to "(may be limited)" caveat refers to? Regards, Steve Fanning ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - icon-themes/elementary
icon-themes/elementary/links.txt | 10 +- icon-themes/elementary/res/lx03245.png |binary icon-themes/elementary/res/lx03246.png |binary icon-themes/elementary/res/lx03247.png |binary icon-themes/elementary/res/lx03248.png |binary icon-themes/elementary/res/lx03249.png |binary icon-themes/elementary/res/lx03250.png |binary icon-themes/elementary/res/lx03251.png |binary icon-themes/elementary/res/lx03255.png |binary 9 files changed, 1 insertion(+), 9 deletions(-) New commits: commit cef5d15e810f16e4f02b8d1a0ce38703a0f6b4f9 Author: Rizal Muttaqin AuthorDate: Tue Aug 18 07:21:57 2020 +0700 Commit: Rizal Muttaqin CommitDate: Tue Aug 18 23:38:03 2020 +0200 elementary: tdf#134887 Use different icons for extra large Change-Id: I84582058033761d6cd5a175fa4da508c97a6866e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100909 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin (cherry picked from commit c0fb40ddbf82c60052bab41f9ad1e9647ddc99a8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100932 diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt index 672caf5cb22b..63f01928ebfe 100644 --- a/icon-themes/elementary/links.txt +++ b/icon-themes/elementary/links.txt @@ -1990,24 +1990,16 @@ res/lx03228.png res/otg_32_8.png res/lx03239.png cmd/32/dbrelationdesign.png res/lx03242.png res/mainapp_32_8.png res/lx03243.png res/lx03123.png -res/lx03245.png res/odb_24_8.png res/lx03245_32.png res/odb_32_8.png -res/lx03246.png res/odg_24_8.png res/lx03246_32.png res/odg_32_8.png -res/lx03247.png res/odf_24_8.png res/lx03247_32.png res/odf_32_8.png -res/lx03248.png res/odm_24_8.png res/lx03248_32.png res/odm_32_8.png -res/lx03249.png res/odp_24_8.png res/lx03249_32.png res/odp_32_8.png -res/lx03250.png res/ods_24_8.png res/lx03250_32.png res/ods_32_8.png -res/lx03251.png res/odt_24_8.png res/lx03251_32.png res/odt_32_8.png res/lx03252.png res/otg_32_8.png res/lx03253.png res/otp_32_8.png res/lx03254.png res/ots_32_8.png -res/lx03255.png res/ott_24_8.png res/lx03255_32.png res/ott_32_8.png res/lx03256.png cmd/lc_insertplugin.png res/mainapp_32.png res/mainapp_32_8.png @@ -2468,7 +2460,7 @@ cmd/32/addtextbox.png cmd/32/insertfixedtext.png cmd/lc_addtextbox.png cmd/lc_insertfixedtext.png cmd/sc_addtextbox.png cmd/sc_insertfixedtext.png -# Edit menu +# Edit menu # === cmd/32/authoritiesentrydialog.png cmd/32/dbviewaliases.png cmd/32/changesmenu.png cmd/32/accepttrackedchange.png diff --git a/icon-themes/elementary/res/lx03245.png b/icon-themes/elementary/res/lx03245.png new file mode 100644 index ..ab1c7c34de00 Binary files /dev/null and b/icon-themes/elementary/res/lx03245.png differ diff --git a/icon-themes/elementary/res/lx03246.png b/icon-themes/elementary/res/lx03246.png new file mode 100644 index ..986ecafb8fc7 Binary files /dev/null and b/icon-themes/elementary/res/lx03246.png differ diff --git a/icon-themes/elementary/res/lx03247.png b/icon-themes/elementary/res/lx03247.png new file mode 100644 index ..b701132d2717 Binary files /dev/null and b/icon-themes/elementary/res/lx03247.png differ diff --git a/icon-themes/elementary/res/lx03248.png b/icon-themes/elementary/res/lx03248.png new file mode 100644 index ..9d1e612d4ee0 Binary files /dev/null and b/icon-themes/elementary/res/lx03248.png differ diff --git a/icon-themes/elementary/res/lx03249.png b/icon-themes/elementary/res/lx03249.png new file mode 100644 index ..8e3d0469b26d Binary files /dev/null and b/icon-themes/elementary/res/lx03249.png differ diff --git a/icon-themes/elementary/res/lx03250.png b/icon-themes/elementary/res/lx03250.png new file mode 100644 index ..89edb9d1c1fe Binary files /dev/null and b/icon-themes/elementary/res/lx03250.png differ diff --git a/icon-themes/elementary/res/lx03251.png b/icon-themes/elementary/res/lx03251.png new file mode 100644 index ..e312d00f7159 Binary files /dev/null and b/icon-themes/elementary/res/lx03251.png differ diff --git a/icon-themes/elementary/res/lx03255.png b/icon-themes/elementary/res/lx03255.png new file mode 100644 index ..bf697f41783f Binary files /dev/null and b/icon-themes/elementary/res/lx03255.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/about.cxx |3 ---
1 file changed, 3 deletions(-)
New commits:
commit 9f4f44bbc7864cb7f1c996f9da6f4fabd81d0783
Author: Stephan Bergmann
AuthorDate: Tue Aug 18 21:53:06 2020 +0200
Commit: Stephan Bergmann
CommitDate: Tue Aug 18 23:53:49 2020 +0200
Remove code that has become nonsense over time
The getToken call started out as
> commit 6f9dff66ee12c3cf5874fd4a33b82dbb090fe124
> Author: Caolán McNamara
> Date: Tue Jun 28 13:00:51 2011 +0100
>
> break build id into multiple lines if using g log
>
> diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
> index 3157a9b48fd7..863bd90312fa 100644
> --- a/cui/source/dialogs/about.cxx
> +++ b/cui/source/dialogs/about.cxx
> @@ -72,13 +72,34 @@ Image SfxApplication::GetApplicationLogo()
> return Image( aBitmap );
> }
>
> -/* intense magic to get strong version information */
> +/* get good version information */
> static String
> GetBuildId()
> {
> rtl::OUString sDefault;
> -String sBuildId( utl::Bootstrap::getBuildIdData( sDefault ) );
> -OSL_ENSURE( sBuildId.Len() > 0, "No BUILDID in bootstrap file" );
> +rtl::OUString sBuildId( utl::Bootstrap::getBuildIdData( sDefault ) );
> +//strip trailing - from ./g log
> +if (!sBuildId.isEmpty() && sBuildId.getStr()[sBuildId.getLength()-1]
== '-')
> +{
> +rtl::OUStringBuffer aBuffer;
> +sal_Int32 nIndex = 0;
> +do
> +{
> +rtl::OUString aToken = sBuildId.getToken( 0, '-', nIndex );
> +if (!aToken.isEmpty())
> +{
> +aBuffer.append(aToken);
> +if (nIndex % 5)
> +aBuffer.append(static_cast('-'));
> +else
> +aBuffer.append(static_cast('\n'));
> +}
> +}
> +while ( nIndex >= 0 );
> +sBuildId = aBuffer.makeStringAndClear();
> +}
> +
> +OSL_ENSURE( sBuildId.getLength() > 0, "No BUILDID in bootstrap file"
);
> return sBuildId;
> }
>
presumably at a time when utl::Bootstrap::getBuildIdData returned multiple
git
hashes for the split repositories back then, separated by dashes.
Then
> commit 8a3aae9b694deb2b41157509e84815a5b7fb7655
> Author: Andrew Higginson
> Date: Tue Apr 10 12:43:48 2012 +0100
>
> Resolves: fdo#31022 about dialog is suboptimal
>
[...]
> diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
> index 3ee3e8fad261..a4352e1dd396 100644
> --- a/cui/source/dialogs/about.cxx
> +++ b/cui/source/dialogs/about.cxx
[...]
> +rtl::OUString AboutDialog::GetBuildId()
> +{
> +rtl::OUString sDefault;
> +rtl::OUString sBuildId(utl::Bootstrap::getBuildVersion(sDefault));
> +if (!sBuildId.isEmpty())
> +return sBuildId;
> +
> +sBuildId = utl::Bootstrap::getBuildIdData(sDefault);
> +
> +if (!sBuildId.isEmpty())
> +{
> +sal_Int32 nIndex = 0;
> +return sBuildId.getToken( 0, '-', nIndex );
> +}
> +
> +OSL_ENSURE( !sBuildId.isEmpty(), "No BUILDID in bootstrap file" );
> +return sBuildId;
> +}
[...]
changed that to only use the first dash-separated part of
utl::Bootstrap::getBuildIdData. The commit (and the corresponding
"EasyHacks:
'About
dialog' wording and layout are suboptimal") is vague on why it did that, but
maybe the value returned by utl::Bootstrap::getBuildIdData had meanwhile
been
reduced to a single git monorepo hash value without any dashes anyway.
Finally,
> commit ab846145bbd56f4308c8657df8b1354a403edd74
> Author: Heiko Tietze
> Date: Wed Apr 29 11:39:57 2020 +0200
>
> Resolves tdf#132322 - Link to Gerrit hash reintroduced
>
> Mulit-line label split, Build realized as link_button
>
> Required changes also solve tdf#132066 partially as many
> localized strings are not anymore copied to clipboard
>
> Change-Id: I346fdc65cd1734f17854eccd587fe0b7e216e720
> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93119
> Tested-by: Jenkins
> Reviewed-by: Heiko Tietze
>
[...]
> diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
> index ed58d06acc1c..845ad5496a37 100644
> --- a/cui/source/dialogs/about.cxx
> +++ b/cui/source/dialogs/about.cxx
[...]
> +OUString AboutDialog::GetBuildString() {
>
[...]
> + OUString sDefault;
> + OUString sBuildId(utl::Bootstrap::getBuildVersion(sDefault));
> + if (sBuildId.isEmpty())
> +sBui
Re: "Bullets and Numbering" translation
Now I confirmed that the issue is resolved. Thank you Caolan! -- himajin10 On 2020-08-07 20:53, Caolán McNamara wrote: On Fri, 2020-08-07 at 14:03 +0900, himajin10 wrote: Hi, Does anyone know the background behind why "Source string comment" gives SVX_NUM_ARABIC for "A, B, C, ..." ? https://translations.documentfoundation.org/translate/libo_ui-master/svxmessages/en/?offset=&q=+note%3AbBGa7+&sort_by=-priority%2Cposition&checksum= The source is svx/inc/numberingtype.hrc and the strings are extracted for translation by ./solenv/bin/hrcex which will run... xgettext -C --add-comments --keyword=NC_:1c,2 --keyword=NNC_:1c,2,3 -- from-code=UTF-8 --no-wrap svx/inc/numberingtype.hrc -o - on that .hrc. In the current numberingtypes.hrc the comments are *after* the string so xgettext has put each comment with the following translation, not the correct one which is the one before the comment. It should have appeared as "1, 2, 3, ..." with a Source string comment of SVX_NUM_ARABIC. https://gerrit.libreoffice.org/c/core/+/100309 will change the .hrc so that the next time hrcex is used to extract the translations the comments will get matched to the correct translation. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Is Idp down now?
When I try to use SSO, my web browser returns "The connection has timed out". -- himajin10 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Is Idp down now?
seems the issue is now gone On 2020-08-19 09:30, himajin10 wrote: When I try to use SSO, my web browser returns "The connection has timed out". -- himajin10 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - download.lst external/curl
download.lst |4 ++-- external/curl/ExternalPackage_curl.mk |2 +- external/curl/ExternalProject_curl.mk |1 + external/curl/clang-cl.patch.0|4 ++-- external/curl/curl-msvc.patch.1 |8 5 files changed, 10 insertions(+), 9 deletions(-) New commits: commit 0b8d282830a2cf4c0445ab8716e6173f8416408f Author: Michael Stahl AuthorDate: Mon Jun 29 14:00:56 2020 +0200 Commit: Andras Timar CommitDate: Wed Aug 19 07:27:24 2020 +0200 curl: upgrade to release 7.71.0 Fixes CVE-2020-8169, and about 3 other ones that don't affect LO/libcmis. Disable new optional dependencies "ngtcp2" and "quiche". Change-Id: I595ed909c4e792ac3244643511a338b117e7f102 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97406 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit cb0c7e26e5708010b1fe941ae2f66134f31ed876) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97386 Reviewed-by: Thorsten Behrens (cherry picked from commit 43130216127913d30074d3fe99c5706dcce44dee) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97572 Tested-by: Michael Stahl Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100904 Tested-by: Jenkins CollaboraOffice Reviewed-by: Andras Timar diff --git a/download.lst b/download.lst index 8f407f2bb34d..842e98a33dd7 100644 --- a/download.lst +++ b/download.lst @@ -29,8 +29,8 @@ export CPPUNIT_SHA256SUM := 3d569869d27b48860210c758c4f313082103a5e58219a7669b52 export CPPUNIT_TARBALL := cppunit-1.14.0.tar.gz export CT2N_SHA256SUM := 71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3 export CT2N_TARBALL := 1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt -export CURL_SHA256SUM := 7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd -export CURL_TARBALL := curl-7.65.0.tar.xz +export CURL_SHA256SUM := cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772 +export CURL_TARBALL := curl-7.71.0.tar.xz export EBOOK_SHA256SUM := 7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9 export EBOOK_TARBALL := libe-book-0.1.3.tar.xz export EPOXY_SHA256SUM := 002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d diff --git a/external/curl/ExternalPackage_curl.mk b/external/curl/ExternalPackage_curl.mk index 56c418b6ef0c..8da569e3e0cf 100644 --- a/external/curl/ExternalPackage_curl.mk +++ b/external/curl/ExternalPackage_curl.mk @@ -20,7 +20,7 @@ $(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.4.dyli else ifeq ($(OS),AIX) $(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so,lib/.libs/libcurl.so.4)) else -$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so.4,lib/.libs/libcurl.so.4.5.0)) +$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so.4,lib/.libs/libcurl.so.4.6.0)) endif endif # $(DISABLE_DYNLOADING) diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index 73d5620eaa01..b1029ea779e3 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -48,6 +48,7 @@ $(call gb_ExternalProject_get_state_target,curl,build): --without-libidn2 --without-libpsl --without-librtmp \ --without-libssh2 --without-metalink --without-nghttp2 \ --without-libssh --without-brotli \ + --without-ngtcp2 --without-quiche \ --disable-ares \ --disable-dict --disable-file --disable-gopher --disable-imap \ --disable-ldap --disable-ldaps --disable-manual --disable-pop3 \ diff --git a/external/curl/clang-cl.patch.0 b/external/curl/clang-cl.patch.0 index 2f7fe567460c..2fbb10c2a9aa 100644 --- a/external/curl/clang-cl.patch.0 +++ b/external/curl/clang-cl.patch.0 @@ -4,8 +4,8 @@ !ELSE CC_NODEBUG = $(CC) /O2 /DNDEBUG CC_DEBUG= $(CC) /Od /D_DEBUG /RTC1 /Z7 /LDd --CFLAGS = /I. /I ../lib /I../include /nologo /W4 /wd4127 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL $(SOLARINC) -+CFLAGS = /I. /I ../lib /I../include /nologo /W4 /wd4127 /EHsc /DWIN32 /c /DBUILDING_LIBCURL $(SOLARINC) +-CFLAGS = /I. /I ../lib /I../include /nologo /W4 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL $(SOLARINC) ++CFLAGS = /I. /I ../lib /I../include /nologo /W4 /EHsc /DWIN32 /c /DBUILDING_LIBCURL $(SOLARINC) !ENDIF LFLAGS = /nologo /machine:$(MACHINE) diff --git a/external/curl/curl-msvc.patch.1 b/external/curl/curl-msvc.patch.1 index 80160958c99d..a5b79a8e9c49 100644 --- a/external/curl/curl-msvc.patch.1 +++ b/external/curl/curl-msvc.patch.1 @@ -6,8 +6,8 @@ MSVC: using SOLARINC !ELSE CC_NODEBUG = $(CC) /O2 /DNDEBUG CC_DEBUG= $(CC) /Od /D_DEBUG /RTC1 /Z7 /LDd --CFLAGS = /I. /I ../lib /I../include /nologo /W4 /wd4127 /EHsc /DWIN3
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - download.lst external/nss
download.lst |4 -
external/nss/UnpackedTarball_nss.mk |4 +
external/nss/macos-dlopen.patch.0| 25 +++
external/nss/nss-android.patch.1 | 22 +-
external/nss/nss-bz1646594.patch.1 | 16 +++
external/nss/nss.bzmozilla1238154.patch | 12 +
external/nss/nss.nspr-parallel-win-debug_build.patch | 40 ---
7 files changed, 69 insertions(+), 54 deletions(-)
New commits:
commit 38dbbea5993e66eccb2171416c2497393a7eaf6c
Author: Michael Stahl
AuthorDate: Fri Aug 7 18:57:00 2020 +0200
Commit: Andras Timar
CommitDate: Wed Aug 19 07:29:11 2020 +0200
nss: upgrade to release 3.55.0
Fixes CVE-2020-6829, CVE-2020-12400 CVE-2020-12401 CVE-2020-12403.
(also CVE-2020-12402 CVE-2020-12399 in older releases since 3.47)
* external/nss/nss.nspr-parallel-win-debug_build.patch:
remove, merged upstream
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100345
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 495a5944a3d442cfe748a3bb0dcef76f6a961d30)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100420
Reviewed-by: Xisco Fauli
(cherry picked from commit 227d30a3a17f2fffb1a166cdc3e2a796bb335214)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100590
Reviewed-by: Caolán McNamara
(cherry picked from commit 94cecbfdf3cf01fe3d5658c7edf78696da2a249f)
Change-Id: I8b48e25ce68a2327cde1420abdaea8f9e51a7888
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100864
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100903
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/download.lst b/download.lst
index 4668fc931810..0871634bf595 100644
--- a/download.lst
+++ b/download.lst
@@ -203,8 +203,8 @@ export MYTHES_SHA256SUM :=
1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b
export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
export NEON_SHA256SUM :=
db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca
export NEON_TARBALL := neon-0.30.2.tar.gz
-export NSS_SHA256SUM :=
861a4510b7c21516f49a4cfa5b871aa796e4e1ef2dfe949091970e56f9d60cdf
-export NSS_TARBALL := nss-3.53-with-nspr-4.25.tar.gz
+export NSS_SHA256SUM :=
ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45
+export NSS_TARBALL := nss-3.55-with-nspr-4.27.tar.gz
export ODFGEN_SHA256SUM :=
2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2
export ODFGEN_VERSION_MICRO := 6
export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
diff --git a/external/nss/UnpackedTarball_nss.mk
b/external/nss/UnpackedTarball_nss.mk
index 92902b2da6bf..8fa1edd530cc 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -21,7 +21,9 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/clang-cl.patch.0 \
external/nss/nss.vs2015.patch \
external/nss/nss.vs2015.pdb.patch \
-external/nss/nss.nspr-parallel-win-debug_build.patch \
+external/nss/nss.bzmozilla1238154.patch \
+ external/nss/nss-bz1646594.patch.1 \
+external/nss/macos-dlopen.patch.0 \
$(if $(filter iOS,$(OS)), \
external/nss/nss-ios.patch) \
$(if $(filter ANDROID,$(OS)), \
diff --git a/external/nss/macos-dlopen.patch.0
b/external/nss/macos-dlopen.patch.0
new file mode 100644
index ..1889b8df7cd3
--- /dev/null
+++ b/external/nss/macos-dlopen.patch.0
@@ -0,0 +1,25 @@
+--- nspr/pr/src/linking/prlink.c
nspr/pr/src/linking/prlink.c
+@@ -799,7 +799,7 @@
+ * The reason is that DARWIN's dlopen ignores the provided path
+ * and checks for the plain filename in DYLD_LIBRARY_PATH,
+ * which could load an unexpected version of a library. */
+-if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL) {
++if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL || strncmp(name,
"@loader_path/", 13) == 0) {
+ /* no slash, allow to load from any location */
+ okToLoad = PR_TRUE;
+ } else {
+--- nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c
nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c
+@@ -224,7 +224,11 @@
+ static PRStatus PR_CALLBACK pkix_getDecodeFunction(void)
+ {
+ pkix_decodeFunc.smimeLib =
++#if defined DARWIN
++ PR_LoadLibrary("@loader_path/"
SHLIB_PREFIX"smime3."SHLIB_SUFFIX);
++#else
+ PR_LoadLibrary(SHLIB_PREFIX"smime3."SHLIB_SUFFIX);
++#endif
+ if (pkix_decodeFunc.smimeLib == NULL) {
+ return PR_FAILURE;
+ }
diff --git a/external/nss/nss-android.patch.1 b/external/nss/nss-android.patch.1
index c45a8b892391..9b120d63ab8c 100644
--- a/external/nss/nss-android.patch.1
+++ b/external/nss/nss-android.pat
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - download.lst external/nss
download.lst |4 - external/nss/ExternalProject_nss.mk |6 +- external/nss/UnpackedTarball_nss.mk | 34 external/nss/nsinstall.py|7 ++- external/nss/nss-3.13.5-zlib-werror.patch|7 +-- external/nss/nss-win32-make.patch.1 |2 external/nss/nss.nspr-parallel-win-debug_build.patch | 40 +++ external/nss/nss.windows.patch |4 - 8 files changed, 75 insertions(+), 29 deletions(-) New commits: commit 97ff5ea60e1b465e33a8a56b748213add5b25b19 Author: Jan-Marek Glogowski AuthorDate: Wed Jun 26 18:09:19 2019 +0200 Commit: Andras Timar CommitDate: Wed Aug 19 07:28:56 2020 +0200 NSS: enable parallel build Since NSS 3.53, the Makefile based build should be fixed (upstream bug 290526). The only missing patch is a minimal NSPR fix for the "NSPR, configure + make, parallel, Windows, MS VS, debug" build. That patch isn't incuded in the NSPR 4.25 release (but it's already in the mercurial repo for NSPR 4.26). Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95218 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski (cherry picked from commit b56e8d6def26a0430853835e997f1be841840a61) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100419 Reviewed-by: Michael Stahl (cherry picked from commit c1bce55faebd9ad8751d7b6b9a7f77dff7b3d507) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100589 (cherry picked from commit 3e4dbb1708d4b3b7619602b63602b884a7bb2caa) Change-Id: I8eaa3792a12bdff734e56ac3f552991478957e23 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100863 Tested-by: Michael Stahl Reviewed-by: Michael Stahl Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100902 Tested-by: Andras Timar Reviewed-by: Andras Timar diff --git a/download.lst b/download.lst index 842e98a33dd7..4668fc931810 100644 --- a/download.lst +++ b/download.lst @@ -203,8 +203,8 @@ export MYTHES_SHA256SUM := 1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz export NEON_SHA256SUM := db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca export NEON_TARBALL := neon-0.30.2.tar.gz -export NSS_SHA256SUM := 07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64 -export NSS_TARBALL := nss-3.47.1-with-nspr-4.23.tar.gz +export NSS_SHA256SUM := 861a4510b7c21516f49a4cfa5b871aa796e4e1ef2dfe949091970e56f9d60cdf +export NSS_TARBALL := nss-3.53-with-nspr-4.25.tar.gz export ODFGEN_SHA256SUM := 2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2 export ODFGEN_VERSION_MICRO := 6 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2 diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 4d175e184da5..6a344da33c83 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -19,11 +19,11 @@ ifeq ($(OS),WNT) $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecutable_get_dependencies,python) $(call gb_ExternalProject_run,build,\ $(if $(MSVC_USE_DEBUG_RUNTIME),USE_DEBUG_RTL=1,BUILD_OPT=1) \ - MOZ_MSVCVERSION=9 OS_TARGET=WIN95 \ + OS_TARGET=WIN95 \ $(if $(filter X86_64,$(CPUNAME)),USE_64=1) \ LIB="$(ILIB)" \ XCFLAGS="-arch:SSE $(SOLARINC)" \ - $(MAKE) -j1 nss_build_all RC="rc.exe $(SOLARINC)" \ + $(MAKE) nss_build_all RC="rc.exe $(SOLARINC)" \ NSINSTALL='$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \ NSS_DISABLE_GTESTS=1 \ ,nss) @@ -46,7 +46,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta $(if $(filter iOS-ARM,$(OS)-$(CPUNAME)),CPU_ARCH=arm) \ NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \ NSDISTMODE=copy \ - $(MAKE) -j1 AR="$(AR)" \ + $(MAKE) AR="$(AR)" \ RANLIB="$(RANLIB)" \ NMEDIT="$(NM)edit" \ COMMA=$(COMMA) \ diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index 9783b1928097..92902b2da6bf 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -12,32 +12,32 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,nss)) $(eval $(call gb_UnpackedTarball_set_tarball,nss,$(NSS_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,nss,\ - external/nss/nss.patch \ - external/nss/nss.aix.patch \ - external/nss/nss-3.13.5-zlib-werror.patch \ -
[Libreoffice-commits] core.git: canvas/workben
canvas/workben/canvasdemo.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6538e5b0bb01fd07183cc6ab99b493cf2b87c3d9 Author: Andrea Gelmini AuthorDate: Mon Aug 17 17:54:38 2020 +0200 Commit: Stephan Bergmann CommitDate: Wed Aug 19 08:13:40 2020 +0200 Fix typo in code Change-Id: Ied22aa3812e7db3550e8884720b1df32e38c65be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100870 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx index a1c5b58165fc..233f0ff3e7d8 100644 --- a/canvas/workben/canvasdemo.cxx +++ b/canvas/workben/canvasdemo.cxx @@ -510,7 +510,7 @@ class DemoRenderer rendering::RenderState maOldRenderState = maRenderState; // push translate( maBox.Width() * 1.0, maBox.Height() * 2.0 ); -drawTitle( OString( "Polgyons" ) ); +drawTitle( OString( "Polygons" ) ); int sides= 3; for (int i= 1; i <= 4; i++) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/xmloff xmloff/inc xmloff/source
include/xmloff/xmlnumfi.hxx| 22 +-
xmloff/inc/XMLNumberStylesImport.hxx |2
xmloff/source/draw/XMLNumberStyles.cxx |2
xmloff/source/draw/ximpstyl.cxx| 16 +++
xmloff/source/style/xmlnumfi.cxx | 70 -
5 files changed, 56 insertions(+), 56 deletions(-)
New commits:
commit 97968ab9a221aae1e25cbf9e18bae4460a488f79
Author: Noel Grandin
AuthorDate: Tue Aug 18 20:45:16 2020 +0200
Commit: Noel Grandin
CommitDate: Wed Aug 19 08:22:49 2020 +0200
convert SvXMLStylesTokens to scoped enum
as a step towards converting the *StyleContext classes to fastparser
Change-Id: I0440cbce91d7b20e7181c3a6112791a9af2210b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100954
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx
index b337fad36832..e428edc671ce 100644
--- a/include/xmloff/xmlnumfi.hxx
+++ b/include/xmloff/xmlnumfi.hxx
@@ -35,15 +35,15 @@ namespace com::sun::star::xml::sax { class XAttributeList; }
#define XML_NUMBERSTYLES "NumberStyles"
-enum SvXMLStylesTokens
+enum class SvXMLStylesTokens
{
-XML_TOK_STYLES_NUMBER_STYLE,
-XML_TOK_STYLES_CURRENCY_STYLE,
-XML_TOK_STYLES_PERCENTAGE_STYLE,
-XML_TOK_STYLES_DATE_STYLE,
-XML_TOK_STYLES_TIME_STYLE,
-XML_TOK_STYLES_BOOLEAN_STYLE,
-XML_TOK_STYLES_TEXT_STYLE
+NUMBER_STYLE,
+CURRENCY_STYLE,
+PERCENTAGE_STYLE,
+DATE_STYLE,
+TIME_STYLE,
+BOOLEAN_STYLE,
+TEXT_STYLE
};
enum SvXMLDateElementAttributes
@@ -120,7 +120,7 @@ class XMLOFF_DLLPUBLIC SvXMLNumFormatContext : public
SvXMLStyleContext
SvXMLNumImpData*pData;
SvXMLStylesContext* pStyles;
std::vectoraMyConditions;
-sal_uInt16 nType;
+SvXMLStylesTokens nType;
sal_Int32 nKey;
// OUString sFormatName;
OUString sFormatTitle;
@@ -157,7 +157,7 @@ public:
sal_uInt16 nPrfx,
const OUString& rLName,
SvXMLNumImpData* pNewData,
-sal_uInt16 nNewType,
+SvXMLStylesTokens nNewType,
const css::uno::Reference<
css::xml::sax::XAttributeList>& xAttrList,
SvXMLStylesContext& rStyles );
SvXMLNumFormatContext( SvXMLImport& rImport,
@@ -178,7 +178,7 @@ public:
sal_Int32 GetKey();
sal_Int32 CreateAndInsert( SvNumberFormatter* pFormatter );
sal_Int32 CreateAndInsert( css::uno::Reference<
css::util::XNumberFormatsSupplier > const & xFormatsSupplier );
-sal_uInt16 GetType() const { return nType; } //
SvXMLStylesTokens
+SvXMLStylesTokens GetType() const { return nType; } //
SvXMLStylesTokens
bool HasLongDoW() const { return bHasLongDoW; }
void SetHasLongDoW(bool bSet) { bHasLongDoW = bSet; }
diff --git a/xmloff/inc/XMLNumberStylesImport.hxx
b/xmloff/inc/XMLNumberStylesImport.hxx
index ed8edb0d8851..caddcb7fc106 100644
--- a/xmloff/inc/XMLNumberStylesImport.hxx
+++ b/xmloff/inc/XMLNumberStylesImport.hxx
@@ -47,7 +47,7 @@ public:
SdXMLNumberFormatImportContext( SdXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLocalName,
-SvXMLNumImpData* pNewData, sal_uInt16 nNewType,
+SvXMLNumImpData* pNewData, SvXMLStylesTokens nNewType,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
SvXMLStylesContext& rStyles);
virtual ~SdXMLNumberFormatImportContext() override;
diff --git a/xmloff/source/draw/XMLNumberStyles.cxx
b/xmloff/source/draw/XMLNumberStyles.cxx
index 4904cabb4c3c..deb191844cdc 100644
--- a/xmloff/source/draw/XMLNumberStyles.cxx
+++ b/xmloff/source/draw/XMLNumberStyles.cxx
@@ -576,7 +576,7 @@ void SdXMLNumberFormatMemberImportContext::Characters(
const OUString& rChars )
}
-SdXMLNumberFormatImportContext::SdXMLNumberFormatImportContext( SdXMLImport&
rImport, sal_uInt16 nPrfx, const OUString& rLocalName, SvXMLNumImpData*
pNewData, sal_uInt16 nNewType, const css::uno::Reference<
css::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles)
+SdXMLNumberFormatImportContext::SdXMLNumberFormatImportContext( SdXMLImport&
rImport, sal_uInt16 nPrfx, const OUString& rLocalName, SvXMLNumImpData*
pNewData, SvXMLStylesTokens nNewType, const css::uno::Reference<
css::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles)
: SvXMLNumFormatContext(rImport, nPrfx, rLocalName, pNewData, nNewType,
xAttrList, rStyles),
mbAutomatic( false ),
mnIndex(0),
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 52d771a6d1da..6952d6b68562 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximps
[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_setup.mk
instsetoo_native/CustomTarget_setup.mk |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4e842482274d9ade61c6aa8c3048efdfa8e0ded5
Author: Stephan Bergmann
AuthorDate: Tue Aug 18 22:32:04 2020 +0200
Commit: Stephan Bergmann
CommitDate: Wed Aug 19 08:56:26 2020 +0200
Spurious space at start of generated version ini file
...since 7f1f1f53206c85fb0e2290e5fb2e20dcedfa2610 "tdf#118303 - Wrong
converting
of the Vendor-String"
Change-Id: I192f8b9cfaba0863612c9099b926ea5828783bd6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100963
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/instsetoo_native/CustomTarget_setup.mk
b/instsetoo_native/CustomTarget_setup.mk
index ea0d2137c1a1..6feb5238664b 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -200,7 +200,7 @@ ifeq ($(HAVE_GNUMAKE_FILE_FUNC),)
printf 'UpdateUserAgent= ($${buildid}; $${_OS}; $${_ARCH};
)\n' >> $@ && \
printf 'Vendor=$(OOO_VENDOR)\n' >> $@
else
- $(file > $@, $(call instsetoo_native_genversionini))
+ $(file > $@,$(call instsetoo_native_genversionini))
endif
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - desktop/source
desktop/source/lib/init.cxx |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 7621398ad1b4e25b87d6da709b41966e7e3a9484
Author: Mert Tumer
AuthorDate: Mon Aug 17 11:40:38 2020 +0300
Commit: Andras Timar
CommitDate: Wed Aug 19 08:58:44 2020 +0200
Fix hyperlink popup does not show up
The popup does not show up when double clicking
same cell after first one when the cell has a
hyperlink. This is because LOK_CALLBACK_INVALIDATE
_VISIBLE_CURSOR message is filtered out when it
is duplicate and hyperlink is inside this callback.
Selecting different cell after editing one does not
make calc to send another invalidate cursor message
because it is only sent if the selected cell is being
edited. This confuses the ui experience, so this patch
prevents the callback from being filtered out
if only it contains a hyperlink. If there is not a hyperlink
on the cursor position the duplicate callbacks will still
be filtered out.
Signed-off-by: Mert Tumer
Change-Id: Ibca0887b7d49633e476bc63d08bc0b7cc309d710
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100851
Tested-by: Jenkins
Reviewed-by: Andras Timar
(cherry picked from commit 06bed3046b4ca62a50566f42d3a7079f0b563935)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100935
Tested-by: Jenkins CollaboraOffice
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d33454297cf8..d0982e0bdcf1 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1519,10 +1519,15 @@ void CallbackFlushHandler::queue(const int type, const
char* data)
case LOK_CALLBACK_VIEW_CURSOR_VISIBLE:
case LOK_CALLBACK_CALC_FUNCTION_LIST:
{
+// deleting the duplicate of visible cursor message can cause
hyperlink popup not to show up on second/or more click on the same place.
+// If the hyperlink is not empty we can bypass that to show
the popup
+const bool hyperLinkException = type ==
LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR &&
+payload.find("\"hyperlink\":\"\"") == std::string::npos &&
+payload.find("\"hyperlink\": {}") == std::string::npos;
const int nViewId = lcl_getViewId(payload);
removeAll(
-[type, nViewId] (const queue_type::value_type& elem) {
-return (elem.Type == type && nViewId ==
lcl_getViewId(elem));
+[type, nViewId, hyperLinkException] (const
queue_type::value_type& elem) {
+return (elem.Type == type && nViewId ==
lcl_getViewId(elem) && !hyperLinkException);
}
);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
