[Libreoffice-commits] core.git: framework/inc
framework/inc/dispatch/closedispatcher.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 1f07faf2caf8fd8df6fa8824ff5030b01c0c0634 Author: Andrea Gelmini AuthorDate: Tue May 14 21:23:08 2019 + Commit: Julien Nabet CommitDate: Sat Jun 8 09:01:06 2019 +0200 Fix typo Change-Id: I57ad3ce3595f8225ae6f52afd63dfc2477b7e5d8 Reviewed-on: https://gerrit.libreoffice.org/73689 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx index dd44a110b3f9..54224b7af9a0 100644 --- a/framework/inc/dispatch/closedispatcher.hxx +++ b/framework/inc/dispatch/closedispatcher.hxx @@ -87,7 +87,7 @@ class CloseDispatcher : public ::cppu::WeakImplHelper< /** @short used for asynchronous callbacks within the main thread. @descr Internally we work asynchronous. Because our callis -are not aware, that her request can kill its own environment ... */ +are not aware, that her request can kill its own environment... */ std::unique_ptr m_aAsyncCallback; /** @short used inside asynchronous callback to decide, @@ -107,7 +107,7 @@ class CloseDispatcher : public ::cppu::WeakImplHelper< public: /** @short connect a new CloseDispatcher instance to its frame. -@descr One CloseDispatcher instance is bound to onw frame only. +@descr One CloseDispatcher instance is bound to own frame only. That makes an implementation (e.g. of listener support) much more easier .-) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang include/sfx2 include/svtools include/svx sc/source sd/source sfx2/source svtools/source svx/source
compilerplugins/clang/unusedfields.only-used-in-constructor.results | 144 --- compilerplugins/clang/unusedfields.readonly.results | 106 ++--- compilerplugins/clang/unusedfields.untouched.results| 134 -- compilerplugins/clang/unusedfields.writeonly.results| 196 +- include/sfx2/templatelocalview.hxx |3 include/sfx2/thumbnailview.hxx |1 include/svtools/simptabl.hxx|4 include/svx/ctredlin.hxx|4 sc/source/core/data/column3.cxx |4 sd/source/ui/dlg/BulletAndPositionDlg.cxx | 13 sd/source/ui/inc/BulletAndPositionDlg.hxx |4 sfx2/source/control/emojiview.cxx |1 sfx2/source/control/templatedefaultview.cxx |1 sfx2/source/control/templatelocalview.cxx | 22 - sfx2/source/control/thumbnailview.cxx | 22 - sfx2/source/dialog/tabdlg.cxx |4 svtools/source/contnr/simptabl.cxx |7 svx/source/dialog/ctredlin.cxx |2 18 files changed, 332 insertions(+), 340 deletions(-) New commits: commit aed5ce3547cc6c28c2cb25d77f3982c53100fee8 Author: Noel Grandin AuthorDate: Fri Jun 7 20:25:45 2019 +0200 Commit: Noel Grandin CommitDate: Sat Jun 8 09:35:54 2019 +0200 loplugin:unusedfields Change-Id: I9758fd606c7d4c251a3ac06661d642a47260b5fc Reviewed-on: https://gerrit.libreoffice.org/73674 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results index bd4a73ed0dfd..bdfd1f8f794e 100644 --- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results +++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results @@ -9,9 +9,9 @@ avmedia/source/vlc/wrapper/Types.hxx:44 avmedia/source/vlc/wrapper/Types.hxx:45 libvlc_event_t::(anonymous union)::(anonymous) dummy2 const char * avmedia/source/vlc/wrapper/Types.hxx:46 -libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/noel/disk2/libo6/avmedia/source/vlc/wrapper/Types.hxx:43:7) +libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/noel/disk2/libo5/avmedia/source/vlc/wrapper/Types.hxx:43:7) avmedia/source/vlc/wrapper/Types.hxx:47 -libvlc_event_t u union (anonymous union at /media/noel/disk2/libo6/avmedia/source/vlc/wrapper/Types.hxx:41:5) +libvlc_event_t u union (anonymous union at /media/noel/disk2/libo5/avmedia/source/vlc/wrapper/Types.hxx:41:5) avmedia/source/vlc/wrapper/Types.hxx:53 libvlc_track_description_t psz_name char * basegfx/source/polygon/b2dtrapezoid.cxx:202 @@ -130,8 +130,10 @@ cppu/source/uno/check.cxx:138 (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3 cui/source/dialogs/colorpicker.cxx:719 cui::ColorPickerDialog m_aColorPrevious class cui::ColorPreviewControl -cui/source/factory/dlgfact.cxx:1340 +cui/source/factory/dlgfact.cxx:1349 SvxMacroAssignDialog m_aItems class SfxItemSet +cui/source/inc/about.hxx:39 +AboutDialog m_pCloseButton weld::Button * cui/source/inc/cfgutil.hxx:238 SvxScriptSelectorDialog m_aStylesInfo struct SfxStylesInfo_Impl cui/source/inc/cuitabarea.hxx:228 @@ -184,9 +186,7 @@ filter/source/graphicfilter/icgm/chart.hxx:46 DataNode nBoxX2 sal_Int16 filter/source/graphicfilter/icgm/chart.hxx:47 DataNode nBoxY2 sal_Int16 -formula/source/ui/dlg/formula.cxx:151 -formula::FormulaDlg_Impl m_rParent weld::Builder & -helpcompiler/inc/HelpCompiler.hxx:206 +helpcompiler/inc/HelpCompiler.hxx:197 HelpCompiler lang const std::string include/basic/basmgr.hxx:56 BasicError nReason enum BasicErrorReason @@ -273,13 +273,13 @@ include/sfx2/msg.hxx:138 include/sfx2/msg.hxx:138 SfxType7 aAttrib struct SfxTypeAttrib [7] include/sfx2/msg.hxx:139 +SfxType8 createSfxPoolItemFunc std::function +include/sfx2/msg.hxx:139 SfxType8 aAttrib struct SfxTypeAttrib [8] include/sfx2/msg.hxx:139 SfxType8 pType const std::type_info * include/sfx2/msg.hxx:139 SfxType8 nAttribs sal_uInt16 -include/sfx2/msg.hxx:139 -SfxType8 createSfxPoolItemFunc std::function include/sfx2/msg.hxx:140 SfxType10 pType const std::type_info * include/sfx2/msg.hxx:140 @@ -340,7 +340,9 @@ include/svl/ondemand.hxx:55 OnDemandLocaleDataWrapper aSysLocale class SvtSysLocale include/svx/ClassificationDialog.hxx:31 svx::ClassificationDialog m_bPerParagraph const _Bool -include/svx/itemwin.hxx:35 +include/svx/imapdlg.hxx:94 +SvxIMapDlg
[Libreoffice-commits] core.git: framework/inc framework/source sfx2/source
framework/inc/jobs/jobdata.hxx|4 ++-- framework/source/services/desktop.cxx |2 +- sfx2/source/doc/objstor.cxx |4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 4195323c05244688a093e95bd75c1e4d504a1a60 Author: Julien Nabet AuthorDate: Sat Jun 8 10:18:48 2019 +0200 Commit: Julien Nabet CommitDate: Sat Jun 8 10:19:32 2019 +0200 Typos Change-Id: If8a5aaba35afb270ce30d49b55a0106e020dfbe0 Reviewed-on: https://gerrit.libreoffice.org/73695 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx index 5a8f9ce12d9d..af48cea7b242 100644 --- a/framework/inc/jobs/jobdata.hxx +++ b/framework/inc/jobs/jobdata.hxx @@ -151,9 +151,9 @@ class JobData final a job can be registered for an event. It can be an empty value! But it will be set from outside any times. Because it's not clear which job this instance should represent if an event -(instaed of an alias) comes in. Because there can be multiple registrations +(instead of an alias) comes in. Because there can be multiple registrations for this event. We use this information only, to merge it with the job specific -arguments. A job can be called so, with a) it's onw config data and b) some dynamic +arguments. A job can be called so, with a) its own config data and b) some dynamic environment data. */ OUString m_sEvent; diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 8a91db555c14..5f0ebc707292 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -182,7 +182,7 @@ Desktop::Desktop( const css::uno::Reference< css::uno::XComponentContext >& xCon /*- @short standard destructor -@descr This one do NOTHING! Use dispose() instaed of this. +@descr This one do NOTHING! Use dispose() instead of this. @seealsomethod dispose() *//*-*/ diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index e0feb44ccfae..009f48b27ba5 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -2081,7 +2081,7 @@ bool SfxObjectShell::ConvertFrom Files which are to be opened here should be opened through 'rMedium' to guarantee the right open modes. Especially if the format is retained -(only possible with SfxFilterFlags::SIMULATE or SfxFilterFlags::ONW) file which must +(only possible with SfxFilterFlags::SIMULATE or SfxFilterFlags::OWN) file which must be opened STREAM_SHARE_DENYWRITE. [Return value] @@ -2444,7 +2444,7 @@ bool SfxObjectShell::ConvertTo Files which are to be opened here should be opened through 'rMedium' to guarantee the right open modes. Especially if the format is retained -(only possible with SfxFilterFlags::SIMULATE or SfxFilterFlags::ONW) file which must +(only possible with SfxFilterFlags::SIMULATE or SfxFilterFlags::OWN) file which must be opened STREAM_SHARE_DENYWRITE. [Return value] ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 officecfg/registry sfx2/Library_sfx.mk sfx2/sdi sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk solenv/sanitizers
include/sfx2/autoredactdialog.hxx| 104 +++
include/sfx2/sfxsids.hrc |3
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 14
sfx2/Library_sfx.mk |1
sfx2/UIConfig_sfx.mk |1
sfx2/sdi/docslots.sdi|5
sfx2/sdi/sfx.sdi | 17
sfx2/source/appl/appuno.cxx |5
sfx2/source/doc/autoredactdialog.cxx | 181
+
sfx2/source/doc/objserv.cxx | 19
sfx2/uiconfig/ui/autoredactdialog.ui | 339
++
solenv/sanitizers/ui/sfx.suppr |2
12 files changed, 688 insertions(+), 3 deletions(-)
New commits:
commit 82bba7e4c044e54fc678ab108c662473d3a471a8
Author: Muhammet Kara
AuthorDate: Mon May 27 17:44:10 2019 +0300
Commit: Muhammet Kara
CommitDate: Sat Jun 8 11:10:14 2019 +0200
Auto redaction dialog first iteration
* Add the uno command .uno:AutoRedact with the name 'Auto-Redact'
* Add the dialog SfxAutoRedactDialog
* Implement the basic functionality to show up when clicked on the
menu/toolbar item.
* Add the class TargetsTable to control the weld::TreeView
which is used to list the targets
* Add the struct RedactionTarget to keep info for individual targets
Change-Id: Ic02dfb009590c0928a2ea7b0f8b19b4febca221a
Reviewed-on: https://gerrit.libreoffice.org/72254
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/include/sfx2/autoredactdialog.hxx
b/include/sfx2/autoredactdialog.hxx
new file mode 100644
index ..8de264871154
--- /dev/null
+++ b/include/sfx2/autoredactdialog.hxx
@@ -0,0 +1,104 @@
+/* -*- 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_SFX2_AUTOREDACTDIALOG_HXX
+#define INCLUDED_SFX2_AUTOREDACTDIALOG_HXX
+
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+
+namespace weld
+{
+class Button;
+}
+namespace weld
+{
+class Label;
+}
+namespace weld
+{
+class Window;
+}
+namespace weld
+{
+class TreeView;
+}
+
+struct RedactionTarget
+{
+sal_uInt32 nID;
+OUString sName;
+OUString sType;
+bool bCaseSensitive;
+bool bWholeWords;
+OUString sDescription;
+};
+
+class TargetsTable
+{
+std::unique_ptr m_xControl;
+int GetRowByTargetName(const OUString& sName);
+
+public:
+TargetsTable(std::unique_ptr xControl);
+void InsertTarget(RedactionTarget* pTarget);
+void SelectByName(const OUString& sName);
+RedactionTarget* GetTargetByName(const OUString& sName);
+OUString GetNameProposal();
+
+void unselect_all() { m_xControl->unselect_all(); }
+bool has_focus() const { return m_xControl->has_focus(); }
+int n_children() const { return m_xControl->n_children(); }
+int get_selected_index() const { return m_xControl->get_selected_index(); }
+std::vector get_selected_rows() const { return
m_xControl->get_selected_rows(); }
+void clear() { m_xControl->clear(); }
+void remove(int nRow) { m_xControl->remove(nRow); }
+void select(int nRow) { m_xControl->select(nRow); }
+OUString get_id(int nRow) const { return m_xControl->get_id(nRow); }
+
+//void connect_changed(const Link& rLink) {
m_xControl->connect_changed(rLink); }
+//void connect_row_activated(const Link& rLink) {
m_xControl->connect_row_activated(rLink); }
+};
+
+class SFX2_DLLPUBLIC SfxAutoRedactDialog : public SfxDialogController
+{
+SfxObjectShellLock m_xDocShell;
+std::vector> m_aTableTargets;
+
+std::unique_ptr m_xRedactionTargetsLabel;
+std::unique_ptr m_xTargetsBox;
+std::unique_ptr m_xLoadBtn;
+std::unique_ptr m_xSaveBtn;
+std::unique_ptr m_xAddBtn;
+std::unique_ptr m_xEditBtn;
+std::unique_ptr m_xDeleteBtn;
+
+public:
+SfxAutoRedactDialog(weld::Window* pParent);
+virtual ~SfxAutoRedactDialog() override;
+
+/*
+ * Check if the dialog has any valid redaction targets.
+ */
+bool hasTargets() const;
+
+// TODO: Some method(s) to check emptiness/validity
+// TODO: Some method(s) to get the search params/objects
+// TODO: Some method(s) to load/save redaction target sets
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - oox/source sd/qa
oox/source/export/drawingml.cxx | 18 ++
sd/qa/unit/data/pptx/tdf125551.pptx |binary
sd/qa/unit/export-tests-ooxml2.cxx | 17 +
3 files changed, 31 insertions(+), 4 deletions(-)
New commits:
commit 3644c9ab6f15a5d539681e84a1d29aa30af561d5
Author: Grzegorz Araminowicz
AuthorDate: Fri Jun 7 15:48:25 2019 +0200
Commit: Grzegorz Araminowicz
CommitDate: Sat Jun 8 11:23:02 2019 +0200
tdf#125551 PPTX export: correct position and size of diagrams
Save position and size of diagram background instead of whole group shape.
Some diagrams contain shapes that are outside these boundaries. That caused
diagram to grow and move.
Change-Id: I909c13a5dc268f77832234b3884b91292922823c
Reviewed-on: https://gerrit.libreoffice.org/73663
Tested-by: Jenkins
Reviewed-by: Grzegorz Araminowicz
Reviewed-on: https://gerrit.libreoffice.org/73681
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index cd91bb12cbe0..85834a14b1b0 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -67,6 +67,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -4074,10 +4075,19 @@ void DrawingML::WriteDiagram(const
css::uno::Reference& rX
mpFS->endElementNS(XML_p, XML_nvGraphicFramePr);
-awt::Point aPos = rXShape->getPosition();
-awt::Size aSize = rXShape->getSize();
-WriteTransformation(tools::Rectangle(Point(aPos.X, aPos.Y),
Size(aSize.Width, aSize.Height)),
-XML_p, false, false, 0, false);
+// store size and position of background shape instead of group shape
+// as some shapes may be outside
+css::uno::Reference xShapes(rXShape,
uno::UNO_QUERY);
+if (xShapes.is() && xShapes->hasElements())
+{
+css::uno::Reference
xShapeBg(xShapes->getByIndex(0),
+ uno::UNO_QUERY);
+awt::Point aPos = xShapeBg->getPosition();
+awt::Size aSize = xShapeBg->getSize();
+WriteTransformation(
+tools::Rectangle(Point(aPos.X, aPos.Y), Size(aSize.Width,
aSize.Height)),
+XML_p, false, false, 0, false);
+}
mpFS->startElementNS(XML_a, XML_graphic);
}
diff --git a/sd/qa/unit/data/pptx/tdf125551.pptx
b/sd/qa/unit/data/pptx/tdf125551.pptx
new file mode 100644
index ..fb7c106d20e2
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf125551.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx
b/sd/qa/unit/export-tests-ooxml2.cxx
index bc987a018af2..9c6cc27aa804 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -205,6 +205,7 @@ public:
void testTdf125360();
void testTdf125360_1();
void testTdf125360_2();
+void testTdf125551();
CPPUNIT_TEST_SUITE(SdOOXMLExportTest2);
@@ -292,6 +293,7 @@ public:
CPPUNIT_TEST(testTdf125360);
CPPUNIT_TEST(testTdf125360_1);
CPPUNIT_TEST(testTdf125360_2);
+CPPUNIT_TEST(testTdf125551);
CPPUNIT_TEST_SUITE_END();
@@ -2318,6 +2320,21 @@ void SdOOXMLExportTest2::testTdf125360_2()
xDocShRef->DoClose();
}
+void SdOOXMLExportTest2::testTdf125551()
+{
+::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf125551.pptx"),
PPTX);
+utl::TempFile tempFile;
+xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+
+uno::Reference xGroupShape(getShapeFromPage(0, 0,
xDocShRef), uno::UNO_QUERY);
+uno::Reference xShapeBg(xGroupShape->getByIndex(0),
uno::UNO_QUERY);
+
+CPPUNIT_ASSERT_EQUAL(static_cast(1024),
xShapeBg->getPosition().X);
+CPPUNIT_ASSERT_EQUAL(static_cast(576),
xShapeBg->getPosition().Y);
+CPPUNIT_ASSERT_EQUAL(static_cast(10815),
xShapeBg->getSize().Width);
+CPPUNIT_ASSERT_EQUAL(static_cast(8587),
xShapeBg->getSize().Height);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest2);
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/inc sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk
sfx2/UIConfig_sfx.mk |1
sfx2/inc/autoredactdialog.hxx| 54 +++-
sfx2/source/doc/autoredactdialog.cxx | 190 +---
sfx2/source/doc/objserv.cxx |2
sfx2/uiconfig/ui/addtargetdialog.ui | 235 +++
sfx2/uiconfig/ui/autoredactdialog.ui | 10 -
6 files changed, 459 insertions(+), 33 deletions(-)
New commits:
commit fe977ec07087b103de8c809597fdaea8dd629837
Author: Muhammet Kara
AuthorDate: Fri May 31 18:02:58 2019 +0300
Commit: Muhammet Kara
CommitDate: Sat Jun 8 12:12:41 2019 +0200
Auto redaction dialog second iteration
* Add the Add handler
* Add SfxAddTargetDialog dialog
* Add the Delete handler
Change-Id: I9c466754f6b593ffe3c8a1cc8034bbe47674f591
Reviewed-on: https://gerrit.libreoffice.org/73285
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index a7154213d128..0eb097b7fffd 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_UIConfig_UIConfig,sfx))
$(eval $(call gb_UIConfig_add_uifiles,sfx,\
sfx2/uiconfig/ui/alienwarndialog \
+ sfx2/uiconfig/ui/addtargetdialog \
sfx2/uiconfig/ui/autoredactdialog \
sfx2/uiconfig/ui/bookmarkdialog \
sfx2/uiconfig/ui/bookmarkmenu \
diff --git a/include/sfx2/autoredactdialog.hxx b/sfx2/inc/autoredactdialog.hxx
similarity index 65%
rename from include/sfx2/autoredactdialog.hxx
rename to sfx2/inc/autoredactdialog.hxx
index 8de264871154..26b29bf10cf5 100644
--- a/include/sfx2/autoredactdialog.hxx
+++ b/sfx2/inc/autoredactdialog.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_SFX2_AUTOREDACTDIALOG_HXX
-#define INCLUDED_SFX2_AUTOREDACTDIALOG_HXX
+#ifndef INCLUDED_SFX2_INC_AUTOREDACTDIALOG_HXX
+#define INCLUDED_SFX2_INC_AUTOREDACTDIALOG_HXX
#include
#include
@@ -25,6 +25,10 @@ class Button;
}
namespace weld
{
+class ComboBox;
+}
+namespace weld
+{
class Label;
}
namespace weld
@@ -36,16 +40,26 @@ namespace weld
class TreeView;
}
+enum RedactionTargetType
+{
+REDACTION_TARGET_TEXT,
+REDACTION_TARGET_REGEX,
+REDACTION_TARGET_PREDEFINED,
+REDACTION_TARGET_UNKNOWN
+};
+
+/// Keeps information for a single redaction target
struct RedactionTarget
{
-sal_uInt32 nID;
OUString sName;
-OUString sType;
+RedactionTargetType sType;
+OUString sContent;
bool bCaseSensitive;
bool bWholeWords;
-OUString sDescription;
+sal_uInt32 nID;
};
+/// Used to display the targets list
class TargetsTable
{
std::unique_ptr m_xControl;
@@ -75,7 +89,7 @@ public:
class SFX2_DLLPUBLIC SfxAutoRedactDialog : public SfxDialogController
{
SfxObjectShellLock m_xDocShell;
-std::vector> m_aTableTargets;
+std::vector> m_aTableTargets;
std::unique_ptr m_xRedactionTargetsLabel;
std::unique_ptr m_xTargetsBox;
@@ -85,6 +99,12 @@ class SFX2_DLLPUBLIC SfxAutoRedactDialog : public
SfxDialogController
std::unique_ptr m_xEditBtn;
std::unique_ptr m_xDeleteBtn;
+/*DECL_LINK(LoadHdl, weld::Button&, void);
+DECL_LINK(SaveHdl, weld::Button&, void);*/
+DECL_LINK(AddHdl, weld::Button&, void);
+//DECL_LINK(EditHdl, weld::Button&, void);
+DECL_LINK(DeleteHdl, weld::Button&, void);
+
public:
SfxAutoRedactDialog(weld::Window* pParent);
virtual ~SfxAutoRedactDialog() override;
@@ -99,6 +119,28 @@ public:
// TODO: Some method(s) to load/save redaction target sets
};
+class SfxAddTargetDialog : public weld::GenericDialogController
+{
+private:
+std::unique_ptr m_xName;
+std::unique_ptr m_xType;
+std::unique_ptr m_xContent;
+std::unique_ptr m_xCaseSensitive;
+std::unique_ptr m_xWholeWords;
+
+public:
+SfxAddTargetDialog(weld::Window* pWindow, const OUString& rName);
+
+OUString getName() const { return m_xName->get_text(); }
+RedactionTargetType getType() const;
+OUString getContent() const { return m_xContent->get_text(); }
+bool isCaseSensitive() const
+{
+return m_xCaseSensitive->get_state() == TriState::TRISTATE_TRUE;
+}
+bool isWholeWords() const { return m_xWholeWords->get_state() ==
TriState::TRISTATE_TRUE; }
+};
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/sfx2/source/doc/autoredactdialog.cxx
b/sfx2/source/doc/autoredactdialog.cxx
index 0974a4f03b27..5d94906e9ba8 100644
--- a/sfx2/source/doc/autoredactdialog.cxx
+++ b/sfx2/source/doc/autoredactdialog.cxx
@@ -8,7 +8,7 @@
*/
#include
-#include
+#include
#include
#include
#include
@@ -50,17 +50,43 @@ int TargetsTable::GetRowByTargetName(const OUString& sName)
TargetsTable::TargetsTable(std::unique_ptr xControl)
: m_xControl(std::move(xControl))
{
-m_xControl->set_size_request(550, 250);
+m_xControl->set_size_request(55
[Libreoffice-commits] core.git: accessibility/source include/sfx2 include/vcl sc/source sd/source sfx2/source vcl/source
accessibility/source/extended/accessiblelistbox.cxx |7 -
accessibility/source/extended/accessiblelistboxentry.cxx |4 ---
include/sfx2/templatelocalview.hxx |3 --
include/sfx2/thumbnailview.hxx |1
include/vcl/treelistbox.hxx | 10 ---
sc/source/ui/app/inputwin.cxx| 17 +++--
sc/source/ui/inc/inputwin.hxx|2 -
sd/source/ui/dlg/BulletAndPositionDlg.cxx| 11 +---
sd/source/ui/inc/BulletAndPositionDlg.hxx|1
sfx2/source/control/templatelocalview.cxx|6 +---
sfx2/source/control/thumbnailview.cxx| 19 +--
vcl/source/treelist/treelistbox.cxx |1
12 files changed, 15 insertions(+), 67 deletions(-)
New commits:
commit 516bdf7989dc2e2650490893e1ead054d40eaf37
Author: Noel Grandin
AuthorDate: Sat Jun 8 12:39:25 2019 +0200
Commit: Noel Grandin
CommitDate: Sat Jun 8 15:01:13 2019 +0200
loplugin:singlevalfields
Change-Id: I7c00b7d932bf96a0725eac5482580461baea6977
Reviewed-on: https://gerrit.libreoffice.org/73697
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/source/extended/accessiblelistbox.cxx
b/accessibility/source/extended/accessiblelistbox.cxx
index 63f7ff87ac10..0441de61dfbc 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -394,13 +394,6 @@ namespace accessibility
{
::comphelper::OExternalLockGuard aGuard( this );
-if(getListBox())
-{
-SvTreeAccRoleType nType =
getListBox()->GetAllEntriesAccessibleRoleType();
-if( nType == SvTreeAccRoleType::TREE)
-return AccessibleRole::TREE;
-}
-
//o is: return AccessibleRole::TREE;
bool bHasButtons = (getListBox()->GetStyle() & WB_HASBUTTONS)!=0;
if(!bHasButtons && (getListBox()->GetTreeFlags() &
SvTreeFlags::CHKBTN))
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx
b/accessibility/source/extended/accessiblelistboxentry.cxx
index b3257345a822..12dd5fbbc629 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -397,10 +397,6 @@ namespace accessibility
SvTreeListBox* pBox = getListBox();
if(pBox)
{
-SvTreeAccRoleType nType = pBox->GetAllEntriesAccessibleRoleType();
-if( nType == SvTreeAccRoleType::TREE)
-return AccessibleRole::TREE_ITEM;
-
SvTreeFlags treeFlag = pBox->GetTreeFlags();
if(treeFlag & SvTreeFlags::CHKBTN )
{
diff --git a/include/sfx2/templatelocalview.hxx
b/include/sfx2/templatelocalview.hxx
index 001929c4d848..def518dca0e0 100644
--- a/include/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
@@ -241,9 +241,6 @@ protected:
TemplateViewItem *maSelectedItem;
-long mnThumbnailWidth;
-long mnThumbnailHeight;
-
Point maPosition; //store the point of click event
Link maOpenRegionHdl;
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index a1400841dafc..dd9c860afbcc 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -303,7 +303,6 @@ protected:
bool mbScroll : 1;
bool mbHasVisibleItems : 1;
bool mbShowTooltips : 1;
-bool mbIsMultiSelectionEnabled: 1;
Color maFillColor; ///< Background color of the thumbnail
view widget.
Color maTextColor; ///< Text color.
Color maHighlightColor; ///< Color of the highlight (background)
of the hovered item.
diff --git a/include/vcl/treelistbox.hxx b/include/vcl/treelistbox.hxx
index 4cfd06a37937..4265b71deae9 100644
--- a/include/vcl/treelistbox.hxx
+++ b/include/vcl/treelistbox.hxx
@@ -105,12 +105,6 @@ namespace o3tl
template<> struct typed_flags : is_typed_flags {};
}
-enum class SvTreeAccRoleType
-{
-NONE = 0x00,
-TREE = 0x02
-};
-
enum class SvLBoxItemType {String, Button, ContextBmp};
class VCL_DLLPUBLIC SvLBoxTab
@@ -222,7 +216,6 @@ class VCL_DLLPUBLIC SvTreeListBox
short nEntryHeightOffs;
short nIndent;
short nFocusWidth;
-SvTreeAccRoleType nAllItemAccRoleType;
sal_uInt16 nFirstSelTab;
sal_uInt16 nLastSelTab;
long mnCheckboxItemWidth;
@@ -501,9 +494,6 @@ public:
/** Enables, that one cell of a tablistbox entry can be focused */
voidEnableCellFocus();
-// For overwriting accessible role for all entries -
normally 0, so each entry can be different
-SvTreeAccRoleType GetAllEntriesAccessibleRoleType() const { return
nAllItemAccRoleType; }
-
[Libreoffice-commits] core.git: .gitignore
.gitignore |1 + 1 file changed, 1 insertion(+) New commits: commit 1d137f07cb7cff1f7bcf12b51ceca6f56059b7ef Author: Muhammet Kara AuthorDate: Sat Jun 8 15:21:03 2019 +0300 Commit: Muhammet Kara CommitDate: Sat Jun 8 15:36:20 2019 +0200 Add QtCreator-specific file to .gitignore Change-Id: If00a4eed997acf2eb7783915e41c61c7651232d6 Reviewed-on: https://gerrit.libreoffice.org/73698 Tested-by: Jenkins Reviewed-by: Muhammet Kara diff --git a/.gitignore b/.gitignore index 170fca277117..d68dd20e1b58 100644 --- a/.gitignore +++ b/.gitignore @@ -147,6 +147,7 @@ LibreOffice.VC.VC.opendb # QtCreator specific *.pro *.pro.user +*.pro.user.* # doxygen output /docs ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/inc chart2/IwyuFilter_chart2.yaml chart2/source chart2/uiconfig extras/source include/svx sfx2/uiconfig solenv/bin solenv/gbuild solenv/sanitizers svx/source
chart2/IwyuFilter_chart2.yaml|2
chart2/inc/pch/precompiled_chartcontroller.hxx | 11
chart2/source/controller/dialogs/dlg_View3D.cxx | 54
chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx | 133 -
chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx | 38
chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx | 197 -
chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx | 52
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 252 +-
chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx | 79
chart2/source/controller/inc/dlg_View3D.hxx | 24
chart2/source/controller/main/ChartController_Properties.cxx |4
chart2/uiconfig/ui/3dviewdialog.ui |8
chart2/uiconfig/ui/tp_3D_SceneGeometry.ui| 52
chart2/uiconfig/ui/tp_3D_SceneIllumination.ui| 174 +
extras/source/glade/libreoffice-catalog.xml.in |3
include/svx/colorbox.hxx |1
include/svx/dlgctl3d.hxx | 147 +
sfx2/uiconfig/ui/alienwarndialog.ui |2
solenv/bin/native-code.py|1
solenv/gbuild/UIConfig.mk|2
solenv/sanitizers/ui/modules/schart.suppr|4
svx/source/dialog/dlgctl3d.cxx | 1201 ++-
svx/source/tbxctrls/tbcontrl.cxx | 13
23 files changed, 1868 insertions(+), 586 deletions(-)
New commits:
commit d00a8b05c057d9260c5a44408d9a815121ee6cba
Author: Caolán McNamara
AuthorDate: Thu Jun 6 10:37:21 2019 +0100
Commit: Caolán McNamara
CommitDate: Sat Jun 8 16:17:45 2019 +0200
weld View3DDialog
Change-Id: Ifd689c54574c08f026f6760efb39b5f927cb2625
Reviewed-on: https://gerrit.libreoffice.org/73604
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/chart2/IwyuFilter_chart2.yaml b/chart2/IwyuFilter_chart2.yaml
index 68761f242b30..445a9f7d60eb 100644
--- a/chart2/IwyuFilter_chart2.yaml
+++ b/chart2/IwyuFilter_chart2.yaml
@@ -463,7 +463,7 @@ blacklist:
- namespace chart { class ThreeD_SceneIllumination_TabPage; }
chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx:
# Needed for vclptr type
-- class SvxColorListBox
+- class ColorListBox
chart2/source/controller/inc/ItemPropertyMap.hxx:
# base class has to be a complete type
- map
diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx
b/chart2/inc/pch/precompiled_chartcontroller.hxx
index a72dea77..a6519d6dac8c 100644
--- a/chart2/inc/pch/precompiled_chartcontroller.hxx
+++ b/chart2/inc/pch/precompiled_chartcontroller.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which
presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2019-05-12 16:56:57 using:
+ Generated on 2019-06-06 21:24:00 using:
./bin/update_pch chart2 chartcontroller --cutoff=6 --exclude:system
--include:module --include:local
If after updating build fails, use the following command to locate
conflicting headers:
@@ -84,7 +84,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -124,7 +123,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -134,12 +132,9 @@
#include
#include
#include
-#include
-#include
#include
#include
#include
-#include
#include
#include
#include
@@ -335,7 +330,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -345,10 +339,8 @@
#include
#include
#include
-#include
#include
#include
-#include
#include
#include
#include
@@ -382,7 +374,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx
b/chart2/source/controller/dialogs/dlg_View3D.cxx
index fc329ce6b733..03a5fcc299f5 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -35,52 +35,44 @@ using namespace ::com::sun::star::chart2;
sal_uInt16 View3DDialog::m_nLastPageId = 0;
-View3DDialog::View3DDialog(vcl::Window* pParent, const uno::Reference<
frame::XModel > & xChartModel)
-: TabDialog(pParent, "3DViewDialog", "modules/schart/ui/3dviewdialog.ui")
-, m_pGeometry(nullptr)
-, m_pAppearance(nullptr)
-, m_pIllumination(nullptr)
+View3DDialog::View3DDialog(weld::Window* pParent, const uno::Reference<
frame::XModel > & xChartModel)
+: GenericDialogController(pParent, "modules/schart/ui/3dviewdialog.ui",
"3DViewDialog")
, m_aControllerLocker(xChartModel)
+, m_xTabControl(m_xBuilder->weld_notebook("tabcontrol"))
{
-
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/objmisc.cxx | 13 +
1 file changed, 13 insertions(+)
New commits:
commit cb0024e3668979dfdef44db5aa15ddfaf035e695
Author: Caolán McNamara
AuthorDate: Fri Jun 7 14:04:07 2019 +0100
Commit: Caolán McNamara
CommitDate: Sat Jun 8 16:18:52 2019 +0200
explictly exclude LibreLogo from XScript usage
Change-Id: I567647f0e2f8b82e4ef2995c673abe82f4564228
Reviewed-on: https://gerrit.libreoffice.org/73659
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 2ece4b9a6e6c..d44b55e6b753 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1344,6 +1344,16 @@ namespace
}
}
+namespace {
+
+// don't allow LibreLogo to be used with our mouseover/etc dom-alike events
+bool UnTrustedScript(const OUString& rScriptURL)
+{
+return
rScriptURL.startsWithIgnoreAsciiCase("vnd.sun.star.script:LibreLogo");
+}
+
+}
+
ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >&
_rxScriptContext, const OUString& _rScriptURL,
const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >&
aOutParamIndex, Sequence< Any >& aOutParam, bool bRaiseError, const
css::uno::Any* pCaller )
{
@@ -1356,6 +1366,9 @@ ErrCode SfxObjectShell::CallXScript( const Reference<
XInterface >& _rxScriptCon
if ( bIsDocumentScript && !lcl_isScriptAccessAllowed_nothrow(
_rxScriptContext ) )
return ERRCODE_IO_ACCESSDENIED;
+if ( UnTrustedScript(_rScriptURL) )
+return ERRCODE_IO_ACCESSDENIED;
+
bool bCaughtException = false;
Any aException;
try
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/misc/dsntypes.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit d34ed0008f12cfe47dd239672f1941f3c54d97fd
Author: Julien Nabet
AuthorDate: Sun May 19 21:08:52 2019 +0200
Commit: Julien Nabet
CommitDate: Sat Jun 8 16:43:46 2019 +0200
tdf#125381: Manage URLs beginning with an "~" in cutPrefix
(dbaccess/dsntypes)
On Windows or with other renderings than gtk3, the urls may begin with an ~
In this case, cutPrefix returns only empty string
When trying to access Index management for odb files related to dBase
indexes don't display because cutPrefix returns empty url
in dbaccess/source/ui/dlg/detailpages.cxx line 200
198 ::dbaccess::ODsnTypeCollection* pTypeCollection = pTypesItem ?
pTypesItem->getCollection() : nullptr;
199 if (pTypeCollection && pUrlItem &&
pUrlItem->GetValue().getLength())
200 m_sDsn = pTypeCollection->cutPrefix(pUrlItem->GetValue());
Change-Id: I47360e205ddea7b060a31da697bbe9857ad3f4c0
Reviewed-on: https://gerrit.libreoffice.org/72568
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/dbaccess/source/core/misc/dsntypes.cxx
b/dbaccess/source/core/misc/dsntypes.cxx
index 05e64ba5a001..7332ccffa196 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -83,17 +83,20 @@ OUString ODsnTypeCollection::cutPrefix(const OUString&
_sURL) const
OUString sRet;
OUString sOldPattern;
+// on Windows or with gen rendering, the urls may begin with an ~
+const OUString& sCleanURL = comphelper::string::stripStart(_sURL, '~');
+
for (auto const& dsnPrefix : m_aDsnPrefixes)
{
WildCard aWildCard(dsnPrefix);
-if ( sOldPattern.getLength() < dsnPrefix.getLength() &&
aWildCard.Matches(_sURL) )
+if ( sOldPattern.getLength() < dsnPrefix.getLength() &&
aWildCard.Matches(sCleanURL) )
{
// This relies on the fact that all patterns are of the form
// foo*
// that is, the very concept of "prefix" applies.
OUString prefix(comphelper::string::stripEnd(dsnPrefix, '*'));
-OSL_ENSURE(prefix.getLength() <= _sURL.getLength(), "How can A
match B when A shorter than B?");
-sRet = _sURL.copy(prefix.getLength());
+OSL_ENSURE(prefix.getLength() <= sCleanURL.getLength(), "How can A
match B when A shorter than B?");
+sRet = sCleanURL.copy(prefix.getLength());
sOldPattern = dsnPrefix;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/inc
framework/inc/jobs/jobresult.hxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 274a295b05f6cac43e79b3bd30d68335f0162f3e
Author: Andrea Gelmini
AuthorDate: Tue May 14 21:22:59 2019 +
Commit: Julien Nabet
CommitDate: Sat Jun 8 16:45:24 2019 +0200
Fix typo
Change-Id: I69019846ebf5e5a953713468b02d66d98ffd75d4
Reviewed-on: https://gerrit.libreoffice.org/73704
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/framework/inc/jobs/jobresult.hxx b/framework/inc/jobs/jobresult.hxx
index 4663cfc77895..aa6989708d62 100644
--- a/framework/inc/jobs/jobresult.hxx
+++ b/framework/inc/jobs/jobresult.hxx
@@ -48,7 +48,7 @@ class JobResult final
parts of an analyzed pure job execution result.
An user of this class can decide, if a member of us can be valid
or not. So it can indicate, if a job used the special part inside
-his returned result protocol.
+its returned result protocol.
To be usable as flags - it must be values of set {0,1,2,4,8,16
...}!
*/
enum EParts
@@ -83,7 +83,7 @@ class JobResult final
represent the part "DispatchResult"
It's a fulfilled event type, which was given
back by the executed job. Any user of us can send
-it to his registered result listener directly.
+it to its registered result listener directly.
*/
css::frame::DispatchResultEvent m_aDispatchResult;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/inc
framework/inc/jobs/jobdata.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a0254104ba59029bfd08889d00946a6df02373c5
Author: Andrea Gelmini
AuthorDate: Tue May 14 21:23:01 2019 +
Commit: Julien Nabet
CommitDate: Sat Jun 8 16:46:07 2019 +0200
Fix typo
Change-Id: I4bb4fed0575e677898d351781b2ed5f44e4ad3d9
Reviewed-on: https://gerrit.libreoffice.org/73703
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx
index af48cea7b242..02d0075be05c 100644
--- a/framework/inc/jobs/jobdata.hxx
+++ b/framework/inc/jobs/jobdata.hxx
@@ -36,7 +36,7 @@ namespace framework{
/**
@short holds all necessary information about a job and
handle it's configuration (if any exist!)
-@descr It can be used rom different use cases as a container
+@descr It can be used from different use cases as a container
(or proxy) for all config data of a registered job.
But it doesn't implement any execute functionality!
*/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/inc
framework/inc/helper/ocomponentaccess.hxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d674e5fdb40f7c7fdc1fcc5be7da0c74c7cfb89d
Author: Andrea Gelmini
AuthorDate: Sat Jun 8 13:38:33 2019 +
Commit: Julien Nabet
CommitDate: Sat Jun 8 16:46:44 2019 +0200
Fix typos
Change-Id: If9ac60fd2e6b0bccd2f7f68b2acd573fac0371de
Reviewed-on: https://gerrit.libreoffice.org/73702
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/framework/inc/helper/ocomponentaccess.hxx
b/framework/inc/helper/ocomponentaccess.hxx
index 1a9b326603a6..4e0751905a85 100644
--- a/framework/inc/helper/ocomponentaccess.hxx
+++ b/framework/inc/helper/ocomponentaccess.hxx
@@ -37,7 +37,7 @@ namespace framework{
/*-
@short implement XEnumerationAccess interface as helper to create
many oneway enumeration of components
-@descr We share mutex and framecontainer with our owner and have
full access to his child tasks.
+@descr We share mutex and framecontainer with our owner and have
full access to its child tasks.
(Our owner can be the Desktop only!) We create oneway
enumerations on demand. These "lists"
can be used for one time only. Step during the list from
first to last element.
(The type of created enumerations is
OComponentEnumeration.)
@@ -65,7 +65,7 @@ class OComponentAccess : public ::cppu::WeakImplHelper<
css::container::XEnum
@short constructor to initialize this instance
@descr A desktop will create an enumeration-access-object. An
enumeration is a oneway-list and a
snapshot of the components of current tasks under the
desktop.
-But we need a instance to create more than one
enumerations at different times!
+But we need an instance to create more than one
enumerations at different times!
@seealsoclass Desktop
@seealsoclass OComponentEnumeration
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/autoredactdialog.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit f6cedcafab11a6d95c7934a737054ad356482874
Author: Andrea Gelmini
AuthorDate: Sat Jun 8 13:36:25 2019 +
Commit: Julien Nabet
CommitDate: Sat Jun 8 16:47:59 2019 +0200
Fix typos
Change-Id: Id0f5a19d5ee4941383bcfaf54e951a40b0d85cdf
Reviewed-on: https://gerrit.libreoffice.org/73701
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/sfx2/source/doc/autoredactdialog.cxx
b/sfx2/source/doc/autoredactdialog.cxx
index 5d94906e9ba8..30977b82e878 100644
--- a/sfx2/source/doc/autoredactdialog.cxx
+++ b/sfx2/source/doc/autoredactdialog.cxx
@@ -161,7 +161,7 @@ IMPL_LINK_NOARG(SfxAutoRedactDialog, SaveHdl,
weld::Button&, void)
IMPL_LINK_NOARG(SfxAutoRedactDialog, AddHdl, weld::Button&, void)
{
-// Open the Add Target dialog, craete a new target and insert into the
targets vector and the listbox
+// Open the Add Target dialog, create a new target and insert into the
targets vector and the listbox
SfxAddTargetDialog aAddTargetDialog(getDialog(),
m_xTargetsBox->GetNameProposal());
bool bIncomplete;
@@ -208,7 +208,7 @@ IMPL_LINK_NOARG(SfxAutoRedactDialog, AddHdl, weld::Button&,
void)
{
std::unique_ptr
xBox(Application::CreateMessageDialog(
getDialog(), VclMessageType::Warning, VclButtonsType::Ok,
-"An error occured while adding new target. Please report this
incidence."));
+"An error occurred while adding new target. Please report this
incident."));
xBox->run();
delete redactiontarget;
}
@@ -258,7 +258,7 @@ SfxAutoRedactDialog::SfxAutoRedactDialog(weld::Window*
pParent)
, m_xEditBtn(m_xBuilder->weld_button("edit"))
, m_xDeleteBtn(m_xBuilder->weld_button("delete"))
{
-// Can be used to remmeber the last set of redaction targets?
+// Can be used to remeber the last set of redaction targets?
OUString sExtraData;
SvtViewOptions aDlgOpt(EViewType::Dialog,
OStringToOUString(m_xDialog->get_help_id(),
RTL_TEXTENCODING_UTF8));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: RepositoryExternal.mk vcl/Executable_lo_kde5filepicker.mk vcl/Library_vclplug_gtk3_kde5.mk vcl/Library_vclplug_kde5.mk vcl/Library_vclplug_qt5.mk
RepositoryExternal.mk |2 +-
vcl/Executable_lo_kde5filepicker.mk |8 +++-
vcl/Library_vclplug_gtk3_kde5.mk|2 +-
vcl/Library_vclplug_kde5.mk |4 ++--
vcl/Library_vclplug_qt5.mk |4 ++--
5 files changed, 9 insertions(+), 11 deletions(-)
New commits:
commit 4aa60490622cc10f8d3a31489c62a5622d240c83
Author: Michael Weghorn
AuthorDate: Sat Jun 8 13:45:36 2019 +0200
Commit: Michael Weghorn
CommitDate: Sat Jun 8 17:12:55 2019 +0200
gbuild: treat $({QT,KF}5_CFLAGS) as cxxflags, not defines
Treat all of QT5_CFLAGS, QT5_GLIB_CFLAGS and KF5_CFLAGS as
C++ flags, since those contain C++ flags in the first place.
Therefore, set them using 'gb_Library_add_cxxflags',
not 'gb_Library_add_defs'.
(Strictly speaking, those variables contain includes as well,
but handling that properly would require splitting this
up further, either in 'configure.ac' or see e.g. how it's done
in 'RepositoryExternal.mk'.)
This also prevents the values of those variables from ending
up in the wrong section in IDE integration generated by
gbuild-to-ide.
Handling them as includes previously resulted e.g. in 'vcl/vcl.pro'
(generated by 'make qtcreator-ide-integration') containing
DEFINES += BOOST_ALL_NO_LIB \
... \
VCLPLUG_GTK3_KDE5_IMPLEMENTATION -isystem /usr/include//KF5 -isystem
/usr/include//KF5/KCoreAddons [...]
and Qt Creator would show a (rather unhelpful) warning like the
following when opening a header file inside 'vcl/inc/':
> Warning: The code model could not parse an included file,
> which might lead to incorrect code completion and highlighting,
> for, example.
>
> 4:9: error: macro name must be an identifier
Change-Id: I2bb0c37fdf1112650e8adc712f60737888a8169b
Reviewed-on: https://gerrit.libreoffice.org/73699
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b039484338a8..6b0c69b3c804 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3084,7 +3084,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
)
-$(call gb_LinkTarget_add_defs,$(1),\
+$(call gb_LinkTarget_add_cxxflags,$(1),\
$(filter-out -I% -isystem%,$(subst -isystem /,-isystem/,$(KF5_CFLAGS)))
\
)
diff --git a/vcl/Executable_lo_kde5filepicker.mk
b/vcl/Executable_lo_kde5filepicker.mk
index f3e940953601..a34682966778 100644
--- a/vcl/Executable_lo_kde5filepicker.mk
+++ b/vcl/Executable_lo_kde5filepicker.mk
@@ -29,6 +29,9 @@ $(eval $(call gb_Executable_set_include,lo_kde5filepicker,\
$(eval $(call gb_Executable_add_cxxflags,lo_kde5filepicker,\
$$(INCLUDE) \
$$(BOOST_CXXFLAGS) \
+$(QT5_CFLAGS) \
+$(QT5_GLIB_CFLAGS) \
+$(KF5_CFLAGS) \
))
$(eval $(call gb_Executable_use_custom_headers,lo_kde5filepicker,\
@@ -69,11 +72,6 @@ $(eval $(call gb_Executable_use_externals,lo_kde5filepicker,\
dbus \
))
-$(eval $(call gb_Executable_add_defs,lo_kde5filepicker,\
-$(QT5_CFLAGS) \
-$(QT5_GLIB_CFLAGS) \
-$(KF5_CFLAGS) \
-))
$(eval $(call gb_Executable_add_libs,lo_kde5filepicker,\
$(QT5_LIBS) \
$(QT5_GLIB_LIBS) \
diff --git a/vcl/Library_vclplug_gtk3_kde5.mk b/vcl/Library_vclplug_gtk3_kde5.mk
index 089d6ee31a1f..cfd370221dde 100644
--- a/vcl/Library_vclplug_gtk3_kde5.mk
+++ b/vcl/Library_vclplug_gtk3_kde5.mk
@@ -35,11 +35,11 @@ $(eval $(call gb_Library_set_include,vclplug_gtk3_kde5,\
$(eval $(call gb_Library_add_cxxflags,vclplug_gtk3_kde5,\
$$(INCLUDE) \
$$(GTK3_CFLAGS) \
+$(KF5_CFLAGS) \
))
$(eval $(call gb_Library_add_defs,vclplug_gtk3_kde5,\
-DVCLPLUG_GTK_IMPLEMENTATION -DVCLPLUG_GTK3_KDE5_IMPLEMENTATION \
-$(KF5_CFLAGS) \
))
$(eval $(call gb_Library_use_custom_headers,vclplug_gtk3_kde5,\
diff --git a/vcl/Library_vclplug_kde5.mk b/vcl/Library_vclplug_kde5.mk
index d097845bd5ce..181a318ab797 100644
--- a/vcl/Library_vclplug_kde5.mk
+++ b/vcl/Library_vclplug_kde5.mk
@@ -62,7 +62,7 @@ $(eval $(call gb_Library_use_externals,vclplug_kde5,\
))
ifneq ($(QT5_HAVE_GLIB),)
-$(eval $(call gb_Library_add_defs,vclplug_kde5,\
+$(eval $(call gb_Library_add_cxxflags,vclplug_kde5,\
$(QT5_GLIB_CFLAGS) \
))
@@ -71,7 +71,7 @@ $(eval $(call gb_Library_add_libs,vclplug_kde5,\
))
endif
-$(eval $(call gb_Library_add_defs,vclplug_kde5,\
+$(eval $(call gb_Library_add_cxxflags,vclplug_kde5,\
$(KF5_CFLAGS) \
))
$(eval $(call gb_Library_add_libs,vclplug_kde5,\
diff --git a/vcl/Library_vclplug_qt5.mk b/vcl/Library_vclplug_qt5.mk
index 3231672c8743..543a4569ceb9 100644
--- a/vcl/Library_vclplug_qt5.mk
+++ b/vcl/Library_vclplug_qt5.mk
@@ -63,7 +63,7 @@ $(eval $(call gb_Library_use_externals,vclplug_qt5,\
qt5 \
))
-$(eval $(call gb_Library_add_defs,vclplug_qt5,\
+$(eval $(call gb_Library_add_cxxflags,vclplug_qt5,\
$(QT5_CFLAGS) \
))
$(eval $(call gb_Library_add_
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - officecfg/registry sc/uiconfig sd/uiconfig sw/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu |4 sc/uiconfig/scalc/ui/notebookbar.ui | 63 sc/uiconfig/scalc/ui/notebookbar_compact.ui | 4871 -- sd/uiconfig/sdraw/ui/notebookbar_compact.ui | 168 sw/uiconfig/swriter/ui/notebookbar_compact.ui| 1017 +- 5 files changed, 4652 insertions(+), 1471 deletions(-) New commits: commit 9a00f42f704dbda4a18c6055d760638202dbbfa1 Author: andreas kainz AuthorDate: Fri Jun 7 15:32:25 2019 +0200 Commit: andreas_kainz CommitDate: Sat Jun 8 17:13:44 2019 +0200 notebookbar_compact update Change-Id: I256c2ec3934d728b5b68fbca8b7ba99a50a840ff Reviewed-on: https://gerrit.libreoffice.org/73661 Tested-by: Jenkins Reviewed-by: andreas_kainz (cherry picked from commit 42223dc7577e18f085592ae2cc06fa4bf3362631) Reviewed-on: https://gerrit.libreoffice.org/73678 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu index 998f0f46935b..28b38336294c 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu @@ -369,7 +369,7 @@ false -4 +3 notebookbar.ui @@ -397,7 +397,7 @@ false -3 +4 notebookbar_compact.ui diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui index 90369c808224..42032e62c55d 100644 --- a/sc/uiconfig/scalc/ui/notebookbar.ui +++ b/sc/uiconfig/scalc/ui/notebookbar.ui @@ -1486,135 +1486,142 @@ True False - + True False .uno:SpellDialog - + True False .uno:SpellOnline - + True False .uno:ThesaurusDialog - + True False - + True False .uno:SetLanguageAllTextMenu - + True False - + True False .uno:Hyphenate - + True False .uno:ChineseConversion - + True False .uno:HangulHanjaConversion - + True False .uno:MoreDictionaries - + True False - + True False .uno:TraceChangeMode - + True False .uno:AcceptChanges - + True False - + True False .uno:InsertAnnotation - + True False .uno:ShowAllNotes - + True False +.uno:HideAllNotes - + +True +False + + + + True False .uno:Protect - + True False .uno:CompareDocuments - + True False .uno:MergeDocuments @@ -4159,10 +4166,10 @@ - + True False -.uno:InsertRowsAfter +.uno:DeleteRows False @@ -4170,10 +4177,10 @@ - + True False -.uno:DeleteRows +.uno:RowOperations False @@ -4205,10 +4212,10 @@ - + True False -
[Libreoffice-commits] core.git: cui/source include/sfx2 include/svx include/vcl sc/inc sc/source sd/inc sd/source sfx2/source starmath/inc starmath/source svx/source sw/source vcl/source writerfilter/
cui/source/inc/about.hxx |1
cui/source/inc/thesdlg.hxx |2
include/sfx2/dinfdlg.hxx |2
include/sfx2/templatelocalview.hxx |4
include/sfx2/thumbnailview.hxx |2
include/svx/contdlg.hxx|4
include/svx/fntctrl.hxx|2
include/svx/langbox.hxx|3
include/vcl/bitmap.hxx |2
include/vcl/layout.hxx |4
include/vcl/tabdlg.hxx |2
include/vcl/toolbox.hxx|1
sc/inc/column.hxx |1
sc/source/core/data/column.cxx | 126 -
sc/source/ui/inc/condformatdlgentry.hxx|1
sc/source/ui/inc/inputwin.hxx |1
sd/inc/sdabstdlg.hxx |1
sd/source/ui/dlg/sddlgfact.cxx |5
sd/source/ui/dlg/sddlgfact.hxx |1
sfx2/source/control/templatelocalview.cxx | 14 -
sfx2/source/control/thumbnailview.cxx | 39
sfx2/source/dialog/dinfdlg.cxx | 12 -
starmath/inc/AccessibleSmElement.hxx |2
starmath/inc/AccessibleSmElementsControl.hxx |4
starmath/inc/ElementsDockingWindow.hxx |1
starmath/inc/document.hxx |2
starmath/source/document.cxx |8
svx/source/dialog/fntctrl.cxx | 239 -
svx/source/dialog/imapwnd.cxx | 83
svx/source/dialog/imapwnd.hxx |4
svx/source/dialog/langbox.cxx | 35 ---
sw/source/filter/ww8/rtfattributeoutput.hxx|1
sw/source/uibase/dochdl/gloshdl.cxx| 22 --
sw/source/uibase/inc/gloshdl.hxx |2
vcl/source/window/layout.cxx |6
writerfilter/source/rtftok/rtfcontrolwords.cxx |5
writerfilter/source/rtftok/rtfcontrolwords.hxx |2
xmloff/source/text/txtparaimphint.hxx |1
38 files changed, 647 deletions(-)
New commits:
commit 53312ca4ee722a6d5ba22d1f578c6de5fbc37207
Author: Noel Grandin
AuthorDate: Sat Jun 8 08:51:44 2019 +0200
Commit: Noel Grandin
CommitDate: Sat Jun 8 17:17:36 2019 +0200
loplugin:unusedmethods
Change-Id: I52efd8d843d0e4cc7a6adefb0eb95aa50469af38
Reviewed-on: https://gerrit.libreoffice.org/73693
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index cabfc3eb652f..7ef833a8b483 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -39,7 +39,6 @@ private:
weld::Button* m_pCloseButton;
void SetBuildIdLink();
-void StyleControls();
void SetLogo();
static OUString GetBuildId();
diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx
index ae44cd6ad34b..4172164f70ea 100644
--- a/cui/source/inc/thesdlg.hxx
+++ b/cui/source/inc/thesdlg.hxx
@@ -48,8 +48,6 @@ class SvxThesaurusDialog : public SfxDialogController
public:
virtual ~SvxThesaurusDialog() override;
-boolWordFound() const { return m_bWordFound; }
-
// Handler
DECL_LINK( ReplaceBtnHdl_Impl, weld::Button&, void );
DECL_LINK( LeftBtnHdl_Impl, weld::Button&, void );
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index b03a7a242a92..b6e815dfd591 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -390,7 +390,6 @@ public:
sal_uInt16 GetExistingLineCount() const { return
m_aCustomPropertiesLines.size(); }
sal_uInt16 GetTotalLineCount() const { return
m_aCustomProperties.size(); }
-sal_uInt16 GetVisibleLineCount() const;
voidSetVisibleLineCount(sal_uInt32 nCount);
sal_Int32 GetHeight() const { return m_nHeight; }
voidSetHeight(int nHeight) { m_nHeight = nHeight; }
@@ -519,7 +518,6 @@ struct CmisPropertyLine
std::vector< std::unique_ptr > m_aValues;
std::vector< std::unique_ptr > m_aDateTimes;
std::vector< std::unique_ptr > m_aYesNos;
-long getItemHeight() const;
CmisPropertyLine(weld::Widget* pParent);
~CmisPropertyLine();
};
diff --git a/include/sfx2/templatelocalview.hxx
b/include/sfx2/templatelocalview.hxx
index def518dca0e0..9161252957c8 100644
--- a/include/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
@@ -88,10 +88,6 @@ public:
DECL_LINK(ContextMenuSelectHdl, Menu*, bool);
-TemplateContainerItem* getRegion(OUString const & sStr);
-
-OUString getRegionName(const sal_uInt16 nRegionId) const;
-
virtual bool renameItem(ThumbnailViewItem* pItem, const OUString&
sNewTitle) override;
virtual void MouseButtonDown( const MouseEvent& rMEvt ) over
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sfx2/source
sfx2/source/doc/objmisc.cxx | 13 +
1 file changed, 13 insertions(+)
New commits:
commit 11fc80500374344f54bd70482d40480b8a5b1a44
Author: Caolán McNamara
AuthorDate: Fri Jun 7 14:04:07 2019 +0100
Commit: Caolán McNamara
CommitDate: Sat Jun 8 18:04:59 2019 +0200
explictly exclude LibreLogo from XScript usage
Change-Id: I567647f0e2f8b82e4ef2995c673abe82f4564228
Reviewed-on: https://gerrit.libreoffice.org/73707
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 2ece4b9a6e6c..d44b55e6b753 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1344,6 +1344,16 @@ namespace
}
}
+namespace {
+
+// don't allow LibreLogo to be used with our mouseover/etc dom-alike events
+bool UnTrustedScript(const OUString& rScriptURL)
+{
+return
rScriptURL.startsWithIgnoreAsciiCase("vnd.sun.star.script:LibreLogo");
+}
+
+}
+
ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >&
_rxScriptContext, const OUString& _rScriptURL,
const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >&
aOutParamIndex, Sequence< Any >& aOutParam, bool bRaiseError, const
css::uno::Any* pCaller )
{
@@ -1356,6 +1366,9 @@ ErrCode SfxObjectShell::CallXScript( const Reference<
XInterface >& _rxScriptCon
if ( bIsDocumentScript && !lcl_isScriptAccessAllowed_nothrow(
_rxScriptContext ) )
return ERRCODE_IO_ACCESSDENIED;
+if ( UnTrustedScript(_rScriptURL) )
+return ERRCODE_IO_ACCESSDENIED;
+
bool bCaughtException = false;
Any aException;
try
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - svx/source
svx/source/unodraw/UnoGraphicExporter.cxx | 66 +++---
1 file changed, 35 insertions(+), 31 deletions(-)
New commits:
commit fd4324c64a6919ef46328608b447decc5c5f2d49
Author: Xisco Fauli
AuthorDate: Mon Jun 3 16:36:23 2019 +0200
Commit: Caolán McNamara
CommitDate: Sat Jun 8 18:56:47 2019 +0200
tdf#125062: distort hairline borders only if selection is used
Regression from 046df0a876b3d948bb1e14443c00c180bc8cccaa
Use the fix for tdf#105998 only when 'selection' option is checked
in the save dialog
Change-Id: I8c4127c780736408e905ead48e0d3ee6ae149197
Reviewed-on: https://gerrit.libreoffice.org/73391
Reviewed-by: Xisco Faulí
Tested-by: Xisco Faulí
(cherry picked from commit 6c31c2b01dd32cc7ba1230f2c4a98b8f7def219b)
Reviewed-on: https://gerrit.libreoffice.org/73559
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx
b/svx/source/unodraw/UnoGraphicExporter.cxx
index 80ff5b14c23b..1e111f7d2ab6 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -178,7 +178,7 @@ namespace {
/** creates a bitmap that is optionally transparent from a metafile
*/
-BitmapEx GetBitmapFromMetaFile( const GDIMetaFile& rMtf, const Size* pSize
)
+BitmapEx GetBitmapFromMetaFile( const GDIMetaFile& rMtf,bool bIsSelection,
const Size* pSize )
{
// use new primitive conversion tooling
basegfx::B2DRange aRange(basegfx::B2DPoint(0.0, 0.0));
@@ -211,35 +211,39 @@ namespace {
if(!aRect.IsEmpty())
{
-// tdf#105998 Correct the Metafile using information from it's
real sizes measured
-// using rMtf.GetBoundRect above and a copy
-const Size aOnePixelInMtf(
-Application::GetDefaultDevice()->PixelToLogic(
-Size(1, 1),
-rMtf.GetPrefMapMode()));
GDIMetaFile aMtf(rMtf);
-const Size aHalfPixelInMtf(
-(aOnePixelInMtf.getWidth() + 1) / 2,
-(aOnePixelInMtf.getHeight() + 1) / 2);
-const bool bHairlineBR(
-!aHairlineRect.IsEmpty() && (aRect.Right() ==
aHairlineRect.Right() || aRect.Bottom() == aHairlineRect.Bottom()));
-
-// Move the content to (0,0), usually TopLeft ist slightly
-// negative. For better visualization, add a half pixel, too
-aMtf.Move(
-aHalfPixelInMtf.getWidth() - aRect.Left(),
-aHalfPixelInMtf.getHeight() - aRect.Top());
-
-// Do not Scale, but set the PrefSize. Some levels deeper the
-// MetafilePrimitive will add a mapping to the decomposition
-// (and possibly a clipping) to map the graphic content to
-// a unit coordinate system.
-// Size is the measured size plus one pixel if needed (bHairlineBR)
-// and the moved half pixwel from above
-aMtf.SetPrefSize(
-Size(
-aRect.getWidth() + (bHairlineBR ?
aOnePixelInMtf.getWidth() : 0) + aHalfPixelInMtf.getWidth(),
-aRect.getHeight() + (bHairlineBR ?
aOnePixelInMtf.getHeight() : 0) + aHalfPixelInMtf.getHeight()));
+
+if (bIsSelection)
+{
+// tdf#105998 Correct the Metafile using information from it's
real sizes measured
+// using rMtf.GetBoundRect above and a copy
+const Size aOnePixelInMtf(
+Application::GetDefaultDevice()->PixelToLogic(
+Size(1, 1),
+rMtf.GetPrefMapMode()));
+const Size aHalfPixelInMtf(
+(aOnePixelInMtf.getWidth() + 1) / 2,
+(aOnePixelInMtf.getHeight() + 1) / 2);
+const bool bHairlineBR(
+!aHairlineRect.IsEmpty() && (aRect.Right() ==
aHairlineRect.Right() || aRect.Bottom() == aHairlineRect.Bottom()));
+
+// Move the content to (0,0), usually TopLeft ist slightly
+// negative. For better visualization, add a half pixel, too
+aMtf.Move(
+aHalfPixelInMtf.getWidth() - aRect.Left(),
+aHalfPixelInMtf.getHeight() - aRect.Top());
+
+// Do not Scale, but set the PrefSize. Some levels deeper the
+// MetafilePrimitive will add a mapping to the decomposition
+// (and possibly a clipping) to map the graphic content to
+// a unit coordinate system.
+// Size is the measured size plus one pixel if needed
(bHairlineBR)
+// and the moved half pixwel from above
+aMtf.SetPrefSize(
+Size(
+aRect.getWidth() + (bHairlineBR ?
aOnePixelInMtf.getWidt
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - chart2/inc chart2/IwyuFilter_chart2.yaml chart2/source chart2/uiconfig extras/source include/svx sfx2/uiconfig solenv/bin solenv/gbuild solen
chart2/IwyuFilter_chart2.yaml|2
chart2/inc/pch/precompiled_chartcontroller.hxx | 11
chart2/source/controller/dialogs/dlg_View3D.cxx | 54
chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx | 133 -
chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx | 38
chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx | 197 -
chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx | 52
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 252 +-
chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx | 79
chart2/source/controller/inc/dlg_View3D.hxx | 24
chart2/source/controller/main/ChartController_Properties.cxx |4
chart2/uiconfig/ui/3dviewdialog.ui |8
chart2/uiconfig/ui/tp_3D_SceneGeometry.ui| 52
chart2/uiconfig/ui/tp_3D_SceneIllumination.ui| 174 +
extras/source/glade/libreoffice-catalog.xml.in |3
include/svx/colorbox.hxx |1
include/svx/dlgctl3d.hxx | 147 +
sfx2/uiconfig/ui/alienwarndialog.ui |2
solenv/bin/native-code.py|1
solenv/gbuild/UIConfig.mk|2
solenv/sanitizers/ui/modules/schart.suppr|4
svx/source/dialog/dlgctl3d.cxx | 1201 ++-
svx/source/tbxctrls/tbcontrl.cxx | 13
23 files changed, 1868 insertions(+), 586 deletions(-)
New commits:
commit 6e7d31556d8a838fad7246ba55d417a565a8a659
Author: Caolán McNamara
AuthorDate: Thu Jun 6 10:37:21 2019 +0100
Commit: Caolán McNamara
CommitDate: Sat Jun 8 18:57:50 2019 +0200
weld View3DDialog
Change-Id: Ifd689c54574c08f026f6760efb39b5f927cb2625
Reviewed-on: https://gerrit.libreoffice.org/73706
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/chart2/IwyuFilter_chart2.yaml b/chart2/IwyuFilter_chart2.yaml
index 68761f242b30..445a9f7d60eb 100644
--- a/chart2/IwyuFilter_chart2.yaml
+++ b/chart2/IwyuFilter_chart2.yaml
@@ -463,7 +463,7 @@ blacklist:
- namespace chart { class ThreeD_SceneIllumination_TabPage; }
chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx:
# Needed for vclptr type
-- class SvxColorListBox
+- class ColorListBox
chart2/source/controller/inc/ItemPropertyMap.hxx:
# base class has to be a complete type
- map
diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx
b/chart2/inc/pch/precompiled_chartcontroller.hxx
index a72dea77..a6519d6dac8c 100644
--- a/chart2/inc/pch/precompiled_chartcontroller.hxx
+++ b/chart2/inc/pch/precompiled_chartcontroller.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which
presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2019-05-12 16:56:57 using:
+ Generated on 2019-06-06 21:24:00 using:
./bin/update_pch chart2 chartcontroller --cutoff=6 --exclude:system
--include:module --include:local
If after updating build fails, use the following command to locate
conflicting headers:
@@ -84,7 +84,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -124,7 +123,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -134,12 +132,9 @@
#include
#include
#include
-#include
-#include
#include
#include
#include
-#include
#include
#include
#include
@@ -335,7 +330,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -345,10 +339,8 @@
#include
#include
#include
-#include
#include
#include
-#include
#include
#include
#include
@@ -382,7 +374,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx
b/chart2/source/controller/dialogs/dlg_View3D.cxx
index fc329ce6b733..03a5fcc299f5 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -35,52 +35,44 @@ using namespace ::com::sun::star::chart2;
sal_uInt16 View3DDialog::m_nLastPageId = 0;
-View3DDialog::View3DDialog(vcl::Window* pParent, const uno::Reference<
frame::XModel > & xChartModel)
-: TabDialog(pParent, "3DViewDialog", "modules/schart/ui/3dviewdialog.ui")
-, m_pGeometry(nullptr)
-, m_pAppearance(nullptr)
-, m_pIllumination(nullptr)
+View3DDialog::View3DDialog(weld::Window* pParent, const uno::Reference<
frame::XModel > & xChartModel)
+: GenericDialogController(pParent, "modules/schart/ui/3dviewdialog.ui",
"3DViewDialog")
, m_aControllerLocker(xChartModel)
+, m_xTabControl(m_xBuilder->weld_notebook("tabcontrol"))
{
-
[Libreoffice-commits] core.git: sfx2/inc sfx2/source
sfx2/inc/autoredactdialog.hxx|8 +-
sfx2/source/doc/autoredactdialog.cxx | 131 +--
2 files changed, 133 insertions(+), 6 deletions(-)
New commits:
commit 670130039c5b100acabe08bc2077980c5c63f82f
Author: Muhammet Kara
AuthorDate: Sat Jun 8 16:37:04 2019 +0300
Commit: Muhammet Kara
CommitDate: Sat Jun 8 19:34:49 2019 +0200
Auto redaction dialog 3rd iteration
* Add the Edit handler
Change-Id: Id900d2aab6fa6795455012aaf2bcaf755ccca139
Reviewed-on: https://gerrit.libreoffice.org/73705
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/sfx2/inc/autoredactdialog.hxx b/sfx2/inc/autoredactdialog.hxx
index 26b29bf10cf5..267427c90b21 100644
--- a/sfx2/inc/autoredactdialog.hxx
+++ b/sfx2/inc/autoredactdialog.hxx
@@ -82,6 +82,9 @@ public:
void select(int nRow) { m_xControl->select(nRow); }
OUString get_id(int nRow) const { return m_xControl->get_id(nRow); }
+// Sync data on the targets box with the data on the target
+void setRowData(const int& nRowIndex, const RedactionTarget* pTarget);
+
//void connect_changed(const Link& rLink) {
m_xControl->connect_changed(rLink); }
//void connect_row_activated(const Link& rLink) {
m_xControl->connect_row_activated(rLink); }
};
@@ -102,7 +105,7 @@ class SFX2_DLLPUBLIC SfxAutoRedactDialog : public
SfxDialogController
/*DECL_LINK(LoadHdl, weld::Button&, void);
DECL_LINK(SaveHdl, weld::Button&, void);*/
DECL_LINK(AddHdl, weld::Button&, void);
-//DECL_LINK(EditHdl, weld::Button&, void);
+DECL_LINK(EditHdl, weld::Button&, void);
DECL_LINK(DeleteHdl, weld::Button&, void);
public:
@@ -130,6 +133,9 @@ private:
public:
SfxAddTargetDialog(weld::Window* pWindow, const OUString& rName);
+SfxAddTargetDialog(weld::Window* pWindow, const OUString& sName,
+ const RedactionTargetType& eTargetType, const OUString&
sContent,
+ const bool& bCaseSensitive, const bool& bWholeWords);
OUString getName() const { return m_xName->get_text(); }
RedactionTargetType getType() const;
diff --git a/sfx2/source/doc/autoredactdialog.cxx
b/sfx2/source/doc/autoredactdialog.cxx
index 30977b82e878..2849f525e0e2 100644
--- a/sfx2/source/doc/autoredactdialog.cxx
+++ b/sfx2/source/doc/autoredactdialog.cxx
@@ -85,6 +85,30 @@ OUString getTypeName(RedactionTargetType nType)
return sTypeName;
}
+
+/// Returns TypeID to be used in the add/edit target dialog
+OUString getTypeID(RedactionTargetType nType)
+{
+OUString sTypeID("unknown");
+
+switch (nType)
+{
+case RedactionTargetType::REDACTION_TARGET_TEXT:
+sTypeID = "text";
+break;
+case RedactionTargetType::REDACTION_TARGET_REGEX:
+sTypeID = "regex";
+break;
+case RedactionTargetType::REDACTION_TARGET_PREDEFINED:
+sTypeID = "predefined";
+break;
+case RedactionTargetType::REDACTION_TARGET_UNKNOWN:
+sTypeID = "unknown";
+break;
+}
+
+return sTypeID;
+}
}
void TargetsTable::InsertTarget(RedactionTarget* pTarget)
@@ -147,6 +171,15 @@ OUString TargetsTable::GetNameProposal()
return sDefaultTargetName + " " + OUString::number(nHighestTargetId + 1);
}
+void TargetsTable::setRowData(const int& nRowIndex, const RedactionTarget*
pTarget)
+{
+m_xControl->set_text(nRowIndex, pTarget->sName, 0);
+m_xControl->set_text(nRowIndex, getTypeName(pTarget->sType), 1);
+m_xControl->set_text(nRowIndex, pTarget->sContent, 2);
+m_xControl->set_text(nRowIndex, pTarget->bCaseSensitive ? OUString("Yes")
: OUString("No"), 3);
+m_xControl->set_text(nRowIndex, pTarget->bWholeWords ? OUString("Yes") :
OUString("No"), 4);
+}
+
/*IMPL_LINK_NOARG(SfxAutoRedactDialog, LoadHdl, weld::Button&, void)
{
//TODO: Implement
@@ -214,11 +247,75 @@ IMPL_LINK_NOARG(SfxAutoRedactDialog, AddHdl,
weld::Button&, void)
}
}
-/*IMPL_LINK_NOARG(SfxAutoRedactDialog, EditHdl, weld::Button&, void)
+IMPL_LINK_NOARG(SfxAutoRedactDialog, EditHdl, weld::Button&, void)
{
-//TODO: Implement
-//Reuse the Add Target dialog
-}*/
+sal_Int32 nSelectedRow = m_xTargetsBox->get_selected_index();
+
+// No selection, nothing to edit
+if (nSelectedRow < 0)
+return;
+
+// Only one entry should be selected for editing
+if (m_xTargetsBox->get_selected_rows().size() > 1)
+{
+OUString sMsg(
+"You have selected multiple targets, but only one target can be
edited at once.");
+//Warn the user about multiple selections
+std::unique_ptr
xBox(Application::CreateMessageDialog(
+getDialog(), VclMessageType::Error, VclButtonsType::Ok, sMsg));
+xBox->run();
+return;
+}
+
+// Get the redaction target to be edited
+RedactionTarget* pTarget
+=
reinterpret_cast(m_xTargetsBox->get_id(nSelectedRow).toInt64()
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/autoredactdialog.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 45e37616b811366f4773ab384911a88121f47726
Author: Andrea Gelmini
AuthorDate: Sat Jun 8 17:33:00 2019 +
Commit: Julien Nabet
CommitDate: Sat Jun 8 19:47:46 2019 +0200
Fix typo
Change-Id: Ia8b54a13266af183de700f309e846eb47b4b9efc
Reviewed-on: https://gerrit.libreoffice.org/73719
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/sfx2/source/doc/autoredactdialog.cxx
b/sfx2/source/doc/autoredactdialog.cxx
index 2849f525e0e2..ee7f09a1d269 100644
--- a/sfx2/source/doc/autoredactdialog.cxx
+++ b/sfx2/source/doc/autoredactdialog.cxx
@@ -355,7 +355,7 @@ SfxAutoRedactDialog::SfxAutoRedactDialog(weld::Window*
pParent)
, m_xEditBtn(m_xBuilder->weld_button("edit"))
, m_xDeleteBtn(m_xBuilder->weld_button("delete"))
{
-// Can be used to remeber the last set of redaction targets?
+// Can be used to remember the last set of redaction targets?
OUString sExtraData;
SvtViewOptions aDlgOpt(EViewType::Dialog,
OStringToOUString(m_xDialog->get_help_id(),
RTL_TEXTENCODING_UTF8));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/guisaveas.cxx | 35 +++
1 file changed, 23 insertions(+), 12 deletions(-)
New commits:
commit 9df8a2eb8c216b16927aac2182b881b21d8b2d14
Author: Caolán McNamara
AuthorDate: Sat Jun 8 17:50:37 2019 +0100
Commit: Caolán McNamara
CommitDate: Sat Jun 8 20:00:11 2019 +0200
Resolves: tdf#120343 show pdf in async pdf export dialog callback
not after dialog async exec begins, but defer to during that response
callback
Change-Id: I316022c01a87cf251d57b1007ae93fefddada776
Reviewed-on: https://gerrit.libreoffice.org/73715
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 72f85f225ddb..614c35e3459f 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1286,6 +1286,21 @@ uno::Reference< css::frame::XModuleManager2 > const &
SfxStoringHelper::GetModul
return m_xModuleManager;
}
+namespace
+{
+void LaunchPDFViewer(const INetURLObject& rURL)
+{
+// Launch PDF viewer
+FilterConfigItem aItem( "Office.Common/Filter/PDF/Export/" );
+bool aViewPDF = aItem.ReadBool( "ViewPDFAfterExport", false );
+
+if ( aViewPDF )
+{
+uno::Reference
xSystemShellExecute(SystemShellExecute::create(::comphelper::getProcessComponentContext()));
+
xSystemShellExecute->execute(rURL.GetMainURL(INetURLObject::DecodeMechanism::NONE),
"", SystemShellExecuteFlags::URIS_ONLY);
+}
+}
+}
bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >&
xModel,
const OUString& aSlotName,
@@ -1636,6 +1651,11 @@ bool SfxStoringHelper::GUIStoreModel( const
uno::Reference< frame::XModel >& xMo
{
SfxStoringHelper::SetDocInfoState(aModel.GetModel(),
xOldDocProps);
}
+
+// Launch PDF viewer
+if (nStoreMode & PDFEXPORT_REQUESTED)
+LaunchPDFViewer(aURL);
+
};
// use dispatch API to show document info dialog
@@ -1657,19 +1677,10 @@ bool SfxStoringHelper::GUIStoreModel( const
uno::Reference< frame::XModel >& xMo
aModelData.GetStorable()->storeToURL( aURL.GetMainURL(
INetURLObject::DecodeMechanism::NONE ), aArgsSequence );
else
aModelData.GetStorable()->storeAsURL( aURL.GetMainURL(
INetURLObject::DecodeMechanism::NONE ), aArgsSequence );
-}
-
-// Launch PDF viewer
-if ( nStoreMode & PDFEXPORT_REQUESTED )
-{
-FilterConfigItem aItem( "Office.Common/Filter/PDF/Export/" );
-bool aViewPDF = aItem.ReadBool( "ViewPDFAfterExport", false );
-if ( aViewPDF )
-{
-uno::Reference
xSystemShellExecute(SystemShellExecute::create(
::comphelper::getProcessComponentContext() ) );
-xSystemShellExecute->execute( aURL.GetMainURL(
INetURLObject::DecodeMechanism::NONE ), "", SystemShellExecuteFlags::URIS_ONLY
);
-}
+// Launch PDF viewer
+if (nStoreMode & PDFEXPORT_REQUESTED)
+LaunchPDFViewer(aURL);
}
return bDialogUsed;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/CustomTarget_kde5_moc.mk vcl/unx
vcl/CustomTarget_kde5_moc.mk |1
vcl/unx/kde5/KDE5FilePicker.hxx | 35
vcl/unx/kde5/KDE5FilePicker2.cxx | 42 +++
vcl/unx/kde5/KDE5SalInstance.cxx |6 -
vcl/unx/kde5/KDE5SalInstance.hxx |9
5 files changed, 5 insertions(+), 88 deletions(-)
New commits:
commit 873eca589a7ac19876058d08601be9415f19b251
Author: Jan-Marek Glogowski
AuthorDate: Sun Jun 2 19:58:50 2019 +
Commit: Jan-Marek Glogowski
CommitDate: Sat Jun 8 20:19:54 2019 +0200
KDE5 header cleanup and Q_OBJECT drop
Uneeded since the merge of most of the KDE5FilePicker code into
Qt5FilePicker. KDE5SalInstance also uses no signals or slots, so
Q_OBJECT + moc can go for them.
Change-Id: If48c677106b78c759ca165563ad3c081ca5442a5
Reviewed-on: https://gerrit.libreoffice.org/73393
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
(cherry picked from commit 81307dd74f26ba5c054dccd32dad507dc1510298)
Reviewed-on: https://gerrit.libreoffice.org/73718
diff --git a/vcl/CustomTarget_kde5_moc.mk b/vcl/CustomTarget_kde5_moc.mk
index 7d68658fc279..5c7fea94428b 100644
--- a/vcl/CustomTarget_kde5_moc.mk
+++ b/vcl/CustomTarget_kde5_moc.mk
@@ -10,7 +10,6 @@
$(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kde5))
$(call gb_CustomTarget_get_target,vcl/unx/kde5) : \
- $(call gb_CustomTarget_get_workdir,vcl/unx/kde5)/KDE5SalInstance.moc \
$(call gb_CustomTarget_get_workdir,vcl/unx/kde5)/KDE5FilePicker.moc \
$(call
gb_CustomTarget_get_workdir,vcl/unx/kde5)/tst_exclude_socket_notifiers.moc \
$(call
gb_CustomTarget_get_workdir,vcl/unx/kde5)/tst_exclude_posted_events.moc
diff --git a/vcl/unx/kde5/KDE5FilePicker.hxx b/vcl/unx/kde5/KDE5FilePicker.hxx
index dc3f5c0f63a4..32cbd4c92e7d 100644
--- a/vcl/unx/kde5/KDE5FilePicker.hxx
+++ b/vcl/unx/kde5/KDE5FilePicker.hxx
@@ -21,34 +21,12 @@
#include
-#include
-
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-
-#include
-
-#include
-#include
-#include
-#include
-#include
-
-class QFileDialog;
class QGridLayout;
-class QWidget;
-class QComboBox;
class KDE5FilePicker : public Qt5FilePicker
{
Q_OBJECT
+
protected:
//layout for extra custom controls
QGridLayout* _layout;
@@ -70,17 +48,6 @@ public:
virtual void SAL_CALL setLabel(sal_Int16 nControlId, const OUString&
rLabel) override;
virtual OUString SAL_CALL getLabel(sal_Int16 nControlId) override;
-/* TODO XFilePreview
-
-virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats(
);
-virtual sal_Int32 SAL_CALL getTargetColorDepth( );
-virtual sal_Int32 SAL_CALL getAvailableWidth( );
-virtual sal_Int32 SAL_CALL getAvailableHeight( );
-virtual void SAL_CALL setImage( sal_Int16 aImageFormat, const
css::uno::Any &rImage );
-virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState );
-virtual sal_Bool SAL_CALL getShowState( );
-*/
-
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName)
override;
diff --git a/vcl/unx/kde5/KDE5FilePicker2.cxx b/vcl/unx/kde5/KDE5FilePicker2.cxx
index 6eab819a1c03..ac99b5d21066 100644
--- a/vcl/unx/kde5/KDE5FilePicker2.cxx
+++ b/vcl/unx/kde5/KDE5FilePicker2.cxx
@@ -18,53 +18,21 @@
*/
#include "KDE5FilePicker.hxx"
+#include
-#include
-#include
-#include
-#include
-#include
-#include
#include
-#include
-#include
-
+#include
#include
-#include
-
-#undef Region
-#include
-#include
#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+#include
#include
-#include
#include
-#include
#include
-#include
-#include
-
using namespace ::com::sun::star;
-using namespace ::com::sun::star::ui::dialogs;
-using namespace ::com::sun::star::ui::dialogs::TemplateDescription;
-using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds;
-using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::uno;
-
-// helper functions
+using
::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION;
namespace
{
@@ -238,6 +206,4 @@ bool KDE5FilePicker::eventFilter(QObject* o, QEvent* e)
return QObject::eventFilter(o, e);
}
-#include
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/kde5/KDE5SalInstance.cxx b/vcl/unx/kde5/KDE5SalInstance.cxx
index b7e2952fd347..63ce689518f5 100644
--- a/vcl/unx/kde5/KDE5SalInstance.cxx
+++ b/vcl/unx/kde5/KDE5SalInstance.cxx
@@ -21,13 +21,8 @@
#include
-#include
-#include
#include
-#include
-#include
-#include
#include
#include
@@ -105,5 +100,4 @@ VCLPLUG_KDE5_PUBLIC SalIns
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sfx2/source
sfx2/source/doc/guisaveas.cxx | 35 +++
1 file changed, 23 insertions(+), 12 deletions(-)
New commits:
commit 63e86506d500dd6f61e12a6d526bd2bc33995a20
Author: Caolán McNamara
AuthorDate: Sat Jun 8 17:50:37 2019 +0100
Commit: Caolán McNamara
CommitDate: Sat Jun 8 20:33:47 2019 +0200
Resolves: tdf#120343 show pdf in async pdf export dialog callback
not after dialog async exec begins, but defer to during that response
callback
Change-Id: I316022c01a87cf251d57b1007ae93fefddada776
Reviewed-on: https://gerrit.libreoffice.org/73716
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 9be232c8d6f5..e14ed2bb7404 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1286,6 +1286,21 @@ uno::Reference< css::frame::XModuleManager2 > const &
SfxStoringHelper::GetModul
return m_xModuleManager;
}
+namespace
+{
+void LaunchPDFViewer(const INetURLObject& rURL)
+{
+// Launch PDF viewer
+FilterConfigItem aItem( "Office.Common/Filter/PDF/Export/" );
+bool aViewPDF = aItem.ReadBool( "ViewPDFAfterExport", false );
+
+if ( aViewPDF )
+{
+uno::Reference
xSystemShellExecute(SystemShellExecute::create(::comphelper::getProcessComponentContext()));
+
xSystemShellExecute->execute(rURL.GetMainURL(INetURLObject::DecodeMechanism::NONE),
"", SystemShellExecuteFlags::URIS_ONLY);
+}
+}
+}
bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >&
xModel,
const OUString& aSlotName,
@@ -1636,6 +1651,11 @@ bool SfxStoringHelper::GUIStoreModel( const
uno::Reference< frame::XModel >& xMo
{
SfxStoringHelper::SetDocInfoState(aModel.GetModel(),
xOldDocProps);
}
+
+// Launch PDF viewer
+if (nStoreMode & PDFEXPORT_REQUESTED)
+LaunchPDFViewer(aURL);
+
};
// use dispatch API to show document info dialog
@@ -1657,19 +1677,10 @@ bool SfxStoringHelper::GUIStoreModel( const
uno::Reference< frame::XModel >& xMo
aModelData.GetStorable()->storeToURL( aURL.GetMainURL(
INetURLObject::DecodeMechanism::NONE ), aArgsSequence );
else
aModelData.GetStorable()->storeAsURL( aURL.GetMainURL(
INetURLObject::DecodeMechanism::NONE ), aArgsSequence );
-}
-
-// Launch PDF viewer
-if ( nStoreMode & PDFEXPORT_REQUESTED )
-{
-FilterConfigItem aItem( "Office.Common/Filter/PDF/Export/" );
-bool aViewPDF = aItem.ReadBool( "ViewPDFAfterExport", false );
-if ( aViewPDF )
-{
-uno::Reference
xSystemShellExecute(SystemShellExecute::create(
::comphelper::getProcessComponentContext() ) );
-xSystemShellExecute->execute( aURL.GetMainURL(
INetURLObject::DecodeMechanism::NONE ), "", SystemShellExecuteFlags::URIS_ONLY
);
-}
+// Launch PDF viewer
+if (nStoreMode & PDFEXPORT_REQUESTED)
+LaunchPDFViewer(aURL);
}
return bDialogUsed;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit c22d5474388354341fd49530556b594325a3afaf
Author: Julien Nabet
AuthorDate: Sat Jun 8 19:55:48 2019 +0200
Commit: Julien Nabet
CommitDate: Sat Jun 8 20:56:03 2019 +0200
Typo xEqationProperties->xEquationProperties
Change-Id: I960506d2aaf0cf3f36f7af4bfa43169bb0afda5a
Reviewed-on: https://gerrit.libreoffice.org/73720
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx
b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx
index 1c42c5b7e6f2..1f4d7ef504fe 100644
--- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx
+++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx
@@ -167,7 +167,7 @@ void SchXMLEquationContext::StartElement( const
uno::Reference< xml::sax::XAttri
if( !sAutoStyleName.isEmpty() || bShowEquation || bShowRSquare )
{
-uno::Reference< beans::XPropertySet > xEqationProperties =
chart2::RegressionEquation::create( comphelper::getProcessComponentContext() );
+uno::Reference< beans::XPropertySet > xEquationProperties =
chart2::RegressionEquation::create( comphelper::getProcessComponentContext() );
if( !sAutoStyleName.isEmpty() )
{
@@ -181,20 +181,20 @@ void SchXMLEquationContext::StartElement( const
uno::Reference< xml::sax::XAttri
const_cast< XMLPropStyleContext* >( dynamic_cast< const
XMLPropStyleContext* >( pStyle ));
if( pPropStyleContext )
-pPropStyleContext->FillPropertySet( xEqationProperties );
+pPropStyleContext->FillPropertySet( xEquationProperties );
}
}
-xEqationProperties->setPropertyValue( "ShowEquation", uno::makeAny(
bShowEquation ));
-xEqationProperties->setPropertyValue( "ShowCorrelationCoefficient",
uno::makeAny( bShowRSquare ));
+xEquationProperties->setPropertyValue( "ShowEquation", uno::makeAny(
bShowEquation ));
+xEquationProperties->setPropertyValue( "ShowCorrelationCoefficient",
uno::makeAny( bShowRSquare ));
if( bHasXPos && bHasYPos )
{
chart2::RelativePosition aRelPos;
aRelPos.Primary = static_cast< double >( aPosition.X ) /
static_cast< double >( maChartSize.Width );
aRelPos.Secondary = static_cast< double >( aPosition.Y ) /
static_cast< double >( maChartSize.Height );
-xEqationProperties->setPropertyValue( "RelativePosition",
uno::makeAny( aRelPos ));
+xEquationProperties->setPropertyValue( "RelativePosition",
uno::makeAny( aRelPos ));
}
-mrRegressionStyle.m_xEquationProperties.set( xEqationProperties );
+mrRegressionStyle.m_xEquationProperties.set( xEquationProperties );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/inc vcl/qt5 vcl/unx
vcl/inc/qt5/Qt5Instance.hxx |5 +
vcl/qt5/Qt5Instance.cxx | 18 --
vcl/unx/kde5/KDE5SalInstance.cxx | 25 +++--
vcl/unx/kde5/KDE5SalInstance.hxx | 20 ++--
4 files changed, 34 insertions(+), 34 deletions(-)
New commits:
commit 33ca4dbcc91164a3725263d8a8f61d9f2866da8f
Author: Jan-Marek Glogowski
AuthorDate: Sun Jun 2 20:17:49 2019 +
Commit: Jan-Marek Glogowski
CommitDate: Sat Jun 8 21:15:43 2019 +0200
Qt5/KDE5 always use either Qt5 or KDE5 pickers
And use RunInMain for both SalInstances and for both picker types,
as there is no reason to assume just the file and not the folder
picker can be called from the non-GUI thread.
Little drawback is the inclusion of Qt5FilePicker header in the
Qt5Instance header, as Qt's enums aren't forward-declarable.
Change-Id: Ie170d247a76134df9aff835393c71c9d6e907d32
Reviewed-on: https://gerrit.libreoffice.org/73416
Reviewed-by: Michael Weghorn
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
(cherry picked from commit ca69a1e17782d88580f2449e0252be52c26cae42)
Reviewed-on: https://gerrit.libreoffice.org/73721
diff --git a/vcl/inc/qt5/Qt5Instance.hxx b/vcl/inc/qt5/Qt5Instance.hxx
index 52b45b12d2b8..c87f3c93c1ac 100644
--- a/vcl/inc/qt5/Qt5Instance.hxx
+++ b/vcl/inc/qt5/Qt5Instance.hxx
@@ -33,6 +33,8 @@
#include
#include
+#include "Qt5FilePicker.hxx"
+
class QApplication;
class SalYieldMutex;
class SalFrame;
@@ -74,6 +76,9 @@ Q_SIGNALS:
void ImplRunInMainSignal();
void deleteObjectLaterSignal(QObject* pObject);
+protected:
+virtual Qt5FilePicker* createPicker(QFileDialog::FileMode);
+
public:
explicit Qt5Instance(std::unique_ptr& pQApp, bool bUseCairo
= false);
virtual ~Qt5Instance() override;
diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
index 1949d426de69..a7b7aeb8638a 100644
--- a/vcl/qt5/Qt5Instance.cxx
+++ b/vcl/qt5/Qt5Instance.cxx
@@ -394,18 +394,32 @@ void Qt5Instance::ProcessEvent(SalUserEvent aEvent)
aEvent.m_pFrame->CallCallback(aEvent.m_nEvent, aEvent.m_pData);
}
+Qt5FilePicker* Qt5Instance::createPicker(QFileDialog::FileMode eMode)
+{
+if (!IsMainThread())
+{
+SolarMutexGuard g;
+Qt5FilePicker* pPicker;
+RunInMainThread(std::function([&, this]() { pPicker =
createPicker(eMode); }));
+assert(pPicker);
+return pPicker;
+}
+
+return new Qt5FilePicker(eMode);
+}
+
css::uno::Reference
Qt5Instance::createFilePicker(const
css::uno::Reference&)
{
return css::uno::Reference(
-new Qt5FilePicker(QFileDialog::ExistingFile));
+createPicker(QFileDialog::ExistingFile));
}
css::uno::Reference
Qt5Instance::createFolderPicker(const
css::uno::Reference&)
{
return css::uno::Reference(
-new Qt5FilePicker(QFileDialog::Directory));
+createPicker(QFileDialog::Directory));
}
css::uno::Reference
diff --git a/vcl/unx/kde5/KDE5SalInstance.cxx b/vcl/unx/kde5/KDE5SalInstance.cxx
index 63ce689518f5..e2bd75277d23 100644
--- a/vcl/unx/kde5/KDE5SalInstance.cxx
+++ b/vcl/unx/kde5/KDE5SalInstance.cxx
@@ -50,34 +50,23 @@ SalFrame* KDE5SalInstance::CreateFrame(SalFrame* pParent,
SalFrameStyleFlags nSt
return pRet;
}
-uno::Reference
-KDE5SalInstance::createFilePicker(const
uno::Reference& xMSF)
+Qt5FilePicker* KDE5SalInstance::createPicker(QFileDialog::FileMode eMode)
{
if (!IsMainThread())
{
SolarMutexGuard g;
-uno::Reference xRet;
-RunInMainThread(
-std::function([&xRet, this, xMSF]() { xRet =
this->createFilePicker(xMSF); }));
-assert(xRet);
-return xRet;
+Qt5FilePicker* pPicker;
+RunInMainThread(std::function([&, this]() { pPicker =
createPicker(eMode); }));
+assert(pPicker);
+return pPicker;
}
// In order to insert custom controls, KDE5FilePicker currently relies on
KFileWidget
// being used in the native file picker, which is only the case for KDE
Plasma.
// Therefore, return the plain qt5 one in order to not lose custom
controls.
if (Application::GetDesktopEnvironment() == "KDE5")
-{
-return uno::Reference(
-new KDE5FilePicker(QFileDialog::ExistingFile));
-}
-return Qt5Instance::createFilePicker(xMSF);
-}
-
-uno::Reference
-KDE5SalInstance::createFolderPicker(const
uno::Reference& /*xMSF*/)
-{
-return uno::Reference(new
KDE5FilePicker(QFileDialog::Directory));
+return new KDE5FilePicker(eMode);
+return Qt5Instance::createPicker(eMode);
}
extern "C" {
diff --git a/vcl/unx/kde5/KDE5SalInstance.hxx b/vcl/unx/kde5/KDE5SalInstance.hxx
index 11276be3f4ec..53993a5ecc34 100644
--- a/vcl/unx/kde5/KDE5SalInstance.hxx
+++ b/vcl/unx/kde5/KDE5SalInstance.hxx
@@ -21,23 +21,15 @@
#include
-class QApplication;
-
-class KDE5SalInstance : public Qt5Instance
+class KDE5SalInstance fi
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/headless vcl/inc vcl/source vcl/unx
vcl/headless/svpvd.cxx| 10 ++---
vcl/inc/headless/svpvd.hxx|5
vcl/source/window/bufferdevice.cxx|2 -
vcl/unx/kde5/KDE5SalGraphics.cxx |2 -
vcl/unx/kde5/KDE5SalInstance.cxx | 19 +
vcl/unx/kde5/KDE5SalInstance.hxx |4 +++
vcl/unx/kde5/KDE5SalVirtualDevice.hxx | 36 ++
7 files changed, 72 insertions(+), 6 deletions(-)
New commits:
commit bc799f2c426d56d2139f476dcad98b33d9d560c7
Author: Jan-Marek Glogowski
AuthorDate: Fri Jun 7 19:09:18 2019 +0200
Commit: Jan-Marek Glogowski
CommitDate: Sat Jun 8 22:00:10 2019 +0200
tdf#125673 KDE5 implement a KDE5SalVirtualDevice
We just need AcquireGraphics() to return a KDE5Graphics.
Otherwise the BufferDevice's SVP will use a SvpSalGraphics
instead of the KDE5Graphics, which knows about Qt's theming.
Change-Id: I0ea646df260f2067d61c753f03dee01a003f382a
Reviewed-on: https://gerrit.libreoffice.org/73673
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
(cherry picked from commit 2cb6a591b643a0f65dc58f060f60cc707ad3589c)
Reviewed-on: https://gerrit.libreoffice.org/73722
diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx
index eeccf2c014a9..a1e415739d6b 100644
--- a/vcl/headless/svpvd.cxx
+++ b/vcl/headless/svpvd.cxx
@@ -45,14 +45,18 @@ SvpSalVirtualDevice::~SvpSalVirtualDevice()
cairo_surface_destroy(m_pRefSurface);
}
-SalGraphics* SvpSalVirtualDevice::AcquireGraphics()
+SvpSalGraphics* SvpSalVirtualDevice::AddGraphics(SvpSalGraphics* pGraphics)
{
-SvpSalGraphics* pGraphics = new SvpSalGraphics();
pGraphics->setSurface(m_pSurface, m_aFrameSize);
-m_aGraphics.push_back( pGraphics );
+m_aGraphics.push_back(pGraphics);
return pGraphics;
}
+SalGraphics* SvpSalVirtualDevice::AcquireGraphics()
+{
+return AddGraphics(new SvpSalGraphics());
+}
+
void SvpSalVirtualDevice::ReleaseGraphics( SalGraphics* pGraphics )
{
m_aGraphics.erase(std::remove(m_aGraphics.begin(), m_aGraphics.end(),
dynamic_cast(pGraphics)), m_aGraphics.end());
diff --git a/vcl/inc/headless/svpvd.hxx b/vcl/inc/headless/svpvd.hxx
index 776cee7cde15..3da74b5e1ba8 100644
--- a/vcl/inc/headless/svpvd.hxx
+++ b/vcl/inc/headless/svpvd.hxx
@@ -21,6 +21,8 @@
#define INCLUDED_VCL_INC_HEADLESS_SVPVD_HXX
#include
+#include
+#include
#include
@@ -35,6 +37,9 @@ class VCL_DLLPUBLIC SvpSalVirtualDevice : public
SalVirtualDevice
basegfx::B2IVector m_aFrameSize;
std::vector< SvpSalGraphics* > m_aGraphics;
+protected:
+SvpSalGraphics* AddGraphics(SvpSalGraphics* aGraphics);
+
public:
SvpSalVirtualDevice(DeviceFormat eFormat, cairo_surface_t* pRefSurface);
virtual ~SvpSalVirtualDevice() override;
diff --git a/vcl/source/window/bufferdevice.cxx
b/vcl/source/window/bufferdevice.cxx
index 5db4cfff458a..d1480588d48f 100644
--- a/vcl/source/window/bufferdevice.cxx
+++ b/vcl/source/window/bufferdevice.cxx
@@ -12,7 +12,7 @@
namespace vcl
{
BufferDevice::BufferDevice(const VclPtr& pWindow,
vcl::RenderContext& rRenderContext)
-: m_pBuffer(VclPtr::Create())
+: m_pBuffer(VclPtr::Create(rRenderContext))
, m_pWindow(pWindow)
, m_rRenderContext(rRenderContext)
{
diff --git a/vcl/unx/kde5/KDE5SalGraphics.cxx b/vcl/unx/kde5/KDE5SalGraphics.cxx
index 6e30b9599740..268f8331f7e7 100644
--- a/vcl/unx/kde5/KDE5SalGraphics.cxx
+++ b/vcl/unx/kde5/KDE5SalGraphics.cxx
@@ -40,7 +40,7 @@ static void QImage2BitmapBuffer(QImage* pImg, BitmapBuffer*
pBuf)
}
KDE5SalGraphics::KDE5SalGraphics(Qt5Frame* pFrame)
-: Qt5SvpGraphics(pFrame->GetQWidget())
+: Qt5SvpGraphics(pFrame ? pFrame->GetQWidget() : nullptr)
, m_pFrame(pFrame)
{
}
diff --git a/vcl/unx/kde5/KDE5SalInstance.cxx b/vcl/unx/kde5/KDE5SalInstance.cxx
index e2bd75277d23..e83d48007712 100644
--- a/vcl/unx/kde5/KDE5SalInstance.cxx
+++ b/vcl/unx/kde5/KDE5SalInstance.cxx
@@ -28,8 +28,9 @@
#include
#include "KDE5FilePicker.hxx"
-#include "KDE5SalInstance.hxx"
#include "KDE5SalFrame.hxx"
+#include "KDE5SalInstance.hxx"
+#include "KDE5SalVirtualDevice.hxx"
using namespace com::sun::star;
@@ -69,6 +70,22 @@ Qt5FilePicker*
KDE5SalInstance::createPicker(QFileDialog::FileMode eMode)
return Qt5Instance::createPicker(eMode);
}
+std::unique_ptr
KDE5SalInstance::CreateVirtualDevice(SalGraphics* pGraphics,
+ long&
nDX, long& nDY,
+
DeviceFormat eFormat,
+ const
SystemGraphicsData*)
+{
+std::unique_ptr pVD;
+assert(pGraphics);
+RunInMainThread(std::function([&]() {
+KDE5SalGraphics* pKDE5Graphics =
dynamic_cast(pGraphics);
+assert(pKDE5Graphics);
+pVD.reset(new KDE5SalVirtualDevice(eFormat,
pKDE5Graphics->
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/source
sw/source/core/layout/calcmove.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit ee46d8e8c7375044e792ce330c80bf313e59b5e7
Author: Michael Stahl
AuthorDate: Sun Jun 2 13:58:01 2019 +0200
Commit: Caolán McNamara
CommitDate: Sat Jun 8 22:18:56 2019 +0200
tdf#119109 sw: tweak assertion in PrepareMake()
Empty section frames cause trouble for the assert added in
e14056e6e88d9b8d988b7b88b2776a8fc952031b:
* existing ones may be skipped by MoveBwd(), so a SwTextFrame moves to
the previous page but the SwSectionFrame that was its mpPrev remains
on this page; e.g. ooo110854-1.rtf
* a SwSectionFrame moves backward, then some SwTextFrame in it splits
and the follow tries to move forward, resulting in *new*
SwSectionFrames on this page that are empty (because the follow is
eventually joined again); e.g. abi3213-1.rtf
So if there's a section frame, assume it's SNAFU and don't assert.
Change-Id: Ibdca2aa39fae123583e5edf5173f80e8b70ef335
Reviewed-on: https://gerrit.libreoffice.org/7
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 1416c5426a757d32f223cab46bf9038bd7f21d48)
Reviewed-on: https://gerrit.libreoffice.org/73616
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/core/layout/calcmove.cxx
b/sw/source/core/layout/calcmove.cxx
index b7b083ee88d4..871f77a2f96e 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -318,6 +318,8 @@ void SwFrame::PrepareMake(vcl::RenderContext*
pRenderContext)
if (isLast && pFrame->GetUpper() != GetUpper())
{
assert(GetUpper()->Lower() == this
+// empty section frames are created all the time...
+|| GetUpper()->Lower()->IsSctFrame()
// tab frame/section frame may split multiple times
|| ( SwFlowFrame::CastFlowFrame(pFrame)
&&
SwFlowFrame::CastFlowFrame(GetUpper()->Lower())
@@ -440,6 +442,8 @@ void SwFrame::PrepareCursor()
if (isLast && pFrame->GetUpper() != GetUpper())
{
assert(GetUpper()->Lower() == this
+// empty section frames are created all the time...
+|| GetUpper()->Lower()->IsSctFrame()
// tab frame/section frame may split multiple times
|| ( SwFlowFrame::CastFlowFrame(pFrame)
&& SwFlowFrame::CastFlowFrame(GetUpper()->Lower())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - i18npool/source officecfg/registry unotools/source vcl/source
i18npool/source/breakiterator/breakiterator_cjk.cxx |4 officecfg/registry/data/org/openoffice/VCL.xcu | 1164 ++-- unotools/source/config/fontcfg.cxx | 15 vcl/source/font/PhysicalFontCollection.cxx |2 vcl/source/font/PhysicalFontFamily.cxx |2 5 files changed, 177 insertions(+), 1010 deletions(-) New commits: commit 0fd3610979a3116ca15377f3450f7794e768d937 Author: DaeHyun Sung AuthorDate: Sat Jun 1 21:43:07 2019 +0900 Commit: Caolán McNamara CommitDate: Sat Jun 8 22:18:37 2019 +0200 tdf#125481 changed font order for Korean locale - Set Noto Sans CJK KR as the 1st priority. - Set Nanum-series font as the 2nd priority, Such as NanumGothic(나눔고딕),NanumMyeongjo(나눔명조) - Set KoPub-series font that Korea Publisher Society(한국출판인회의) and Ministry of Culture, Sports and Tourism, Republic of Korea(문화체육관광부) are released - for Windows vista and later versions, Add default Korean font, Malgun Gothic(맑은고딕) - for Mac OSX, add default Korean font Apple SD Gothic Neo(Korean: 애플 SD 산돌고딕 Neo) - for Mac OSX, Also add Mac OSX fonts Apple Gothic(애플고딕),AppleMyungjo(애플명조) - remove Sun-style fonts(Maybe Sun StarOffice's legacy) - remove Hy(한양)-series fonts(Hancom HWP package's font, proprietary font-series) Modern Linux distribution's default Korean font-families are Noto Sans&Noto Serif-family Before Noto Sans font released, UnFont-family was Linux distribition default Korean font. Early Linux distribution's default Korean font: Baekmuk-family. Sun-series font rarely use in Korean Linux distribution. ps. Noto Fonts(Modern Korean All OS default fonts) https://www.google.co.kr/get/noto/ Source Han Sans https://fonts.adobe.com/fonts/source-han-sans-korean Source Han Serif https://source.typekit.com/source-han-serif/kr/ Nanum-series font https://hangeul.naver.com/font KoPub-series font http://www.kopus.org/biz/electronic/font.aspx UnFont(Many of Linux distribution's default Korean font) http://kldp.net/unfonts/release/ Baekmuk Font(Early Linux distribution's Korean default font http://kldp.net/baekmuk/ Change-Id: If5bbcf549cbe96240250e44396dce1ff714c88b8 Reviewed-on: https://gerrit.libreoffice.org/73307 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu index bc10863683d6..4ace2f6f9a41 100644 --- a/officecfg/registry/data/org/openoffice/VCL.xcu +++ b/officecfg/registry/data/org/openoffice/VCL.xcu @@ -388,55 +388,55 @@ -썬굴림;SunGulim;Baekmuk Gulim;굴림;Gulim;Baekmuk Batang;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced +Noto Sans Mono CJK KR;Noto Sans Mono KR;Source Han Mono KR;Source Han Mono;D2 Coding;Nanum Gothic Coding;Noto Sans CJK KR;Noto Sans KR;Source Han Sans KR;나눔고딕;NanumGothic;나눔바른고딕;NanumBarunGothic;나눔바른고딕 옛한글;NanumBarunGothic YetHangul;KoPubWorld돋움체;KoPubWorld Dotum;KoPub돋움체;맑은 고딕;Malgun Gothic;애플 SD 산돌고딕 Neo;Apple SD Gothic Neo;돋음;Dotum;굴림;Gulim;애플고딕;Apple Gothic;은 돋음;UnDotum;백묵 굴림;Baekmuk Gulim;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced -썬돋움;SunDotum;Baekmuk Dotum;돋움;Dotum;썬굴림;SunGulim;Baekmuk Gulim;굴림;Gulim;Baekmuk Batang;Roundgothic;Albany AMT;Albany;Arial;Nimbus Sans L;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif +Noto Sans CJK KR;Noto Sans KR;Source Han Sans KR;나눔고딕;NanumGothic;나눔바른고딕;NanumBarunGothic;나눔바른고딕 옛한글;NanumBarunGothic YetHangul;KoPubWorld돋움체;KoPubWorld Dotum;KoPub돋움체;맑은 고딕;Malgun Gothic;애플 SD 산돌고딕 Neo;Apple SD Gothic Neo;돋음;Dotum;굴림;Gulim;애플고딕;Apple Gothic;은 돋음;UnDotum;백묵 굴림;Baekmuk Gulim;Albany AMT;Albany;Arial;Nimbus Sans L;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif -썬바탕;SunBatang;Baekmuk Batang;바탕;Batang;Myeongjo;썬굴림;SunGulim;Baekmuk Gulim;굴림;Gulim;Baekmuk Batang;Roundgothic;Albany AMT;Albany;Arial;Nimbus Sans L;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif +Noto Sans CJK KR;Noto Sans KR;Source Han Sans KR;나눔고딕;NanumGothic;나눔바른고딕;NanumBarunGothic;나눔바른고딕 옛한글;NanumBarunGothic YetHangul;KoPubWorld돋움체;KoPubWorld Dotum;KoPub돋움체;맑은 고딕;Malgun Gothic;애플 SD 산돌고딕 Neo;Apple SD Gothic Neo;돋음;Dotum;굴림;Gulim;애플고딕;Apple Gothic;은 돋음;UnDotum;백묵 굴림;Baekmuk Gulim;Albany AMT;Albany;Arial;Nimbus Sans L;Helvetica;Lucida;Geneva;Helmet;Arial Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif -썬굴림;SunGulim;Baekmuk Gulim;굴림;Gulim;Batang;Myeongjo;Gulim;Baekmuk Batang;Roundgothic;Thorndale AMT;Thorndale;Times New Roman;Nimbus Roman No9 L;Times;Lucida Se
[Libreoffice-commits] core.git: vcl/qt5
vcl/qt5/Qt5Widget.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 87238627b025ee6aa61378667e56b1769d4460c2 Author: Michael Weghorn AuthorDate: Sat Jun 8 12:34:24 2019 +0200 Commit: Michael Weghorn CommitDate: Sun Jun 9 00:35:26 2019 +0200 Qt5Widget: lcl_retrieveSurrounding needs SolarMutex Otherwise * starting Writer * "File" -> "New" -> "Spreadsheet" * switching back to Writer window using Alt+Tab in Plasma Wayland session results in Thread 1 "soffice.bin" received signal SIGABRT, Aborted. __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:50 50 ../sysdeps/unix/sysv/linux/raise.c: No such file or directory. (gdb) bt #0 0x77b287bb in __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:50 #1 0x77b13535 in __GI_abort () at abort.c:79 #2 0x77b1340f in __assert_fail_base (fmt=0x77c75ee0 "%s%s%s:%u: %s%sAssertion `%s' failed. %n", assertion=0x714b0410 "ImplGetSVData()->mpDefInst->GetYieldMutex()->IsCurrentThread() && \"SolarMutex not owned!\"", file=0x714b03d0 "/mnt/data/development/git/libreoffice/vcl/source/app/dbggui.cxx", line=46, function=) at assert.c:92 #3 0x77b21102 in __GI___assert_fail (assertion=0x714b0410 "ImplGetSVData()->mpDefInst->GetYieldMutex()->IsCurrentThread() && \"SolarMutex not owned!\"", file=0x714b03d0 "/mnt/data/development/git/libreoffice/vcl/source/app/dbggui.cxx", line=46, function=0x714b0470 "void ImplDbgTestSolarMutex()") at assert.c:101 #4 0x70e495db in ImplDbgTestSolarMutex() () at /mnt/data/development/git/libreoffice/vcl/source/app/dbggui.cxx:46 #5 0x72026c2f in DbgTestSolarMutex() () at /mnt/data/development/git/libreoffice/tools/source/debug/debug.cxx:91 #6 0x74eea765 in SfxBroadcaster::AddListener(SfxListener&) (this=0x58e61620, rListener=...) at /mnt/data/development/git/libreoffice/svl/source/notify/SfxBroadcaster.cxx:94 #7 0x74effe4e in SfxListener::StartListening(SfxBroadcaster&, DuplicateHandling) (this=0x5a1ebe50, rBroadcaster=..., eDuplicateHanding=DuplicateHandling::Unexpected) at /mnt/data/development/git/libreoffice/svl/source/notify/lstner.cxx:104 #8 0x7fffbfdff188 in ScTabViewShell::AddAccessibilityObject(SfxListener&) (this=0x58c27080, rObject=...) at /mnt/data/development/git/libreoffice/sc/source/ui/view/tabvwshh.cxx:215 #9 0x7fffbf65754a in ScAccessibleDocument::PreInit() (this=0x5a1ebdb0) at /mnt/data/development/git/libreoffice/sc/source/ui/Accessibility/AccessibleDocument.cxx:1303 #10 0x7fffbfd12754 in ScGridWindow::CreateAccessible() (this=0x58c2dd50) at /mnt/data/development/git/libreoffice/sc/source/ui/view/gridwin5.cxx:443 #11 0x706ef948 in vcl::Window::GetAccessible(bool) (this=0x58c2dd50, bCreate=true) at /mnt/data/development/git/libreoffice/vcl/source/window/accessibility.cxx:129 #12 0x7fffe730f9c6 in lcl_retrieveSurrounding(sal_Int32&, sal_Int32&, QString*, QString*) (rPosition=@0x7fffcb90: -12560, rAnchor=@0x7fffcba0: -13392, pText=0x0, pSelection=0x0) at /mnt/data/development/git/libreoffice/vcl/qt5/Qt5Widget.cxx:598 #13 0x7fffe730ff17 in Qt5Widget::inputMethodQuery(Qt::InputMethodQuery) const (this=0x56c50ec0, property=Qt::ImCursorPosition) at /mnt/data/development/git/libreoffice/vcl/qt5/Qt5Widget.cxx:656 #14 0x7fffe786c7f7 in QWidget::event(QEvent*) (this=0x56c50ec0, event=0x7fffcef0) at kernel/qwidget.cpp:8993 #15 0x7fffe730f0d3 in Qt5Widget::event(QEvent*) (this=0x56c50ec0, pEvent=0x7fffcef0) at /mnt/data/development/git/libreoffice/vcl/qt5/Qt5Widget.cxx:466 #16 0x7fffe782e4b1 in QApplicationPrivate::notify_helper(QObject*, QEvent*) (this=this@entry=0x556480f0, receiver=receiver@entry=0x56c50ec0, e=e@entry=0x7fffcef0) at kernel/qapplication.cpp:3726 #17 0x7fffe7835950 in QApplication::notify(QObject*, QEvent*) (this=0x55647fe0, receiver=0x56c50ec0, e=0x7fffcef0) at kernel/qapplication.cpp:3485 #18 0x7fffe851b5a9 in QCoreApplication::notifyInternal2(QObject*, QEvent*) (receiver=0x56c50ec0, event=event@entry=0x7fffcef0) at ../../include/QtCore/5.11.3/QtCore/private/../../../../../src/corelib/thread/qthread_p.h:307 #19 0x7fffe5bdbf6a in QCoreApplication::sendEvent(QObject*, QEvent*) (event=0x7fffcef0, receiver=) at /usr/include/x86_64-linux-gnu/qt5/QtCore/qcoreapplication.h:234 #20 0x7fffe5bdbf6a in QtWaylandClient::QWaylandTextInput::updateState(QFlags, unsigned int) (this=0x55655ab0, queries=..., flags=2) at qwaylandinputcontext.cpp:134 #21 0x7fffe5bdc433 in QtWaylandClient::QWaylandTextInput::commit() (this=
CppCheck Report Update
A new cppcheck report is available at : http://dev-builds.libreoffice.org/cppcheck_reports/master/ Note: The script generating this report was run at : 2019-09-06 02:24:00 with user buildslave at host vm140 as /home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s /home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w /home/buildslave/tmp/www It can be found and improved here: https://gerrit.libreoffice.org/plugins/gitiles/dev-tools/+/master/cppcheck/cppcheck-report.sh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/qt5
vcl/qt5/Qt5Widget.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit d60eb4b7458454dde25a51eeeda0d545c9cf7957 Author: Michael Weghorn AuthorDate: Sat Jun 8 12:34:24 2019 +0200 Commit: Jan-Marek Glogowski CommitDate: Sun Jun 9 04:13:09 2019 +0200 Qt5Widget: lcl_retrieveSurrounding needs SolarMutex Otherwise * starting Writer * "File" -> "New" -> "Spreadsheet" * switching back to Writer window using Alt+Tab in Plasma Wayland session results in Thread 1 "soffice.bin" received signal SIGABRT, Aborted. __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:50 50 ../sysdeps/unix/sysv/linux/raise.c: No such file or directory. (gdb) bt #0 0x77b287bb in __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:50 #1 0x77b13535 in __GI_abort () at abort.c:79 #2 0x77b1340f in __assert_fail_base (fmt=0x77c75ee0 "%s%s%s:%u: %s%sAssertion `%s' failed. %n", assertion=0x714b0410 "ImplGetSVData()->mpDefInst->GetYieldMutex()->IsCurrentThread() && \"SolarMutex not owned!\"", file=0x714b03d0 "/mnt/data/development/git/libreoffice/vcl/source/app/dbggui.cxx", line=46, function=) at assert.c:92 #3 0x77b21102 in __GI___assert_fail (assertion=0x714b0410 "ImplGetSVData()->mpDefInst->GetYieldMutex()->IsCurrentThread() && \"SolarMutex not owned!\"", file=0x714b03d0 "/mnt/data/development/git/libreoffice/vcl/source/app/dbggui.cxx", line=46, function=0x714b0470 "void ImplDbgTestSolarMutex()") at assert.c:101 #4 0x70e495db in ImplDbgTestSolarMutex() () at /mnt/data/development/git/libreoffice/vcl/source/app/dbggui.cxx:46 #5 0x72026c2f in DbgTestSolarMutex() () at /mnt/data/development/git/libreoffice/tools/source/debug/debug.cxx:91 #6 0x74eea765 in SfxBroadcaster::AddListener(SfxListener&) (this=0x58e61620, rListener=...) at /mnt/data/development/git/libreoffice/svl/source/notify/SfxBroadcaster.cxx:94 #7 0x74effe4e in SfxListener::StartListening(SfxBroadcaster&, DuplicateHandling) (this=0x5a1ebe50, rBroadcaster=..., eDuplicateHanding=DuplicateHandling::Unexpected) at /mnt/data/development/git/libreoffice/svl/source/notify/lstner.cxx:104 #8 0x7fffbfdff188 in ScTabViewShell::AddAccessibilityObject(SfxListener&) (this=0x58c27080, rObject=...) at /mnt/data/development/git/libreoffice/sc/source/ui/view/tabvwshh.cxx:215 #9 0x7fffbf65754a in ScAccessibleDocument::PreInit() (this=0x5a1ebdb0) at /mnt/data/development/git/libreoffice/sc/source/ui/Accessibility/AccessibleDocument.cxx:1303 #10 0x7fffbfd12754 in ScGridWindow::CreateAccessible() (this=0x58c2dd50) at /mnt/data/development/git/libreoffice/sc/source/ui/view/gridwin5.cxx:443 #11 0x706ef948 in vcl::Window::GetAccessible(bool) (this=0x58c2dd50, bCreate=true) at /mnt/data/development/git/libreoffice/vcl/source/window/accessibility.cxx:129 #12 0x7fffe730f9c6 in lcl_retrieveSurrounding(sal_Int32&, sal_Int32&, QString*, QString*) (rPosition=@0x7fffcb90: -12560, rAnchor=@0x7fffcba0: -13392, pText=0x0, pSelection=0x0) at /mnt/data/development/git/libreoffice/vcl/qt5/Qt5Widget.cxx:598 #13 0x7fffe730ff17 in Qt5Widget::inputMethodQuery(Qt::InputMethodQuery) const (this=0x56c50ec0, property=Qt::ImCursorPosition) at /mnt/data/development/git/libreoffice/vcl/qt5/Qt5Widget.cxx:656 #14 0x7fffe786c7f7 in QWidget::event(QEvent*) (this=0x56c50ec0, event=0x7fffcef0) at kernel/qwidget.cpp:8993 #15 0x7fffe730f0d3 in Qt5Widget::event(QEvent*) (this=0x56c50ec0, pEvent=0x7fffcef0) at /mnt/data/development/git/libreoffice/vcl/qt5/Qt5Widget.cxx:466 #16 0x7fffe782e4b1 in QApplicationPrivate::notify_helper(QObject*, QEvent*) (this=this@entry=0x556480f0, receiver=receiver@entry=0x56c50ec0, e=e@entry=0x7fffcef0) at kernel/qapplication.cpp:3726 #17 0x7fffe7835950 in QApplication::notify(QObject*, QEvent*) (this=0x55647fe0, receiver=0x56c50ec0, e=0x7fffcef0) at kernel/qapplication.cpp:3485 #18 0x7fffe851b5a9 in QCoreApplication::notifyInternal2(QObject*, QEvent*) (receiver=0x56c50ec0, event=event@entry=0x7fffcef0) at ../../include/QtCore/5.11.3/QtCore/private/../../../../../src/corelib/thread/qthread_p.h:307 #19 0x7fffe5bdbf6a in QCoreApplication::sendEvent(QObject*, QEvent*) (event=0x7fffcef0, receiver=) at /usr/include/x86_64-linux-gnu/qt5/QtCore/qcoreapplication.h:234 #20 0x7fffe5bdbf6a in QtWaylandClient::QWaylandTextInput::updateState(QFlags, unsigned int) (this=0x55655ab0, queries=..., flags=2) at qwaylandinputcontext.cpp:134 #21 0x7fffe5bdc433 in QtWaylandClient::QWaylandTextInput::commit() (t
[Libreoffice-commits] core.git: avmedia/Library_avmediagst.mk avmedia/source vcl/qt5
avmedia/Library_avmediagst.mk | 10 +
avmedia/source/gstreamer/gstplayer.cxx | 34 +
vcl/qt5/Qt5Frame.cxx |2 -
vcl/qt5/Qt5Object.cxx |2 -
4 files changed, 42 insertions(+), 6 deletions(-)
New commits:
commit 6fd4bfee60e93ee29c3e68587ff4665650b31a56
Author: Michael Weghorn
AuthorDate: Fri May 31 15:11:13 2019 +0200
Commit: Michael Weghorn
CommitDate: Sun Jun 9 05:29:12 2019 +0200
tdf#125219 qt5: Try qwidget5videosink on Wayland
Try to use GStreamer's qwidget5videosink when using the
qt5 (or kde5) VCL plugin on Wayland.
This is strongly inspired by commit
8543fbc72fafc0d71a8760752ca2ef5b7119cb5c
("gtk3+wayland: play video via gtksink gstreamer element").
qwidget5videosink allows to directly set a 'QWidget*'
for the sink's "widget" property to make it paint into this
widget, s. [1] for more details.
In order for this to work, the relevant Qt5 packages for
QtGStreamer need to be installed (provided e.g. by package
'qtgstreamer-plugins-qt5' on Debian). If qwidget5videosink
is available, video playback works as expected on Wayland.
If it is not available, GStreamer will create it's own
(misplaced) window(s) to show the video as is the case without
this commit.
Switching to e.g. qtglvideosink in the future may theoretically
improve performance, since that one uses OpenGL/OpenGLES and
supports hardware colorspace conversion and color balance, while
qwidgetvideosink does software painting (s. [1]).
Also, extending commit 9d18bc40416b651340804f44ba5fae65f3bbbcfa
("tdf#125271 under wayland without gtksink, try waylandsink") to
also work with (i.e. set the right window for) waylandsink on
qt5 may be worth to take a look at in the future, but didn't
"just work" in a quick attempt.
[1]
https://gstreamer.freedesktop.org/data/doc/gstreamer/head/qt-gstreamer/html/qtvideosink_overview.html
Change-Id: I6e17838dcdf5c31a1a8a07f7836a4cf36c63bd06
Reviewed-on: https://gerrit.libreoffice.org/72968
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk
index cd651c82e60b..027123911e87 100644
--- a/avmedia/Library_avmediagst.mk
+++ b/avmedia/Library_avmediagst.mk
@@ -31,6 +31,16 @@ $(eval $(call gb_Library_add_libs,avmediagst,\
))
endif
+ifneq ($(ENABLE_QT5),)
+$(eval $(call gb_Library_add_cxxflags,avmediagst,\
+$$(QT5_CFLAGS) \
+))
+
+$(eval $(call gb_Library_add_libs,avmediagst,\
+$(QT5_LIBS) \
+))
+endif
+
$(eval $(call gb_Library_use_external,avmediagst,boost_headers))
$(eval $(call gb_Library_use_sdk_api,avmediagst))
diff --git a/avmedia/source/gstreamer/gstplayer.cxx
b/avmedia/source/gstreamer/gstplayer.cxx
index 07b58898e070..570a6fe02fe5 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -42,6 +42,10 @@
#include "gstframegrabber.hxx"
#include "gstwindow.hxx"
+#if ENABLE_QT5
+#include
+#endif
+
#include
#define AVMEDIA_GST_PLAYER_IMPLEMENTATIONNAME
"com.sun.star.comp.avmedia.Player_GStreamer"
#define AVMEDIA_GST_PLAYER_SERVICENAME
"com.sun.star.media.Player_GStreamer"
@@ -908,10 +912,32 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL
Player::createPlayerWindow( co
else
#endif
{
-if (aPlatform == "wayland")
-pVideosink = gst_element_factory_make("waylandsink",
"video-output");
-else
-pVideosink = gst_element_factory_make("autovideosink",
"video-output");
+#if ENABLE_QT5
+// try to use qwidget5videosink for qt5 on Wayland, which
requires the Qt5 packages for QtGStreamer to be installed
+if (aToolkit == "qt5" && aPlatform == "wayland")
+{
+pVideosink =
gst_element_factory_make("qwidget5videosink", "qwidget5videosink");
+if (pVideosink) {
+QWidget* pQWidget =
static_cast(pEnvData->pWidget);
+g_object_set(G_OBJECT(pVideosink), "widget",
pQWidget, nullptr);
+}
+else
+{
+SAL_WARN("avmedia.gstreamer", "Couldn't initialize
qwidget5videosink."
+ " Video playback
might not work as expected."
+ " Please install Qt5
packages for QtGStreamer.");
+// with no videosink explicitly set, GStreamer
will open it's own (misplaced) window(s) to display video
+}
+}
+#endif
+if (!pVideosink)
+{
+
