[Libreoffice-bugs] [Bug 45904] move java based api tests to c++
https://bugs.documentfoundation.org/show_bug.cgi?id=45904 --- Comment #284 from Commit Notification --- Jens Carl committed a patch related to this issue. It has been pushed to "master": https://git.libreoffice.org/core/+/eb0653ee80ad7249fde9ff752b56316fb98c4592%5E%21 tdf#45904 Move XServiceInfo Java tests to C++ It will be available in 6.3.0. The patch should be included in the daily builds available at https://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: https://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 45904] move java based api tests to c++
https://bugs.documentfoundation.org/show_bug.cgi?id=45904 --- Comment #285 from Commit Notification --- Jens Carl committed a patch related to this issue. It has been pushed to "master": https://git.libreoffice.org/core/+/ee503c36199d225f4c906fe43c927f911c2097c7%5E%21 tdf#45904 Move XShapeGrouper Java tests to C++ It will be available in 6.3.0. The patch should be included in the daily builds available at https://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: https://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: include/test qadevOOo/objdsc sc/qa test/Library_subsequenttest.mk test/source
include/test/drawing/xshapegrouper.hxx| 44 +++
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv |2
sc/qa/extras/scdrawpageobj.cxx| 10 +
test/Library_subsequenttest.mk|1
test/source/drawing/xshapegrouper.cxx | 58 ++
5 files changed, 112 insertions(+), 3 deletions(-)
New commits:
commit ee503c36199d225f4c906fe43c927f911c2097c7
Author: Jens Carl
AuthorDate: Thu Mar 28 00:22:44 2019 +
Commit: Jens Carl
CommitDate: Thu Mar 28 06:28:16 2019 +0100
tdf#45904 Move XShapeGrouper Java tests to C++
Move XShapeGrouper Java tests to C++ for ScDrawPageObj.
Change-Id: I4a1ed4f14f759fa4214141f0d552e35ccae28035
Reviewed-on: https://gerrit.libreoffice.org/69873
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/include/test/drawing/xshapegrouper.hxx
b/include/test/drawing/xshapegrouper.hxx
new file mode 100644
index ..1770d3f76d6c
--- /dev/null
+++ b/include/test/drawing/xshapegrouper.hxx
@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_DRAWING_XSHAPEGROUPER_HXX
+#define INCLUDED_TEST_DRAWING_XSHAPEGROUPER_HXX
+
+#include
+
+#include
+
+#include
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XShapeGrouper
+{
+public:
+void setDrawPage(const css::uno::Reference&
r_xDrawPage)
+{
+m_xDrawPage = r_xDrawPage;
+}
+
+virtual css::uno::Reference init() = 0;
+
+void testGroup();
+void testUngroup();
+
+protected:
+~XShapeGrouper() {}
+
+private:
+css::uno::Reference m_xDrawPage;
+};
+} // namespace apitest
+
+#endif // INCLUDED_TEST_DRAWING_XSHAPEGROUPER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv
index c742ce529e4f..b39d7b6062be 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv
@@ -1,4 +1,2 @@
"ScDrawPageObj";"com::sun::star::drawing::XShapes";"add()"
"ScDrawPageObj";"com::sun::star::drawing::XShapes";"remove()"
-"ScDrawPageObj";"com::sun::star::drawing::XShapeGrouper";"group()"
-"ScDrawPageObj";"com::sun::star::drawing::XShapeGrouper";"ungroup()"
diff --git a/sc/qa/extras/scdrawpageobj.cxx b/sc/qa/extras/scdrawpageobj.cxx
index de8d8baa4e9c..7d50a783d9d5 100644
--- a/sc/qa/extras/scdrawpageobj.cxx
+++ b/sc/qa/extras/scdrawpageobj.cxx
@@ -11,6 +11,7 @@
#include
#include
#include
+#include
#include
#include
@@ -32,7 +33,8 @@ namespace sc_apitest
class ScDrawPageObj : public CalcUnoApiTest,
public apitest::XElementAccess,
public apitest::XIndexAccess,
- public apitest::XServiceInfo
+ public apitest::XServiceInfo,
+ public apitest::XShapeGrouper
{
public:
ScDrawPageObj();
@@ -56,6 +58,10 @@ public:
CPPUNIT_TEST(testGetSupportedServiceNames);
CPPUNIT_TEST(testSupportsService);
+// XShapeGrouper
+CPPUNIT_TEST(testGroup);
+CPPUNIT_TEST(testUngroup);
+
CPPUNIT_TEST_SUITE_END();
private:
@@ -90,6 +96,8 @@ uno::Reference ScDrawPageObj::init()
uno::UNO_QUERY_THROW);
xShapes->add(xRectangle1);
+// needed for XShapeGrouper tests
+setDrawPage(xDrawPage);
return xDrawPage;
}
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index 7fca94314977..c267a1570d1f 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -56,6 +56,7 @@ $(eval $(call
gb_Library_add_exception_objects,subsequenttest,\
test/source/document/xlinktargetsupplier \
test/source/drawing/captionshape \
test/source/drawing/xdrawpages \
+ test/source/drawing/xshapegrouper \
test/source/lang/xserviceinfo \
test/source/lang/xcomponent \
test/source/sheet/cellarealink \
diff --git a/test/source/drawing/xshapegrouper.cxx
b/test/source/drawing/xshapegrouper.cxx
new file mode 100644
index ..6595050ad418
--- /dev/null
+++ b/test/source/drawing/xshapegrouper.cxx
@@ -0,0 +1,58 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
[Libreoffice-commits] core.git: qadevOOo/objdsc sc/qa
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv |2 -
sc/qa/extras/scdrawpageobj.cxx| 11 +-
2 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit f897e80d063436be07356049f595efe5afb04859
Author: Jens Carl
AuthorDate: Wed Mar 27 23:14:48 2019 +
Commit: Jens Carl
CommitDate: Thu Mar 28 06:27:15 2019 +0100
tdf#45904 Move XElementAccess Java tests to C++
Move XElementAccess Java tests to C++ for ScDrawPageObj.
Change-Id: I3a51c77f524311416ac054005c0632e5127efb79
Reviewed-on: https://gerrit.libreoffice.org/69871
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv
index 11bfae0d02d9..7273ff229a1d 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv
@@ -1,8 +1,6 @@
"ScDrawPageObj";"com::sun::star::lang::XServiceInfo";"getImplementationName()"
"ScDrawPageObj";"com::sun::star::lang::XServiceInfo";"supportsService()"
"ScDrawPageObj";"com::sun::star::lang::XServiceInfo";"getSupportedServiceNames()"
-"ScDrawPageObj";"com::sun::star::container::XElementAccess";"getElementType()"
-"ScDrawPageObj";"com::sun::star::container::XElementAccess";"hasElements()"
"ScDrawPageObj";"com::sun::star::drawing::XShapes";"add()"
"ScDrawPageObj";"com::sun::star::drawing::XShapes";"remove()"
"ScDrawPageObj";"com::sun::star::drawing::XShapeGrouper";"group()"
diff --git a/sc/qa/extras/scdrawpageobj.cxx b/sc/qa/extras/scdrawpageobj.cxx
index 77beb3629528..9f8e9194598d 100644
--- a/sc/qa/extras/scdrawpageobj.cxx
+++ b/sc/qa/extras/scdrawpageobj.cxx
@@ -9,7 +9,9 @@
#include
#include
+#include
#include
+#include
#include
#include
@@ -26,7 +28,9 @@ using namespace css;
namespace sc_apitest
{
-class ScDrawPageObj : public CalcUnoApiTest, public apitest::XIndexAccess
+class ScDrawPageObj : public CalcUnoApiTest,
+ public apitest::XElementAccess,
+ public apitest::XIndexAccess
{
public:
ScDrawPageObj();
@@ -37,6 +41,10 @@ public:
CPPUNIT_TEST_SUITE(ScDrawPageObj);
+// XElementAccess
+CPPUNIT_TEST(testGetElementType);
+CPPUNIT_TEST(testHasElements);
+
// XIndexAccess
CPPUNIT_TEST(testGetByIndex);
CPPUNIT_TEST(testGetCount);
@@ -49,6 +57,7 @@ private:
ScDrawPageObj::ScDrawPageObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
+, XElementAccess(cppu::UnoType::get())
, XIndexAccess(2)
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 45904] move java based api tests to c++
https://bugs.documentfoundation.org/show_bug.cgi?id=45904 --- Comment #283 from Commit Notification --- Jens Carl committed a patch related to this issue. It has been pushed to "master": https://git.libreoffice.org/core/+/f897e80d063436be07356049f595efe5afb04859%5E%21 tdf#45904 Move XElementAccess Java tests to C++ It will be available in 6.3.0. The patch should be included in the daily builds available at https://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: https://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: qadevOOo/objdsc sc/qa
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv |3 ---
sc/qa/extras/scdrawpageobj.cxx| 10 +-
2 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit eb0653ee80ad7249fde9ff752b56316fb98c4592
Author: Jens Carl
AuthorDate: Wed Mar 27 23:25:38 2019 +
Commit: Jens Carl
CommitDate: Thu Mar 28 06:27:41 2019 +0100
tdf#45904 Move XServiceInfo Java tests to C++
Move XServiceInfo Java tests to C++ for ScDrawPageObj.
Change-Id: Icc2c97296f549763068475be18c00a23b7cd73dc
Reviewed-on: https://gerrit.libreoffice.org/69872
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv
index 7273ff229a1d..c742ce529e4f 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv
@@ -1,6 +1,3 @@
-"ScDrawPageObj";"com::sun::star::lang::XServiceInfo";"getImplementationName()"
-"ScDrawPageObj";"com::sun::star::lang::XServiceInfo";"supportsService()"
-"ScDrawPageObj";"com::sun::star::lang::XServiceInfo";"getSupportedServiceNames()"
"ScDrawPageObj";"com::sun::star::drawing::XShapes";"add()"
"ScDrawPageObj";"com::sun::star::drawing::XShapes";"remove()"
"ScDrawPageObj";"com::sun::star::drawing::XShapeGrouper";"group()"
diff --git a/sc/qa/extras/scdrawpageobj.cxx b/sc/qa/extras/scdrawpageobj.cxx
index 9f8e9194598d..de8d8baa4e9c 100644
--- a/sc/qa/extras/scdrawpageobj.cxx
+++ b/sc/qa/extras/scdrawpageobj.cxx
@@ -11,6 +11,7 @@
#include
#include
#include
+#include
#include
#include
@@ -30,7 +31,8 @@ namespace sc_apitest
{
class ScDrawPageObj : public CalcUnoApiTest,
public apitest::XElementAccess,
- public apitest::XIndexAccess
+ public apitest::XIndexAccess,
+ public apitest::XServiceInfo
{
public:
ScDrawPageObj();
@@ -49,6 +51,11 @@ public:
CPPUNIT_TEST(testGetByIndex);
CPPUNIT_TEST(testGetCount);
+// XServiceInfo
+CPPUNIT_TEST(testGetImplementationName);
+CPPUNIT_TEST(testGetSupportedServiceNames);
+CPPUNIT_TEST(testSupportsService);
+
CPPUNIT_TEST_SUITE_END();
private:
@@ -59,6 +66,7 @@ ScDrawPageObj::ScDrawPageObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
, XElementAccess(cppu::UnoType::get())
, XIndexAccess(2)
+, XServiceInfo("ScPageObj", "com.sun.star.sheet.SpreadsheetDrawPage")
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 124382] FILEOPEN PDF Crash if open file from mounted via pam_mount net share (cifs)
https://bugs.documentfoundation.org/show_bug.cgi?id=124382 --- Comment #1 from Anton Shevtsov --- Created attachment 150335 --> https://bugs.documentfoundation.org/attachment.cgi?id=150335=edit strace log -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 124382] New: FILEOPEN PDF Crash if open file from mounted via pam_mount net share (cifs)
https://bugs.documentfoundation.org/show_bug.cgi?id=124382 Bug ID: 124382 Summary: FILEOPEN PDF Crash if open file from mounted via pam_mount net share (cifs) Product: LibreOffice Version: 6.0.7.3 release Hardware: All OS: Linux (All) Status: UNCONFIRMED Severity: minor Priority: medium Component: Draw Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: shevtsov.an...@gmail.com Description: If i try open pdf file from mounted via pam_mount (https://wiki.archlinux.org/index.php/Pam_mount) net share from Windows File Server then Draw is crashed. After restart Draw, it try restore pdf file, but crashed again. Other apps opened this (and other) pdf's fine. If i copy file to local folder (as example /tmp) - all work fine. tested on few computers (KDE5, Mate). Steps to Reproduce: I am run command line bellow export LANG=en_US.UTF-8 ; strace -s 1024 -o /tmp/draw_open_pdf_from_smbshare_pammount.txt libreoffice6.0 --draw '/home/ADM72.LOCAL/shevtsovay/mnt/share_all/Шевцов А.Ю/Протокол ДЛК2.pdf' (soffice:28945): GLib-GObject-WARNING **: gsignal.c:3492: signal name 'selection_changed' is invalid for instance '0x2a712a0' of type 'OOoAtkObjCompTxt' Fatal exception: Signal 7 Stack: /usr/lib64/LibreOffice/program/libuno_sal.so.3(+0x3b9b0)[0x7f45e23f49b0] /usr/lib64/LibreOffice/program/libuno_sal.so.3(+0x3bb20)[0x7f45e23f4b20] /lib64/libc.so.6(+0x0)[0x7f45e1d8f330] /usr/lib64/LibreOffice/program/../program/libpdfimportlo.so(+0x210e8)[0x7f458caa80e8] /usr/lib64/LibreOffice/program/../program/libpdfimportlo.so(+0x21667)[0x7f458caa8667] /usr/lib64/LibreOffice/program/../program/libpdfimportlo.so(+0x1112d)[0x7f458ca9812d] /usr/lib64/LibreOffice/program/../program/libpdfimportlo.so(+0x11c8f)[0x7f458ca98c8f] /usr/lib64/LibreOffice/program/../program/libfilterconfiglo.so(+0x411f0)[0x7f459646e1f0] /usr/lib64/LibreOffice/program/../program/libfilterconfiglo.so(+0x4199b)[0x7f459646e99b] /usr/lib64/LibreOffice/program/../program/libfilterconfiglo.so(+0x42307)[0x7f459646f307] /usr/lib64/LibreOffice/program/../program/libfwklo.so(+0x11b247)[0x7f45c0618247] /usr/lib64/LibreOffice/program/../program/libfwklo.so(+0x11f251)[0x7f45c061c251] /usr/lib64/LibreOffice/program/../program/libfwklo.so(+0xb031f)[0x7f45c05ad31f] /usr/lib64/LibreOffice/program/../program/libfwklo.so(+0xb10e8)[0x7f45c05ae0e8] /usr/lib64/LibreOffice/program/libcomphelper.so(_ZN10comphelper19SynchronousDispatch8dispatchERKN3com3sun4star3uno9ReferenceINS4_10XInterfaceEEERKN3rtl8OUStringESD_iRKNS4_8SequenceINS3_5beans13PropertyValueEEE+0x3cf)[0x7f45e00d8e3f] /usr/lib64/LibreOffice/program/libsofficeapp.so(+0x41795)[0x7f45e2140795] /usr/lib64/LibreOffice/program/libsofficeapp.so(+0x4c201)[0x7f45e214b201] /usr/lib64/LibreOffice/program/libsofficeapp.so(+0x2679a)[0x7f45e212579a] /usr/lib64/LibreOffice/program/libsofficeapp.so(+0x27b8a)[0x7f45e2126b8a] /usr/lib64/LibreOffice/program/libvcllo.so(+0x30264f)[0x7f45dafee64f] /usr/lib64/LibreOffice/program/libvcllo.so(_ZN16SalUserEventList18DispatchUserEventsEb+0x12f)[0x7f45db1eb97f] /usr/lib64/LibreOffice/program/libvclplug_gtk3lo.so(+0x41fd9)[0x7f45c595afd9] /lib64/libglib-2.0.so.0(g_main_context_dispatch+0x13a)[0x7f45d362695a] /lib64/libglib-2.0.so.0(+0x4dcd8)[0x7f45d3626cd8] /lib64/libglib-2.0.so.0(g_main_context_iteration+0x2c)[0x7f45d3626d7c] /usr/lib64/LibreOffice/program/libvclplug_gtk3lo.so(+0x43343)[0x7f45c595c343] /usr/lib64/LibreOffice/program/libvcllo.so(_ZN11Application5YieldEv+0x2e)[0x7f45db1fc47e] /usr/lib64/LibreOffice/program/libvcllo.so(_ZN11Application7ExecuteEv+0x45)[0x7f45db1fdce5] /usr/lib64/LibreOffice/program/libsofficeapp.so(+0x28e01)[0x7f45e2127e01] /usr/lib64/LibreOffice/program/libvcllo.so(+0x517226)[0x7f45db203226] /usr/lib64/LibreOffice/program/libvcllo.so(_Z6SVMainv+0x22)[0x7f45db203322] /usr/lib64/LibreOffice/program/libsofficeapp.so(soffice_main+0x8a)[0x7f45e215309a] /usr/lib64/LibreOffice/program/soffice.bin[0x40070b] /lib64/libc.so.6(__libc_start_main+0xf0)[0x7f45e1d7c7f0] /usr/lib64/LibreOffice/program/soffice.bin[0x400749] strace log: https://cloud.72to.ru/index.php/s/rXLcXsds2HqTiFX mount options output //fs1-sovet61/share_all on /home/ADM72.LOCAL/shevtsovay/mnt/share_all type cifs (rw,relatime,vers=2.0,sec=krb5,cache=strict,username=shevtsovay,uid=215651267,forceuid,gid=215600513,forcegid,addr=10.61.7.16,file_mode=0755,dir_mode=0755,nounix,serverino,mapposix,rsize=65536,wsize=65536,echo_interval=60,actimeo=1) /etc/auto.smb on /mnt/samba/fs1-sovet61/share_all type autofs (rw,relatime,fd=18,pgrp=1239,timeout=34567,minproto=5,maxproto=5,offset,pipe_ino=14847) if use simple as mount -t cifs -o=username //server/share /local/folder - аll work fine if use gvfs - all work fine if use pam_mount (autofs?) - crashed Actual Results: file not opened. Draw is crashed Expected Results: i want open file. Reproducible:
[Libreoffice-bugs] [Bug 61963] UI: 'Group and Outline' impossible with active Filter
https://bugs.documentfoundation.org/show_bug.cgi?id=61963 --- Comment #9 from QA Administrators --- ** Please read this message in its entirety before responding ** To make sure we're focusing on the bugs that affect our users today, LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed bugs which have not been touched for over a year. There have been thousands of bug fixes and commits since anyone checked on this bug report. During that time, it's possible that the bug has been fixed, or the details of the problem have changed. We'd really appreciate your help in getting confirmation that the bug is still present. If you have time, please do the following: Test to see if the bug is still present with the latest version of LibreOffice from https://www.libreoffice.org/download/ If the bug is present, please leave a comment that includes the information from Help - About LibreOffice. If the bug is NOT present, please set the bug's Status field to RESOLVED-WORKSFORME and leave a comment that includes the information from Help - About LibreOffice. Please DO NOT Update the version field Reply via email (please reply directly on the bug tracker) Set the bug's Status field to RESOLVED - FIXED (this status has a particular meaning that is not appropriate in this case) If you want to do more to help you can test to see if your issue is a REGRESSION. To do so: 1. Download and install oldest version of LibreOffice (usually 3.3 unless your bug pertains to a feature added after 3.3) from http://downloadarchive.documentfoundation.org/libreoffice/old/ 2. Test your bug 3. Leave a comment with your results. 4a. If the bug was present with 3.3 - set version to 'inherited from OOo'; 4b. If the bug was not present in 3.3 - add 'regression' to keyword Feel free to come ask questions or to say hello in our QA chat: https://kiwiirc.com/nextclient/irc.freenode.net/#libreoffice-qa Thank you for helping us make LibreOffice even better for everyone! Warm Regards, QA Team MassPing-UntouchedBug -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 101182] Sort destroys group information
https://bugs.documentfoundation.org/show_bug.cgi?id=101182 --- Comment #5 from QA Administrators --- ** Please read this message in its entirety before responding ** To make sure we're focusing on the bugs that affect our users today, LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed bugs which have not been touched for over a year. There have been thousands of bug fixes and commits since anyone checked on this bug report. During that time, it's possible that the bug has been fixed, or the details of the problem have changed. We'd really appreciate your help in getting confirmation that the bug is still present. If you have time, please do the following: Test to see if the bug is still present with the latest version of LibreOffice from https://www.libreoffice.org/download/ If the bug is present, please leave a comment that includes the information from Help - About LibreOffice. If the bug is NOT present, please set the bug's Status field to RESOLVED-WORKSFORME and leave a comment that includes the information from Help - About LibreOffice. Please DO NOT Update the version field Reply via email (please reply directly on the bug tracker) Set the bug's Status field to RESOLVED - FIXED (this status has a particular meaning that is not appropriate in this case) If you want to do more to help you can test to see if your issue is a REGRESSION. To do so: 1. Download and install oldest version of LibreOffice (usually 3.3 unless your bug pertains to a feature added after 3.3) from http://downloadarchive.documentfoundation.org/libreoffice/old/ 2. Test your bug 3. Leave a comment with your results. 4a. If the bug was present with 3.3 - set version to 'inherited from OOo'; 4b. If the bug was not present in 3.3 - add 'regression' to keyword Feel free to come ask questions or to say hello in our QA chat: https://kiwiirc.com/nextclient/irc.freenode.net/#libreoffice-qa Thank you for helping us make LibreOffice even better for everyone! Warm Regards, QA Team MassPing-UntouchedBug -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 106620] Glued lines are not perfectly aligned
https://bugs.documentfoundation.org/show_bug.cgi?id=106620 --- Comment #5 from QA Administrators --- ** Please read this message in its entirety before responding ** To make sure we're focusing on the bugs that affect our users today, LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed bugs which have not been touched for over a year. There have been thousands of bug fixes and commits since anyone checked on this bug report. During that time, it's possible that the bug has been fixed, or the details of the problem have changed. We'd really appreciate your help in getting confirmation that the bug is still present. If you have time, please do the following: Test to see if the bug is still present with the latest version of LibreOffice from https://www.libreoffice.org/download/ If the bug is present, please leave a comment that includes the information from Help - About LibreOffice. If the bug is NOT present, please set the bug's Status field to RESOLVED-WORKSFORME and leave a comment that includes the information from Help - About LibreOffice. Please DO NOT Update the version field Reply via email (please reply directly on the bug tracker) Set the bug's Status field to RESOLVED - FIXED (this status has a particular meaning that is not appropriate in this case) If you want to do more to help you can test to see if your issue is a REGRESSION. To do so: 1. Download and install oldest version of LibreOffice (usually 3.3 unless your bug pertains to a feature added after 3.3) from http://downloadarchive.documentfoundation.org/libreoffice/old/ 2. Test your bug 3. Leave a comment with your results. 4a. If the bug was present with 3.3 - set version to 'inherited from OOo'; 4b. If the bug was not present in 3.3 - add 'regression' to keyword Feel free to come ask questions or to say hello in our QA chat: https://kiwiirc.com/nextclient/irc.freenode.net/#libreoffice-qa Thank you for helping us make LibreOffice even better for everyone! Warm Regards, QA Team MassPing-UntouchedBug -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 33697] Unable to choose proxy type "system"
https://bugs.documentfoundation.org/show_bug.cgi?id=33697 --- Comment #16 from QA Administrators --- ** Please read this message in its entirety before responding ** To make sure we're focusing on the bugs that affect our users today, LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed bugs which have not been touched for over a year. There have been thousands of bug fixes and commits since anyone checked on this bug report. During that time, it's possible that the bug has been fixed, or the details of the problem have changed. We'd really appreciate your help in getting confirmation that the bug is still present. If you have time, please do the following: Test to see if the bug is still present with the latest version of LibreOffice from https://www.libreoffice.org/download/ If the bug is present, please leave a comment that includes the information from Help - About LibreOffice. If the bug is NOT present, please set the bug's Status field to RESOLVED-WORKSFORME and leave a comment that includes the information from Help - About LibreOffice. Please DO NOT Update the version field Reply via email (please reply directly on the bug tracker) Set the bug's Status field to RESOLVED - FIXED (this status has a particular meaning that is not appropriate in this case) If you want to do more to help you can test to see if your issue is a REGRESSION. To do so: 1. Download and install oldest version of LibreOffice (usually 3.3 unless your bug pertains to a feature added after 3.3) from http://downloadarchive.documentfoundation.org/libreoffice/old/ 2. Test your bug 3. Leave a comment with your results. 4a. If the bug was present with 3.3 - set version to 'inherited from OOo'; 4b. If the bug was not present in 3.3 - add 'regression' to keyword Feel free to come ask questions or to say hello in our QA chat: https://kiwiirc.com/nextclient/irc.freenode.net/#libreoffice-qa Thank you for helping us make LibreOffice even better for everyone! Warm Regards, QA Team MassPing-UntouchedBug -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 50202] FORMATTING: Rotated RTL text mixed with numbers produces complete mess
https://bugs.documentfoundation.org/show_bug.cgi?id=50202 --- Comment #13 from QA Administrators --- ** Please read this message in its entirety before responding ** To make sure we're focusing on the bugs that affect our users today, LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed bugs which have not been touched for over a year. There have been thousands of bug fixes and commits since anyone checked on this bug report. During that time, it's possible that the bug has been fixed, or the details of the problem have changed. We'd really appreciate your help in getting confirmation that the bug is still present. If you have time, please do the following: Test to see if the bug is still present with the latest version of LibreOffice from https://www.libreoffice.org/download/ If the bug is present, please leave a comment that includes the information from Help - About LibreOffice. If the bug is NOT present, please set the bug's Status field to RESOLVED-WORKSFORME and leave a comment that includes the information from Help - About LibreOffice. Please DO NOT Update the version field Reply via email (please reply directly on the bug tracker) Set the bug's Status field to RESOLVED - FIXED (this status has a particular meaning that is not appropriate in this case) If you want to do more to help you can test to see if your issue is a REGRESSION. To do so: 1. Download and install oldest version of LibreOffice (usually 3.3 unless your bug pertains to a feature added after 3.3) from http://downloadarchive.documentfoundation.org/libreoffice/old/ 2. Test your bug 3. Leave a comment with your results. 4a. If the bug was present with 3.3 - set version to 'inherited from OOo'; 4b. If the bug was not present in 3.3 - add 'regression' to keyword Feel free to come ask questions or to say hello in our QA chat: https://kiwiirc.com/nextclient/irc.freenode.net/#libreoffice-qa Thank you for helping us make LibreOffice even better for everyone! Warm Regards, QA Team MassPing-UntouchedBug -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 105325] Sorting of Conditional Formatting Ranges in the manage dialog should be by column order instead of alphabetically
https://bugs.documentfoundation.org/show_bug.cgi?id=105325 --- Comment #11 from QA Administrators --- ** Please read this message in its entirety before responding ** To make sure we're focusing on the bugs that affect our users today, LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed bugs which have not been touched for over a year. There have been thousands of bug fixes and commits since anyone checked on this bug report. During that time, it's possible that the bug has been fixed, or the details of the problem have changed. We'd really appreciate your help in getting confirmation that the bug is still present. If you have time, please do the following: Test to see if the bug is still present with the latest version of LibreOffice from https://www.libreoffice.org/download/ If the bug is present, please leave a comment that includes the information from Help - About LibreOffice. If the bug is NOT present, please set the bug's Status field to RESOLVED-WORKSFORME and leave a comment that includes the information from Help - About LibreOffice. Please DO NOT Update the version field Reply via email (please reply directly on the bug tracker) Set the bug's Status field to RESOLVED - FIXED (this status has a particular meaning that is not appropriate in this case) If you want to do more to help you can test to see if your issue is a REGRESSION. To do so: 1. Download and install oldest version of LibreOffice (usually 3.3 unless your bug pertains to a feature added after 3.3) from http://downloadarchive.documentfoundation.org/libreoffice/old/ 2. Test your bug 3. Leave a comment with your results. 4a. If the bug was present with 3.3 - set version to 'inherited from OOo'; 4b. If the bug was not present in 3.3 - add 'regression' to keyword Feel free to come ask questions or to say hello in our QA chat: https://kiwiirc.com/nextclient/irc.freenode.net/#libreoffice-qa Thank you for helping us make LibreOffice even better for everyone! Warm Regards, QA Team MassPing-UntouchedBug -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 49259] Writer sheets are too jumpy in various cases
https://bugs.documentfoundation.org/show_bug.cgi?id=49259 --- Comment #7 from QA Administrators --- ** Please read this message in its entirety before responding ** To make sure we're focusing on the bugs that affect our users today, LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed bugs which have not been touched for over a year. There have been thousands of bug fixes and commits since anyone checked on this bug report. During that time, it's possible that the bug has been fixed, or the details of the problem have changed. We'd really appreciate your help in getting confirmation that the bug is still present. If you have time, please do the following: Test to see if the bug is still present with the latest version of LibreOffice from https://www.libreoffice.org/download/ If the bug is present, please leave a comment that includes the information from Help - About LibreOffice. If the bug is NOT present, please set the bug's Status field to RESOLVED-WORKSFORME and leave a comment that includes the information from Help - About LibreOffice. Please DO NOT Update the version field Reply via email (please reply directly on the bug tracker) Set the bug's Status field to RESOLVED - FIXED (this status has a particular meaning that is not appropriate in this case) If you want to do more to help you can test to see if your issue is a REGRESSION. To do so: 1. Download and install oldest version of LibreOffice (usually 3.3 unless your bug pertains to a feature added after 3.3) from http://downloadarchive.documentfoundation.org/libreoffice/old/ 2. Test your bug 3. Leave a comment with your results. 4a. If the bug was present with 3.3 - set version to 'inherited from OOo'; 4b. If the bug was not present in 3.3 - add 'regression' to keyword Feel free to come ask questions or to say hello in our QA chat: https://kiwiirc.com/nextclient/irc.freenode.net/#libreoffice-qa Thank you for helping us make LibreOffice even better for everyone! Warm Regards, QA Team MassPing-UntouchedBug -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 105620] Cairo pattern to be filled into path is placed incorrectly
https://bugs.documentfoundation.org/show_bug.cgi?id=105620 --- Comment #13 from QA Administrators --- ** Please read this message in its entirety before responding ** To make sure we're focusing on the bugs that affect our users today, LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed bugs which have not been touched for over a year. There have been thousands of bug fixes and commits since anyone checked on this bug report. During that time, it's possible that the bug has been fixed, or the details of the problem have changed. We'd really appreciate your help in getting confirmation that the bug is still present. If you have time, please do the following: Test to see if the bug is still present with the latest version of LibreOffice from https://www.libreoffice.org/download/ If the bug is present, please leave a comment that includes the information from Help - About LibreOffice. If the bug is NOT present, please set the bug's Status field to RESOLVED-WORKSFORME and leave a comment that includes the information from Help - About LibreOffice. Please DO NOT Update the version field Reply via email (please reply directly on the bug tracker) Set the bug's Status field to RESOLVED - FIXED (this status has a particular meaning that is not appropriate in this case) If you want to do more to help you can test to see if your issue is a REGRESSION. To do so: 1. Download and install oldest version of LibreOffice (usually 3.3 unless your bug pertains to a feature added after 3.3) from http://downloadarchive.documentfoundation.org/libreoffice/old/ 2. Test your bug 3. Leave a comment with your results. 4a. If the bug was present with 3.3 - set version to 'inherited from OOo'; 4b. If the bug was not present in 3.3 - add 'regression' to keyword Feel free to come ask questions or to say hello in our QA chat: https://kiwiirc.com/nextclient/irc.freenode.net/#libreoffice-qa Thank you for helping us make LibreOffice even better for everyone! Warm Regards, QA Team MassPing-UntouchedBug -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 124253] It unexpectedly closes libreoffice calc (macros problem)
https://bugs.documentfoundation.org/show_bug.cgi?id=124253 Eduardo Castillo changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |spamkiller12...@gmail.com |desktop.org | --- Comment #6 from Eduardo Castillo --- Created attachment 150334 --> https://bugs.documentfoundation.org/attachment.cgi?id=150334=edit screenshot -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 102616] EDITING: Compare documents on near-identical files flags 99.9% of the contents as different
https://bugs.documentfoundation.org/show_bug.cgi?id=102616 --- Comment #9 from Luke Kendall --- This is just an interim note. It seems that compare documents for me now reproducibly crashes LO. After recovery, the merged document has a combination of: - genuine changes marked, - identical text marked as changed, and - a large amount of ruined formatting and paragraph style corruption, to the extent that the merged document for comparison is only of marginal utility. In short, Compare Documents is now of some utility, but it's certainly unsafe for use. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 124373] Feature Request: Option to hide "Title Bar"
https://bugs.documentfoundation.org/show_bug.cgi?id=124373 --- Comment #2 from prabesh...@gmail.com --- Does that mean people can "feature-request" in Bugzilla? -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 124188] Image resizing
https://bugs.documentfoundation.org/show_bug.cgi?id=124188 --- Comment #7 from amadorgil...@gmail.com --- Thank you for trying. Looks like I just have to live with the change. Please close this bug report. Regards -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 124381] New: PASSWORD not working AT SENECA
https://bugs.documentfoundation.org/show_bug.cgi?id=124381 Bug ID: 124381 Summary: PASSWORD not working AT SENECA Product: LibreOffice Version: 3.3.1 release Hardware: x86-64 (AMD64) OS: All Status: UNCONFIRMED Severity: trivial Priority: medium Component: Android Viewer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: wiseo...@gmail.com Description: password problem has been there since 4 days Actual Results: The login should work Expected Results: Logon fixed Reproducible: Always User Profile Reset: No Additional Info: -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 99648] [META] Improve Layer Handling
https://bugs.documentfoundation.org/show_bug.cgi?id=99648 Bug 99648 depends on bug 53864, which changed state. Bug 53864 Summary: Export ignores layer options 'printable' and 'visible' https://bugs.documentfoundation.org/show_bug.cgi?id=53864 What|Removed |Added Status|RESOLVED|NEW Resolution|FIXED |--- -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 53864] Export ignores layer options 'printable' and 'visible'
https://bugs.documentfoundation.org/show_bug.cgi?id=53864 Wolfgang Jäger changed: What|Removed |Added Resolution|FIXED |--- Status|RESOLVED|NEW --- Comment #12 from Wolfgang Jäger --- Sorry. I must have been stoned. Pdf is still the only export format regarding the visibility of layers. (This is now tested at least with one example for every type.) Settinng the bug NEW again. (Also somehow strange for a bug reporterd in 2012 originally.) -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.LokDialog.js |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b860ecf3900304841cdfa289213193153cf9506c
Author: Ashod Nakashian
AuthorDate: Sun Feb 3 17:32:25 2019 -0500
Commit: Ashod Nakashian
CommitDate: Thu Mar 28 02:05:52 2019 +0100
leaflet: align drop-down lists with parent combobox
This ensures that child-windows are aligned correctly
with their parents.
Change-Id: I3c491fb34083f26c7d376924ab04fbce83103f22
Reviewed-on: https://gerrit.libreoffice.org/68250
Reviewed-by: Szymon Kłos
Tested-by: Szymon Kłos
Reviewed-on: https://gerrit.libreoffice.org/69874
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/loleaflet/src/control/Control.LokDialog.js
b/loleaflet/src/control/Control.LokDialog.js
index 7c6c7e95a..1836bf7a2 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -658,12 +658,12 @@ L.Control.LokDialog = L.Control.extend({
var dialogTitle = $('.lokdialog_notitle');
if (dialogTitle != null && dialogTitle.length == 0) {
var dialogTitleBar = $('.ui-dialog-titlebar');
- top += dialogTitleBar.height() * L.getDpiScaleFactor();
+ top += dialogTitleBar.outerHeight() *
L.getDpiScaleFactor();
}
floatingCanvas.id = strId + '-floating';
L.DomUtil.setStyle(floatingCanvas, 'position', 'absolute');
- L.DomUtil.setStyle(floatingCanvas, 'left', left + 'px'); //
yes, it's necessary to append 'px'
+ L.DomUtil.setStyle(floatingCanvas, 'left', (left - 1) + 'px');
// Align drop-down list with parent.
L.DomUtil.setStyle(floatingCanvas, 'top', top + 'px');
// attach events
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 124380] New: Writer loses indenting of paragraphs on paragraph space change
https://bugs.documentfoundation.org/show_bug.cgi?id=124380 Bug ID: 124380 Summary: Writer loses indenting of paragraphs on paragraph space change Product: LibreOffice Version: 6.2.2.2 release Hardware: x86-64 (AMD64) OS: Linux (All) Status: UNCONFIRMED Severity: minor Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: ajt...@msn.com Description: If you have a document that contains multi-line paragraphs: If some paragraphs are indented and some are not: When you go to Format > Paragraph > Spacing Below paragraph: When you change that setting: The indented paragraphs unexpectedly lose their indenting. Worked correctly in 6.1.5 Steps to Reproduce: 1. Create a document that contains some multi-line paragraphs. 2. Indent some paragraphs but not others using "Increase Indent" button. 3. Highlight several paragraphs (both indented and not indented.) 4. From menu-bar, goto Format > Paragraph... > Spacing Below paragraph: 5. Change the value. 6. Click on OK button. Actual Results: All highlighted paragraphs are no-longer indented. Previously formatted text is not as expected. Time wasted! Expected Results: The leading under the text should have adjusted to the new setting but the indentation should have remained as previously set. The two settings should not give a linked result. Version 6.1.5 worked correctly here. However, it had another problem with the leading function which has been corrected in version 6.2.2.2. Reproducible: Always User Profile Reset: No Additional Info: [Information automatically included from LibreOffice] Locale: en-GB Module: TextDocument [Information guessed from browser] OS: Linux (All) OS is 64bit: yes +++ Version: 6.2.2.2 Build ID: 1:6.2.2-0ubuntu0.18.10.1~lo1 CPU threads: 4; OS: Linux 4.18; UI render: default; VCL: gtk3; Locale: en-GB (en_GB.UTF-8); UI-Language: en-GB Calc: threaded -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 124379] libre calc does not sort
https://bugs.documentfoundation.org/show_bug.cgi?id=124379 --- Comment #1 from sam3...@gmx.com --- Created attachment 150333 --> https://bugs.documentfoundation.org/attachment.cgi?id=150333=edit spreadsheet of a route -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 124379] New: libre calc does not sort
https://bugs.documentfoundation.org/show_bug.cgi?id=124379 Bug ID: 124379 Summary: libre calc does not sort Product: LibreOffice Version: 6.1.5.2 release Hardware: All OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Calc Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: sam3...@gmx.com Description: i highlight the entire file go to data, sort, then enter the parameters and the file does not get sorted properly Steps to Reproduce: 1.go to data 2.go to sort 3.enter parameters to sort by 4.hit ok Actual Results: certain items refuse to sort even after reentering the data to ensure correctness Expected Results: certain items are left out of the sort process in every file every time Reproducible: Always User Profile Reset: No Additional Info: sorted the entire file -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 124289] Slow Formula Bar
https://bugs.documentfoundation.org/show_bug.cgi?id=124289 --- Comment #2 from mulla.tasa...@gmail.com --- Thank you for reporting the bug. I can not reproduce the bug in Version: 6.2.1.2 (x64) Build ID: 7bcb35dc3024a62dea0caee87020152d1ee96e71 CPU threads: 4; OS: Windows 6.3; UI render: default; VCL: win; Locale: en-US (en_US); UI-Language: en-US Calc: CL Version: 6.3.0.0.alpha0+ (x64) Build ID: 91cdf22b88a4f7bec243c8fb187627e766d3294c CPU threads: 4; OS: Windows 6.3; UI render: default; VCL: win; TinderBox: Win-x86_64@42, Branch:master, Time: 2019-03-08_00:38:10 Locale: en-US (en_US); UI-Language: en-US Calc: CL -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 45904] move java based api tests to c++
https://bugs.documentfoundation.org/show_bug.cgi?id=45904 --- Comment #282 from Commit Notification --- Jens Carl committed a patch related to this issue. It has been pushed to "master": https://git.libreoffice.org/core/+/ed6a71eafa61bade50219d2ff6233a42ab6d1c17%5E%21 tdf#45904 Move XIndexAccess Java tests to C++ It will be available in 6.3.0. The patch should be included in the daily builds available at https://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: https://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 119489] LibreOffice win64 writer 6.1.0.3 stalls when clicking the save button
https://bugs.documentfoundation.org/show_bug.cgi?id=119489 --- Comment #3 from gomi...@gmail.com --- 20190327 No like problems in recent releases. Please close this report. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: qadevOOo/objdsc sc/CppunitTest_sc_drawpageobj.mk sc/Module_sc.mk sc/qa
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv |2
sc/CppunitTest_sc_drawpageobj.mk | 43
sc/Module_sc.mk |1
sc/qa/extras/scdrawpageobj.cxx| 98 ++
4 files changed, 142 insertions(+), 2 deletions(-)
New commits:
commit ed6a71eafa61bade50219d2ff6233a42ab6d1c17
Author: Jens Carl
AuthorDate: Wed Mar 27 18:43:29 2019 +
Commit: Jens Carl
CommitDate: Wed Mar 27 23:53:32 2019 +0100
tdf#45904 Move XIndexAccess Java tests to C++
Move XIndexAccess Java tests to C++ for ScDrawPageObj.
Change-Id: I8b0c80b9213130870ce5445bcf52705df367cb0e
Reviewed-on: https://gerrit.libreoffice.org/69864
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv
index a5afd6833915..11bfae0d02d9 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDrawPageObj.csv
@@ -1,5 +1,3 @@
-"ScDrawPageObj";"com::sun::star::container::XIndexAccess";"getCount()"
-"ScDrawPageObj";"com::sun::star::container::XIndexAccess";"getByIndex()"
"ScDrawPageObj";"com::sun::star::lang::XServiceInfo";"getImplementationName()"
"ScDrawPageObj";"com::sun::star::lang::XServiceInfo";"supportsService()"
"ScDrawPageObj";"com::sun::star::lang::XServiceInfo";"getSupportedServiceNames()"
diff --git a/sc/CppunitTest_sc_drawpageobj.mk b/sc/CppunitTest_sc_drawpageobj.mk
new file mode 100644
index ..05bbaef9eb37
--- /dev/null
+++ b/sc/CppunitTest_sc_drawpageobj.mk
@@ -0,0 +1,43 @@
+# -*- 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,sc_drawpageobj))
+
+$(eval $(call gb_CppunitTest_use_external,sc_drawpageobj,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_drawpageobj, \
+ sc/qa/extras/scdrawpageobj \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_drawpageobj, \
+ cppu \
+ sal \
+ subsequenttest \
+ test \
+ unotest \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_drawpageobj,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_drawpageobj))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_drawpageobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_drawpageobj))
+
+$(eval $(call gb_CppunitTest_use_components,sc_drawpageobj,\
+ $(sc_unoapi_common_components) \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_drawpageobj))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index e5975b78352e..7e014431f6a5 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -140,6 +140,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_ddelinkobj \
CppunitTest_sc_ddelinksobj \
CppunitTest_sc_documentconfigurationobj \
+ CppunitTest_sc_drawpageobj \
CppunitTest_sc_drawpagesobj \
CppunitTest_sc_editfieldobj_cell \
CppunitTest_sc_editfieldobj_header \
diff --git a/sc/qa/extras/scdrawpageobj.cxx b/sc/qa/extras/scdrawpageobj.cxx
new file mode 100644
index ..77beb3629528
--- /dev/null
+++ b/sc/qa/extras/scdrawpageobj.cxx
@@ -0,0 +1,98 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+using namespace css;
+
+namespace sc_apitest
+{
+class ScDrawPageObj : public CalcUnoApiTest, public apitest::XIndexAccess
+{
+public:
+ScDrawPageObj();
+
+virtual uno::Reference init() override;
+virtual void setUp() override;
+virtual void tearDown() override;
+
+CPPUNIT_TEST_SUITE(ScDrawPageObj);
+
+// XIndexAccess
+CPPUNIT_TEST(testGetByIndex);
+CPPUNIT_TEST(testGetCount);
+
+CPPUNIT_TEST_SUITE_END();
+
+private:
+uno::Reference m_xComponent;
+};
+
+ScDrawPageObj::ScDrawPageObj()
+: CalcUnoApiTest("/sc/qa/extras/testdocuments")
+, XIndexAccess(2)
+{
+}
+
+uno::Reference ScDrawPageObj::init()
+{
+uno::Reference xDoc(m_xComponent,
[Libreoffice-bugs] [Bug 124277] Slower pasting of sheets
https://bugs.documentfoundation.org/show_bug.cgi?id=124277 mulla.tasa...@gmail.com changed: What|Removed |Added Ever confirmed|1 |0 Status|NEW |UNCONFIRMED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 124253] It unexpectedly closes libreoffice calc (macros problem)
https://bugs.documentfoundation.org/show_bug.cgi?id=124253 Michael Weghorn changed: What|Removed |Added CC||m.wegh...@posteo.de Ever confirmed|0 |1 Status|UNCONFIRMED |NEEDINFO --- Comment #5 from Michael Weghorn --- Setting to NEEDINFO as per comment 4 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - loleaflet/src
loleaflet/src/dom/DomEvent.js |8
loleaflet/src/layer/vector/SVGGroup.js | 25 +
2 files changed, 33 insertions(+)
New commits:
commit 3c854c32e00fcc26f7f507c7d2384c59f8887500
Author: Tor Lillqvist
AuthorDate: Thu Mar 28 00:07:15 2019 +0200
Commit: Tor Lillqvist
CommitDate: Thu Mar 28 00:44:01 2019 +0200
tdf#124179: Make it possible to drag an image using a touch gesture
First select the image (so that the circular handles show up), then
drag it.
diff --git a/loleaflet/src/dom/DomEvent.js b/loleaflet/src/dom/DomEvent.js
index 67e04c4ce..0d59d54aa 100644
--- a/loleaflet/src/dom/DomEvent.js
+++ b/loleaflet/src/dom/DomEvent.js
@@ -178,6 +178,9 @@ L.DomEvent = {
getMousePosition: function (e, container) {
if (!container) {
+ if (e.clientX === undefined && e.touches !== undefined)
+ return new L.Point(e.touches[0].clientX,
e.touches[0].clientY);
+
return new L.Point(e.clientX, e.clientY);
}
@@ -192,6 +195,11 @@ L.DomEvent = {
left = top = 0;
}
+ if (e.clientX === undefined && e.touches !== undefined)
+ return new L.Point(
+ e.touches[0].clientX - left -
container.clientLeft,
+ e.touches[0].clientY - top -
container.clientTop);
+
return new L.Point(
e.clientX - left - container.clientLeft,
e.clientY - top - container.clientTop);
diff --git a/loleaflet/src/layer/vector/SVGGroup.js
b/loleaflet/src/layer/vector/SVGGroup.js
index c719a7b1a..a61aa35c3 100644
--- a/loleaflet/src/layer/vector/SVGGroup.js
+++ b/loleaflet/src/layer/vector/SVGGroup.js
@@ -9,6 +9,11 @@ L.SVGGroup = L.Layer.extend({
noClip: true
},
+ lastTouchEvent: {
+ clientX: 0,
+ clientY: 0
+ },
+
initialize: function (bounds, options) {
L.setOptions(this, options);
this._bounds = bounds;
@@ -40,6 +45,11 @@ L.SVGGroup = L.Layer.extend({
},
_onDragStart: function(evt) {
+ if (evt.type === 'touchstart') {
+ this.lastTouchEvent.clientX = evt.touches[0].clientX;
+ this.lastTouchEvent.clientY = evt.touches[0].clientY;
+ }
+
if (!this._dragShape)
return;
this._moved = false;
@@ -47,6 +57,9 @@ L.SVGGroup = L.Layer.extend({
L.DomEvent.on(this._dragShape, 'mousemove', this._onDrag, this);
L.DomEvent.on(this._dragShape, 'mouseup', this._onDragEnd,
this);
+ L.DomEvent.on(this._dragShape, 'touchmove', this._onDrag, this);
+ L.DomEvent.on(this._dragShape, 'touchend', this._onDragEnd,
this);
+
var data = {
originalEvent: evt,
containerPoint:
this._map.mouseEventToContainerPoint(evt)
@@ -58,6 +71,11 @@ L.SVGGroup = L.Layer.extend({
},
_onDrag: function(evt) {
+ if (evt.type === 'touchmove') {
+ this.lastTouchEvent.clientX = evt.touches[0].clientX;
+ this.lastTouchEvent.clientY = evt.touches[0].clientY;
+ }
+
if (!this._dragShape)
return;
@@ -75,11 +93,17 @@ L.SVGGroup = L.Layer.extend({
},
_onDragEnd: function(evt) {
+ if (evt.type === 'touchend' && evt.touches.length == 0)
+ evt.touches[0] = {clientX: this.lastTouchEvent.clientX,
clientY: this.lastTouchEvent.clientY};
+
if (!this._dragShape)
return;
L.DomEvent.off(this._dragShape, 'mousemove', this._onDrag,
this);
L.DomEvent.off(this._dragShape, 'mouseup', this._onDragEnd,
this);
+ L.DomEvent.off(this._dragShape, 'touchmove', this._onDrag,
this);
+ L.DomEvent.off(this._dragShape, 'touchend', this._onDragEnd,
this);
+
this._moved = false;
this._hideEmbeddedSVG();
var pos = this._map.mouseEventToLatLng(evt);
@@ -122,6 +146,7 @@ L.SVGGroup = L.Layer.extend({
this._path.appendChild(this._rect._path);
this._dragShape = this._rect._path;
L.DomEvent.on(this._rect._path, 'mousedown',
this._onDragStart, this);
+ L.DomEvent.on(this._rect._path, 'touchstart',
this._onDragStart, this);
}
this._update();
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-bugs] [Bug 124192] Doubled global menu bar in Ubuntu Unity environment
https://bugs.documentfoundation.org/show_bug.cgi?id=124192 --- Comment #4 from mfco --- Description: OS Ubuntu 16.04. After update of LibreOffice packages from version 6.1.2 to 6.1.5 there is doubled global menu in title bar. I have this problem on 2 computers running ubuntu 16.04. Both have only Libreoffice-writer, Libreoffice-calc and Libreoffice-draw installed. If I use symantic to uninstall Libreoffice-gtk3, LO looks as it should with only one menu. When I open a existing file using the open file icon LO reverts back to having two menus. If I close LO and use Nautilus to open a LO file all is well with only one menu. Making a test file and saving it then bringing it back with open file results in a double menu. One computer is running 6.1.5 the other 6.2.2, I did a total reinstall of 6.2.2 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: sd/uiconfig
sd/uiconfig/sdraw/menubar/menubar.xml| 90 +++ sd/uiconfig/simpress/menubar/menubar.xml | 102 +++ 2 files changed, 100 insertions(+), 92 deletions(-) New commits: commit 0c44946a43d1a16f94327c996369e68f9f01f5d3 Author: andreas kainz AuthorDate: Thu Mar 21 00:17:01 2019 +0100 Commit: andreas_kainz CommitDate: Wed Mar 27 23:37:29 2019 +0100 sd menubar update impress and draw Change-Id: I37d71a7eca1c75dd6f1eb3fe0428fd176c44f1d2 Reviewed-on: https://gerrit.libreoffice.org/69493 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index b465f34498f4..a372853ccc4d 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -20,9 +20,9 @@ + - @@ -61,8 +61,8 @@ - + @@ -91,6 +91,7 @@ + @@ -116,10 +117,11 @@ + - + @@ -141,6 +143,7 @@ + @@ -148,7 +151,6 @@ - @@ -180,6 +182,8 @@ + + @@ -192,14 +196,12 @@ - - @@ -210,7 +212,6 @@ - @@ -345,6 +346,7 @@ + @@ -354,11 +356,12 @@ - + + @@ -382,13 +385,6 @@ - - - - - - - @@ -419,6 +415,11 @@ + + + + + @@ -432,14 +433,14 @@ - - - - + + + + @@ -466,39 +467,46 @@ + + + - - - - - - - - - - - - + + + + - - - + + + + + + + + + + + + + + + + - - - + + + - @@ -511,7 +519,6 @@ - @@ -552,6 +559,9 @@ + + + @@ -597,7 +607,6 @@ - @@ -609,6 +618,7 @@ + diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index 910e938fd1b4..afe3a180f5e7 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -20,9 +20,9 @@ + - @@ -61,8 +61,8 @@ - + @@ -91,6 +91,7 @@ + @@ -121,11 +122,12 @@ + - + @@ -147,6 +149,7 @@ + @@ -154,7 +157,6 @@ - @@ -190,6 +192,8 @@ + + @@ -203,7 +207,6 @@ - @@ -225,14 +228,13 @@ - - - + + + - @@ -242,7 +244,6 @@ - @@ -378,6 +379,7 @@ + @@ -387,11 +389,11 @@ - + @@ -415,7 +417,6 @@
[Libreoffice-bugs] [Bug 115983] findAll and replaceAll methods have an unexpected behavior when they are called from the com.sun.star.sheet.SheetCellRanges service.
https://bugs.documentfoundation.org/show_bug.cgi?id=115983 tvata...@starxpert.fr changed: What|Removed |Added Version|3.3.0 release |Inherited From OOo -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 124292] KDE5: Fractional scaling makes most UI and rendered text look bad
https://bugs.documentfoundation.org/show_bug.cgi?id=124292 Michael Weghorn changed: What|Removed |Added CC||donaldbrown2...@gmail.com --- Comment #5 from Michael Weghorn --- *** Bug 123709 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 102495] [META] KDE VCL backend bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=102495 Bug 102495 depends on bug 123709, which changed state. Bug 123709 Summary: Font Rendering Issue after update to 6.2.0 in both editor and GUI https://bugs.documentfoundation.org/show_bug.cgi?id=123709 What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |DUPLICATE -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 123709] Font Rendering Issue after update to 6.2.0 in both editor and GUI
https://bugs.documentfoundation.org/show_bug.cgi?id=123709 Michael Weghorn changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |DUPLICATE --- Comment #5 from Michael Weghorn --- Thanks for the update! Let's mark this as a duplicate of bug 124292 then. *** This bug has been marked as a duplicate of bug 124292 *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 118346] Slow performance in Draw with (moderately) complex drawings
https://bugs.documentfoundation.org/show_bug.cgi?id=118346 --- Comment #13 from Gessel --- The issue seems to be resolved in Version: 6.2.2.2 on Linux 19.1. Drawings open quickly and are responsive. I note that some objects are not fully rendered in edit view, but they do convert to PDF correctly. I also note that hardware acceleration works without crashing. That might help a bit. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 123416] Doubled global menu in 6.2.0-2
https://bugs.documentfoundation.org/show_bug.cgi?id=123416 Michael Weghorn changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |WORKSFORME CC||m.wegh...@posteo.de --- Comment #12 from Michael Weghorn --- @Konstantin: Thanks for your report. While the visual result you get sounds very similar to the original bug report, the original one was for KDE, while you state that the gtk3 variants are affected and kde is fine. In order to keep the scope of this bug report and thus avoid confusion, I'm closing it again. Please open a new bug report for your issue, to make it easier to keep track of the single issues. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 102495] [META] KDE VCL backend bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=102495 Bug 102495 depends on bug 123416, which changed state. Bug 123416 Summary: Doubled global menu in 6.2.0-2 https://bugs.documentfoundation.org/show_bug.cgi?id=123416 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 124213] A recovered document has "(Remote)" in the title
https://bugs.documentfoundation.org/show_bug.cgi?id=124213 mulla.tasa...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #1 from mulla.tasa...@gmail.com --- Thank you for reporting the bug. I can confirm that the bug is present in Version: 6.3.0.0.alpha0+ (x64) Build ID: 91cdf22b88a4f7bec243c8fb187627e766d3294c CPU threads: 4; OS: Windows 6.3; UI render: default; VCL: win; TinderBox: Win-x86_64@42, Branch:master, Time: 2019-03-08_00:38:10 Locale: en-US (en_US); UI-Language: en-US Calc: CL In: Version: 6.2.1.2 (x64) Build ID: 7bcb35dc3024a62dea0caee87020152d1ee96e71 CPU threads: 4; OS: Windows 6.3; UI render: default; VCL: win; Locale: en-US (en_US); UI-Language: en-US Calc: CL After Killing the process in Task Manager when I am Restarting LibreOffice Its not showing restore window so I can not notice "(Remote)" in Title -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 100253] Complex draw diagram fails to open after 25 hours on 5.0.3.2 Linux, opens fine on 4.3.5.2 Windows
https://bugs.documentfoundation.org/show_bug.cgi?id=100253 --- Comment #13 from Gessel --- Version: 6.2.2.2 does not seem to be affected under Mint 19.1 I think this can be closed. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 124188] Image resizing
https://bugs.documentfoundation.org/show_bug.cgi?id=124188 --- Comment #6 from mulla.tasa...@gmail.com --- Thank you for reporting the bug. I can not reproduce the bug in Version: 6.2.1.2 (x64) Build ID: 7bcb35dc3024a62dea0caee87020152d1ee96e71 CPU threads: 4; OS: Windows 6.3; UI render: default; VCL: win; Locale: en-US (en_US); UI-Language: en-US Calc: CL Version: 6.3.0.0.alpha0+ (x64) Build ID: 91cdf22b88a4f7bec243c8fb187627e766d3294c CPU threads: 4; OS: Windows 6.3; UI render: default; VCL: win; TinderBox: Win-x86_64@42, Branch:master, Time: 2019-03-08_00:38:10 Locale: en-US (en_US); UI-Language: en-US Calc: CL -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - icon-themes/tango
icon-themes/tango/cmd/lc_redactdoc.png |binary icon-themes/tango/cmd/lc_redactedexportblack.png |binary icon-themes/tango/cmd/lc_redactedexportwhite.png |binary icon-themes/tango/cmd/sc_redactdoc.png |binary icon-themes/tango/cmd/sc_redactedexportblack.png |binary icon-themes/tango/cmd/sc_redactedexportwhite.png |binary 6 files changed New commits: commit 9c644c8bf3d7096efeb52beccaef02f6455f83eb Author: Andras Timar AuthorDate: Wed Mar 27 22:54:38 2019 +0100 Commit: Andras Timar CommitDate: Wed Mar 27 22:54:38 2019 +0100 Add Redaction toolbar icons from colibre to tango Tango is the default theme of Collabora Office 6.0 Change-Id: I95722b0794aec9fc9eac707e4020460ddfb1371f diff --git a/icon-themes/tango/cmd/lc_redactdoc.png b/icon-themes/tango/cmd/lc_redactdoc.png new file mode 100644 index ..3cdc2ffc2918 Binary files /dev/null and b/icon-themes/tango/cmd/lc_redactdoc.png differ diff --git a/icon-themes/tango/cmd/lc_redactedexportblack.png b/icon-themes/tango/cmd/lc_redactedexportblack.png new file mode 100644 index ..c1f9ec36f122 Binary files /dev/null and b/icon-themes/tango/cmd/lc_redactedexportblack.png differ diff --git a/icon-themes/tango/cmd/lc_redactedexportwhite.png b/icon-themes/tango/cmd/lc_redactedexportwhite.png new file mode 100644 index ..a07f9c82d288 Binary files /dev/null and b/icon-themes/tango/cmd/lc_redactedexportwhite.png differ diff --git a/icon-themes/tango/cmd/sc_redactdoc.png b/icon-themes/tango/cmd/sc_redactdoc.png new file mode 100644 index ..013684ba7470 Binary files /dev/null and b/icon-themes/tango/cmd/sc_redactdoc.png differ diff --git a/icon-themes/tango/cmd/sc_redactedexportblack.png b/icon-themes/tango/cmd/sc_redactedexportblack.png new file mode 100644 index ..1163e7d2856e Binary files /dev/null and b/icon-themes/tango/cmd/sc_redactedexportblack.png differ diff --git a/icon-themes/tango/cmd/sc_redactedexportwhite.png b/icon-themes/tango/cmd/sc_redactedexportwhite.png new file mode 100644 index ..ff872a4ccd51 Binary files /dev/null and b/icon-themes/tango/cmd/sc_redactedexportwhite.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 124378] Table in LibreOffice Writer when saved as Word 2007-2019 .docx changes the borders when opened again
https://bugs.documentfoundation.org/show_bug.cgi?id=124378 Stefan changed: What|Removed |Added Keywords||filter:docx --- Comment #1 from Stefan --- I hope that you will be able to fix this issue! -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 124378] New: Table in LibreOffice Writer when saved as Word 2007-2019 .docx changes the borders when opened again
https://bugs.documentfoundation.org/show_bug.cgi?id=124378 Bug ID: 124378 Summary: Table in LibreOffice Writer when saved as Word 2007-2019 .docx changes the borders when opened again Product: LibreOffice Version: 6.1.4.2 release Hardware: x86-64 (AMD64) OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: sj_k...@yahoo.com Description: I made a table with 2 rows in Writer. The top row has all borders in 1 point black and the row directly under it has no borders. When I save this document as Word 2007-2019 .docx, close it and then open it again, the top row is correct, but the bottom row has partial borders. This does not happen when I save the file in ODF format. Steps to Reproduce: 1. Create a two-row table. 2. Format the 1st row with 1 point (weight) borders (inner and outer) 3. Format the 2nd row to not show any borders. 4. Save the file as a Word 2007-2019 .docx file. 5. Close the file. 6. Open the file. 7. Bottom row has partial border showing. Repairing this requires to select each row where issue happened and re-format these. Actual Results: I get tables with borders I do not want requiring me to manually go though all tables / rows where I do not want to see borders. Working between my work (Word) and home (LibreOffice) environment becomes not doable with tables. Expected Results: I want to keep my table formatting to remain as intended when saving in Word (.docx) format and not having to manually re-format my tables when I need to make changes working on my home computer. Reproducible: Always User Profile Reset: No Additional Info: Keep the table border formatting as intended. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 62326] Instruction Cint fails when converting Hex strings of a negative value to a 16-bit integer value.
https://bugs.documentfoundation.org/show_bug.cgi?id=62326 --- Comment #9 from irs --- Hi Using the test method in the original Description posting, the problem still exists with Libreoffice: Version: 6.0.7.3 Build ID: 1:6.0.7-0ubuntu0.18.04.2 CPU threads: 2; OS: Linux 4.15; UI render: default; VCL: gtk3; Locale: en-NZ (en_NZ.UTF-8); Calc: group regards, Ian. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: cui/source include/svtools svtools/source svx/source
cui/source/tabpages/border.cxx |6
include/svtools/ctrlbox.hxx| 139 +++-
svtools/source/control/ctrlbox.cxx | 309
svx/source/tbxctrls/tbcontrl.cxx | 316 +
4 files changed, 379 insertions(+), 391 deletions(-)
New commits:
commit 74e1112a546b1d116f30161952c35819e4b72f84
Author: Caolán McNamara
AuthorDate: Wed Mar 27 15:54:24 2019 +
Commit: Caolán McNamara
CommitDate: Wed Mar 27 22:47:44 2019 +0100
move LineListBox beside last consumer
Change-Id: Ie683784a9f4ecfb0015bf7ae79769238719a6376
Reviewed-on: https://gerrit.libreoffice.org/69841
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index a66b3481943a..e8169f2cb0e0 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -1272,9 +1272,9 @@ void SvxBorderTabPage::FillLineListBox_Impl()
static struct {
SvxBorderLineStyle mnStyle;
long mnMinWidth;
-LineListBox::ColorFunc mpColor1Fn;
-LineListBox::ColorFunc mpColor2Fn;
-LineListBox::ColorDistFunc mpColorDistFn;
+SvtLineListBox::ColorFunc mpColor1Fn;
+SvtLineListBox::ColorFunc mpColor2Fn;
+SvtLineListBox::ColorDistFunc mpColorDistFn;
} const aLines[] = {
// Simple lines
{ SvxBorderLineStyle::SOLID,0, , ,
},
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index f94d4462e434..80384fd0e882 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -22,6 +22,8 @@
#include
+#include
+
#include
#include
#include
@@ -35,7 +37,64 @@ namespace weld { class CustomWeld; }
class VirtualDevice;
class BorderWidthImpl;
class FontList;
-class ImpLineListData;
+
+/** Utility class storing the border line width, style and colors. The widths
+are defined in Twips.
+ */
+class ImpLineListData
+{
+private:
+BorderWidthImpl const m_aWidthImpl;
+
+Color ( * const m_pColor1Fn )( Color );
+Color ( * const m_pColor2Fn )( Color );
+Color ( * const m_pColorDistFn )( Color, Color );
+
+long const m_nMinWidth;
+SvxBorderLineStyle const m_nStyle;
+
+public:
+ImpLineListData( BorderWidthImpl aWidthImpl,
+ SvxBorderLineStyle nStyle, long nMinWidth, Color ( *pColor1Fn )(
Color ),
+ Color ( *pColor2Fn )( Color ), Color ( *pColorDistFn )( Color,
Color ) ) :
+m_aWidthImpl( aWidthImpl ),
+m_pColor1Fn( pColor1Fn ),
+m_pColor2Fn( pColor2Fn ),
+m_pColorDistFn( pColorDistFn ),
+m_nMinWidth( nMinWidth ),
+m_nStyle( nStyle )
+{
+}
+
+/** Returns the computed width of the line 1 in twips. */
+long GetLine1ForWidth( long nWidth ) { return m_aWidthImpl.GetLine1(
nWidth ); }
+
+/** Returns the computed width of the line 2 in twips. */
+long GetLine2ForWidth( long nWidth ) { return m_aWidthImpl.GetLine2(
nWidth ); }
+
+/** Returns the computed width of the gap in twips. */
+long GetDistForWidth( long nWidth ) { return m_aWidthImpl.GetGap( nWidth
); }
+
+Color GetColorLine1( const Color& rMain )
+{
+return ( *m_pColor1Fn )( rMain );
+}
+
+Color GetColorLine2( const Color& rMain )
+{
+return ( *m_pColor2Fn )( rMain );
+}
+
+Color GetColorDist( const Color& rMain, const Color& rDefault )
+{
+return ( *m_pColorDistFn )( rMain, rDefault );
+}
+
+/** Returns the minimum width in twips */
+long GetMinWidth( ) { return m_nMinWidth;}
+SvxBorderLineStyle GetStyle( ) { return m_nStyle;}
+};
+
enum class SvxBorderLineStyle : sal_Int16;
typedef ::std::vector< FontMetric > ImplFontList;
@@ -140,84 +199,6 @@ inline Color sameDistColor( Color /*rMain*/, Color
rDefault )
return rDefault;
}
-class SVT_DLLPUBLIC LineListBox final : public ListBox
-{
-public:
-typedef Color (*ColorFunc)(Color);
-typedef Color (*ColorDistFunc)(Color, Color);
-
-LineListBox( vcl::Window* pParent, WinBits nWinStyle =
WB_BORDER );
-virtual ~LineListBox() override;
-virtual voiddispose() override;
-
-/** Set the width in Twips */
-voidSetWidth( long nWidth );
-longGetWidth() const { return m_nWidth; }
-voidSetNone( const OUString& sNone );
-
-using ListBox::InsertEntry;
-/** Insert a listbox entry with all widths in Twips. */
-voidInsertEntry(const BorderWidthImpl& rWidthImpl,
-SvxBorderLineStyle nStyle, long nMinWidth = 0,
-ColorFunc pColor1Fn = ,
-ColorFunc pColor2Fn = ,
-ColorDistFunc pColorDistFn = );
-
-SvxBorderLineStyle GetEntryStyle( sal_Int32 nPos ) const;
-
-SvxBorderLineStyle
[Libreoffice-bugs] [Bug 107742] [META] Form control bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=107742 Bug 107742 depends on bug 31270, which changed state. Bug 31270 Summary: Impress V3.3.0 Beta does not save Interactions that are assigned to Form Controls https://bugs.documentfoundation.org/show_bug.cgi?id=31270 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 31270] Impress V3.3.0 Beta does not save Interactions that are assigned to Form Controls
https://bugs.documentfoundation.org/show_bug.cgi?id=31270 irs changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME --- Comment #13 from irs --- This problem now seems to be resolved as it works for me with the following Libreoffice: Version: 6.0.7.3 Build ID: 1:6.0.7-0ubuntu0.18.04.2 CPU threads: 2; OS: Linux 4.15; UI render: default; VCL: gtk3; Locale: en-NZ (en_NZ.UTF-8); Calc: group Thanks and regards, irs. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 53864] Export ignores layer options 'printable' and 'visible'
https://bugs.documentfoundation.org/show_bug.cgi?id=53864 --- Comment #11 from crx...@hotmail.com --- (In reply to Wolfgang Jäger from comment #10) > Export as Pdf, No 'General' export option checked > > Result: Exactly the layers set to 'Visible' were exported. > 'Printable' was ignored. > > Conclusion: RESOLVED FIXED Was it tested also with exporting to SVG, PNG or JPEG (the most common non-PDF exports)? PDF is a very different type of export. (I have no easy access to a current version right now) -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 124377] Make better bitmap export quality to PDF for Redaction
https://bugs.documentfoundation.org/show_bug.cgi?id=124377 --- Comment #1 from Roman Kuznetsov <79045_79...@mail.ru> --- Created attachment 150332 --> https://bugs.documentfoundation.org/attachment.cgi?id=150332=edit Example of Redaction PDF -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 124377] Make better bitmap export quality to PDF for Redaction
https://bugs.documentfoundation.org/show_bug.cgi?id=124377 Roman Kuznetsov <79045_79...@mail.ru> changed: What|Removed |Added Keywords||filter:pdf Blocks||103378 CC||muhamm...@gmail.com Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=103378 [Bug 103378] [META] PDF export bugs and enhancements -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 103378] [META] PDF export bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=103378 Roman Kuznetsov <79045_79...@mail.ru> changed: What|Removed |Added Depends on||124377 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=124377 [Bug 124377] Make better bitmap export quality to PDF for Redaction -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 124377] New: Make better bitmap export quality to PDF for Redaction
https://bugs.documentfoundation.org/show_bug.cgi?id=124377 Bug ID: 124377 Summary: Make better bitmap export quality to PDF for Redaction Product: LibreOffice Version: 6.3.0.0.alpha0+ Master Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Printing and PDF export Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: 79045_79...@mail.ru Description: Make better bitmap export quality to PDF for Redaction Now we don't have any options for quality of bitmap export to PDF when we use Redaction function Steps to Reproduce: 1. Try use Redaction function 2. Look at result PDF (looks ugly) Actual Results: result PDF after Redaction function looks ugly Expected Results: result PDF after Redaction function looks fine Reproducible: Always User Profile Reset: No Additional Info: -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 117122] Word Count option to exclude footnotes, endnotes and/or inline citations
https://bugs.documentfoundation.org/show_bug.cgi?id=117122 Cor Nouws changed: What|Removed |Added CC||c...@nouenoff.nl Resolution|--- |DUPLICATE Status|NEW |RESOLVED --- Comment #3 from Cor Nouws --- *** This bug has been marked as a duplicate of bug 99189 *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 99189] Add option to exclude footnotes, endnotes and textboxes and inline citations from word count
https://bugs.documentfoundation.org/show_bug.cgi?id=99189 Cor Nouws changed: What|Removed |Added CC||declan.br...@gmail.com --- Comment #2 from Cor Nouws --- *** Bug 117122 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 123709] Font Rendering Issue after update to 6.2.0 in both editor and GUI
https://bugs.documentfoundation.org/show_bug.cgi?id=123709 --- Comment #4 from donaldbrown2...@gmail.com --- (In reply to Michael Weghorn from comment #3) > Also, are you using a fractional scale factor, as described in bug 124292? Yes, I am using a scale factor of 1.5 on my system, and now that I look at that bug, it looks exactly the same as my issue. As a quick update, I've tested in 2.2.2-2 and this is still the case. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: readlicense_oo/license
readlicense_oo/license/license.xml | 40 + 1 file changed, 40 insertions(+) New commits: commit 9c047d066811e2227948e4d03c2fd8a94087b38c Author: Andras Timar AuthorDate: Wed Mar 27 22:18:14 2019 +0100 Commit: Andras Timar CommitDate: Wed Mar 27 22:22:06 2019 +0100 license: add xmlsec-mscrypto and xmlsec-mscng xmlsec-mscrypto is for LibreOffice <= 6.1 xmlsec-mscng is for LibreOffice >= 6.2 But who knows where this this patch will be backported. Let's include both. Change-Id: I4c35a7e63c7024022e0215f9dad486afae0896f9 diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml index 6b2bd45837c9..a1d96581ce47 100644 --- a/readlicense_oo/license/license.xml +++ b/readlicense_oo/license/license.xml @@ -2054,6 +2054,46 @@ DEALINGS IN THE SOFTWARE. Except as contained in this notice, the name of Aleksey Sanin shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from him. + +xmlsec-mscrypto library +Copyright (C) 2002-2016 Aleksey Sanin alek...@aleksey.com. All Rights Reserved. +Copyright (C) 2003 Cordys RD BV, All rights reserved. +Copyright (C) 2007 Roumen Petrov. +Copyright (c) 2005-2006 Cryptocom LTD (http://www.cryptocom.ru). +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and +associated documentation files (the "Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the +following conditions: +The above copyright notice and this permission notice shall be included in all copies or substantial +portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT +LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO +EVENT SHALL THE ALEKSEY SANIN BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF +CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. +Except as contained in this notice, the name of Aleksey Sanin shall not be used in advertising or +otherwise to promote the sale, use or other dealings in this Software without prior written authorization +from him. +xmlsec-mscng library +Copyright (C) 2018 Aleksey Sanin. All Rights Reserved. +Copyright (C) 2018 Miklos Vajna. All Rights Reserved. +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and +associated documentation files (the "Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the +following conditions: +The above copyright notice and this permission notice shall be included in all copies or substantial +portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT +LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO +EVENT SHALL THE ALEKSEY SANIN BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF +CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. +Except as contained in this notice, the name of Aleksey Sanin shall not be used in advertising or +otherwise to promote the sale, use or other dealings in this Software without prior written authorization +from him. + XSLT MathML Library ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 99189] Add option to exclude footnotes, endnotes and textboxes and inline citations from word count
https://bugs.documentfoundation.org/show_bug.cgi?id=99189 Cor Nouws changed: What|Removed |Added Summary|Add option to exclude |Add option to exclude |footnotes, endnotes and |footnotes, endnotes and |textboxes from word count |textboxes and inline ||citations from word count -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 103249] Enhancement: convert all footnotes to endnotes at once (and/or vice versa) plus additional conversion options
https://bugs.documentfoundation.org/show_bug.cgi?id=103249 Cor Nouws changed: What|Removed |Added CC||c...@nouenoff.nl Version|unspecified |Inherited From OOo -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 122934] ENDNOTE enhancement -- we should be able to COPY endnotes / footnotes and PASTE into a new document
https://bugs.documentfoundation.org/show_bug.cgi?id=122934 Cor Nouws changed: What|Removed |Added CC||c...@nouenoff.nl Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #2 from Cor Nouws --- *** This bug has been marked as a duplicate of bug 99096 *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 99096] The ability to select and copy multiple footnotes/endnotes (into a new document)
https://bugs.documentfoundation.org/show_bug.cgi?id=99096 Cor Nouws changed: What|Removed |Added CC||j...@cspv.hu --- Comment #3 from Cor Nouws --- *** Bug 122934 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 103164] [META] Footnote and Endnote bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=103164 Bug 103164 depends on bug 122934, which changed state. Bug 122934 Summary: ENDNOTE enhancement -- we should be able to COPY endnotes / footnotes and PASTE into a new document https://bugs.documentfoundation.org/show_bug.cgi?id=122934 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 99096] The ability to select and copy multiple footnotes/endnotes (into a new document)
https://bugs.documentfoundation.org/show_bug.cgi?id=99096 Cor Nouws changed: What|Removed |Added CC||c...@nouenoff.nl Summary|The ability to select and |The ability to select and |copy multiple |copy multiple |footnotes/endnotes |footnotes/endnotes (into a ||new document) Version|unspecified |Inherited From OOo -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 124277] Slower pasting of sheets
https://bugs.documentfoundation.org/show_bug.cgi?id=124277 Telesto changed: What|Removed |Added Status|UNCONFIRMED |NEW Keywords||bibisectRequest Ever confirmed|0 |1 --- Comment #4 from Telesto --- In both cases to long IMHO -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 124370] LOcalc: marked cells are incompletely printed
https://bugs.documentfoundation.org/show_bug.cgi?id=124370 hans-georg.bossha...@rub.de changed: What|Removed |Added CC||hans-georg.bossha...@rub.de Ever confirmed|1 |0 Status|NEEDINFO|UNCONFIRMED Assignee|libreoffice-b...@lists.free |hans-georg.bossha...@rub.de |desktop.org | --- Comment #2 from hans-georg.bossha...@rub.de --- Created attachment 150331 --> https://bugs.documentfoundation.org/attachment.cgi?id=150331=edit calculation of wages Wages are calculated for each week and month. Because the whole sheet is too large to fit on one DIN A4 sheet, only the block I1:N17 should be printed. After having selected this block and only the selected cells are requested for print, only I1:K17 is printed. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 123416] Doubled global menu in 6.2.0-2
https://bugs.documentfoundation.org/show_bug.cgi?id=123416 --- Comment #11 from Konstantin --- Reports by VCL on 6.2.2: General: not affected (does not export menus) GTK3: affected (double menus) GTK3_KDE5: affected (double menus) GTK2: okay (menus exported and single, no double menus) QT5: okay (menus exported and single, no double menus) KDE5: okay (menus exported and single, no double menus) It seems than only GTK3 frontend is affected. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - include/svl sfx2/source svl/source
include/svl/documentlockfile.hxx|2
include/svl/msodocumentlockfile.hxx |2
sfx2/source/doc/docfile.cxx | 80 +++-
svl/source/misc/msodocumentlockfile.cxx | 14 +
4 files changed, 26 insertions(+), 72 deletions(-)
New commits:
commit 59e89f7ef64ae2b40a37aa552c51a69ceea1cd42
Author: Tamás Zolnai
AuthorDate: Tue Mar 26 16:12:49 2019 +0100
Commit: Andras Timar
CommitDate: Wed Mar 27 21:48:27 2019 +0100
MSO lockfiles: Deduplicate MSO lock file reading code
The removed code was extracted to MSODocumentLockFile class
so use that class here too.
Use openStreamNoLock() for reading MSO lockfiles, because otherwise
we can not read lock files written by MSO.
Change-Id: Ib31cb9f3783d0b0ce784f900821047b9d32156f2
Reviewed-on: https://gerrit.libreoffice.org/69759
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai
(cherry picked from commit ad47e9b1c0d3f1720665b2786090e8c0927b5b45)
Reviewed-on: https://gerrit.libreoffice.org/69844
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/include/svl/documentlockfile.hxx b/include/svl/documentlockfile.hxx
index 77b1075ba6ea..7de20ea241e7 100644
--- a/include/svl/documentlockfile.hxx
+++ b/include/svl/documentlockfile.hxx
@@ -53,7 +53,7 @@ public:
protected:
virtual void WriteEntryToStream( const LockFileEntry& aEntry, const
css::uno::Reference< css::io::XOutputStream >& xStream ) = 0;
-css::uno::Reference< css::io::XInputStream > OpenStream();
+virtual css::uno::Reference< css::io::XInputStream > OpenStream();
};
/// Class implementing reading and writing LO lockfiles.
diff --git a/include/svl/msodocumentlockfile.hxx
b/include/svl/msodocumentlockfile.hxx
index 2c438f0178cb..5fa6fcbf10bf 100644
--- a/include/svl/msodocumentlockfile.hxx
+++ b/include/svl/msodocumentlockfile.hxx
@@ -64,6 +64,8 @@ protected:
WriteEntryToStream(const LockFileEntry& aEntry,
const css::uno::Reference&
xStream) override;
+virtual css::uno::Reference OpenStream() override;
+
public:
MSODocumentLockFile(const OUString& aOrigURL);
virtual ~MSODocumentLockFile() override;
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index e55bd203a9b5..4c09ef2db87d 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -839,84 +839,22 @@ void SfxMedium::SetEncryptionDataToStorage_Impl()
namespace
{
-OUString tryMSOwnerFile(const INetURLObject& aLockfileURL)
+
+OUString tryMSOwnerFiles(const OUString& sDocURL)
{
+svt::MSODocumentLockFile aMSOLockFile(sDocURL);
+LockFileEntry aData;
try
{
-static osl::Mutex aMutex;
-osl::MutexGuard aGuard(aMutex);
-css::uno::Reference xEnv;
-ucbhelper::Content aSourceContent(
-aLockfileURL.GetMainURL(INetURLObject::DecodeMechanism::NONE),
xEnv,
-comphelper::getProcessComponentContext());
-
-// Excel creates Owner Files with FILE_FLAG_DELETE_ON_CLOSE, so we
need to open it with
-// FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE share mode
-css::uno::Reference xStream =
aSourceContent.openStreamNoLock();
-if (!xStream)
-return OUString();
-
-const sal_Int32 nBufLen = 256;
-css::uno::Sequence aBuf(nBufLen);
-const sal_Int32 nRead = xStream->readBytes(aBuf, nBufLen);
-xStream->closeInput();
-if (nRead >= 162)
-{
-// Reverse engineering of MS Office Owner Files format (MS Office
2016 tested).
-// It starts with a single byte with name length, after which
characters of username go
-// in current Windows 8-bit codepage.
-// For Word lockfiles, the name is followed by zero bytes up to
position 54.
-// For PowerPoint lockfiles, the name is followed by a single zero
byte, and then 0x20
-// bytes up to position 55.
-// For Excel lockfiles, the name is followed by 0x20 bytes up to
position 55.
-// At those positions in each type of lockfile, a name length
2-byte word goes, followed
-// by UTF-16-LE-encoded copy of username. Spaces or some garbage
follow up to the end of
-// the lockfile (total 162 bytes for Word, 165 bytes for
Excel/PowerPoint).
-// Apparently MS Office does not allow username to be longer than
52 characters (trying
-// to enter more in its options dialog results in error messages
stating this limit).
-const int nACPLen = aBuf[0];
-if (nACPLen > 0 && nACPLen <= 52) // skip wrong format
-{
-const sal_Int8* pBuf = aBuf.getConstArray() + 54;
-int nUTF16Len = *pBuf; // try Word position
-// If UTF-16 length is 0x20, then ACP length is also less than
maximal, which means
-// that in Word lockfile
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - cui/source cui/uiconfig include/svl include/unotools officecfg/registry sfx2/source svl/qa svl/source unotools/source
cui/source/options/optfltr.cxx | 10 ++
cui/source/options/optfltr.hxx |1
cui/uiconfig/ui/optfltrembedpage.ui| 63 +++--
include/svl/lockfilecommon.hxx |2
include/svl/msodocumentlockfile.hxx|8 +
include/unotools/fltrcfg.hxx |3
officecfg/registry/schema/org/openoffice/Office/Common.xcs |8 +
sfx2/source/doc/docfile.cxx| 46 +
svl/qa/unit/lockfiles/test_lockfiles.cxx |2
svl/source/misc/lockfilecommon.cxx |2
svl/source/misc/msodocumentlockfile.cxx| 19 ++-
unotools/source/config/fltrcfg.cxx | 25 -
12 files changed, 165 insertions(+), 24 deletions(-)
New commits:
commit 5aa23e4d6e849f1ecccb2f6f290e7b34c9df7399
Author: Tamás Zolnai
AuthorDate: Wed Mar 27 15:52:32 2019 +0100
Commit: Andras Timar
CommitDate: Wed Mar 27 21:48:06 2019 +0100
Generate MSO lock files when the related MSO compat. option is set
Added a new compatibility option to the Tools -> Load / Save ->
Microsoft.
When this option is set on the UI or or set in the configuration files
LO generates lock files for MSO supported file formats, similar to
the lock files MSO generates itself.
Reviewed-on: https://gerrit.libreoffice.org/69678
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai
(cherry picked from commit 41dc917b9b55b8c0c4307ffc58a1fb7257df2b69)
Change-Id: I2f882723841162add01be9d3f7285a5162a60331
Reviewed-on: https://gerrit.libreoffice.org/69843
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index d1fd93342264..9c3c15d71e93 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -155,6 +155,7 @@ OfaMSFilterTabPage2::OfaMSFilterTabPage2( vcl::Window*
pParent, const SfxItemSet
get( aHighlightingRB, "highlighting");
get( aShadingRB, "shading" );
+get( aMSOLockFileCB, "mso_lockfile");
Size aControlSize(248, 55);
aControlSize = LogicToPixel(aControlSize, MapMode(MapUnit::MapAppFont));
@@ -185,6 +186,7 @@ void OfaMSFilterTabPage2::dispose()
m_pCheckLBContainer.clear();
aHighlightingRB.clear();
aShadingRB.clear();
+aMSOLockFileCB.clear();
SfxTabPage::dispose();
}
@@ -254,6 +256,11 @@ bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet* )
rOpt.SetCharBackground2Shading();
}
+if( aMSOLockFileCB->IsValueChangedFromSaved() )
+{
+rOpt.EnableMSOLockFileCreation(aMSOLockFileCB->IsChecked());
+}
+
return true;
}
@@ -320,6 +327,9 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet* )
aShadingRB->Check();
aHighlightingRB->SaveValue();
+
+aMSOLockFileCB->Check(rOpt.IsMSOLockFileCreationIsEnabled());
+aMSOLockFileCB->SaveValue();
}
void OfaMSFilterTabPage2::InsertEntry( const OUString& _rTxt, sal_IntPtr
_nType )
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index 4ef6cf3a63c0..aa5d89f23123 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -86,6 +86,7 @@ class OfaMSFilterTabPage2 : public SfxTabPage
VclPtr aHighlightingRB;
VclPtr aShadingRB;
+VclPtraMSOLockFileCB;
virtual ~OfaMSFilterTabPage2() override;
virtual void dispose() override;
diff --git a/cui/uiconfig/ui/optfltrembedpage.ui
b/cui/uiconfig/ui/optfltrembedpage.ui
index 811ecdc990ff..059d20cbf778 100644
--- a/cui/uiconfig/ui/optfltrembedpage.ui
+++ b/cui/uiconfig/ui/optfltrembedpage.ui
@@ -1,4 +1,5 @@
+
@@ -48,8 +49,8 @@
True
False
-0
[L]: Load and convert the object
+0
False
@@ -61,8 +62,8 @@
True
False
-0
[S]: Convert and save the object
+0
False
@@ -88,8 +89,6 @@
0
0
-1
-1
@@ -182,8 +181,60 @@
0
1
-1
-1
+
+
+
+
+True
+False
+0
+none
+
+
+True
+False
+6
+12
+
+
+True
+False
+start
+
+
+Create MSO lock file
+True
+True
+False
+True
+
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - vcl/source
vcl/source/image/ImplImageTree.cxx | 15 +++
1 file changed, 15 insertions(+)
New commits:
commit fb02d9f64198635e2c3c1593816ba8ec75782f9f
Author: Muhammet Kara
AuthorDate: Wed Mar 27 20:45:24 2019 +0300
Commit: Andras Timar
CommitDate: Wed Mar 27 21:47:03 2019 +0100
Fix icon load error for uno commands with params
Change-Id: I80be21b551cbd4eb029cb660fca98aef2727d584
Reviewed-on: https://gerrit.libreoffice.org/69850
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/vcl/source/image/ImplImageTree.cxx
b/vcl/source/image/ImplImageTree.cxx
index 30d9d9d38b7d..1a41d175a0b1 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -291,6 +291,21 @@ bool ImplImageTree::loadImage(OUString const & rName,
OUString const & rStyle, B
aCurrentStyle = fallbackStyle(aCurrentStyle);
}
+
+/* If the uno command has parameters, passed in from a toolbar,
+ * recover from failure by removing the parameters from the file name
+ */
+if (rName.indexOf("%3f") > 0)
+{
+OUString sName(rName);
+sal_Int32 nStart = sName.indexOf("%3f");
+sal_Int32 nEnd = sName.lastIndexOf(".");
+
+sName = sName.replaceAt(nStart, nEnd - nStart, "");
+
+return loadImage(sName, rStyle, rBitmap, localized, eFlags,
nScalePercentage);
+}
+
return false;
}
___
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.0' - include/svl sfx2/source svl/CppunitTest_svl_lockfiles.mk svl/Library_svl.mk svl/Module_svl.mk svl/qa svl/source
include/svl/documentlockfile.hxx | 39 +
include/svl/lockfilecommon.hxx | 21
include/svl/msodocumentlockfile.hxx | 82 +++
include/svl/sharecontrolfile.hxx |2
sfx2/source/doc/docfile.cxx |2
svl/CppunitTest_svl_lockfiles.mk | 52 ++
svl/Library_svl.mk |3
svl/Module_svl.mk|1
svl/qa/unit/lockfiles/test_lockfiles.cxx | 732 +++
svl/source/misc/documentlockfile.cxx | 140 +++--
svl/source/misc/lockfilecommon.cxx | 35 +
svl/source/misc/msodocumentlockfile.cxx | 244 ++
svl/source/misc/sharecontrolfile.cxx |6
13 files changed, 1264 insertions(+), 95 deletions(-)
New commits:
commit a2304edb5528700306a35f58607ac9a1753befdc
Author: Tamás Zolnai
AuthorDate: Sat Mar 23 15:53:27 2019 +0100
Commit: Andras Timar
CommitDate: Wed Mar 27 21:47:44 2019 +0100
Introduce new lockfile handler for MSO like lockfiles
* Implement writing of MSO lockfiles
* Grab the already implemented parsing code (tryMSOwnerFile method)
and put it together into one class
* Add tests about the generated URL for lockfiles and the lockfile content
* MSO lockfiles are not written yet by LO, next step is to integrate
this code into the locking mechanism.
Reviewed-on: https://gerrit.libreoffice.org/69582
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai
(cherry picked from commit 5db1e20b8b0942dac2d50f3cd34532bb61147020)
Change-Id: I3b0ed1975cd57dfd006d4e1890b23c307890de5c
Reviewed-on: https://gerrit.libreoffice.org/69842
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/include/svl/documentlockfile.hxx b/include/svl/documentlockfile.hxx
index ec94f1f22dde..77b1075ba6ea 100644
--- a/include/svl/documentlockfile.hxx
+++ b/include/svl/documentlockfile.hxx
@@ -32,28 +32,41 @@
namespace svt {
-class SVL_DLLPUBLIC DocumentLockFile : public LockFileCommon
+/// Generalized class for LO and MSO lockfile handling.
+class SVL_DLLPUBLIC GenDocumentLockFile : public LockFileCommon
{
-// the workaround for automated testing!
-static bool m_bAllowInteraction;
-
-css::uno::Reference< css::io::XInputStream > OpenStream();
-
-void WriteEntryToStream( const LockFileEntry& aEntry, const
css::uno::Reference< css::io::XOutputStream >& xStream );
-
public:
-DocumentLockFile( const OUString& aOrigURL );
-~DocumentLockFile();
+/// Specify the lockfile URL directly
+GenDocumentLockFile( const OUString& aURL );
+/// Let the object generate and own URL based on the original file's URL
and a prefix
+GenDocumentLockFile( const OUString& aOrigURL, const OUString& aPrefix );
+virtual ~GenDocumentLockFile() override;
bool CreateOwnLockFile();
-LockFileEntry GetLockData();
bool OverwriteOwnLockFile();
/// Delete the Lockfile, if current user is the owner
-void RemoveFile();
+virtual void RemoveFile();
/// Only delete lockfile, disregarding ownership
void RemoveFileDirectly();
-static bool IsInteractionAllowed() { return m_bAllowInteraction; }
+virtual LockFileEntry GetLockData() = 0;
+
+protected:
+virtual void WriteEntryToStream( const LockFileEntry& aEntry, const
css::uno::Reference< css::io::XOutputStream >& xStream ) = 0;
+css::uno::Reference< css::io::XInputStream > OpenStream();
+};
+
+/// Class implementing reading and writing LO lockfiles.
+class SVL_DLLPUBLIC DocumentLockFile : public GenDocumentLockFile
+{
+protected:
+virtual void WriteEntryToStream( const LockFileEntry& aEntry, const
css::uno::Reference< css::io::XOutputStream >& xStream ) override;
+
+public:
+DocumentLockFile( const OUString& aOrigURL );
+virtual ~DocumentLockFile() override;
+
+virtual LockFileEntry GetLockData() override;
};
}
diff --git a/include/svl/lockfilecommon.hxx b/include/svl/lockfilecommon.hxx
index ee4674840029..f66fb135139c 100644
--- a/include/svl/lockfilecommon.hxx
+++ b/include/svl/lockfilecommon.hxx
@@ -42,18 +42,27 @@ typedef o3tl::enumarray
LockFileEntry;
namespace svt {
-// This is a general implementation that is used in document lock file
implementation and in sharing control file implementation
+/// This is a general implementation that is used in document lock file
implementation and in sharing control file implementation
class SVL_DLLPUBLIC LockFileCommon
{
-protected:
-::osl::Mutex m_aMutex;
+private:
OUString m_aURL;
-INetURLObject ResolveLinks( const INetURLObject& aDocURL ) const;
+protected:
+::osl::Mutex m_aMutex;
public:
+/// Specify the lockfile URL directly
+LockFileCommon( const OUString& aURL );
+/// Let the object generate and own URL based on the original file's URL
and a prefix
LockFileCommon( const OUString& aOrigURL, const OUString& aPrefix );
-~LockFileCommon();
+virtual
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_svg icon-themes/colibre icon-themes/colibre_svg icon-themes/sifr icon-t
icon-themes/breeze/cmd/lc_redactdoc.png |binary icon-themes/breeze/cmd/sc_redactdoc.png |binary icon-themes/breeze_dark/cmd/lc_redactdoc.png |binary icon-themes/breeze_dark/cmd/sc_redactdoc.png |binary icon-themes/breeze_svg/cmd/lc_redactdoc.svg |6 ++ icon-themes/breeze_svg/cmd/sc_redactdoc.svg |6 ++ icon-themes/colibre/cmd/lc_redactdoc.png |binary icon-themes/colibre/cmd/sc_redactdoc.png |binary icon-themes/colibre_svg/cmd/lc_redactdoc.svg | 18 ++ icon-themes/colibre_svg/cmd/sc_redactdoc.svg | 13 + icon-themes/sifr/cmd/lc_redactdoc.png|binary icon-themes/sifr/cmd/sc_redactdoc.png|binary icon-themes/sifr_dark/cmd/lc_redactdoc.png |binary icon-themes/sifr_dark/cmd/sc_redactdoc.png |binary icon-themes/sifr_svg/cmd/lc_redactdoc.svg|6 ++ icon-themes/sifr_svg/cmd/sc_redactdoc.svg|6 ++ sc/uiconfig/scalc/menubar/menubar.xml|1 + sw/uiconfig/swriter/menubar/menubar.xml |1 + 18 files changed, 57 insertions(+) New commits: commit 8f35c6ad6735c32dc9b3afcf82a613092645cbc5 Author: andreas kainz AuthorDate: Wed Mar 27 11:32:57 2019 +0100 Commit: Andras Timar CommitDate: Wed Mar 27 21:46:29 2019 +0100 tdf#124293 add RedactDoc to writer, calc menubar in tools Change-Id: I8276506aaeaaee2bef5dad832d488450688081ee Reviewed-on: https://gerrit.libreoffice.org/69810 Tested-by: Jenkins Reviewed-by: andreas_kainz Reviewed-on: https://gerrit.libreoffice.org/69847 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/icon-themes/breeze/cmd/lc_redactdoc.png b/icon-themes/breeze/cmd/lc_redactdoc.png new file mode 100644 index ..612f698f7732 Binary files /dev/null and b/icon-themes/breeze/cmd/lc_redactdoc.png differ diff --git a/icon-themes/breeze/cmd/sc_redactdoc.png b/icon-themes/breeze/cmd/sc_redactdoc.png new file mode 100644 index ..b15bffbebc50 Binary files /dev/null and b/icon-themes/breeze/cmd/sc_redactdoc.png differ diff --git a/icon-themes/breeze_dark/cmd/lc_redactdoc.png b/icon-themes/breeze_dark/cmd/lc_redactdoc.png new file mode 100644 index ..d1b07a792df2 Binary files /dev/null and b/icon-themes/breeze_dark/cmd/lc_redactdoc.png differ diff --git a/icon-themes/breeze_dark/cmd/sc_redactdoc.png b/icon-themes/breeze_dark/cmd/sc_redactdoc.png new file mode 100644 index ..ccb75e7f9f15 Binary files /dev/null and b/icon-themes/breeze_dark/cmd/sc_redactdoc.png differ diff --git a/icon-themes/breeze_svg/cmd/lc_redactdoc.svg b/icon-themes/breeze_svg/cmd/lc_redactdoc.svg new file mode 100644 index ..e3389fc7bc33 --- /dev/null +++ b/icon-themes/breeze_svg/cmd/lc_redactdoc.svg @@ -0,0 +1,6 @@ +http://www.w3.org/2000/svg; viewBox="0 0 24 24"> + + diff --git a/icon-themes/breeze_svg/cmd/sc_redactdoc.svg b/icon-themes/breeze_svg/cmd/sc_redactdoc.svg new file mode 100644 index ..da2be336 --- /dev/null +++ b/icon-themes/breeze_svg/cmd/sc_redactdoc.svg @@ -0,0 +1,6 @@ +http://www.w3.org/2000/svg; viewBox="0 0 16 16"> + + diff --git a/icon-themes/colibre/cmd/lc_redactdoc.png b/icon-themes/colibre/cmd/lc_redactdoc.png new file mode 100644 index ..3cdc2ffc2918 Binary files /dev/null and b/icon-themes/colibre/cmd/lc_redactdoc.png differ diff --git a/icon-themes/colibre/cmd/sc_redactdoc.png b/icon-themes/colibre/cmd/sc_redactdoc.png new file mode 100644 index ..013684ba7470 Binary files /dev/null and b/icon-themes/colibre/cmd/sc_redactdoc.png differ diff --git a/icon-themes/colibre_svg/cmd/lc_redactdoc.svg b/icon-themes/colibre_svg/cmd/lc_redactdoc.svg new file mode 100644 index ..385d9bab4a36 --- /dev/null +++ b/icon-themes/colibre_svg/cmd/lc_redactdoc.svg @@ -0,0 +1,18 @@ +http://www.w3.org/2000/svg; viewBox="0 0 24 24"> + + + + + diff --git a/icon-themes/colibre_svg/cmd/sc_redactdoc.svg b/icon-themes/colibre_svg/cmd/sc_redactdoc.svg new file mode 100644 index ..34420f64e67d --- /dev/null +++ b/icon-themes/colibre_svg/cmd/sc_redactdoc.svg @@ -0,0 +1,13 @@ +http://www.w3.org/2000/svg; viewBox="0 0 16 16"> + + + + diff --git a/icon-themes/sifr/cmd/lc_redactdoc.png b/icon-themes/sifr/cmd/lc_redactdoc.png new file mode 100644 index ..dcd2e4e11189 Binary files /dev/null and b/icon-themes/sifr/cmd/lc_redactdoc.png differ diff --git a/icon-themes/sifr/cmd/sc_redactdoc.png b/icon-themes/sifr/cmd/sc_redactdoc.png new file mode 100644 index ..ab33ed998565 Binary files /dev/null and b/icon-themes/sifr/cmd/sc_redactdoc.png differ diff --git a/icon-themes/sifr_dark/cmd/lc_redactdoc.png b/icon-themes/sifr_dark/cmd/lc_redactdoc.png new file mode 100644 index ..86d5dc3c4b25 Binary files /dev/null and b/icon-themes/sifr_dark/cmd/lc_redactdoc.png differ diff --git a/icon-themes/sifr_dark/cmd/sc_redactdoc.png b/icon-themes/sifr_dark/cmd/sc_redactdoc.png new file
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - icon-themes/sifr
icon-themes/sifr/cmd/lc_exportto.svg|6 -- icon-themes/sifr/cmd/lc_redactedexportblack.svg |6 -- icon-themes/sifr/cmd/lc_redactedexportwhite.svg | 10 -- icon-themes/sifr/cmd/sc_redactedexportblack.svg |6 -- icon-themes/sifr/cmd/sc_redactedexportwhite.svg | 10 -- 5 files changed, 38 deletions(-) New commits: commit 3c3f3b4040bcb9040a22b9c84439421625f4f65b Author: andreas kainz AuthorDate: Tue Mar 19 22:28:55 2019 +0100 Commit: Andras Timar CommitDate: Wed Mar 27 21:46:02 2019 +0100 Sifr icon theme fix Change-Id: Ifd066516aaf2a69623d34ad48b541a17f6853697 Reviewed-on: https://gerrit.libreoffice.org/69446 Tested-by: Jenkins Reviewed-by: andreas_kainz Reviewed-on: https://gerrit.libreoffice.org/69846 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/icon-themes/sifr/cmd/lc_exportto.svg b/icon-themes/sifr/cmd/lc_exportto.svg deleted file mode 100644 index 5a471201ae8d.. --- a/icon-themes/sifr/cmd/lc_exportto.svg +++ /dev/null @@ -1,6 +0,0 @@ -http://www.w3.org/2000/svg;> - - diff --git a/icon-themes/sifr/cmd/lc_redactedexportblack.svg b/icon-themes/sifr/cmd/lc_redactedexportblack.svg deleted file mode 100644 index 044b7c85e861.. --- a/icon-themes/sifr/cmd/lc_redactedexportblack.svg +++ /dev/null @@ -1,6 +0,0 @@ -http://www.w3.org/2000/svg;> - - diff --git a/icon-themes/sifr/cmd/lc_redactedexportwhite.svg b/icon-themes/sifr/cmd/lc_redactedexportwhite.svg deleted file mode 100644 index cc008eaa401d.. --- a/icon-themes/sifr/cmd/lc_redactedexportwhite.svg +++ /dev/null @@ -1,10 +0,0 @@ -http://www.w3.org/2000/svg;> - - - diff --git a/icon-themes/sifr/cmd/sc_redactedexportblack.svg b/icon-themes/sifr/cmd/sc_redactedexportblack.svg deleted file mode 100644 index b9ab653391c4.. --- a/icon-themes/sifr/cmd/sc_redactedexportblack.svg +++ /dev/null @@ -1,6 +0,0 @@ -http://www.w3.org/2000/svg;> - - diff --git a/icon-themes/sifr/cmd/sc_redactedexportwhite.svg b/icon-themes/sifr/cmd/sc_redactedexportwhite.svg deleted file mode 100644 index ad68636b59c5.. --- a/icon-themes/sifr/cmd/sc_redactedexportwhite.svg +++ /dev/null @@ -1,10 +0,0 @@ -http://www.w3.org/2000/svg;> - - - ___ 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.0' - sfx2/inc sfx2/Library_sfx.mk sfx2/source
sfx2/Library_sfx.mk|1
sfx2/inc/SfxRedactionHelper.hxx| 69
sfx2/source/doc/SfxRedactionHelper.cxx | 180 +
sfx2/source/doc/objserv.cxx| 145 ++
4 files changed, 261 insertions(+), 134 deletions(-)
New commits:
commit b8ad8213efb62387371a60a1c522b06169df60c5
Author: Muhammet Kara
AuthorDate: Mon Feb 25 14:43:28 2019 +0300
Commit: Andras Timar
CommitDate: Wed Mar 27 21:45:16 2019 +0100
Create the SfxRedactionHelper class
And move some code pieces, related to the redaction functionality,
from objserv.cxx to the new SfxRedactionHelper.cxx file.
Change-Id: I6491c9b581ea6d3a05a72117c5b72e1dc19025dc
Reviewed-on: https://gerrit.libreoffice.org/68338
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
Reviewed-on: https://gerrit.libreoffice.org/69839
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 3d7e8ac3559e..0e4bd2a572f7 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -236,6 +236,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
sfx2/source/doc/docundomanager \
sfx2/source/doc/sfxbasemodel \
sfx2/source/doc/sfxmodelfactory \
+sfx2/source/doc/SfxRedactionHelper \
sfx2/source/doc/syspath \
sfx2/source/doc/zoomitem \
sfx2/source/doc/templatedlg \
diff --git a/sfx2/inc/SfxRedactionHelper.hxx b/sfx2/inc/SfxRedactionHelper.hxx
new file mode 100644
index ..d338143c608e
--- /dev/null
+++ b/sfx2/inc/SfxRedactionHelper.hxx
@@ -0,0 +1,69 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_CUI_SOURCE_INC_SFXREDACTIONHELPER_HXX
+#define INCLUDED_CUI_SOURCE_INC_SFXREDACTIONHELPER_HXX
+
+#include
+#include
+
+#include
+#include
+
+#include
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+
+class SfxRequest;
+class SfxStringItem;
+class GDIMetaFile;
+class DocumentToGraphicRenderer;
+class SfxViewFrame;
+
+/*
+ * Mostly a bunch of static methods to handle the redaction functionality at
+ * different points of the process.
+ **/
+class SfxRedactionHelper
+{
+public:
+/// Checks to see if the request has a parameter of IsRedactMode:bool=true
+static bool isRedactMode(const SfxRequest& rReq);
+/*
+ * Returns the value of the given string param as an OUString
+ * Returns empty OUString if no param
+ * */
+static OUString getStringParam(const SfxRequest& rReq, const sal_uInt16&
nParamId);
+/*
+ * Creates metafiles from the pages of the given document,
+ * and pushes into the given vector.
+ * */
+static void getPageMetaFilesFromDoc(std::vector& aMetaFiles,
+const sal_Int32& nPages,
+DocumentToGraphicRenderer& aRenderer,
bool bIsWriter,
+bool bIsCalc);
+/*
+ * Creates one shape and one draw page for each gdimetafile,
+ * and inserts the shapes into the newly created draw pages.
+ * */
+static void addPagesToDraw(uno::Reference& xComponent, const
sal_Int32& nPages,
+ const std::vector& aMetaFiles,
bool bIsCalc);
+/*
+ * Makes the Redaction toolbar visible to the user.
+ * Meant to be called after converting a document to a Draw doc
+ * for redaction purposes.
+ * */
+static void showRedactionToolbar(SfxViewFrame* pViewFrame);
+};
+
+#endif // INCLUDED_CUI_SOURCE_INC_SFXREDACTIONHELPER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/sfx2/source/doc/SfxRedactionHelper.cxx
b/sfx2/source/doc/SfxRedactionHelper.cxx
new file mode 100644
index ..cb333d0ccc3d
--- /dev/null
+++ b/sfx2/source/doc/SfxRedactionHelper.cxx
@@ -0,0 +1,180 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+
+#include
+#include
+
+#include
+
+#include
+#include
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+
+bool
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_svg icon-themes/colibre icon-themes/colibre_svg icon-themes/sifr icon-t
icon-themes/breeze/cmd/lc_redactedexportblack.png |binary icon-themes/breeze/cmd/lc_redactedexportwhite.png |binary icon-themes/breeze/cmd/sc_redactedexportblack.png |binary icon-themes/breeze/cmd/sc_redactedexportwhite.png |binary icon-themes/breeze/links.txt |9 - icon-themes/breeze_dark/cmd/lc_redactedexportblack.png |binary icon-themes/breeze_dark/cmd/lc_redactedexportwhite.png |binary icon-themes/breeze_dark/cmd/sc_redactedexportblack.png |binary icon-themes/breeze_dark/cmd/sc_redactedexportwhite.png |binary icon-themes/breeze_svg/cmd/lc_redactedexportblack.svg |6 +++ icon-themes/breeze_svg/cmd/lc_redactedexportwhite.svg | 10 + icon-themes/breeze_svg/cmd/sc_redactedexportblack.svg |6 +++ icon-themes/breeze_svg/cmd/sc_redactedexportwhite.svg | 10 + icon-themes/colibre/cmd/lc_redactedexportblack.png |binary icon-themes/colibre/cmd/lc_redactedexportwhite.png |binary icon-themes/colibre/cmd/sc_redactedexportblack.png |binary icon-themes/colibre/cmd/sc_redactedexportwhite.png |binary icon-themes/colibre/links.txt |9 - icon-themes/colibre_svg/cmd/lc_redactedexportblack.svg | 27 +++ icon-themes/colibre_svg/cmd/lc_redactedexportwhite.svg | 30 + icon-themes/colibre_svg/cmd/sc_redactedexportblack.svg | 22 icon-themes/colibre_svg/cmd/sc_redactedexportwhite.svg | 22 icon-themes/sifr/cmd/lc_exportto.png |binary icon-themes/sifr/cmd/lc_exportto.svg |6 +++ icon-themes/sifr/cmd/lc_redactedexportblack.png|binary icon-themes/sifr/cmd/lc_redactedexportblack.svg|6 +++ icon-themes/sifr/cmd/lc_redactedexportwhite.png|binary icon-themes/sifr/cmd/lc_redactedexportwhite.svg| 10 + icon-themes/sifr/cmd/sc_redactedexportblack.png|binary icon-themes/sifr/cmd/sc_redactedexportblack.svg|6 +++ icon-themes/sifr/cmd/sc_redactedexportwhite.png|binary icon-themes/sifr/cmd/sc_redactedexportwhite.svg| 10 + icon-themes/sifr_dark/cmd/lc_exportto.png |binary icon-themes/sifr_dark/cmd/lc_redactedexportblack.png |binary icon-themes/sifr_dark/cmd/lc_redactedexportwhite.png |binary icon-themes/sifr_dark/cmd/sc_redactedexportblack.png |binary icon-themes/sifr_dark/cmd/sc_redactedexportwhite.png |binary icon-themes/sifr_svg/cmd/lc_exportto.svg |6 +++ icon-themes/sifr_svg/cmd/lc_redactedexportblack.svg|6 +++ icon-themes/sifr_svg/cmd/lc_redactedexportwhite.svg| 10 + icon-themes/sifr_svg/cmd/sc_redactedexportblack.svg|6 +++ icon-themes/sifr_svg/cmd/sc_redactedexportwhite.svg| 10 + 42 files changed, 209 insertions(+), 18 deletions(-) New commits: commit 28266de0ad1546365d3f68612abd0b13bb4423ab Author: andreas kainz AuthorDate: Mon Mar 18 12:38:16 2019 +0100 Commit: Andras Timar CommitDate: Wed Mar 27 21:45:33 2019 +0100 Redacted icons for Breeze, Sifr and Colibre Change-Id: I0a121bbc16c3aabf7873f79ff037b1085d42867b Reviewed-on: https://gerrit.libreoffice.org/69407 Tested-by: Jenkins Reviewed-by: andreas_kainz Reviewed-on: https://gerrit.libreoffice.org/69845 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/icon-themes/breeze/cmd/lc_redactedexportblack.png b/icon-themes/breeze/cmd/lc_redactedexportblack.png new file mode 100644 index ..f7185975ce9f Binary files /dev/null and b/icon-themes/breeze/cmd/lc_redactedexportblack.png differ diff --git a/icon-themes/breeze/cmd/lc_redactedexportwhite.png b/icon-themes/breeze/cmd/lc_redactedexportwhite.png new file mode 100644 index ..6283217f7a48 Binary files /dev/null and b/icon-themes/breeze/cmd/lc_redactedexportwhite.png differ diff --git a/icon-themes/breeze/cmd/sc_redactedexportblack.png b/icon-themes/breeze/cmd/sc_redactedexportblack.png new file mode 100644 index ..4d752eddbee3 Binary files /dev/null and b/icon-themes/breeze/cmd/sc_redactedexportblack.png differ diff --git a/icon-themes/breeze/cmd/sc_redactedexportwhite.png b/icon-themes/breeze/cmd/sc_redactedexportwhite.png new file mode 100644 index ..87986494e23a Binary files /dev/null and b/icon-themes/breeze/cmd/sc_redactedexportwhite.png differ diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt index ddf77579b98e..e562fe12365f 100644 --- a/icon-themes/breeze/links.txt +++ b/icon-themes/breeze/links.txt @@ -1722,12 +1722,3 @@ cmd/sc_rowoperations.png cmd/sc_entirerow.png cmd/sc_cellprotection.png cmd/sc_protect.png cmd/lc_cellprotection.png cmd/lc_protect.png - -# Redaction toolbar -cmd/lc_redactedexportblack.png cmd/lc_exportdirecttopdf.png -cmd/sc_redactedexportblack.png cmd/sc_exportdirecttopdf.png -cmd/32/redactedexportblack.png cmd/32/exportdirecttopdf.png -
[Libreoffice-bugs] [Bug 115983] findAll and replaceAll methods have an unexpected behavior when they are called from the com.sun.star.sheet.SheetCellRanges service.
https://bugs.documentfoundation.org/show_bug.cgi?id=115983 --- Comment #11 from tvata...@starxpert.fr --- This bug yet exists in LibreOffice 6.2.2 : User Profile Reset: Yes Informations from 'Help - About LibreOffice' : Version: 6.2.2.2 Build ID: 2b840030fec2aae0fd2658d8d4f9548af4e3518d Threads CPU : 4; OS : Linux 4.9; UI Render : par défaut; VCL: gtk3; Locale : fr-FR (fr_FR.utf8); Langue IHM : fr-FR Calc: threaded -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - icon-themes/breeze officecfg/registry sd/uiconfig
icon-themes/breeze/links.txt|9 + officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu |2 +- sd/uiconfig/sdraw/toolbar/redactedexportbar.xml |4 ++-- sd/uiconfig/sdraw/toolbar/redactionbar.xml |3 +-- 4 files changed, 13 insertions(+), 5 deletions(-) New commits: commit 1d647aea40abf3fe966866eb7baff108071e672e Author: Muhammet Kara AuthorDate: Sun Feb 24 11:55:29 2019 +0300 Commit: Andras Timar CommitDate: Wed Mar 27 21:44:46 2019 +0100 Temp icons for the redactedexport commands Just put some links for now for the icons, and replace the two buttons on the redaction toolbar with the new redactedexporttoolbox Change-Id: Ic1df62d56c965869135ceca97bbeb87efd3aaa0d Reviewed-on: https://gerrit.libreoffice.org/68281 Tested-by: Jenkins Reviewed-by: Muhammet Kara Reviewed-on: https://gerrit.libreoffice.org/69838 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt index e562fe12365f..ddf77579b98e 100644 --- a/icon-themes/breeze/links.txt +++ b/icon-themes/breeze/links.txt @@ -1722,3 +1722,12 @@ cmd/sc_rowoperations.png cmd/sc_entirerow.png cmd/sc_cellprotection.png cmd/sc_protect.png cmd/lc_cellprotection.png cmd/lc_protect.png + +# Redaction toolbar +cmd/lc_redactedexportblack.png cmd/lc_exportdirecttopdf.png +cmd/sc_redactedexportblack.png cmd/sc_exportdirecttopdf.png +cmd/32/redactedexportblack.png cmd/32/exportdirecttopdf.png + +cmd/lc_redactedexportwhite.png cmd/lc_exportdirecttopdf.png +cmd/sc_redactedexportwhite.png cmd/sc_exportdirecttopdf.png +cmd/32/redactedexportwhite.png cmd/32/exportdirecttopdf.png diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu index 8c6daa310c36..260a20b4cd1e 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu @@ -611,7 +611,7 @@ com.sun.star.comp.framework.SubToolBarController - redactedexportbar;.uno:ExportDirectToPDF?IsRedactMode:bool=true + redactedexportbar;.uno:RedactedExportBlack diff --git a/sd/uiconfig/sdraw/toolbar/redactedexportbar.xml b/sd/uiconfig/sdraw/toolbar/redactedexportbar.xml index 06468d459409..727a34ba72d5 100644 --- a/sd/uiconfig/sdraw/toolbar/redactedexportbar.xml +++ b/sd/uiconfig/sdraw/toolbar/redactedexportbar.xml @@ -18,6 +18,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> http://openoffice.org/2001/toolbar; xmlns:xlink="http://www.w3.org/1999/xlink;> - - + + diff --git a/sd/uiconfig/sdraw/toolbar/redactionbar.xml b/sd/uiconfig/sdraw/toolbar/redactionbar.xml index bb27cd01acb4..e25e53d4414b 100644 --- a/sd/uiconfig/sdraw/toolbar/redactionbar.xml +++ b/sd/uiconfig/sdraw/toolbar/redactionbar.xml @@ -21,6 +21,5 @@ - - + ___ 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.0' - sd/source
sd/source/ui/func/fuconbez.cxx | 52 -
1 file changed, 26 insertions(+), 26 deletions(-)
New commits:
commit 8ca55f57c9d0d982356f85e25edec03249ea8cc3
Author: Muhammet Kara
AuthorDate: Wed Mar 27 18:08:40 2019 +0300
Commit: Andras Timar
CommitDate: Wed Mar 27 21:44:23 2019 +0100
Sync fuconbez.cxx with master
Change-Id: I2e898f5bfbbaa55c5e403185cd445af605300d1e
Reviewed-on: https://gerrit.libreoffice.org/69837
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index b6de7982701a..ad62133b0d8e 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -104,35 +104,35 @@ void FuConstructBezierPolygon::DoExecute( SfxRequest&
rReq )
const SfxItemSet* pArgs = rReq.GetArgs();
-if( pArgs )
+if( !pArgs )
+return;
+
+const SfxPoolItem* pPoolItem = nullptr;
+if( SfxItemState::SET == pArgs->GetItemState( SID_ADD_MOTION_PATH, true,
) )
+maTargets = static_cast( pPoolItem )->GetValue();
+
+if (nSlotId == SID_DRAW_FREELINE_NOFILL)
{
-const SfxPoolItem* pPoolItem = nullptr;
-if( SfxItemState::SET == pArgs->GetItemState( SID_ADD_MOTION_PATH,
true, ) )
-maTargets = static_cast( pPoolItem
)->GetValue();
+const SfxUInt16Item* pTransparence =
rReq.GetArg(FN_PARAM_1);
+const SfxStringItem* pColor =
rReq.GetArg(FN_PARAM_2);
+const SfxUInt16Item* pWidth =
rReq.GetArg(FN_PARAM_3);
+const SfxStringItem* pShapeName =
rReq.GetArg(SID_SHAPE_NAME);
-if (nSlotId == SID_DRAW_FREELINE_NOFILL)
+if (pTransparence && pTransparence->GetValue() > 0)
{
-const SfxUInt16Item* pTransparence =
rReq.GetArg(FN_PARAM_1);
-const SfxStringItem* pColor =
rReq.GetArg(FN_PARAM_2);
-const SfxUInt16Item* pWidth =
rReq.GetArg(FN_PARAM_3);
-const SfxStringItem* pShapeName =
rReq.GetArg(SID_SHAPE_NAME);
-
-if (pTransparence && pTransparence->GetValue() > 0)
-{
-mnTransparence = pTransparence->GetValue();
-}
-if (pColor && !pColor->GetValue().isEmpty())
-{
-msColor = pColor->GetValue();
-}
-if (pWidth && pWidth->GetValue() > 0)
-{
-mnWidth = pWidth->GetValue();
-}
-if (pShapeName && !pShapeName->GetValue().isEmpty())
-{
-msShapeName = pShapeName->GetValue();
-}
+mnTransparence = pTransparence->GetValue();
+}
+if (pColor && !pColor->GetValue().isEmpty())
+{
+msColor = pColor->GetValue();
+}
+if (pWidth && pWidth->GetValue() > 0)
+{
+mnWidth = pWidth->GetValue();
+}
+if (pShapeName && !pShapeName->GetValue().isEmpty())
+{
+msShapeName = pShapeName->GetValue();
}
}
}
___
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.0' - include/sfx2 include/svx officecfg/registry sd/sdi sd/uiconfig sd/UIConfig_sdraw.mk sfx2/sdi sfx2/source
include/sfx2/sfxsids.hrc | 3 include/svx/svxids.hrc | 4 officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 14 ++ officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 30 + officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu | 14 ++ sd/UIConfig_sdraw.mk | 1 sd/sdi/_drvwsh.sdi | 5 sd/sdi/sdraw.sdi | 18 +++ sd/uiconfig/sdraw/toolbar/redactedexportbar.xml | 23 +++ sd/uiconfig/sdraw/toolbar/redactionbar.xml | 3 sfx2/sdi/sfx.sdi | 2 sfx2/source/appl/appuno.cxx | 1 sfx2/source/doc/objserv.cxx | 60 -- 13 files changed, 167 insertions(+), 11 deletions(-) New commits: commit ddcc4c817380f013ed312367c17c8603e96c2237 Author: Muhammet Kara AuthorDate: Wed Feb 20 14:36:12 2019 +0300 Commit: Andras Timar CommitDate: Wed Mar 27 21:43:59 2019 +0100 Add style options to redaction export * Add 2 new uno command aliases to handle 2 different styles of redaction export/sanitization: * .uno:RedactedExportBlack & .uno:RedactedExportWhite * Replace the single export button with the 2 new buttons * Add a new toolbox names .uno:RedactedExportToolbox which consists of the new 2 commands. It will be added to the Redaction toolbar after we solve the icon issue. * Now new redaction shapes are named as RectangleRedactionShape or FreeformRedactionShape based on their type. * While exporting to PDF, a seamless step of "Sanitization" takes place, in which, all shapes in the Draw doc are traversed and turned into opaq black or white (with black border) shapes, then the whole doc is converted into bitmap (page by page). * After the export operation is completed. All shapes are converted back to the usual redaction style (gray and transparent). * Icon issue: * We need 2 new icons for our new commands, one for black redaction shapes without border, and one for white redaction shapes with black border. * I tried adding links to a current icon, but it didn't work, so they are iconless for now. * Next to do: Handle icon issue, and take the redaction implementation into a separate helper class because it is growing fast. Change-Id: I9b2b7716289b800cdbe7bf3ffa4a442fe5afc474 Reviewed-on: https://gerrit.libreoffice.org/68072 Tested-by: Jenkins Reviewed-by: Muhammet Kara Reviewed-on: https://gerrit.libreoffice.org/69836 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index e275ba953a69..c725951cf118 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -247,8 +247,9 @@ #define SID_NO_FILE_SYNC(SID_SFX_START + 1729) #define SID_IS_REDACT_MODE (SID_SFX_START + 1731) +#define SID_REDACTION_STYLE (SID_SFX_START + 1732) -// SID_SFX_free_START (SID_SFX_START + 1732) +// SID_SFX_free_START (SID_SFX_START + 1733) // SID_SFX_free_END(SID_SFX_START + 3999) #define SID_OPEN_NEW_VIEW (SID_SFX_START + 520) diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index 8649f2ba2317..b3ed3911ac36 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -471,6 +471,8 @@ // CAUTION! Range <413 .. 413> used by EditEngine (!) +#define SID_DRAWTBX_REDACTED_EXPORT ( SID_SVX_START + 606 ) + #define SID_ATTR_3D_START ( SID_SVX_START + 415 ) #define SID_RULER_PROTECT SID_ATTR_3D_START #define SID_COLOR_CONTROL ( SID_SVX_START + 417 ) @@ -552,7 +554,7 @@ #define SID_FM_DBGRID ( SID_SVX_START + 603 ) #define SID_FM_IMAGEBUTTON ( SID_SVX_START + 604 ) #define SID_FM_FILECONTROL ( SID_SVX_START + 605 ) -//FREE +//( SID_SVX_START + 606 ) is used by SID_DRAWTBX_REDACTED_EXPORT #define SID_FM_NAVIGATIONBAR( SID_SVX_START + 607 ) //FREE //FREE diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu index 12d7ccd3de91..8c6daa310c36 100644 ---
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - include/sfx2 officecfg/registry sd/source sd/uiconfig sfx2/source svx/sdi
include/sfx2/sfxsids.hrc |4
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |4
sd/source/ui/func/fuconbez.cxx | 14 ++-
sd/source/ui/func/fuconrec.cxx |7 +
sd/source/ui/inc/fuconbez.hxx|3
sd/source/ui/inc/fuconrec.hxx|1
sd/uiconfig/sdraw/toolbar/redactionbar.xml |4
sfx2/source/doc/objserv.cxx | 46
+++---
svx/sdi/svx.sdi |6 -
9 files changed, 46 insertions(+), 43 deletions(-)
New commits:
commit 6f5466e19e7a645ad0a8215c29a2a3a0213e6dd6
Author: Muhammet Kara
AuthorDate: Tue Feb 19 23:41:57 2019 +0300
Commit: Andras Timar
CommitDate: Wed Mar 27 21:43:37 2019 +0100
Use named shapes for redaction
Change-Id: Ibb55bd503d264b618c3fbebfdbcf3fe9958c6783
Reviewed-on: https://gerrit.libreoffice.org/68031
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
Reviewed-on: https://gerrit.libreoffice.org/69835
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 68e2055db36c..e275ba953a69 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -406,7 +406,9 @@
#define SID_PASTE_ONLY_TEXT (SID_SFX_START + 802)
#define SID_PASTE_ONLY_FORMULA (SID_SFX_START + 803)
#define SID_PASTE_ONLY_VALUE(SID_SFX_START + 804)
-// FREE: SID_SFX_START + 808
+
+// Used for redaction
+#define SID_SHAPE_NAME (SID_SFX_START + 808)
// FREE: SID_SFX_START + 809
// FREE: SID_SFX_START + 810
#define SID_ASYNCHRON (SID_SFX_START + 811)
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 7f92b83df9e9..1a26c35eb2d1 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2071,7 +2071,7 @@
1
-
+
Rectangle
@@ -4666,7 +4666,7 @@
1
-
+
Freeform
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index bb7352328d10..b6de7982701a 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -55,7 +55,8 @@ namespace sd {
/*//Extra attributes coming from parameters
sal_uInt16 mnTransparence; // Default: 0
OUStringmsColor; // Default: ""
-sal_uInt16 mnWidth; // Default: 0*/
+sal_uInt16 mnWidth; // Default: 0
+OUStringmsShapeName; // Default: ""*/
FuConstructBezierPolygon::FuConstructBezierPolygon (
ViewShell* pViewSh,
::sd::Window* pWin,
@@ -114,6 +115,7 @@ void FuConstructBezierPolygon::DoExecute( SfxRequest& rReq )
const SfxUInt16Item* pTransparence =
rReq.GetArg(FN_PARAM_1);
const SfxStringItem* pColor =
rReq.GetArg(FN_PARAM_2);
const SfxUInt16Item* pWidth =
rReq.GetArg(FN_PARAM_3);
+const SfxStringItem* pShapeName =
rReq.GetArg(SID_SHAPE_NAME);
if (pTransparence && pTransparence->GetValue() > 0)
{
@@ -127,6 +129,10 @@ void FuConstructBezierPolygon::DoExecute( SfxRequest& rReq
)
{
mnWidth = pWidth->GetValue();
}
+if (pShapeName && !pShapeName->GetValue().isEmpty())
+{
+msShapeName = pShapeName->GetValue();
+}
}
}
}
@@ -173,7 +179,7 @@ bool FuConstructBezierPolygon::MouseButtonDown(const
MouseEvent& rMEvt)
{
SfxItemSet aAttr(mpDoc->GetPool());
SetStyleSheet(aAttr, pObj);
-SetAttributes(aAttr);
+SetAttributes(aAttr, pObj);
pObj->SetMergedItemSet(aAttr);
}
}
@@ -351,7 +357,7 @@ Color strToColor(const OUString& sColor)
}
}
-void FuConstructBezierPolygon::SetAttributes(SfxItemSet& rAttr)
+void FuConstructBezierPolygon::SetAttributes(SfxItemSet& rAttr, SdrObject
*pObj)
{
if (nSlotId == SID_DRAW_FREELINE_NOFILL)
{
@@ -361,6 +367,8 @@ void FuConstructBezierPolygon::SetAttributes(SfxItemSet&
rAttr)
rAttr.Put(XLineColorItem(OUString(), strToColor(msColor)));
if (mnWidth > 0)
rAttr.Put(XLineWidthItem(mnWidth));
+if (!msShapeName.isEmpty())
+pObj->SetName(msShapeName);
}
}
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index 6631a8705294..91c629240380 100644
---
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sfx2/source
sfx2/source/doc/objserv.cxx | 174 +++-
1 file changed, 173 insertions(+), 1 deletion(-)
New commits:
commit b93a50c4acae93bff3596663361bb26753241c34
Author: Muhammet Kara
AuthorDate: Thu Feb 7 22:07:09 2019 +0300
Commit: Andras Timar
CommitDate: Wed Mar 27 21:43:12 2019 +0100
Handle redaction finalization: Black
Convert shapes on the document to black & opaque
before sending it to the pdfexport filter.
Convert them back to gray & transparent after
the export operation.
Change-Id: Iffe66e371710f16ef1c04f0da196fc5a561af344
Reviewed-on: https://gerrit.libreoffice.org/67517
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
Reviewed-on: https://gerrit.libreoffice.org/69834
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 776e4c7b997a..1cc2a0f4f8fc 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -121,6 +121,7 @@
#include
#include
+#include
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
@@ -399,6 +400,23 @@ uno::Sequence< document::CmisVersion >
SfxObjectShell::GetCmisVersions( )
return uno::Sequence< document::CmisVersion > ( );
}
+namespace{
+
+/// Checks to see if the request has a parameter of IsRedactMode:bool=true
+bool isRedactMode(SfxRequest& rReq)
+{
+const SfxItemSet *pArgs = rReq.GetArgs();
+if (pArgs)
+{
+const SfxBoolItem* pIsRedactMode =
rReq.GetArg(SID_IS_REDACT_MODE);
+if (pIsRedactMode && pIsRedactMode->GetValue())
+return true;
+}
+
+return false;
+}
+
+}
void SfxObjectShell::ExecFile_Impl(SfxRequest )
{
@@ -661,8 +679,93 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest )
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-case SID_EXPORTDOCASPDF:
case SID_DIRECTEXPORTDOCASPDF:
+{
+uno::Reference< lang::XComponent > xComponent(
GetCurrentComponent(), uno::UNO_QUERY );
+if (!xComponent.is())
+return;
+
+uno::Reference< lang::XServiceInfo > xServiceInfo( xComponent,
uno::UNO_QUERY);
+
+// Redaction finalization takes place in Draw
+if ( xServiceInfo.is() &&
xServiceInfo->supportsService("com.sun.star.drawing.DrawingDocument")
+ && isRedactMode(rReq) )
+{
+// Access the draw pages
+uno::Reference
xDrawPagesSupplier(xComponent, uno::UNO_QUERY);
+uno::Reference xDrawPages =
xDrawPagesSupplier->getDrawPages();
+
+sal_Int32 nPageCount = xDrawPages->getCount();
+for (sal_Int32 nPageNum = 0; nPageNum < nPageCount; ++nPageNum)
+{
+// Get the page
+uno::Reference< drawing::XDrawPage > xPage(
xDrawPages->getByIndex( nPageNum ), uno::UNO_QUERY );
+
+if (!xPage.is())
+continue;
+
+// Go through all shapes
+sal_Int32 nShapeCount = xPage->getCount();
+for (sal_Int32 nShapeNum = 0; nShapeNum < nShapeCount;
++nShapeNum)
+{
+uno::Reference< drawing::XShape >
xCurrShape(xPage->getByIndex(nShapeNum), uno::UNO_QUERY);
+if (!xCurrShape.is())
+continue;
+
+uno::Reference< beans::XPropertySet >
xPropSet(xCurrShape, uno::UNO_QUERY);
+if (!xPropSet.is())
+continue;
+
+uno::Reference< beans::XPropertySetInfo> xInfo =
xPropSet->getPropertySetInfo();
+if (!xInfo.is())
+continue;
+
+// Rectangle redaction
+if (xInfo->hasPropertyByName("FillTransparence") &&
xInfo->hasPropertyByName("FillColor"))
+{
+uno::Any aAnyTransp =
xPropSet->getPropertyValue("FillTransparence");
+uno::Any aAnyColor =
xPropSet->getPropertyValue("FillColor");
+
+sal_Int16 nTransp = 0;
+const OUString
sRectangleName("RectangleRedactionShape");
+
+aAnyTransp >>= nTransp;
+Color aColor(aAnyColor.get());
+
+
+if (nTransp == 50 && aColor == COL_GRAY7)
+{
+xPropSet->setPropertyValue("FillTransparence",
css::uno::makeAny(static_cast(0)));
+xPropSet->setPropertyValue("FillColor",
css::uno::makeAny(COL_BLACK));
+xPropSet->setPropertyValue("Name",
css::uno::makeAny(sRectangleName));
+
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 22 ++ 1 file changed, 22 insertions(+) New commits: commit 54087433e7495a7fa74661e5bfebac95b5648598 Author: Muhammet Kara AuthorDate: Sat Jan 26 01:33:37 2019 +0300 Commit: Andras Timar CommitDate: Wed Mar 27 21:42:25 2019 +0100 Make the text on Redaction toolbar buttons visible Change-Id: I3d6bc2adb91fbe16da008797b7b7e5189726c500 Reviewed-on: https://gerrit.libreoffice.org/66968 Tested-by: Jenkins Reviewed-by: Muhammet Kara Reviewed-on: https://gerrit.libreoffice.org/69818 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 4e93b335b3ce..45ed074966df 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -2071,6 +2071,17 @@ 1 + + + Rectangle + + + Rectangle Redaction + + + 1 + + Rectangle, Rounded @@ -4655,6 +4666,17 @@ 1 + + + Freeform + + + Freeform Redaction + + + 1 + + Text Animation ___ 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.0' - filter/source include/sfx2 officecfg/registry sd/uiconfig sfx2/sdi sfx2/source
filter/source/pdf/pdfexport.cxx | 25
++
filter/source/pdf/pdfexport.hxx |2
filter/source/pdf/pdffilter.cxx | 36
+-
include/sfx2/sfxsids.hrc |4 -
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 14 +++
sd/uiconfig/sdraw/toolbar/redactionbar.xml |2
sfx2/sdi/sfx.sdi |3
sfx2/source/appl/appuno.cxx |1
sfx2/source/doc/objstor.cxx | 12 +++
9 files changed, 95 insertions(+), 4 deletions(-)
New commits:
commit e4f9c34a1b21674289d42bea1e4a3b94879bc731
Author: Muhammet Kara
AuthorDate: Tue Jan 29 23:02:22 2019 +0300
Commit: Andras Timar
CommitDate: Wed Mar 27 21:42:48 2019 +0100
Support bitmap PDF export for Redaction
* Add a new parameter IsRedactMode (SID_IS_REDACT_MODE) to
.uno:ExportDirectToPDF
* Make sure the new param makes it into PDFExport as part of FilterData
* Hijack the metafile before being sent to ImplExportPage(), convert to
bitmap, and replace the original
* Add a new entry to GenericCommands.xcu to make our button with param
visible
* Nitpick: For things to be included in the bitmap conversion,
they need to be added to the metafile before the conversion
in PDFExport::ExportSelection(). Things added after that point
(inside ImplExportPage() for example) will not be
bitmapped/pixelized
Change-Id: Iec7020917da920a968ea969b98e53f17eadaa275
Reviewed-on: https://gerrit.libreoffice.org/67108
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
Reviewed-on: https://gerrit.libreoffice.org/69833
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 31adb9788e1d..9013c63e2973 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -114,6 +114,8 @@ PDFExport::PDFExport( const Reference< XComponent >&
rxSrcDoc,
mnProgressValue ( 0 ),
mbRemoveTransparencies ( false ),
+mbIsRedactMode ( false ),
+
mbHideViewerToolbar ( false ),
mbHideViewerMenubar ( false ),
mbHideViewerWindowControls ( false ),
@@ -225,7 +227,27 @@ bool PDFExport::ExportSelection( vcl::PDFWriter&
rPDFWriter,
if( aMtf.GetActionSize() &&
( !mbSkipEmptyPages || aPageSize.Width ||
aPageSize.Height ) )
+{
+// We convert the whole metafile into a bitmap to get
rid of the
+// text covered by redaction shapes
+if (mbIsRedactMode)
+{
+try
+{
+Graphic aGraph(aMtf);
+BitmapEx bmp = aGraph.GetBitmapEx();
+Graphic bgraph(bmp);
+aMtf = bgraph.GetGDIMetaFile();
+}
+catch(const Exception& e)
+{
+SAL_WARN("filter.pdf", "Something went wrong
while converting metafile to bitmap. Exception: "
+ << e.Message);
+}
+}
+
bRet = ImplExportPage(rPDFWriter, rPDFExtOutDevData,
aMtf) || bRet;
+}
pOut->Pop();
@@ -555,6 +577,9 @@ bool PDFExport::Export( const OUString& rFile, const
Sequence< PropertyValue >&
rFilterData[ nData ].Value >>= mbExportPlaceholders;
else if ( rFilterData[ nData ].Name == "UseReferenceXObject" )
rFilterData[ nData ].Value >>= mbUseReferenceXObject;
+// Redaction & bitmap related stuff
+else if ( rFilterData[ nData ].Name == "IsRedactMode" )
+rFilterData[ nData ].Value >>= mbIsRedactMode;
}
aContext.URL=
aURL.GetMainURL(INetURLObject::DecodeMechanism::ToIUri);
diff --git a/filter/source/pdf/pdfexport.hxx b/filter/source/pdf/pdfexport.hxx
index 9d302900cdee..da7ca044ea60 100644
--- a/filter/source/pdf/pdfexport.hxx
+++ b/filter/source/pdf/pdfexport.hxx
@@ -65,6 +65,8 @@ private:
sal_Int32 mnProgressValue;
boolmbRemoveTransparencies;
+boolmbIsRedactMode;
+
OUStringmsWatermark;
OUStringmsTiledWatermark;
diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sd/source sd/uiconfig svx/sdi
sd/source/ui/func/fuconbez.cxx | 86 +++--
sd/source/ui/inc/fuconbez.hxx | 10 +++
sd/uiconfig/sdraw/toolbar/redactionbar.xml |2
svx/sdi/svx.sdi|3 -
4 files changed, 96 insertions(+), 5 deletions(-)
New commits:
commit 38ce298746bc26d6894432d8baed7aac45c379ca
Author: Muhammet Kara
AuthorDate: Fri Jan 25 14:24:42 2019 +0300
Commit: Andras Timar
CommitDate: Wed Mar 27 21:41:54 2019 +0100
Forge the freeform redaction tool
out of the Freeform Line tool in Draw.
* Replace .uno:LineToolbox with .uno:Freeline_Unfilled in Redaction toolbar
* Add new parameters to .uno:Freeline_Unfilled
- SfxUInt16Item Transparence, SfxStringItem Color,
SfxUInt16Item Width, SfxBoolItem IsSticky
* Handle the params in FuConstructBezierPolygon
* Now the freeform line draw tool on the Redaction toolbar
works with a default width of 5mm, color of COL_GRAY7,
and a transparency of 50%; and it sticks when it is
clicked/selected once until user deliberately deselects it
by clicking on another tool or by clicking outside of the page.
* Known problem: icon is not displayed on the toolbar after adding the
params
Change-Id: I6b09276ca82782dbf214aab8d2ba3b407fb0d81c
Reviewed-on: https://gerrit.libreoffice.org/66916
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
Reviewed-on: https://gerrit.libreoffice.org/69817
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index d49f009506dc..bb7352328d10 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -31,6 +31,9 @@
#include
#include
+#include
+#include
+#include
#include
#include
@@ -49,7 +52,10 @@ using namespace ::com::sun::star::uno;
namespace sd {
-
+/*//Extra attributes coming from parameters
+sal_uInt16 mnTransparence; // Default: 0
+OUStringmsColor; // Default: ""
+sal_uInt16 mnWidth; // Default: 0*/
FuConstructBezierPolygon::FuConstructBezierPolygon (
ViewShell* pViewSh,
::sd::Window* pWin,
@@ -57,8 +63,29 @@ FuConstructBezierPolygon::FuConstructBezierPolygon (
SdDrawDocument* pDoc,
SfxRequest& rReq)
: FuConstruct(pViewSh, pWin, pView, pDoc, rReq),
- nEditMode(SID_BEZIER_MOVE)
+ nEditMode(SID_BEZIER_MOVE),
+ mnTransparence(0),
+ mnWidth(0)
+{
+}
+
+namespace{
+
+/// Checks to see if the request has a parameter of IsSticky:bool=true
+/// It means that the selected command/button will stay selected after use
+bool isSticky(SfxRequest& rReq)
{
+const SfxItemSet *pArgs = rReq.GetArgs ();
+if (pArgs)
+{
+const SfxBoolItem* pIsSticky = rReq.GetArg(FN_PARAM_4);
+if (pIsSticky && pIsSticky->GetValue())
+return true;
+}
+
+return false;
+}
+
}
rtl::Reference FuConstructBezierPolygon::Create( ViewShell* pViewSh,
::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq,
bool bPermanent )
@@ -66,7 +93,7 @@ rtl::Reference FuConstructBezierPolygon::Create(
ViewShell* pViewSh, ::s
FuConstructBezierPolygon* pFunc;
rtl::Reference xFunc( pFunc = new FuConstructBezierPolygon(
pViewSh, pWin, pView, pDoc, rReq ) );
xFunc->DoExecute(rReq);
-pFunc->SetPermanent(bPermanent);
+pFunc->SetPermanent(bPermanent || isSticky(rReq));
return xFunc;
}
@@ -75,11 +102,32 @@ void FuConstructBezierPolygon::DoExecute( SfxRequest& rReq
)
FuConstruct::DoExecute( rReq );
const SfxItemSet* pArgs = rReq.GetArgs();
+
if( pArgs )
{
const SfxPoolItem* pPoolItem = nullptr;
if( SfxItemState::SET == pArgs->GetItemState( SID_ADD_MOTION_PATH,
true, ) )
maTargets = static_cast( pPoolItem
)->GetValue();
+
+if (nSlotId == SID_DRAW_FREELINE_NOFILL)
+{
+const SfxUInt16Item* pTransparence =
rReq.GetArg(FN_PARAM_1);
+const SfxStringItem* pColor =
rReq.GetArg(FN_PARAM_2);
+const SfxUInt16Item* pWidth =
rReq.GetArg(FN_PARAM_3);
+
+if (pTransparence && pTransparence->GetValue() > 0)
+{
+mnTransparence = pTransparence->GetValue();
+}
+if (pColor && !pColor->GetValue().isEmpty())
+{
+msColor = pColor->GetValue();
+}
+if (pWidth && pWidth->GetValue() > 0)
+{
+mnWidth = pWidth->GetValue();
+}
+}
}
}
@@ -125,6 +173,7 @@ bool FuConstructBezierPolygon::MouseButtonDown(const
MouseEvent& rMEvt)
{
SfxItemSet aAttr(mpDoc->GetPool());
SetStyleSheet(aAttr, pObj);
+SetAttributes(aAttr);
pObj->SetMergedItemSet(aAttr);
}
}
@@ -284,6 +333,37 @@ void
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - officecfg/registry sd/source sd/uiconfig sd/UIConfig_sdraw.mk sfx2/source svx/sdi
officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu | 11 +
sd/UIConfig_sdraw.mk |1
sd/source/ui/func/fuconrec.cxx | 97
+-
sd/source/ui/inc/fuconrec.hxx|6
sd/uiconfig/sdraw/toolbar/redactionbar.xml | 25 ++
sfx2/source/doc/objserv.cxx | 32 +++
svx/sdi/svx.sdi |5
7 files changed, 171 insertions(+), 6 deletions(-)
New commits:
commit 6f3359112ed46ca74e3217fb3f8d9fb224aa228b
Author: Muhammet Kara
AuthorDate: Tue Jan 22 01:00:39 2019 +0300
Commit: Andras Timar
CommitDate: Wed Mar 27 21:41:25 2019 +0100
Add Redaction Toolbar
* Consists of .uno:Rect, .uno:LineToolbox, and .uno:ExportDirectToPDF
* Automatically shown when we are in the redaction process
* Customizes the rectangle tool for our needs
Also:
* Adds new parameters to the SID_DRAW_RECT (.uno:Rect)
to be able to set transparancy, fill color, and line/border style,
and to make our button sticky/permanent
Known problem: Button's icon is not shown after adding the parameters
Change-Id: I7928264415769f7e0a4ded171b864adb99aed442
Reviewed-on: https://gerrit.libreoffice.org/66706
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
Reviewed-on: https://gerrit.libreoffice.org/69816
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
index ab64a1eb10f6..53f3d1adb244 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
@@ -900,6 +900,17 @@
true
+
+
+ false
+
+
+ false
+
+
+ Redaction
+
+
diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk
index 1d2d6e9f2a1e..93056ddec9b6 100644
--- a/sd/UIConfig_sdraw.mk
+++ b/sd/UIConfig_sdraw.mk
@@ -86,6 +86,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/sdraw,\
sd/uiconfig/sdraw/toolbar/optionsbar \
sd/uiconfig/sdraw/toolbar/positionbar \
sd/uiconfig/sdraw/toolbar/rectanglesbar \
+ sd/uiconfig/sdraw/toolbar/redactionbar \
sd/uiconfig/sdraw/toolbar/standardbar \
sd/uiconfig/sdraw/toolbar/starshapes \
sd/uiconfig/sdraw/toolbar/symbolshapes \
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index e46293693ae6..6631a8705294 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -26,6 +26,7 @@
#include
#include
+#include
#include
#include
#include
@@ -42,6 +43,8 @@
#include
#include
#include
+#include
+#include
#include
@@ -72,15 +75,36 @@ FuConstructRectangle::FuConstructRectangle (
SdDrawDocument* pDoc,
SfxRequest& rReq)
: FuConstruct(pViewSh, pWin, pView, pDoc, rReq)
+, mnFillTransparence(0)
+, mnLineStyle(SAL_MAX_UINT16)
{
}
+namespace{
+
+/// Checks to see if the request has a parameter of IsSticky:bool=true
+/// It means that the selected command/button will stay selected after use
+bool isSticky(SfxRequest& rReq)
+{
+const SfxItemSet *pArgs = rReq.GetArgs ();
+if (pArgs)
+{
+const SfxBoolItem* pIsSticky = rReq.GetArg(FN_PARAM_4);
+if (pIsSticky && pIsSticky->GetValue())
+return true;
+}
+
+return false;
+}
+
+}
+
rtl::Reference FuConstructRectangle::Create( ViewShell* pViewSh,
::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq,
bool bPermanent )
{
FuConstructRectangle* pFunc;
rtl::Reference xFunc( pFunc = new FuConstructRectangle( pViewSh,
pWin, pView, pDoc, rReq ) );
xFunc->DoExecute(rReq);
-pFunc->SetPermanent(bPermanent);
+pFunc->SetPermanent(bPermanent || isSticky(rReq));
return xFunc;
}
@@ -105,6 +129,9 @@ void FuConstructRectangle::DoExecute( SfxRequest& rReq )
const SfxUInt32Item* pAxisX =
rReq.GetArg(ID_VAL_AXIS_X);
const SfxUInt32Item* pAxisY =
rReq.GetArg(ID_VAL_AXIS_Y);
+if (!pCenterX || !pCenterY || !pAxisX || !pAxisY)
+break;
+
::tools::Rectangle aNewRectangle (pCenterX->GetValue () -
pAxisX->GetValue () / 2,
pCenterY->GetValue () -
pAxisY->GetValue () / 2,
pCenterX->GetValue () +
pAxisX->GetValue () / 2,
@@ -118,10 +145,29 @@ void FuConstructRectangle::DoExecute( SfxRequest& rReq )
case SID_DRAW_RECT :
{
-const
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - include/svtools sfx2/source svtools/source
include/svtools/DocumentToGraphicRenderer.hxx | 15 -
sfx2/source/doc/objserv.cxx | 36 +++-
svtools/source/filter/DocumentToGraphicRenderer.cxx | 58 ++--
3 files changed, 99 insertions(+), 10 deletions(-)
New commits:
commit ad32e6a65bfbcf439470e16c3442a499a9f6b40a
Author: Muhammet Kara
AuthorDate: Fri Jan 18 14:07:56 2019 +0300
Commit: Andras Timar
CommitDate: Wed Mar 27 21:41:10 2019 +0100
Redaction: Adjust offset for multiple Calc pages
* Add an enum and some methods to DocumentToGraphicRenderer
to differentiate between the doc/module types:
isWriter(), isCalc(), isImpress()
* Put some checks for module/doc type
* The result seems ok for a Calc document of multiple sheets
with hundreds of pages
Change-Id: Idf3e1966d4239df30a48a947a95c9085c25ee1bb
Reviewed-on: https://gerrit.libreoffice.org/66605
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
Reviewed-on: https://gerrit.libreoffice.org/69815
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/include/svtools/DocumentToGraphicRenderer.hxx
b/include/svtools/DocumentToGraphicRenderer.hxx
index b44a7015d0df..96ea882f3917 100644
--- a/include/svtools/DocumentToGraphicRenderer.hxx
+++ b/include/svtools/DocumentToGraphicRenderer.hxx
@@ -44,6 +44,13 @@ class SVT_DLLPUBLIC DocumentToGraphicRenderer
{
const css::uno::Reference& mxDocument;
+enum DocType {
+WRITER,
+CALC,
+IMPRESS,
+UNKNOWN
+};
+
css::uno::Reference mxModel;
css::uno::ReferencemxController;
css::uno::Reference mxRenderable;
@@ -51,6 +58,7 @@ class SVT_DLLPUBLIC DocumentToGraphicRenderer
css::uno::Any maSelection;
boolmbSelectionOnly;
boolmbIsWriter;
+DocType meDocType;
bool hasSelection() const;
@@ -70,7 +78,8 @@ public:
Size getDocumentSizeInPixels( sal_Int32 nCurrentPage );
-Size getDocumentSizeIn100mm(sal_Int32 nCurrentPage, Point*
pDocumentPosition = nullptr);
+Size getDocumentSizeIn100mm(sal_Int32 nCurrentPage, Point*
pDocumentPosition = nullptr,
+Point* pCalcPagePosition = nullptr, Size
*pCalcPageSize = nullptr);
Graphic renderToGraphic( sal_Int32 nCurrentPage, Size aDocumentSizePixel,
Size aTargetSizePixel, Color aPageColor);
@@ -85,6 +94,10 @@ public:
css::uno::Reference< css::drawing::XShapes > & rxShapes,
css::uno::Reference< css::drawing::XShape > & rxShape,
const css::uno::Reference< css::frame::XController > &
rxController );
+
+bool isWriter() const;
+bool isCalc() const;
+bool isImpress() const;
};
#endif
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 6c5819cd3f78..ee8d25987845 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -534,7 +534,16 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest )
uno::Reference< lang::XComponent > xSourceDoc( xModel );
-DocumentToGraphicRenderer aRenderer(xSourceDoc,
/*bSelectionOnly=*/false);
+DocumentToGraphicRenderer aRenderer(xSourceDoc, false);
+
+bool bIsWriter = aRenderer.isWriter();
+bool bIsCalc = aRenderer.isCalc();
+
+if (!bIsWriter && !bIsCalc)
+{
+SAL_WARN( "sfx.doc", "Redaction is supported only for Writer
and Calc! (for now...)");
+return;
+}
sal_Int32 nPages = aRenderer.getPageCount();
@@ -544,7 +553,9 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest )
{
::Size aDocumentSizePixel =
aRenderer.getDocumentSizeInPixels(nPage);
::Point aLogicPos;
-::Size aLogic = aRenderer.getDocumentSizeIn100mm(nPage,
);
+::Point aCalcPageLogicPos;
+::Size aCalcPageContentSize;
+::Size aLogic = aRenderer.getDocumentSizeIn100mm(nPage,
, , );
// FIXME: This is a temporary hack. Need to figure out a
proper way to derive this scale factor.
::Size aTargetSize(aDocumentSizePixel.Width() * 1.23,
aDocumentSizePixel.Height() * 1.23);
@@ -556,9 +567,21 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest )
MapMode aMapMode;
aMapMode.SetMapUnit(MapUnit::Map100thMM);
// FIXME: This is a temporary hack. Need to figure out a
proper way to derive these magic numbers.
-aMapMode.SetOrigin(::Point(-(aLogicPos.getX() - 512) * 1.53,
-((aLogicPos.getY() - 501)* 1.53 + (nPage-1)*740 )));
+if (bIsWriter)
+
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sfx2/source
sfx2/source/doc/objserv.cxx | 76 +++-
1 file changed, 47 insertions(+), 29 deletions(-)
New commits:
commit 91b9632395a191264b13b2d51fc6510ac9a1134c
Author: Muhammet Kara
AuthorDate: Tue Mar 26 20:06:37 2019 +0300
Commit: Andras Timar
CommitDate: Wed Mar 27 21:39:46 2019 +0100
Redaction: Handle multiple Writer pages
* Creates one GDIMetaFile from each Writer page * Inserts them as Shapes
into the newly created Draw doc
* Has some 'magic' numbers needs to be figured out
* Tried with a 100-page Writer doc, seems okay
* Seems slow, might need to be optimized
* Seems like getDocumentSizeInPixels() and getDocumentSizeIn100mm()
are consuming most of the cycles. Will look into this at the end.
Change-Id: Ic6046af0c12e26185edf59862e55b17117495922
Reviewed-on: https://gerrit.libreoffice.org/65847
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
Reviewed-on: https://gerrit.libreoffice.org/69769
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 4102bebe3435..43538cf7665c 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -542,28 +542,36 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest )
if(!xCursor.is())
return;
+xCursor->jumpToLastPage();
+sal_Int16 nPages = xCursor->getPage();
+
uno::Reference< lang::XComponent > xSourceDoc( xModel );
DocumentToGraphicRenderer aRenderer(xSourceDoc,
/*bSelectionOnly=*/false);
-// Only take the first page for now
-sal_Int16 nPage = 1;
-
-::Size aDocumentSizePixel =
aRenderer.getDocumentSizeInPixels(nPage);
-::Point aLogicPos;
-::Size aLogic = aRenderer.getDocumentSizeIn100mm(nPage,
);
-// FIXME: This is a temporary hack. Need to figure out a proper
way to derive this scale factor.
-::Size aTargetSize(aDocumentSizePixel.Width() * 1.23,
aDocumentSizePixel.Height() * 1.23);
+std::vector< GDIMetaFile > aMetaFiles;
-Graphic aGraphic = aRenderer.renderToGraphic(nPage,
aDocumentSizePixel, aTargetSize, COL_TRANSPARENT);
-auto& rGDIMetaFile =
const_cast(aGraphic.GetGDIMetaFile());
-
-// Set preferred map unit and size on the metafile, so the Shape
size
-// will be correct in MM.
-MapMode aMapMode;
-aMapMode.SetMapUnit(MapUnit::Map100thMM);
-aMapMode.SetOrigin(::Point(-aLogicPos.getX(), -aLogicPos.getY()));
-rGDIMetaFile.SetPrefMapMode(aMapMode);
-rGDIMetaFile.SetPrefSize(aLogic);
+for (sal_Int32 nPage = 1; nPage <= nPages; ++nPage)
+{
+::Size aDocumentSizePixel =
aRenderer.getDocumentSizeInPixels(nPage);
+::Point aLogicPos;
+::Size aLogic = aRenderer.getDocumentSizeIn100mm(nPage,
);
+// FIXME: This is a temporary hack. Need to figure out a
proper way to derive this scale factor.
+::Size aTargetSize(aDocumentSizePixel.Width() * 1.23,
aDocumentSizePixel.Height() * 1.23);
+
+Graphic aGraphic = aRenderer.renderToGraphic(nPage,
aDocumentSizePixel, aTargetSize, COL_TRANSPARENT);
+auto& rGDIMetaFile =
const_cast(aGraphic.GetGDIMetaFile());
+
+// Set preferred map unit and size on the metafile, so the
Shape size
+// will be correct in MM.
+MapMode aMapMode;
+aMapMode.SetMapUnit(MapUnit::Map100thMM);
+// FIXME: This is a temporary hack. Need to figure out a
proper way to derive these magic numbers.
+aMapMode.SetOrigin(::Point(-(aLogicPos.getX() - 512) * 1.53,
-((aLogicPos.getY() - 501)* 1.53 + (nPage-1)*740 )));
+rGDIMetaFile.SetPrefMapMode(aMapMode);
+rGDIMetaFile.SetPrefSize(aLogic);
+
+aMetaFiles.push_back(rGDIMetaFile);
+}
// Create an empty Draw component.
uno::Reference xDesktop =
css::frame::Desktop::create(comphelper::getProcessComponentContext());
@@ -573,21 +581,31 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest )
// Access the draw pages
uno::Reference
xDrawPagesSupplier(xComponent, uno::UNO_QUERY);
uno::Reference xDrawPages =
xDrawPagesSupplier->getDrawPages();
-uno::Reference< drawing::XDrawPage > xPage(
xDrawPages->getByIndex( 0 ), uno::UNO_QUERY_THROW );
+uno::Reference
xFactory(xComponent, uno::UNO_QUERY);
-uno::Reference xGraph = aGraphic.GetXGraphic();
+for (sal_Int32 nPage = 0; nPage < nPages; ++nPage)
+{
+GDIMetaFile rGDIMetaFile = aMetaFiles[nPage];
+Graphic aGraphic(rGDIMetaFile);
-
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - include/svtools sfx2/source svtools/source
include/svtools/DocumentToGraphicRenderer.hxx |1
sfx2/source/doc/objserv.cxx | 16 ++---
svtools/source/filter/DocumentToGraphicRenderer.cxx | 23
3 files changed, 27 insertions(+), 13 deletions(-)
New commits:
commit d132d2206926c8b25a11384844d5afe446901826
Author: Muhammet Kara
AuthorDate: Tue Jan 8 16:58:40 2019 +0300
Commit: Andras Timar
CommitDate: Wed Mar 27 21:40:13 2019 +0100
Add method DocumentToGraphicRenderer::getPageCount()
And use that in sfx2 Redaction code to be independent of
the document/module type
Change-Id: Ic206f7a10a27d8d44566df34a10d009a34adf0a5
Reviewed-on: https://gerrit.libreoffice.org/65971
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
Reviewed-on: https://gerrit.libreoffice.org/69813
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/include/svtools/DocumentToGraphicRenderer.hxx
b/include/svtools/DocumentToGraphicRenderer.hxx
index af0ce6e8086f..b44a7015d0df 100644
--- a/include/svtools/DocumentToGraphicRenderer.hxx
+++ b/include/svtools/DocumentToGraphicRenderer.hxx
@@ -66,6 +66,7 @@ public:
~DocumentToGraphicRenderer();
sal_Int32 getCurrentPage();
+sal_Int32 getPageCount();
Size getDocumentSizeInPixels( sal_Int32 nCurrentPage );
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 43538cf7665c..6c5819cd3f78 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -532,22 +532,12 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest )
if(!xModel.is())
return;
-uno::Reference
xTextViewCursorSupplier(
-xModel->getCurrentController(), uno::UNO_QUERY);
-if(!xTextViewCursorSupplier.is())
-return;
-
-uno::Reference
xCursor(xTextViewCursorSupplier->getViewCursor(),
- uno::UNO_QUERY);
-if(!xCursor.is())
-return;
-
-xCursor->jumpToLastPage();
-sal_Int16 nPages = xCursor->getPage();
-
uno::Reference< lang::XComponent > xSourceDoc( xModel );
+
DocumentToGraphicRenderer aRenderer(xSourceDoc,
/*bSelectionOnly=*/false);
+sal_Int32 nPages = aRenderer.getPageCount();
+
std::vector< GDIMetaFile > aMetaFiles;
for (sal_Int32 nPage = 1; nPage <= nPages; ++nPage)
diff --git a/svtools/source/filter/DocumentToGraphicRenderer.cxx
b/svtools/source/filter/DocumentToGraphicRenderer.cxx
index 00c27c7c0fd8..58f1cfafa954 100644
--- a/svtools/source/filter/DocumentToGraphicRenderer.cxx
+++ b/svtools/source/filter/DocumentToGraphicRenderer.cxx
@@ -231,6 +231,29 @@ sal_Int32 DocumentToGraphicRenderer::getCurrentPage()
return 1;
}
+sal_Int32 DocumentToGraphicRenderer::getPageCount()
+{
+Reference< awt::XDevice > xDevice(mxToolkit->createScreenCompatibleDevice(
32, 32 ) );
+
+uno::Any selection( getSelection() );
+
+PropertyValues renderProperties;
+
+renderProperties.realloc( 4 );
+renderProperties[0].Name = "IsPrinter";
+renderProperties[0].Value <<= true;
+renderProperties[1].Name = "RenderDevice";
+renderProperties[1].Value <<= xDevice;
+renderProperties[2].Name = "View";
+renderProperties[2].Value <<= mxController;
+renderProperties[3].Name = "RenderToGraphic";
+renderProperties[3].Value <<= true;
+
+sal_Int32 nPages = mxRenderable->getRendererCount( selection,
renderProperties );
+
+return nPages;
+}
+
sal_Int32 DocumentToGraphicRenderer::getCurrentPageWriter()
{
Reference
xTextViewCursorSupplier(mxModel->getCurrentController(), UNO_QUERY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - include/svtools sfx2/source svtools/source sw/CppunitTest_sw_unowriter.mk sw/qa sw/source
include/svtools/DocumentToGraphicRenderer.hxx|2
sfx2/source/doc/objserv.cxx |4
svtools/source/filter/DocumentToGraphicRenderer.cxx | 13 +
sw/CppunitTest_sw_unowriter.mk | 75
sw/qa/extras/unowriter/data/renderable-page-position.odt |binary
sw/qa/extras/unowriter/unowriter.cxx | 128 +++
sw/source/uibase/uno/unotxdoc.cxx|9 -
7 files changed, 226 insertions(+), 5 deletions(-)
New commits:
commit 5ceee417fef834cd6b033603d72eaf4708970a1d
Author: Miklos Vajna
AuthorDate: Fri Jan 4 11:04:05 2019 +0100
Commit: Andras Timar
CommitDate: Wed Mar 27 21:39:20 2019 +0100
svtools: expose document position in DocumentToGraphicRenderer
Writer pages always have an offset inside the root frame, and this is
visible in the generated metafile as well. The offset is minimal for a
small window and a single page, but the vertical offset increases with
every page. Make this information visible, so sfx2 can compensate this.
This is somewhat similar to what SfxObjectShell::DoDraw_Impl() does, but
that works for the first page only (use case is thumbnail generation),
while this is 0 offset for Calc/Impress and a proper offset for all
Writer pages.
Change-Id: I1075c98faf74f9e77c916572b4d63d40fbd80ab1
Reviewed-on: https://gerrit.libreoffice.org/65850
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/69758
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/include/svtools/DocumentToGraphicRenderer.hxx
b/include/svtools/DocumentToGraphicRenderer.hxx
index 5ed6f2ce4434..af0ce6e8086f 100644
--- a/include/svtools/DocumentToGraphicRenderer.hxx
+++ b/include/svtools/DocumentToGraphicRenderer.hxx
@@ -69,7 +69,7 @@ public:
Size getDocumentSizeInPixels( sal_Int32 nCurrentPage );
-Size getDocumentSizeIn100mm( sal_Int32 nCurrentPage );
+Size getDocumentSizeIn100mm(sal_Int32 nCurrentPage, Point*
pDocumentPosition = nullptr);
Graphic renderToGraphic( sal_Int32 nCurrentPage, Size aDocumentSizePixel,
Size aTargetSizePixel, Color aPageColor);
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 689dc36b42e7..4102bebe3435 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -549,7 +549,8 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest )
sal_Int16 nPage = 1;
::Size aDocumentSizePixel =
aRenderer.getDocumentSizeInPixels(nPage);
-::Size aLogic = aRenderer.getDocumentSizeIn100mm(nPage);
+::Point aLogicPos;
+::Size aLogic = aRenderer.getDocumentSizeIn100mm(nPage,
);
// FIXME: This is a temporary hack. Need to figure out a proper
way to derive this scale factor.
::Size aTargetSize(aDocumentSizePixel.Width() * 1.23,
aDocumentSizePixel.Height() * 1.23);
@@ -560,6 +561,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest )
// will be correct in MM.
MapMode aMapMode;
aMapMode.SetMapUnit(MapUnit::Map100thMM);
+aMapMode.SetOrigin(::Point(-aLogicPos.getX(), -aLogicPos.getY()));
rGDIMetaFile.SetPrefMapMode(aMapMode);
rGDIMetaFile.SetPrefSize(aLogic);
diff --git a/svtools/source/filter/DocumentToGraphicRenderer.cxx
b/svtools/source/filter/DocumentToGraphicRenderer.cxx
index 812fea51d701..00c27c7c0fd8 100644
--- a/svtools/source/filter/DocumentToGraphicRenderer.cxx
+++ b/svtools/source/filter/DocumentToGraphicRenderer.cxx
@@ -114,7 +114,8 @@ uno::Any DocumentToGraphicRenderer::getSelection() const
return aSelection;
}
-Size DocumentToGraphicRenderer::getDocumentSizeIn100mm(sal_Int32 nCurrentPage)
+Size DocumentToGraphicRenderer::getDocumentSizeIn100mm(sal_Int32 nCurrentPage,
+ Point*
pDocumentPosition)
{
Reference< awt::XDevice > xDevice(mxToolkit->createScreenCompatibleDevice(
32, 32 ) );
@@ -133,6 +134,7 @@ Size
DocumentToGraphicRenderer::getDocumentSizeIn100mm(sal_Int32 nCurrentPage)
renderProperties[3].Value <<= true;
awt::Size aSize;
+awt::Point aPos;
sal_Int32 nPages = mxRenderable->getRendererCount( selection,
renderProperties );
if (nPages >= nCurrentPage)
@@ -144,9 +146,18 @@ Size
DocumentToGraphicRenderer::getDocumentSizeIn100mm(sal_Int32 nCurrentPage)
{
aResult[ nProperty ].Value >>= aSize;
}
+else if (aResult[nProperty].Name == "PagePos")
+{
+aResult[nProperty].Value >>= aPos;
+}
}
}
+if (pDocumentPosition)
+{
+*pDocumentPosition = Point(aPos.X, aPos.Y);
+}
+
return Size( aSize.Width, aSize.Height );
}
diff --git
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - include/sfx2 officecfg/registry sfx2/sdi sfx2/source
include/sfx2/sfxsids.hrc |3 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 14 + sfx2/sdi/docslots.sdi|5 sfx2/sdi/sfx.sdi | 17 ++ sfx2/source/appl/appuno.cxx |4 sfx2/source/doc/objserv.cxx | 76 ++ 6 files changed, 116 insertions(+), 3 deletions(-) New commits: commit cbbe3edc5668fa21f8507a6435547dbfe5eef4d0 Author: Muhammet Kara AuthorDate: Thu Dec 6 12:10:13 2018 +0300 Commit: Andras Timar CommitDate: Wed Mar 27 21:39:00 2019 +0100 Redaction: First steps - Add an uno command to create an empty draw document - Create a meta file from the first page of a Writer document - Insert meta file to the draw page - Doesn't work with normal/default view on big/high-res screens because of a bug in the MapModes. Manually setting zoom level to %200 or "Page Width" (to get rid of the extra space around the actual page) works for now as workaround. Change-Id: I05a987617efdda6690400ef550b81b58b21aa27e Reviewed-on: https://gerrit.libreoffice.org/64858 Tested-by: Jenkins Reviewed-by: Muhammet Kara Reviewed-on: https://gerrit.libreoffice.org/69728 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index e4c757ae756a..4dc9db677a8b 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -127,6 +127,7 @@ #define SID_DIRECTEXPORTDOCASPDF(SID_SFX_START + 1674) #define SID_EXPORTDOCASEPUB (SID_SFX_START + 1677) #define SID_DIRECTEXPORTDOCASEPUB (SID_SFX_START + 1678) +#define SID_REDACTDOC (SID_SFX_START + 1730) #define SID_UPDATEDOCMODE (SID_SFX_START + 1668) #define SID_CHECKOUT(SID_SFX_START + 512) #define SID_CANCELCHECKOUT (SID_SFX_START + 513) @@ -245,7 +246,7 @@ #define SID_TOOLBAR_MODE(SID_SFX_START + 1728) #define SID_NO_FILE_SYNC(SID_SFX_START + 1729) -// SID_SFX_free_START (SID_SFX_START + 1730) +// SID_SFX_free_START (SID_SFX_START + 1731) // SID_SFX_free_END(SID_SFX_START + 3999) #define SID_OPEN_NEW_VIEW (SID_SFX_START + 520) diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index aeb79c35c1ec..4e93b335b3ce 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -4914,6 +4914,20 @@ 1 + + + Redact + + + Redact + + + Redact Document + + + 1 + + ~Customize... diff --git a/sfx2/sdi/docslots.sdi b/sfx2/sdi/docslots.sdi index 811467cd94be..5b878b8ff051 100644 --- a/sfx2/sdi/docslots.sdi +++ b/sfx2/sdi/docslots.sdi @@ -248,6 +248,11 @@ shell SfxObjectShell ExecMethod = ExecFile_Impl ; StateMethod = GetState_Impl ; ] +SID_REDACTDOC +[ +ExecMethod = ExecFile_Impl ; +StateMethod = GetState_Impl ; +] SID_SIGNATURE [ ExecMethod = ExecFile_Impl; diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index 83d26d5797e8..240cb0be10f0 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -4777,6 +4777,23 @@ SfxVoidItem ExportDirectToEPUB SID_DIRECTEXPORTDOCASEPUB GroupId = SfxGroupId::Document; ] +SfxVoidItem RedactDoc SID_REDACTDOC +(SfxStringItem URL SID_FILE_NAME, SfxStringItem FilterName SID_FILTER_NAME) +[ +AutoUpdate = FALSE, +FastCall = FALSE, +ReadOnlyDoc = TRUE, +Toggle = FALSE, +Container = TRUE, +RecordAbsolute = FALSE, +RecordPerSet; + +AccelConfig = TRUE, +MenuConfig = TRUE, +ToolBoxConfig = TRUE, +GroupId = SfxGroupId::Document; +] + SfxImageItem ImageOrientation SID_IMAGE_ORIENTATION [ diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index a0bf23d483f6..bed21cc2b91b 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -172,7 +172,7 @@ static bool isMediaDescriptor( sal_uInt16 nSlotId ) nSlotId == SID_SAVETO || nSlotId == SID_SAVEACOPY || nSlotId == SID_EXPORTDOCASPDF || nSlotId == SID_DIRECTEXPORTDOCASPDF || nSlotId == SID_EXPORTDOCASEPUB || nSlotId == SID_DIRECTEXPORTDOCASEPUB || - nSlotId == SID_SAVEACOPYITEM); + nSlotId == SID_REDACTDOC || nSlotId == SID_SAVEACOPYITEM); } void TransformParameters(
[Libreoffice-bugs] [Bug 124329] Published attribute of shapes in sheets regarding the now 3 anchoring types is missing
https://bugs.documentfoundation.org/show_bug.cgi?id=124329 Wolfgang Jäger changed: What|Removed |Added CC||j...@psilosoph.de --- Comment #2 from Wolfgang Jäger --- Why isn't it possible to introduce a property .AnchorType for ScShapeObj as it already exists for SwXShape? -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 124376] Sidebar Separator lines
https://bugs.documentfoundation.org/show_bug.cgi?id=124376 andreas_k changed: What|Removed |Added Keywords||needsUXEval CC||kain...@gmail.com -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 124376] New: Sidebar Separator lines
https://bugs.documentfoundation.org/show_bug.cgi?id=124376 Bug ID: 124376 Summary: Sidebar Separator lines Product: LibreOffice Version: unspecified Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: UI Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: kain...@gmail.com Created attachment 150330 --> https://bugs.documentfoundation.org/attachment.cgi?id=150330=edit Sidebar Line Separators I'd recommend to remove the Lines around the sidebar, like you see in the attachment. But I also recommend to have an horizontal Line at bottom of the top Toolbar. For example the Statusbar has an horizontal line at top. thanks -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 123416] Doubled global menu in 6.2.0-2
https://bugs.documentfoundation.org/show_bug.cgi?id=123416 Konstantin changed: What|Removed |Added Resolution|WORKSFORME |--- Status|RESOLVED|REOPENED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 102495] [META] KDE VCL backend bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=102495 Bug 102495 depends on bug 123416, which changed state. Bug 123416 Summary: Doubled global menu in 6.2.0-2 https://bugs.documentfoundation.org/show_bug.cgi?id=123416 What|Removed |Added Status|RESOLVED|REOPENED Resolution|WORKSFORME |--- -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 123416] Doubled global menu in 6.2.0-2
https://bugs.documentfoundation.org/show_bug.cgi?id=123416 --- Comment #10 from Konstantin --- Hello, I am rilian-la-te, a developer of vala-panel-appmenu, and I still see a bug under MATE and XFCE (with vala-panel-appmenu). I see you send only GMenuModels, if we using gtk frontend (I do not know, which sort of Global Menus you send under KDE), so, we need to look to your MenuModel XML. Distribution: ArchLinux Package: extra/libreoffice-fresh 6.2.2-2 GTK frontend affected, in KDE frontend all is OK. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
