date:20190404

[Libreoffice-commits] core.git: chart2/source codemaker/source sc/source sw/source unodevtools/source winaccessibility/source

2019-04-04 Thread Mike Kaganski (via logerrit)

 chart2/source/controller/main/ChartController.cxx |4 ++--
 chart2/source/controller/main/ChartController_Window.cxx  |4 ++--
 codemaker/source/cppumaker/cpputype.cxx   |3 +--
 sc/source/core/tool/chgtrack.cxx  |5 ++---
 sc/source/ui/pagedlg/areasdlg.cxx |5 ++---
 sw/source/core/crsr/annotationmark.cxx|6 +++---
 sw/source/core/txtnode/atrfld.cxx |   10 --
 unodevtools/source/skeletonmaker/cpptypemaker.cxx |   12 ++--
 winaccessibility/source/service/AccFrameEventListener.cxx |4 ++--
 9 files changed, 24 insertions(+), 29 deletions(-)

New commits:
commit 7327260de3c0c627e62f7c3fddbe3d71ea88e88f
Author: Mike Kaganski 
AuthorDate: Thu Apr 4 23:45:11 2019 +0300
Commit: Stephan Bergmann 
CommitDate: Fri Apr 5 08:33:33 2019 +0200

tdf#120703: partially revert commit 85456fae54029edd26df2277a9eec5e2fe3d9739

... to take into account possible differences of results of dynamic_cast
vs static_cast; the change casts dynamically, as before the commit, and
only adds asserts on the result of the cast.

Thanks to sberg for pointing my mistake out!

Change-Id: Ib77d443e5a858e744f369f58542de603f948fd1c
Reviewed-on: https://gerrit.libreoffice.org/70274
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/chart2/source/controller/main/ChartController.cxx 
b/chart2/source/controller/main/ChartController.cxx
index 533029f3024a..b92d9bb7e265 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -396,8 +396,8 @@ void SAL_CALL ChartController::attachFrame(
 uno::Reference xSidebar = getSidebarFromModel(getModel());
 if (xSidebar.is())
 {
-
assert(dynamic_cast(xSidebar.get()));
-auto pSidebar = 
static_cast(xSidebar.get());
+auto pSidebar = 
dynamic_cast(xSidebar.get());
+assert(pSidebar);
 sfx2::sidebar::SidebarController::registerSidebarForFrame(pSidebar, 
this);
 pSidebar->updateModel(getModel());
 css::lang::EventObject aEvent;
diff --git a/chart2/source/controller/main/ChartController_Window.cxx 
b/chart2/source/controller/main/ChartController_Window.cxx
index 06e870dc05ae..acfb1233e772 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -852,8 +852,8 @@ void ChartController::execute_MouseButtonUp( const 
MouseEvent& rMEvt )
 m_xUndoManager );
 
 bool bChanged = false;
-assert(dynamic_cast(getModel().get()));
-ChartModel* pModel = 
static_cast(getModel().get());
+ChartModel* pModel = 
dynamic_cast(getModel().get());
+assert(pModel);
 if ( eObjectType == OBJECTTYPE_LEGEND )
 bChanged = 
DiagramHelper::switchDiagramPositioningToExcludingPositioning( *pModel, false , 
true );
 
diff --git a/codemaker/source/cppumaker/cpputype.cxx 
b/codemaker/source/cppumaker/cpputype.cxx
index 31361928fba8..a32e8dd1d0ca 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -527,9 +527,8 @@ void CppuType::dumpInitializer(
 out << "0";
 break;
 case codemaker::UnoType::Sort::Enum:
-assert(dynamic_cast(ent.get()));
 out << codemaker::cpp::scopedCppName(n.toUtf8()) << "_"
-<< (static_cast(ent.get())->
+<< (dynamic_cast(*ent.get()).
 getMembers()[0].name);
 break;
 case codemaker::UnoType::Sort::String:
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 5f165aab0172..4900c4d28b1b 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -4483,9 +4483,8 @@ ScChangeTrack* ScChangeTrack::Clone( ScDocument* 
pDocument ) const
 break;
 case SC_CAT_MOVE:
 {
-assert(dynamic_cast(pAction)
-   && "ScChangeTrack::Clone: pMove is null!");
-auto pMove = static_cast(pAction);
+auto pMove = dynamic_cast(pAction);
+assert(pMove && "ScChangeTrack::Clone: pMove is null!");
 
 pClonedAction = new ScChangeActionMove(
 pAction->GetActionNumber(),
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx 
b/sc/source/ui/pagedlg/areasdlg.cxx
index de0196609adf..25552871e396 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -124,9 +124,8 @@ ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, 
SfxChildWindow* pCW, vcl::Win
 get(pBtnC

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - cui/source

2019-04-04 Thread Andras Timar (via logerrit)

 cui/source/options/optfltr.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8ebab95924434376e18cb6bb88e443b3454795ec
Author: Andras Timar 
AuthorDate: Thu Apr 4 21:59:06 2019 +0200
Commit: Andras Timar 
CommitDate: Fri Apr 5 08:31:06 2019 +0200

respect read-only config item: CreateMSOLockFiles

Change-Id: I6b264a2f2e2995e880169f6224c60f023584469d
Reviewed-on: https://gerrit.libreoffice.org/70277
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 9c3c15d71e93..cdebf8d3afd2 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 #include "optfltr.hxx"
 #include 
 #include 
@@ -330,6 +331,7 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet* )
 
 aMSOLockFileCB->Check(rOpt.IsMSOLockFileCreationIsEnabled());
 aMSOLockFileCB->SaveValue();
+
aMSOLockFileCB->Enable(!officecfg::Office::Common::Filter::Microsoft::Import::CreateMSOLockFiles::isReadOnly());
 }
 
 void OfaMSFilterTabPage2::InsertEntry( const OUString& _rTxt, sal_IntPtr 
_nType )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sw/source

2019-04-04 Thread Andras Timar (via logerrit)

 sw/source/ui/misc/glossary.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 176891d895d2c9f8b3cf46e72d9a0d0e523e2ac4
Author: Andras Timar 
AuthorDate: Thu Apr 4 23:04:44 2019 +0200
Commit: Andras Timar 
CommitDate: Fri Apr 5 08:30:20 2019 +0200

respect read-only config item: AutoFunction/Text/ShowToolTip

Change-Id: Ib808e35d3cc3c2895993193ac6ed05d556c1857d
Reviewed-on: https://gerrit.libreoffice.org/70278
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index a0d95507feef..bd50bbccad81 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -72,6 +72,8 @@
 
 #include 
 
+#include 
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
@@ -768,6 +770,7 @@ void SwGlossaryDlg::Init()
 m_pNetRelCB->Check( rCfg.IsSaveRelNet() );
 m_pNetRelCB->SetClickHdl(LINK(this, SwGlossaryDlg, CheckBoxHdl));
 m_pInsertTipCB->Check( rCfg.IsAutoTextTip() );
+
m_pInsertTipCB->Enable(!officecfg::Office::Writer::AutoFunction::Text::ShowToolTip::isReadOnly());
 m_pInsertTipCB->SetClickHdl(LINK(this, SwGlossaryDlg, CheckBoxHdl));
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

2019-04-04 Thread Andras Timar (via logerrit)

 sw/source/ui/misc/glossary.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 5d0700bd3afef6d39b63fe813aaa0ac856ff5785
Author: Andras Timar 
AuthorDate: Thu Apr 4 23:04:44 2019 +0200
Commit: Andras Timar 
CommitDate: Fri Apr 5 08:28:50 2019 +0200

respect read-only config item: AutoFunction/Text/ShowToolTip

Change-Id: Ib808e35d3cc3c2895993193ac6ed05d556c1857d
Reviewed-on: https://gerrit.libreoffice.org/70275
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index cd3853f38f64..ce5dee06b6ff 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -73,6 +73,8 @@
 #include 
 #include 
 
+#include 
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
@@ -770,6 +772,7 @@ void SwGlossaryDlg::Init()
 m_pNetRelCB->Check( rCfg.IsSaveRelNet() );
 m_pNetRelCB->SetClickHdl(LINK(this, SwGlossaryDlg, CheckBoxHdl));
 m_pInsertTipCB->Check( rCfg.IsAutoTextTip() );
+
m_pInsertTipCB->Enable(!officecfg::Office::Writer::AutoFunction::Text::ShowToolTip::isReadOnly());
 m_pInsertTipCB->SetClickHdl(LINK(this, SwGlossaryDlg, CheckBoxHdl));
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source

2019-04-04 Thread Andras Timar (via logerrit)

 cui/source/options/optfltr.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 56971d434bf2242e436f6d671221fa80d1d2895a
Author: Andras Timar 
AuthorDate: Thu Apr 4 21:59:06 2019 +0200
Commit: Andras Timar 
CommitDate: Fri Apr 5 08:28:34 2019 +0200

respect read-only config item: CreateMSOLockFiles

Change-Id: I6b264a2f2e2995e880169f6224c60f023584469d
Reviewed-on: https://gerrit.libreoffice.org/70270
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index f29c14c78837..b97adf52cbbe 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -19,6 +19,7 @@
 
 #include 
 #include 
+#include 
 #include "optfltr.hxx"
 #include 
 #include 
@@ -328,6 +329,7 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet* )
 
 aMSOLockFileCB->Check(rOpt.IsMSOLockFileCreationIsEnabled());
 aMSOLockFileCB->SaveValue();
+
aMSOLockFileCB->Enable(!officecfg::Office::Common::Filter::Microsoft::Import::CreateMSOLockFiles::isReadOnly());
 }
 
 void OfaMSFilterTabPage2::InsertEntry( const OUString& _rTxt, 
MSFltrPg2_CheckBoxEntries _nType )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source

2019-04-04 Thread Andrea Gelmini (via logerrit)

 chart2/source/controller/main/ChartController_Properties.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d48f5dc1a0ed0c2c41888c91d8f9f140c58b27b3
Author: Andrea Gelmini 
AuthorDate: Thu Apr 4 19:21:04 2019 +
Commit: Julien Nabet 
CommitDate: Fri Apr 5 07:56:35 2019 +0200

Fix typo

Change-Id: I7b329b4da49464e2bb34c29b8db0aa8e21c94c0e
Reviewed-on: https://gerrit.libreoffice.org/70283
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/chart2/source/controller/main/ChartController_Properties.cxx 
b/chart2/source/controller/main/ChartController_Properties.cxx
index f40ab6fc7702..9a0242081da2 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -299,7 +299,7 @@ wrapper::ItemConverter* createItemConverter(
 }
 else
 {
-//create itemconverter for a all objects of given type
+//create itemconverter for all objects of given type
 switch(eObjectType)
 {
 case OBJECTTYPE_TITLE:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_svg

2019-04-04 Thread andreas kainz (via logerrit)

 dev/null|binary
 icon-themes/colibre/links.txt   |4 
 icon-themes/sifr/cmd/sc_numericfield.png|binary
 icon-themes/sifr/links.txt  |  217 
+-
 icon-themes/sifr_dark/cmd/sc_numericfield.png   |binary
 icon-themes/sifr_svg/cmd/lc_addons.svg  |   10 
 icon-themes/sifr_svg/cmd/lc_alignvcenter.svg|6 
 icon-themes/sifr_svg/cmd/lc_commentchange.svg   |6 
 icon-themes/sifr_svg/cmd/lc_conditionalformatmenu.svg   |6 
 icon-themes/sifr_svg/cmd/lc_drawtext.svg|6 
 icon-themes/sifr_svg/cmd/lc_hscrollbar.svg  |   10 
 icon-themes/sifr_svg/cmd/lc_insertannotation.svg|6 
 icon-themes/sifr_svg/cmd/lc_insertcurrencyfield.svg |6 
 icon-themes/sifr_svg/cmd/lc_insertdatefield.svg |6 
 icon-themes/sifr_svg/cmd/lc_insertimagecontrol.svg  |   10 
 icon-themes/sifr_svg/cmd/lc_insertobjectfloatingframe.svg   |6 
 icon-themes/sifr_svg/cmd/lc_insertpushbutton.svg|6 
 icon-themes/sifr_svg/cmd/lc_inserttimefield.svg |6 
 icon-themes/sifr_svg/cmd/lc_inserttimefieldfix.svg  |6 
 icon-themes/sifr_svg/cmd/lc_objectalign.svg |6 
 icon-themes/sifr_svg/cmd/lc_openurl.svg |6 
 icon-themes/sifr_svg/cmd/lc_showchanges.svg |6 
 icon-themes/sifr_svg/cmd/lc_showtrackedchanges.svg  |6 
 icon-themes/sifr_svg/cmd/lc_textfittosizetool.svg   |6 
 icon-themes/sifr_svg/cmd/lc_tracechangemode.svg |6 
 icon-themes/sifr_svg/cmd/lc_zoom100percent.svg  |6 
 icon-themes/sifr_svg/cmd/sc_acceptchanges.svg   |6 
 icon-themes/sifr_svg/cmd/sc_addons.svg  |   10 
 icon-themes/sifr_svg/cmd/sc_alignvcenter.svg|6 
 icon-themes/sifr_svg/cmd/sc_commentchange.svg   |6 
 icon-themes/sifr_svg/cmd/sc_conditionalformatmenu.svg   |6 
 icon-themes/sifr_svg/cmd/sc_deleteallnotes.svg  |6 
 icon-themes/sifr_svg/cmd/sc_deletenote.svg  |6 
 icon-themes/sifr_svg/cmd/sc_drawtext.svg|6 
 icon-themes/sifr_svg/cmd/sc_fontheight.svg  |6 
 icon-themes/sifr_svg/cmd/sc_fontworkcharacterspacingfloater.svg |6 
 icon-themes/sifr_svg/cmd/sc_formatallnotes.svg  |6 
 icon-themes/sifr_svg/cmd/sc_formatbulletsmenu.svg   |6 
 icon-themes/sifr_svg/cmd/sc_formatframemenu.svg |6 
 icon-themes/sifr_svg/cmd/sc_formatimagemenu.svg |6 
 icon-themes/sifr_svg/cmd/sc_formatspacingmenu.svg   |6 
 icon-themes/sifr_svg/cmd/sc_hscrollbar.svg  |   10 
 icon-themes/sifr_svg/cmd/sc_insertannotation.svg|6 
 icon-themes/sifr_svg/cmd/sc_insertcurrencyfield.svg |6 
 icon-themes/sifr_svg/cmd/sc_insertdatefield.svg |6 
 icon-themes/sifr_svg/cmd/sc_insertedit.svg  |6 
 icon-themes/sifr_svg/cmd/sc_insertformattedfield.svg|6 
 icon-themes/sifr_svg/cmd/sc_insertformcheck.svg |6 
 icon-themes/sifr_svg/cmd/sc_insertformradio.svg |6 
 icon-themes/sifr_svg/cmd/sc_insertformula.svg   |6 
 icon-themes/sifr_svg/cmd/sc_insertformvscroll.svg   |   10 
 icon-themes/sifr_svg/cmd/sc_insertframeinteract.svg |6 
 icon-themes/sifr_svg/cmd/sc_insertframemenu.svg |6 
 icon-themes/sifr_svg/cmd/sc_insertimagecontrol.svg  |6 
 icon-themes/sifr_svg/cmd/sc_insertnumericfield.svg  |6 
 icon-themes/sifr_svg/cmd/sc_insertobjectchart.svg   |   10 
 icon-themes/sifr_svg/cmd/sc_insertobjectfloatingframe.svg   |6 
 icon-themes/sifr_svg/cmd/sc_insertobjectstarmath.svg|6 
 icon-themes/sifr_svg/cmd/sc_insertpushbutton.svg|6 
 icon-themes/sifr_svg/cmd/sc_insertspreadsheet.svg   |   10 
 icon-themes/sifr_svg/cmd/sc_inserttimefield.svg |6 
 icon-themes/sifr_svg/cmd/sc_inserttimefieldfix.svg  |6 
 icon-themes/sifr_svg/cmd/sc_numericfield.svg|8 
 icon-themes/sifr_svg/cmd/sc_objectalign.svg |6 
 icon-themes/sifr_svg/cmd/sc_objectcatalog.svg   |6 
 icon-themes/sifr_svg/cmd/sc_objects3dtoolbox.svg|   10 
 icon-themes/sifr_svg/cmd/sc_openurl.svg |6 
 icon-themes/sifr_svg/cmd/sc_previewzoom.svg |   10 
 icon-themes/sifr_svg/cm

[Libreoffice-commits] core.git: drawinglayer/source

2019-04-04 Thread Andrea Gelmini (via logerrit)

 drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c998228ac79cf07829fe3cd16c048caeea6a680f
Author: Andrea Gelmini 
AuthorDate: Thu Apr 4 19:17:38 2019 +
Commit: Julien Nabet 
CommitDate: Fri Apr 5 07:08:14 2019 +0200

Fix typo

Change-Id: Ie5b9e2a603146dd6bd0e22c80f7cee23ccfd39b2
Reviewed-on: https://gerrit.libreoffice.org/70282
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx 
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx
index 062e9d53d2c7..c5253cd35c24 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx
@@ -83,7 +83,7 @@ namespace drawinglayer
 /** VclMetafileProcessor2D class
 
 This processor derived from VclProcessor2D is the base class for 
rendering
-all feeded primitives to a classical VCL-Metafile, including all 
over the
+all fed primitives to a classical VCL-Metafile, including all over 
the
 time grown extra data in comments and PDF exception data 
creations. Also
 printing needs some exception stuff.
 
@@ -175,7 +175,7 @@ namespace drawinglayer
 vcl::PDFExtOutDevData*  mpPDFExtOutDevData;
 
 // Remember the current OutlineLevel. This is used when tagged PDF 
export
-// is used to create/write valid structued list entries using PDF 
statements
+// is used to create/write valid structured list entries using PDF 
statements
 // like '/L', '/LI', 'LBody' instead of simple '/P' (Paragraph).
 // The value -1 means 'no OutlineLevel' and values >= 0 express 
the level.
 sal_Int16   mnCurrentOutlineLevel;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source

2019-04-04 Thread Andrea Gelmini (via logerrit)

 chart2/source/inc/LifeTime.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 35d9a2618dc0116378ab795a7b9277d248c5afd4
Author: Andrea Gelmini 
AuthorDate: Thu Apr 4 19:21:00 2019 +
Commit: Julien Nabet 
CommitDate: Fri Apr 5 07:07:32 2019 +0200

Fix typo

Change-Id: I15ab841fb9398a52d4df48b4bc4022b0f469f771
Reviewed-on: https://gerrit.libreoffice.org/70281
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx
index 4fc1908c6bcc..f30d184b058e 100644
--- a/chart2/source/inc/LifeTime.hxx
+++ b/chart2/source/inc/LifeTime.hxx
@@ -116,7 +116,7 @@ private:
 /*
 Use this Guard in your ApiCalls to protect access on resources
 which will be released in dispose.
-It's guarantied, that the release of resources only starts if your
+It's guaranteed that the release of resources only starts if your
 guarded call has finished.
 ! It's only partly guaranteed that this resources will not change during the 
call.
 See the example for details.
@@ -124,7 +124,7 @@ See the example for details.
 This class is to be used as described in the example.
 
 If this guard is used in all api calls of an XCloseable object
-it's guarantied, that the closeable will close itself after finishing the last 
call
+it's guaranteed that the closeable will close itself after finishing the last 
call
 if it should do so.
 
   ::ApiCall
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Google Summer of Code

2019-04-04 Thread Supriya Palli

Hello,



My name is Supriya Palli and I am a first-year Computer Science B.S.
student at Florida State University. I currently finishing up a C++ course
in Object Oriented Programming and am looking for ways to continue my
learning in C++ and other technologies over the summer. I noticed that some
of the projects you have listed for Google Summer of Code include C++ as a
skill, but I am not sure I would meet the other skill requirements. Are
there any specific projects you would recommend for beginners? Or any
projects I could contribute to outside of the Google Summer of Code program?


*Thank You,*
*Supriya Palli*
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 16 commits - configure.ac desktop/source download.lst external/python3 i18npool/source icon-themes/colibre icon-themes/galaxy icon

2019-04-04 Thread Thorsten Behrens (via logerrit)

Rebased ref, commits from common ancestor:
commit d989d34834e09325b0eb305b00959e1589404c22
Author: Thorsten Behrens 
AuthorDate: Wed Jul 18 18:06:44 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Fri Apr 5 00:12:36 2019 +0200

Default OpenGL to off on all platforms

Change-Id: Ide04d3b37b9fabb64d514fd87acbdfe9e49e6727

diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 26d1ba053a1e..1e001efd4a12 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -59,9 +59,7 @@
   
   
 
-  false
-  false
-  true
+  false
 
   
   
commit 726bcf895a930fc8a8589677c8a8d6623b6217ad
Author: Samuel Mehrbrodt 
AuthorDate: Thu Jan 12 16:46:45 2017 +0100
Commit: Thorsten Behrens 
CommitDate: Fri Apr 5 00:12:36 2019 +0200

Disable crash reporter UI

Change-Id: I8106ec674080ede7072581dab2e6700040de5828
(cherry picked from commit b981aa30c3eb5ddd0cf6c35e4c37ab687667f71b)

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index c83d424f8a30..e7a4f82ba081 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -913,7 +913,8 @@ bool crashReportInfoExists()
 #if HAVE_FEATURE_BREAKPAD
 void handleCrashReport()
 {
-static const char SERVICENAME_CRASHREPORT[] = 
"com.sun.star.comp.svx.CrashReportUI";
+// Don't show the dialog since we don't offer upload - only want the dumps
+/*static const char SERVICENAME_CRASHREPORT[] = 
"com.sun.star.comp.svx.CrashReportUI";
 
 css::uno::Reference< css::uno::XComponentContext > xContext = 
::comphelper::getProcessComponentContext();
 
@@ -927,7 +928,7 @@ void handleCrashReport()
 css::util::URL aURL;
 css::uno::Any aRet = xRecoveryUI->dispatchWithReturnValue(aURL, 
css::uno::Sequence< css::beans::PropertyValue >());
 bool bRet = false;
-aRet >>= bRet;
+aRet >>= bRet;*/
 }
 #endif
 
commit 53346ed879a9aec0d4147e0bf0eb76452bbb748a
Author: Katarina Behrens 
AuthorDate: Wed Feb 10 14:42:18 2016 +0100
Commit: Thorsten Behrens 
CommitDate: Fri Apr 5 00:12:36 2019 +0200

Branded images for msi installer

The sizes are 122 x 234, 374 x 44 installed units respectively, according to

http://msdn.microsoft.com/de-de/library/windows/desktop/aa369490%28v=vs.85%29.aspx

it is 163x312, 499x58 pixels at 96 dpi. I bumped dpi to 120 and it still 
looks pixelated,
but it's as good as it gets.

For better results, we need different graphics, with less fine details 
given the very limited
space

Change-Id: I4a7eafed16fd79f377d27afa8151cfab614b464b

diff --git 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp
index 5a163cf86c23..471eea4c22e6 100644
Binary files 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp and 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp differ
diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp
index b4210d131ba2..2703670952bd 100644
Binary files 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp and 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp differ
commit f4cfc7cb72b00a1fc68ca6f98a8217ac592e3c8e
Author: Katarina Behrens 
AuthorDate: Tue Feb 9 11:09:30 2016 +0100
Commit: Thorsten Behrens 
CommitDate: Fri Apr 5 00:12:36 2019 +0200

Branded application icons

sadly, this doesn't replace Windows taskbar icon, that must be living 
somewhere
else. It works on Linux though.

 Conflicts:
icon-themes/galaxy/res/main128.png
icon-themes/galaxy/res/mainapp_16.png
icon-themes/galaxy/res/mainapp_16_8.png
icon-themes/galaxy/res/mainapp_32.png
icon-themes/galaxy/res/mainapp_32_8.png
icon-themes/galaxy/res/mainapp_48_8.png

Change-Id: I028fc68d96f02113622c5e1ec3ed830ac797be0b

diff --git a/icon-themes/galaxy/res/main128.png 
b/icon-themes/galaxy/res/main128.png
new file mode 100644
index ..818b7330c25b
Binary files /dev/null and b/icon-themes/galaxy/res/main128.png differ
diff --git a/icon-themes/galaxy/res/mainapp_48_8.png 
b/icon-themes/galaxy/res/mainapp_48_8.png
new file mode 100644
index ..562ea23e89c2
Binary files /dev/null and b/icon-themes/galaxy/res/mainapp_48_8.png differ
diff --git a/icon-themes/tango/res/mainapp_16.png 
b/icon-themes/tango/res/mainapp_16.png
index 4a96735b6bb6..13945eeadfd4 100644
Binary files a/icon-themes/tango/res/mainapp_16.png and 
b/icon-themes/tango/res/mainapp_16.png differ
diff --git a/icon-themes/tango/res/mainapp_16_8.png 
b/icon-themes/tango/res/mainapp_16_8.png
index 94abb952996b..13945eeadfd4 100644
Bin

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - 2 commits - vcl/qt5

2019-04-04 Thread Katarina Behrens (via logerrit)

 vcl/qt5/Qt5Data.cxx  |   13 ++---
 vcl/qt5/Qt5Frame.cxx |4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 7963a389dea1ff1a0c3a1910ae05ecc562597b13
Author: Katarina Behrens 
AuthorDate: Mon Apr 1 09:41:39 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Fri Apr 5 00:05:08 2019 +0200

tdf#120865: preserve cursor shape on repositioning the cursor

i.e. don't recreate cursor with new (default) arrow shape in
SalFrame::SetPointerPos, but simply move the existing one

Change-Id: I3406ceff25a53de6f2afa318114370c318e6a500
Reviewed-on: https://gerrit.libreoffice.org/70049
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 
(cherry picked from commit 330df37c7e2af0564bcd2de1f171bed4befcc074)
Reviewed-on: https://gerrit.libreoffice.org/70238
Reviewed-by: Thorsten Behrens 

diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 3172b769f550..b1ad0f93d561 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -682,9 +682,9 @@ void Qt5Frame::CaptureMouse(bool bMouse)
 
 void Qt5Frame::SetPointerPos(long nX, long nY)
 {
-QCursor aCursor = m_pQWidget->cursor();
+// some cursor already exists (and it has m_ePointerStyle shape)
+// so here we just reposition it
 QCursor::setPos(m_pQWidget->mapToGlobal(QPoint(nX, nY)));
-m_pQWidget->setCursor(aCursor);
 }
 
 void Qt5Frame::Flush()
commit 0ff90fd5cb698ef78fc15e3073eaaacd599beae7
Author: Katarina Behrens 
AuthorDate: Wed Mar 27 09:32:47 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Fri Apr 5 00:04:53 2019 +0200

tdf#124026: map window resizing-related cursors to their Qt equivalents

there is no direct Qt equivalent of X11 xc_[top|bottom|left|right]_side
cursors, but those come at least close

Change-Id: Ifd442c46c08c71b1e1b9ddac42628b38eefee47f
Reviewed-on: https://gerrit.libreoffice.org/69797
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 
(cherry picked from commit 167812fe0d77b993427e7dca112f319a92942a3c)
Reviewed-on: https://gerrit.libreoffice.org/70245
Reviewed-by: Thorsten Behrens 

diff --git a/vcl/qt5/Qt5Data.cxx b/vcl/qt5/Qt5Data.cxx
index 1830dab0e523..597a0a4d0a77 100644
--- a/vcl/qt5/Qt5Data.cxx
+++ b/vcl/qt5/Qt5Data.cxx
@@ -204,12 +204,10 @@ QCursor& Qt5Data::getCursor(PointerStyle ePointerStyle)
 MAP_BUILTIN(PointerStyle::NESize, Qt::SizeBDiagCursor);
 MAP_BUILTIN(PointerStyle::SWSize, Qt::SizeBDiagCursor);
 MAP_BUILTIN(PointerStyle::SESize, Qt::SizeFDiagCursor);
-#if 0
-MAP_BUILTIN( PointerStyle::WindowNSize, GDK_TOP_SIDE );
-MAP_BUILTIN( PointerStyle::WindowSSize, GDK_BOTTOM_SIDE );
-MAP_BUILTIN( PointerStyle::WindowWSize, GDK_LEFT_SIDE );
-MAP_BUILTIN( PointerStyle::WindowESize, GDK_RIGHT_SIDE );
-#endif
+MAP_BUILTIN(PointerStyle::WindowNSize, Qt::SizeVerCursor);
+MAP_BUILTIN(PointerStyle::WindowSSize, Qt::SizeVerCursor);
+MAP_BUILTIN(PointerStyle::WindowWSize, Qt::SizeHorCursor);
+MAP_BUILTIN(PointerStyle::WindowESize, Qt::SizeHorCursor);
 MAP_BUILTIN(PointerStyle::WindowNWSize, Qt::SizeFDiagCursor);
 MAP_BUILTIN(PointerStyle::WindowNESize, Qt::SizeBDiagCursor);
 MAP_BUILTIN(PointerStyle::WindowSWSize, Qt::SizeBDiagCursor);
@@ -299,7 +297,8 @@ QCursor& Qt5Data::getCursor(PointerStyle ePointerStyle)
 if (!pCursor)
 {
 pCursor = new QCursor(Qt::ArrowCursor);
-SAL_WARN("vcl.qt5", "pointer " << static_cast(ePointerStyle) 
<< "not implemented");
+SAL_WARN("vcl.qt5",
+ "pointer " << static_cast(ePointerStyle) << " not 
implemented");
 }
 
 m_aCursors[ePointerStyle].reset(pCursor);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - include/test offapi/com sc/inc sc/qa sc/source test/source

2019-04-04 Thread Samuel Mehrbrodt (via logerrit)

 include/test/sheet/shape.hxx|3 -
 offapi/com/sun/star/sheet/Shape.idl |8 +++
 sc/inc/unonames.hxx |1 
 sc/qa/extras/scshapeobj.cxx |3 -
 sc/source/ui/unoobj/shapeuno.cxx|   33 
 test/source/sheet/shape.cxx |   94 +---
 6 files changed, 103 insertions(+), 39 deletions(-)

New commits:
commit de89c8169cfbaa68e42e6a53c5d64fb404bf6892
Author: Samuel Mehrbrodt 
AuthorDate: Mon Apr 1 15:00:00 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Fri Apr 5 00:03:55 2019 +0200

tdf#124329 Add API to make cell anchored graphic resize with cell

Change-Id: Ib2335b1eb26e55fcfcfb964d0f3fe3dd267bdd0d
Reviewed-on: https://gerrit.libreoffice.org/70067
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit 823c77a98ffbc1c819a81687ca7e13d91277bca5)

The following commits have been squased into this one:

Improve sc shape test

Actually test anchoring the shape to a cell and to a page again

Change-Id: I2d625b9a4f04aaf61dd8c1e8d10c639cbb4f0da5
Reviewed-on: https://gerrit.libreoffice.org/70110
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 67c5fb957f585772e23678fdcc6e24734b9fbc48)

tdf#124329 Test setting ResizeWithCell via UNO API

Change-Id: Iab8733e5a5df2b189197df89c3e08cd3463f2ec7
Reviewed-on: https://gerrit.libreoffice.org/70111
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 8603d7029b0d62032a5c9d2e039117799be9e798)

Split large test method in two

Change-Id: If1b915f721a5768b682c63dc9c08b708ba37a705
Reviewed-on: https://gerrit.libreoffice.org/70116
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 8ecdaecfa8f8665b0c8c9e3e909f683a6c198797)

tdf#124329 Keep ResizeWithCell value when anchoring to a different cell

Change-Id: I62010b4882268aae135a406eb27634c3335d72cf
Reviewed-on: https://gerrit.libreoffice.org/70118
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit c8e1f2fb1e5576dd85a1172d064480734e21d96e)
Reviewed-on: https://gerrit.libreoffice.org/70264
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/include/test/sheet/shape.hxx b/include/test/sheet/shape.hxx
index 3d10fc31eb4f..ad2b7b7657ce 100644
--- a/include/test/sheet/shape.hxx
+++ b/include/test/sheet/shape.hxx
@@ -23,7 +23,8 @@ public:
 virtual css::uno::Reference init() = 0;
 virtual css::uno::Reference getXSheetDocument() = 0;
 
-void testShapeProperties();
+void testShapePropertiesAnchor();
+void testShapePropertiesPosition();
 
 protected:
 ~Shape() {}
diff --git a/offapi/com/sun/star/sheet/Shape.idl 
b/offapi/com/sun/star/sheet/Shape.idl
index d23a004b074e..9904a49ef163 100644
--- a/offapi/com/sun/star/sheet/Shape.idl
+++ b/offapi/com/sun/star/sheet/Shape.idl
@@ -35,6 +35,14 @@ service Shape
  Possible objects are XSpreadsheet and XCell.
 */
 [property] com::sun::star::uno::XInterface Anchor;
+
+/** If set, the shape will resize with the cell.
+Only works when shape is anchored to a cell.
+
+@since LibreOffice 6.3
+*/
+[optional, property] boolean ResizeWithCell;
+
 /** contains the horizontal position of the object (1/100 mm).
  The position is relative to the anchor object.
  If the underlying table layout direction is left to right
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index a2a407ee5fdc..b7d1823d06f3 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -192,6 +192,7 @@
 //  drawing objects
 #define SC_UNONAME_IMAGEMAP "ImageMap"
 #define SC_UNONAME_ANCHOR   "Anchor"
+#define SC_UNONAME_RESIZE_WITH_CELL "ResizeWithCell"
 #define SC_UNONAME_HORIPOS  "HoriOrientPosition"
 #define SC_UNONAME_VERTPOS  "VertOrientPosition"
 // #i66550 HLINK_FOR_SHAPES
diff --git a/sc/qa/extras/scshapeobj.cxx b/sc/qa/extras/scshapeobj.cxx
index 4b8c6069302e..cf9b0789385d 100644
--- a/sc/qa/extras/scshapeobj.cxx
+++ b/sc/qa/extras/scshapeobj.cxx
@@ -43,7 +43,8 @@ public:
 CPPUNIT_TEST_SUITE(ScShapeObj);
 
 // Shape
-CPPUNIT_TEST(testShapeProperties);
+CPPUNIT_TEST(testShapePropertiesAnchor);
+CPPUNIT_TEST(testShapePropertiesPosition);
 
 CPPUNIT_TEST_SUITE_END();
 
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index aed1d55e389a..b3f6c3dad4e5 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -53,6 +53,7 @@ static const SfxItemPropertyMapEntry* lcl_GetShapeMap()
 static const SfxItemPropertyMapEntry aShapeMap_Impl[] =
 {
 {OUString(SC_UNONAME_ANCHOR), 0, 
cppu::UnoType::get(), 0, 0 },
+{OUString(SC_UNONAME_RESIZE_WITH_CELL), 0, 
cppu::UnoType::get(), 0, 0 },
 {OUStri

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - sc/source

2019-04-04 Thread Samuel Mehrbrodt (via logerrit)

 sc/source/ui/unoobj/shapeuno.cxx |   14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit a8238d31249296de1eaa97a81677a667a6d4a806
Author: Samuel Mehrbrodt 
AuthorDate: Fri Mar 29 07:43:00 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Apr 4 23:58:37 2019 +0200

Related tdf#124329 Handle shapes resizing with the cell

The same as shapes just anchored to the cell.

Change-Id: I0ce03e4c650dd10bd89cee87aa26775c32703d06
Reviewed-on: https://gerrit.libreoffice.org/70065
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit e587645f551c6c684f9f36606f8fa5e1b06004a1)
Reviewed-on: https://gerrit.libreoffice.org/70263
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index 04ef95a81e9f..aed1d55e389a 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -510,7 +510,9 @@ void SAL_CALL ScShapeObj::setPropertyValue(const OUString& 
aPropertyName, const
 xShape->setPosition(aPoint);
 pDocSh->SetModified();
 }
-else if (ScDrawLayer::GetAnchorType(*pObj) 
== SCA_CELL)
+else if (ScDrawLayer::GetAnchorType(*pObj) 
== SCA_CELL
+ || 
ScDrawLayer::GetAnchorType(*pObj)
+== SCA_CELL_RESIZE)
 {
 awt::Size aUnoSize;
 awt::Point aCaptionPoint;
@@ -595,7 +597,9 @@ void SAL_CALL ScShapeObj::setPropertyValue(const OUString& 
aPropertyName, const
 xShape->setPosition(aPoint);
 pDocSh->SetModified();
 }
-else if (ScDrawLayer::GetAnchorType(*pObj) 
== SCA_CELL)
+else if (ScDrawLayer::GetAnchorType(*pObj) 
== SCA_CELL
+ || 
ScDrawLayer::GetAnchorType(*pObj)
+== SCA_CELL_RESIZE)
 {
 awt::Size aUnoSize;
 awt::Point aCaptionPoint;
@@ -724,7 +728,8 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const 
OUString& aPropertyName )
 uno::Reference xShape( mxShapeAgg, 
uno::UNO_QUERY );
 if (xShape.is())
 {
-if (ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL)
+if (ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL
+|| ScDrawLayer::GetAnchorType(*pObj) == 
SCA_CELL_RESIZE)
 {
 awt::Size aUnoSize;
 awt::Point aCaptionPoint;
@@ -784,7 +789,8 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const 
OUString& aPropertyName )
 uno::Reference xShape( mxShapeAgg, 
uno::UNO_QUERY );
 if (xShape.is())
 {
-if (ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL)
+if (ScDrawLayer::GetAnchorType(*pObj) == SCA_CELL
+|| ScDrawLayer::GetAnchorType(*pObj) == 
SCA_CELL_RESIZE)
 {
 awt::Size aUnoSize;
 awt::Point aCaptionPoint;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - vcl/unx

2019-04-04 Thread Caolán McNamara (via logerrit)

 vcl/unx/gtk3/gtk3gtkinst.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 690fc6c492ec4c8e35e6eb52e914c06a4740d952
Author: Caolán McNamara 
AuthorDate: Tue May 2 12:13:41 2017 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Apr 4 23:57:35 2019 +0200

Resolves: tdf#99467 pasting text from java apps to gtk3 gives bad results

Change-Id: Ib2625c900def20baa470f0a15e4f72a3f763099e
Reviewed-on: https://gerrit.libreoffice.org/70261
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 426cc235c5a9..59a7f07b0387 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -103,6 +103,10 @@ std::vector 
GtkTransferable::getTransferDataFlavo
 const char* pFinalName = pName;
 css::datatransfer::DataFlavor aFlavor;
 
+// omit text/plain;charset=unicode since it is not well defined
+if (rtl_str_compare(pName, "text/plain;charset=unicode") == 0)
+continue;
+
 for (size_t j = 0; j < SAL_N_ELEMENTS(aConversionTab); ++j)
 {
 if (rtl_str_compare(pName, aConversionTab[j].pNativeType) == 0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: kit/Kit.cpp scripts/perftrace.pl

2019-04-04 Thread Libreoffice Gerrit user

 kit/Kit.cpp  |2 ++
 scripts/perftrace.pl |   40 +++-
 2 files changed, 29 insertions(+), 13 deletions(-)

New commits:
commit ca619e6fd7add691b1e44c0b19a46b7cf9e0da8f
Author: Michael Meeks 
AuthorDate: Thu Apr 4 20:01:19 2019 +0100
Commit: Michael Meeks 
CommitDate: Thu Apr 4 20:01:19 2019 +0100

perftrace: annotate start events as idle as well.

Change-Id: Iaf603101426caca1f48ebe10918170287aee006d

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 42663d3ee..7555ae9eb 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -1344,6 +1344,8 @@ public:
 }
 else
 tileQueue->put("callback " + 
std::to_string(descriptor->getViewId()) + ' ' + std::to_string(type) + ' ' + 
payload);
+
+LOG_TRC("Document::ViewCallback end.");
 }
 
 private:
diff --git a/scripts/perftrace.pl b/scripts/perftrace.pl
index a5b1a01d4..f639fb2f1 100755
--- a/scripts/perftrace.pl
+++ b/scripts/perftrace.pl
@@ -88,21 +88,33 @@ my @event_pairs = (
 );
 
 # Idle events
-my @idle_types = (
+my @idleend_types = (
 '^Poll completed'
 );
 
+my @idlestart_types = (
+'^Document::ViewCallback end\.'
+);
+
 my %pair_starts;
 my %proc_names;
 
-sub get_event_type($$$)
+sub match_list($@)
 {
-my ($type, $emitter, $message) = @_;
-foreach my $match (@idle_types) {
+my $message = shift;
+while (my $match =  shift) {
if ($message =~ m/$match/) {
-   return 'idle';
+   return 1;
}
 }
+return 0;
+}
+
+sub get_event_type($$$)
+{
+my ($type, $emitter, $message) = @_;
+return 'idle_end' if (match_list($message, @idleend_types));
+return 'idle_start' if (match_list($message, @idlestart_types));
 return '';
 }
 
@@ -110,6 +122,9 @@ sub consume()
 {
 my ($proc, $pid, $tid, $time, $emitter, $type, $message, $line) = @_;
 
+$pid = int($pid);
+$tid = int($tid);
+
 # print STDERR "$emitter, $type, $time, $message, $line\n";
 
 $time = offset_microsecs($time) if ($json); # microseconds from start
@@ -118,13 +133,13 @@ sub consume()
 if (!defined $emitters{$emitter}) {
$emitters{$emitter} = (scalar keys %emitters) + 1;
if ($json) {
-   push @events, "{\"name\": \"thread_name\", \"ph\": \"M\", \"pid\": 
$pid, \"tid\": $tid, \"args\": { \"name\" : \"$emitter\" } }";
+   push @events, "{\"name\": \"thread_name\", \"thread_sort_index\": 
-$tid, \"ph\": \"M\", \"pid\": $pid, \"tid\": $tid, \"args\": { \"name\" : 
\"$emitter\" } }";
}
 }
 if (!defined $proc_names{$pid}) {
$proc_names{$pid} = 1;
if ($json) {
-   push @events, "{\"name\": \"process_name\", \"ph\": \"M\", \"pid\": 
$pid, \"args\": { \"name\" : \"$proc\" } }";
+   push @events, "{\"name\": \"process_name\", \"process_sort_index\": 
-$pid, \"ph\": \"M\", \"pid\": $pid, \"args\": { \"name\" : \"$proc\" } }";
}
 }
 
@@ -178,17 +193,16 @@ sub consume()
$dur = $time - $last_times{$key};
my $idx = $last_event_idx{$key};
 
-   if ($event_type ne 'idle') { # onlt re-write if not idle
-   $events[$idx] =~ s/\"dur\":10/\"dur\":$dur/;
-   } else {
-   print STDERR "idle re-write to $dur\n";
-   }
+   $dur = 1 if ($event_type eq 'idle_end' && $dur > 1);
+   $events[$idx] =~ s/\"dur\":10/\"dur\":$dur/;
}
$last_times{$key} = $time;
$last_event_idx{$key} = scalar @events;
 
my $json_type = "\"ph\":\"X\", \"s\":\"p\"";
-   push @events, "{\"pid\":$pid, \"tid\":$tid, \"ts\":$time, \"dur\":10, 
$json_type, \"name\":\"$content_e\" }";
+   my $replace_dur = 10;
+   $replace_dur = 1 if ($event_type eq 'idle_start'); # miss the regexp
+   push @events, "{\"pid\":$pid, \"tid\":$tid, \"ts\":$time, 
\"dur\":$replace_dur, $json_type, \"name\":\"$content_e\" }";
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: codemaker/source include/codemaker unodevtools/source

2019-04-04 Thread Mike Kaganski (via logerrit)

 codemaker/source/codemaker/exceptiontree.cxx  |6 
 codemaker/source/codemaker/typemanager.cxx|4 
 codemaker/source/commoncpp/commoncpp.cxx  |3 
 codemaker/source/cppumaker/cppumaker.cxx  |2 
 codemaker/source/cppumaker/cpputype.cxx   |  128 +-
 codemaker/source/cppumaker/dependencies.cxx   |4 
 codemaker/source/cppumaker/includes.cxx   |   14 -
 codemaker/source/javamaker/javamaker.cxx  |2 
 codemaker/source/javamaker/javatype.cxx   |   10 -
 include/codemaker/typemanager.hxx |9 -
 unodevtools/source/skeletonmaker/cppcompskeleton.cxx  |   18 +-
 unodevtools/source/skeletonmaker/cpptypemaker.cxx |   58 
 unodevtools/source/skeletonmaker/javacompskeleton.cxx |   18 +-
 unodevtools/source/skeletonmaker/javatypemaker.cxx|   40 ++---
 unodevtools/source/skeletonmaker/skeletoncommon.cxx   |6 
 15 files changed, 155 insertions(+), 167 deletions(-)

New commits:
commit 84662e9030a855c8db7cd40d9ce354b773d78c16
Author: Mike Kaganski 
AuthorDate: Thu Apr 4 12:27:22 2019 +0300
Commit: Mike Kaganski 
CommitDate: Thu Apr 4 20:36:11 2019 +0200

Get rid of b2u/u2b helpers; use OUString's toUtf8/fromUtf8 instead

These helpers are used in code generator code; so any invalid UTF-8
or UTF-16 in the conversion is programmer's error which needs fixing.
Thus, the behavior of toUtf8/fromUtf8 which asserts the validity is
fine here.

Change-Id: I3004e233c9de59f8e348455f1f04d23e8c51ed3d
Reviewed-on: https://gerrit.libreoffice.org/70249
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
Reviewed-by: Mike Kaganski 

diff --git a/codemaker/source/codemaker/exceptiontree.cxx 
b/codemaker/source/codemaker/exceptiontree.cxx
index b6c2aeee6f87..796f52671ce3 100644
--- a/codemaker/source/codemaker/exceptiontree.cxx
+++ b/codemaker/source/codemaker/exceptiontree.cxx
@@ -55,12 +55,10 @@ void ExceptionTree::add(
 }
 list.push_back(n);
 rtl::Reference< unoidl::Entity > ent;
-codemaker::UnoType::Sort s = manager->getSort(b2u(n), &ent);
+codemaker::UnoType::Sort s = manager->getSort(OUString::fromUtf8(n), 
&ent);
 (void) s; // WaE: unused variable
 assert(s == codemaker::UnoType::Sort::Exception);
-n = u2b(
-static_cast< unoidl::ExceptionTypeEntity * >(ent.get())->
-getDirectBase());
+n = 
static_cast(ent.get())->getDirectBase().toUtf8();
 assert(!n.isEmpty());
 }
 if (!bRuntimeException) {
diff --git a/codemaker/source/codemaker/typemanager.cxx 
b/codemaker/source/codemaker/typemanager.cxx
index cf638f0ca4eb..f723ee699948 100644
--- a/codemaker/source/codemaker/typemanager.cxx
+++ b/codemaker/source/codemaker/typemanager.cxx
@@ -164,7 +164,7 @@ codemaker::UnoType::Sort TypeManager::decompose(
 {
 sal_Int32 k;
 std::vector< OString > args;
-OUString n = b2u(codemaker::UnoType::decompose(u2b(name), &k, &args));
+OUString n = 
OUString::fromUtf8(codemaker::UnoType::decompose(name.toUtf8(), &k, &args));
 for (;;) {
 rtl::Reference< unoidl::Entity > ent;
 codemaker::UnoType::Sort s = getSort(n, &ent);
@@ -238,7 +238,7 @@ codemaker::UnoType::Sort TypeManager::decompose(
 arguments->clear();
 for (const OString& rArg : args)
 {
-arguments->push_back(b2u(rArg));
+arguments->push_back(OUString::fromUtf8(rArg));
 }
 }
 if (entity != nullptr) {
diff --git a/codemaker/source/commoncpp/commoncpp.cxx 
b/codemaker/source/commoncpp/commoncpp.cxx
index 6774aedf4fba..07b689a39b06 100644
--- a/codemaker/source/commoncpp/commoncpp.cxx
+++ b/codemaker/source/commoncpp/commoncpp.cxx
@@ -79,8 +79,7 @@ OString translateUnoToCppType(
 {
 buf.append("::css::uno::XInterface");
 } else {
-//TODO: check that nucleus is a valid (UTF-8) identifier
-buf.append(u2b(nucleus));
+buf.append(nucleus.toUtf8()); // nucleus must be a valid UTF-16
 }
 }
 return buf.makeStringAndClear();
diff --git a/codemaker/source/cppumaker/cppumaker.cxx 
b/codemaker/source/cppumaker/cppumaker.cxx
index b1769eda87a6..9adf31d07d36 100644
--- a/codemaker/source/cppumaker/cppumaker.cxx
+++ b/codemaker/source/cppumaker/cppumaker.cxx
@@ -54,7 +54,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
 }
 codemaker::GeneratedTypeSet generated;
 if (options.isValid("-T")) {
-OUString names(b2u(options.getOption("-T")));
+OUString names(OUString::fromUtf8(options.getOption("-T")));
 for (sal_Int32 i = 0; i != -1;) {
 OUString name(names.getToken(0, ';', i));
 if (!name.isEmpty()) {
diff --git a/codemaker/source/cppumaker/cpputype.cxx 
b/codem

Re: [GSoC] Subpixel glyph positioning - Looking for a mentor

2019-04-04 Thread Kaganski Mike

On 04.04.2019 19:56, Alexander Farrow wrote:
> Hi Jan-Marek,
> 
> Thank you for your reply.
> 
>      I have added some potential mentors, which are normally also 
> interested in font
>      rendering. As much as I could potentially do some mentoring, as I 
> know a share
>      of SalLayout and VCL, I have just minimal idea about text rendering, 
> mainly from
>      the time writing the Qt5 VCL backend. I'm willing to do some larger 
> share of it.
>      Someone of you want to share?
> 
> I'm extremely glad to hear that you are happy to be a mentor for this 
> project, as
> I am very keen to continue working on this for GSoC. Thank you for CC'ing 
> Mike and
> Khaled, hopefully we can find another mentor to join us on this project.

Oh! I didn't realize that I was in the explicit CC list; since I never 
worked with font rendering stuff closely, I even didn't consider myself 
as a potential mentor. Sorry, but I don't have required skills. But of 
course, I'm ready to answer any questions in the course of the project 
(be it GSoC or otherwise) as much as I have knowledge. I consider this 
task an important thins, so it's in my scope of interest.

-- 
Best regards,
Mike Kaganski
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: net/Socket.hpp scripts/perftrace.pl

2019-04-04 Thread Libreoffice Gerrit user

 net/Socket.hpp   |1 
 scripts/perftrace.pl |  133 +++
 2 files changed, 83 insertions(+), 51 deletions(-)

New commits:
commit cacaefc2871b26372ff9aaf3135970dcf2dc2053
Author: Michael Meeks 
AuthorDate: Thu Apr 4 18:55:07 2019 +0100
Commit: Michael Meeks 
CommitDate: Thu Apr 4 19:18:45 2019 +0100

perftrace: Annotate idleness and render it better as gaps.

Change-Id: If4d7853d02ca736f8cab12bd9dcc7c4b60ec7d27

diff --git a/net/Socket.hpp b/net/Socket.hpp
index c2355b7b7..c1c17b2be 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -488,6 +488,7 @@ public:
 int rc;
 do
 {
+LOG_TRC("Poll start");
 #if !MOBILEAPP
 rc = ::poll(&_pollFds[0], size + 1, std::max(timeoutMaxMs,0));
 #else
diff --git a/scripts/perftrace.pl b/scripts/perftrace.pl
index 32c0f0a71..a5b1a01d4 100755
--- a/scripts/perftrace.pl
+++ b/scripts/perftrace.pl
@@ -70,21 +70,42 @@ sub offset_microsecs($)
 return $usec;
 }
 
-# Delimit spans of time:
-my @pairs = (
+# Important things that happen in pairs
+my @event_pairs = (
+ { type => 'INF',
+   emitter => '^loolwsd$',
+   start => 'Initializing wsd.\.*',
+   end => 'Listening to prisoner connections.*' },
+ { type => 'INF',
+   emitter => '^forkit$',
+   start => 'Initializing frk.\.*',
+   end => 'ForKit process is ready.*' },
 { type => 'INF',
-  emitter => 'loolwsd',
-  start => 'Initializing wsd.\.*',
-  end => 'Listening to prisoner connections.*' },
-{ type => 'INF',
-  emitter => 'forkit',
-  start => 'Initializing frk.\.*',
-  end => 'ForKit process is ready.*'
-}
-);
+  emitter => "^lokit_.*",
+  start => 'Loading url .*',
+  end => '^Document loaded in .*ms$' },
+# FIXME: add save too ...
+);
+
+# Idle events
+my @idle_types = (
+'^Poll completed'
+);
+
 my %pair_starts;
 my %proc_names;
 
+sub get_event_type($$$)
+{
+my ($type, $emitter, $message) = @_;
+foreach my $match (@idle_types) {
+   if ($message =~ m/$match/) {
+   return 'idle';
+   }
+}
+return '';
+}
+
 sub consume()
 {
 my ($proc, $pid, $tid, $time, $emitter, $type, $message, $line) = @_;
@@ -108,57 +129,66 @@ sub consume()
 }
 
 my $handled = 0;
-foreach my $match (@pairs) {
-   next if ($type ne $match->{type});
-   next if (!($emitter =~ m/$match->{emitter}/));
-
-   my $start = $match->{start};
-   my $end = $match->{end};
-   my $key = $type.$emitter.$start;
-   if ($message =~ m/$start/) {
-   defined $pair_starts{$key} && die "event $start ($end) starts and 
fails to finish";
-   $pair_starts{$key} = $time;
-   last;
-   } elsif ($message =~ m/$end/) {
-   defined $pair_starts{$key} || die "event $start ($end) ends but 
failed to start";
-
-   my $content_e = escape($start);
-   my $title_e = escape($line);
-   my $start_time = $pair_starts{$key};
-   my $end_time = $time;
-
-   if ($json)
-   {
-   my $dur = $end_time - $start_time;
-   my $ms = int ($dur / 1000.0);
-   push @events, "{\"pid\":$pid, \"tid\":$tid, \"ts\":$start_time, 
\"dur\":$dur, \"ph\":\"X\", \"name\":\"$title_e\", \"args\":{ \"ms\":$ms } }";
-   }
-   else
-   {
-   my $id = (scalar @events) + 1;
-   push @events, "{id: $id, group: $emitters{$emitter}, ".
-   "start: new Date('$log_start_date $start_time'), ".
-   "end: new Date('$log_start_date $end_time'), ".
-   "content: '$content_e', title: '$title_e'}";
-   }
-   last;
-   }
+foreach my $match (@event_pairs) {
+   next if ($type ne $match->{type});
+   next if (defined $match->{emitter} && !($emitter =~ 
m/$match->{emitter}/));
+
+   my $start = $match->{start};
+   my $end = $match->{end};
+   my $key = $type.$emitter.$start;
+   if ($message =~ m/$start/) {
+   defined $pair_starts{$key} && die "event $start ($end) starts and 
fails to finish";
+   $pair_starts{$key} = $time;
+   last;
+   } elsif ($message =~ m/$end/) {
+   defined $pair_starts{$key} || die "event $start ($end) ends but 
failed to start";
+
+   my $content_e = escape($start);
+   my $title_e = escape($line);
+   my $start_time = $pair_starts{$key};
+   my $end_time = $time;
+
+   if ($json)
+   {
+   my $dur = $end_time - $start_time;
+   my $ms = int ($dur / 1000.0);
+   push @events, "{\"pid\":$pid, \"tid\":$tid, \"ts\":$start_time, 
\"dur\":$dur, \"ph\":\"X\", \"name\":\"$title_e\", \"args\":{ \"ms\":$ms } }";
+   }
+   else
+   {
+   my $id = (scalar @events) + 1;
+   push @events,

Re: [TDF infra] Announcing Gitiles VCS browser (gitweb replacement) and https:// anon git URIs

2019-04-04 Thread Luke Benes

Switching to hub redirection solves the annoying symbols that Gitiles appends 
to URLs leading to copy and paste errors and the timestamp issue. But it does 
not address:

* Lack of Built-in, easy to use search functionality
* Lack of branch tags, allowing you to see what release you are on when going 
through the master log
*cgit is a cleaner, easier to read interface

I have noticed that both QA and Developers continue to post cgit links on the 
bug tracker. When I have asked on IRC, no developers or QA members voiced 
support for using Gitiles. 

So unless someone has some compelling reasons to keep it, I respectfully ask 
that the Commit Notification Bot be switch back to cgit. We have tried to use 
it, and as far as I can tell, universally dislike it.

-Luke
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [GSoC] Subpixel glyph positioning - Looking for a mentor

2019-04-04 Thread Alexander Farrow

Hi Jan-Marek,

Thank you for your reply.

    I have added some potential mentors, which are normally also interested 
in font
    rendering. As much as I could potentially do some mentoring, as I know 
a share
    of SalLayout and VCL, I have just minimal idea about text rendering, 
mainly from
    the time writing the Qt5 VCL backend. I'm willing to do some larger 
share of it.
    Someone of you want to share?

I'm extremely glad to hear that you are happy to be a mentor for this project, 
as
I am very keen to continue working on this for GSoC. Thank you for CC'ing Mike 
and
Khaled, hopefully we can find another mentor to join us on this project.

    There is also https://gerrit.libreoffice.org/#/c/62219 


    Interesting post for a different problem with the same solution: 
Getting real
    linearly-scalable text
    (https://lists.cairographics.org/archives/cairo/2008-May/014149.html 
)
    But it's also 10 years old...

    The image link still works and show the (potentially long fixed?) 
problem
    https://www.flickr.com/photos/behdad/2493693932/sizes/o 


    Then there is
    
https://www.unicodeconference.org/presentations/S5T2-Röttsches-Esfahbod.pdf 

    - that's from 2016.
    It's not about positioning, but a nice overview of Chromes text 
rendering
    evolution, as Behdad Esfahbod is working for Google for quite some time.

Thanks for the links, I'll give them a read through. Any resources regarding 
text
rendering are greatly appreciated.

I've continued familiarising myself with the text layout code and I've got a 
couple
of simple patches to submit for review. I've finished looking into how to change
GlyphItem to use floating point values for glyph positioning and I'm now looking
into how to change DeviceCoordinate from a long to a double.

I think to move forward with the project the next step is to get the proposal 
finished
and submitted. I've got the first draft ready and although it is a WIP I was 
wondering
if I could send it to you for some feedback?

I look forward to working with you on this project.

Thanks,
Alex (IRC: AlexanderFarrow)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: minutes of ESC call ...

2019-04-04 Thread Oliver Brinzing


Hi,


 + 6.1.6 rc1: April 9 next week >  + Most pressing bugs:

Could someone please take a look at issue

crash: use of "com.sun.star.ui.dialogs.FolderPicker" service from java seems to 
cause crashes
https://bugs.documentfoundation.org/show_bug.cgi?id=123502

it affects windows 7/10 and is reproducible with LO 6.1.5.2 but not with LO 
6.1.4.2.

Regards
Oliver
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: configure.ac vcl/headless vcl/source

2019-04-04 Thread Caolán McNamara (via logerrit)

 configure.ac  |2 +-
 vcl/headless/svpgdi.cxx   |   23 ++-
 vcl/source/bitmap/BitmapTools.cxx |4 
 3 files changed, 27 insertions(+), 2 deletions(-)

New commits:
commit 3c6c56b107d71d5f4790be0b76299e8f215f88cc
Author: Caolán McNamara 
AuthorDate: Thu Apr 4 15:56:29 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 4 18:07:53 2019 +0200

Revert "raise cairo baseline to 1.12.0"

This reverts commit 50580f452cc7c88a231831619a3f05958ce56460.

Revert "raise cairo baseline to 1.10.0"

This reverts commit 58a0e60dee0d27a699f856827c20b792417d3478.

32bit baseline is currently at cairo 1.8.8

Change-Id: I5156df6aee03dbbb2e209dbd5717a98580256170
Reviewed-on: https://gerrit.libreoffice.org/70260
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/configure.ac b/configure.ac
index 02ea8809de4b..befe75bbac3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11600,7 +11600,7 @@ if test "$test_cairo" = "yes"; then
 SYSTEM_CAIRO=TRUE
 AC_MSG_RESULT([yes])
 
-PKG_CHECK_MODULES( CAIRO, cairo >= 1.12.0 )
+PKG_CHECK_MODULES( CAIRO, cairo >= 1.8.0 )
 CAIRO_CFLAGS=$(printf '%s' "$CAIRO_CFLAGS" | sed -e 
"s/-I/${ISYSTEM?}/g")
 FilterLibs "${CAIRO_LIBS}"
 CAIRO_LIBS="${filteredlibs}"
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index b072bf946cdc..2cf49ca17696 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -47,6 +47,12 @@
 #include 
 #include 
 
+#if ENABLE_CAIRO_CANVAS
+#   if defined CAIRO_VERSION && CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 10, 0)
+#  define CAIRO_OPERATOR_DIFFERENCE (static_cast(23))
+#   endif
+#endif
+
 namespace
 {
 basegfx::B2DRange getClipBox(cairo_t* cr)
@@ -1739,7 +1745,11 @@ std::shared_ptr SvpSalGraphics::getBitmap( 
long nX, long nY, long nWi
 
 Color SvpSalGraphics::getPixel( long nX, long nY )
 {
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0)
 cairo_surface_t *target = cairo_surface_create_similar_image(m_pSurface, 
CAIRO_FORMAT_ARGB32, 1, 1);
+#else
+cairo_surface_t *target = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 
1, 1);
+#endif
 
 cairo_t* cr = cairo_create(target);
 
@@ -1795,7 +1805,14 @@ void SvpSalGraphics::invert(const basegfx::B2DPolygon 
&rPoly, SalInvert nFlags)
 
 cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
 
-cairo_set_operator(cr, CAIRO_OPERATOR_DIFFERENCE);
+if (cairo_version() >= CAIRO_VERSION_ENCODE(1, 10, 0))
+{
+cairo_set_operator(cr, CAIRO_OPERATOR_DIFFERENCE);
+}
+else
+{
+SAL_WARN("vcl.gdi", "SvpSalGraphics::invert, archaic cairo");
+}
 
 if (nFlags & SalInvert::TrackFrame)
 {
@@ -1973,7 +1990,11 @@ cairo_surface_t* 
SvpSalGraphics::createCairoSurface(const BitmapBuffer *pBuffer)
 
 cairo_t* SvpSalGraphics::createTmpCompatibleCairoContext() const
 {
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0)
 cairo_surface_t *target = cairo_surface_create_similar_image(m_pSurface,
+#else
+cairo_surface_t *target = cairo_image_surface_create(
+#endif
 CAIRO_FORMAT_ARGB32,
 m_aFrameSize.getX() * m_fScale,
 m_aFrameSize.getY() * m_fScale);
diff --git a/vcl/source/bitmap/BitmapTools.cxx 
b/vcl/source/bitmap/BitmapTools.cxx
index 212557d3c28a..6f14c3526d42 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -236,7 +236,11 @@ BitmapEx* CreateFromCairoSurface(Size aSize, 
cairo_surface_t * pSurface)
 // FIXME: if we could teach VCL/ about cairo handles, life could
 // be significantly better here perhaps.
 
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0)
 cairo_surface_t *pPixels = cairo_surface_create_similar_image(pSurface,
+#else
+cairo_surface_t *pPixels = cairo_image_surface_create(
+#endif
 CAIRO_FORMAT_ARGB32, aSize.Width(), aSize.Height());
 cairo_t *pCairo = cairo_create( pPixels );
 if( !pPixels || !pCairo || cairo_status(pCairo) != CAIRO_STATUS_SUCCESS )
___
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-3' - sc/source

2019-04-04 Thread Jaromir Wysoglad (via logerrit)

 sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 7708861765dae49a60386774970db21e598be7c1
Author: Jaromir Wysoglad 
AuthorDate: Thu Mar 28 19:55:23 2019 +0100
Commit: Michael Weghorn 
CommitDate: Thu Apr 4 17:28:23 2019 +0200

tdf#121103 ANOVA sum of squares formula correction

The ANOVA sum of squares is now hardcoded to use '$Sheet?' in the
source cell addless every time.

Change-Id: I215b719be11ecfc2ae20c5df8e86876bc22d50f0
Reviewed-on: https://gerrit.libreoffice.org/69899
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit 66c08a0d308fd6119460546a906434bbc9d23c2e)
Reviewed-on: https://gerrit.libreoffice.org/70153
(cherry picked from commit 205f9756f70fe32db169d6f81795f4c66382d014)
Reviewed-on: https://gerrit.libreoffice.org/70183
Reviewed-by: Xisco Faulí 
Reviewed-by: Michael Weghorn 
Tested-by: Michael Weghorn 

diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx 
b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
index a655c8c1bd51..1f823fae8204 100644
--- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
@@ -67,7 +67,7 @@ OUString lclCreateMultiParameterFormula(
 OUStringBuffer aResult;
 for (size_t i = 0; i < aRangeList.size(); i++)
 {
-OUString aRangeString(aRangeList[i].Format(ScRefFlags::RANGE_ABS, 
pDocument, aAddressDetails));
+OUString aRangeString(aRangeList[i].Format(ScRefFlags::RANGE_ABS_3D, 
pDocument, aAddressDetails));
 OUString aFormulaString = aFormulaTemplate.replaceAll(aWildcard, 
aRangeString);
 aResult.append(aFormulaString);
 if(i != aRangeList.size() - 1) // Not Last
@@ -260,7 +260,6 @@ void 
ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output,
 output.nextColumn();
 
 // Sum of Squares
-
 
aTemplate.setTemplate("=SUMPRODUCT(%SUM_RANGE%;%MEAN_RANGE%)-SUM(%SUM_RANGE%)^2/SUM(%COUNT_RANGE%)");
 aTemplate.autoReplaceAddress("%BETWEEN_SS%", output.current());
 output.writeFormula(aTemplate.getTemplate());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source

2019-04-04 Thread Caolán McNamara (via logerrit)

 svx/source/svdraw/svdundo.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b8c49b1d4d4debd86c4b944b0bb2ba020ef1b030
Author: Caolán McNamara 
AuthorDate: Thu Apr 4 12:22:06 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 4 17:21:46 2019 +0200

Resolves: tdf#120754 on undoing an obj insert use its current ordinal

there may have been changes not caught by undo to the object's
ordinal, so on use of RemoveObject (or ReplaceObject) call GetOrdNum
on the object to get its current position within its parent.

We can keep nOrdNum for the desired dest position within the parent
for InsertObject

Change-Id: I3bdabf387dd630fc1fadaaa1f3d8c05e93865e4f
Reviewed-on: https://gerrit.libreoffice.org/70251
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 61b829b95249..300bcdb3a814 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -707,7 +707,7 @@ void SdrUndoRemoveObj::Redo()
 {
 ImplUnmarkObject( pObj );
 E3DModifySceneSnapRectUpdater aUpdater(pObj);
-pObjList->RemoveObject(nOrdNum);
+pObjList->RemoveObject(pObj->GetOrdNum());
 }
 
 // Trigger PageChangeCall
@@ -729,7 +729,7 @@ void SdrUndoInsertObj::Undo()
 {
 ImplUnmarkObject( pObj );
 
-SdrObject* pChkObj= pObjList->RemoveObject(nOrdNum);
+SdrObject* pChkObj= pObjList->RemoveObject(pObj->GetOrdNum());
 DBG_ASSERT(pChkObj==pObj,"UndoInsertObj: RemoveObjNum!=pObj");
 }
 }
@@ -885,7 +885,7 @@ void SdrUndoReplaceObj::Undo()
 SetNewOwner(true);
 
 ImplUnmarkObject( pNewObj );
-pObjList->ReplaceObject(pObj,nOrdNum);
+pObjList->ReplaceObject(pObj,pNewObj->GetOrdNum());
 }
 else
 {
@@ -903,7 +903,7 @@ void SdrUndoReplaceObj::Redo()
 SetNewOwner(false);
 
 ImplUnmarkObject( pObj );
-pObjList->ReplaceObject(pNewObj,nOrdNum);
+pObjList->ReplaceObject(pNewObj,pObj->GetOrdNum());
 
 }
 else
___
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-3' - vcl/source

2019-04-04 Thread Caolán McNamara (via logerrit)

 vcl/source/app/salvtables.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 0b3ceaaf9bddd74aa61e8ab934caa68a7238e405
Author: Caolán McNamara 
AuthorDate: Mon Apr 1 12:09:43 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 4 17:10:52 2019 +0200

Resolves: tdf#124440 nospin has no subedit

Change-Id: I4e801ec234e86be935a79c9e29f0e5091904f12e
Reviewed-on: https://gerrit.libreoffice.org/70053
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 
(cherry picked from commit 2c150f952fb75da271648bf76c3a1bbf32bd25da)
Reviewed-on: https://gerrit.libreoffice.org/70125
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 297926d03012..bce3b3815f06 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -2559,7 +2559,10 @@ public:
 m_xButton->SetLoseFocusHdl(LINK(this, SalInstanceSpinButton, 
LoseFocusHdl));
 m_xButton->SetOutputHdl(LINK(this, SalInstanceSpinButton, OutputHdl));
 m_xButton->SetInputHdl(LINK(this, SalInstanceSpinButton, InputHdl));
-m_xButton->GetSubEdit()->SetActivateHdl(LINK(this, 
SalInstanceSpinButton, ActivateHdl));
+if (Edit* pEdit = m_xButton->GetSubEdit())
+pEdit->SetActivateHdl(LINK(this, SalInstanceSpinButton, 
ActivateHdl));
+else
+m_xButton->SetActivateHdl(LINK(this, SalInstanceSpinButton, 
ActivateHdl));
 }
 
 virtual int get_value() const override
@@ -2621,6 +2624,8 @@ public:
 {
 if (Edit* pEdit = m_xButton->GetSubEdit())
 pEdit->SetActivateHdl(Link());
+else
+m_xButton->SetActivateHdl(Link());
 m_xButton->SetInputHdl(Link());
 m_xButton->SetOutputHdl(Link());
 m_xButton->SetLoseFocusHdl(Link());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/Package_theme_definitions.mk vcl/uiconfig

2019-04-04 Thread Tomaž Vajngerl (via logerrit)

 vcl/Package_theme_definitions.mk  |2 
 vcl/uiconfig/theme_definitions/ios/definition.xml |   19 
 vcl/uiconfig/theme_definitions/ios/spinbox-left-disabled.svg  |2 
 vcl/uiconfig/theme_definitions/ios/spinbox-left-pressed.svg   |5 
 vcl/uiconfig/theme_definitions/ios/spinbox-left-rollover.svg  |4 
 vcl/uiconfig/theme_definitions/ios/spinbox-left.svg   |2 
 vcl/uiconfig/theme_definitions/ios/spinbox-right-disabled.svg |4 
 vcl/uiconfig/theme_definitions/ios/spinbox-right-pressed.svg  |7 
 vcl/uiconfig/theme_definitions/ios/spinbox-right-rollover.svg |5 
 vcl/uiconfig/theme_definitions/ios/spinbox-right.svg  |4 
 vcl/uiconfig/theme_definitions/ios/switch-off-disabled.svg|  192 -
 vcl/uiconfig/theme_definitions/ios/switch-off-pressed.svg |  170 
 vcl/uiconfig/theme_definitions/ios/switch-off.svg |  193 --
 vcl/uiconfig/theme_definitions/ios/switch-on-disabled.svg |  157 
 vcl/uiconfig/theme_definitions/ios/switch-on-pressed.svg  |  155 
 vcl/uiconfig/theme_definitions/ios/switch-on.svg  |  157 
 vcl/uiconfig/theme_definitions/ios/tick-off-disabled.svg  |   95 
 vcl/uiconfig/theme_definitions/ios/tick-off-pressed.svg   |  135 --
 vcl/uiconfig/theme_definitions/ios/tick-off.svg   |  124 --
 vcl/uiconfig/theme_definitions/ios/tick-on-disabled.svg   |  134 --
 vcl/uiconfig/theme_definitions/ios/tick-on-pressed.svg|  125 --
 vcl/uiconfig/theme_definitions/ios/tick-on.svg|  127 --
 22 files changed, 153 insertions(+), 1665 deletions(-)

New commits:
commit 64ee37e4409dbde80bd98fb8d3f65b0146b9cb92
Author: Tomaž Vajngerl 
AuthorDate: Thu Apr 4 21:51:22 2019 +0900
Commit: Tomaž Vajngerl 
CommitDate: Thu Apr 4 16:59:26 2019 +0200

ios widget defs: update combobox, checkbox, spinbox SVGs

In addition remove spinbox pressed state (it wasn't useful) and
draw white filled empty rect for spinbox as we don't draw the
background automatically.

Change-Id: I892108c5839dc463cdb9e4f4f09276fc184f4944
Reviewed-on: https://gerrit.libreoffice.org/70258
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/Package_theme_definitions.mk b/vcl/Package_theme_definitions.mk
index dbb0a92fe268..395a90b19b6e 100644
--- a/vcl/Package_theme_definitions.mk
+++ b/vcl/Package_theme_definitions.mk
@@ -25,11 +25,9 @@ $(eval $(call 
gb_Package_add_files_with_dir,vcl_theme_definitions,$(LIBO_SHARE_F
ios/tick-on-disabled.svg \
ios/spinbox-left.svg \
ios/spinbox-left-pressed.svg \
-   ios/spinbox-left-rollover.svg \
ios/spinbox-left-disabled.svg \
ios/spinbox-right.svg \
ios/spinbox-right-pressed.svg \
-   ios/spinbox-right-rollover.svg \
ios/spinbox-right-disabled.svg \
ios/common-rect.svg \
ios/common-rect-disabled.svg \
diff --git a/vcl/uiconfig/theme_definitions/ios/definition.xml 
b/vcl/uiconfig/theme_definitions/ios/definition.xml
index 5b4aa12b44ea..61d6aa21578e 100644
--- a/vcl/uiconfig/theme_definitions/ios/definition.xml
+++ b/vcl/uiconfig/theme_definitions/ios/definition.xml
@@ -102,7 +102,7 @@
 
 
 
-
+
 
 
 
@@ -113,7 +113,7 @@
 
 
 
-
+

 
 
@@ -130,7 +130,7 @@
 
 
 
-
+
 
 
 
@@ -192,8 +192,7 @@
 
 
 
-
-
+ 
 
 
 
@@ -212,7 +211,9 @@
 
 
 
- 
+
+
+
 
 
  
@@ -224,9 +225,6 @@
 
 
 
-
-
-
 
 
 
@@ -238,9 +236,6 @@
 
 
 
-
-
-
 
 
 
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-left-disabled.svg 
b/vcl/uiconfig/theme_definitions/ios/spinbox-left-disabled.svg
index b239b8e239b9..01cac0c3e881 100644
--- a/vcl/uiconfig/theme_definitions/ios/spinbox-left-disabled.svg
+++ b/vcl/uiconfig/theme_definitions/ios/spinbox-left-disabled.svg
@@ -1,4 +1,4 @@
 http://www.w3.org/2000/svg";>
  
- 
+ 
 
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-left-pressed.svg 
b/vcl/uiconfig/theme_definitions/ios/spinbox-left-pressed.svg
index 1ddc6503b087..df8c90cccb89 100644
--- a/vcl/uiconfig/theme_definitions/ios/spinbox-left-pressed.svg
+++ b/vcl/uiconfig/theme_definitions/ios/spinbox-left-pressed.svg
@@ -1,4 +1,5 @@
 http://www.w3.org/2000/svg";>
- 
- 
+ 
+ 
+ 
 
diff --git a/vcl/uic

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - vcl/source

2019-04-04 Thread Tor Lillqvist (via logerrit)

 vcl/source/filter/ipdf/pdfread.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit cba5d19a4e0c929cafbeccbaaa1da63ee1ec20b5
Author: Tor Lillqvist 
AuthorDate: Thu Apr 4 17:53:38 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Apr 4 17:54:39 2019 +0300

Fix compilation in !HAVE_FEATURE_PDFIUM case

Change-Id: Ifc5e82f9bf57c76abe8810911f8f4339f9763453

diff --git a/vcl/source/filter/ipdf/pdfread.cxx 
b/vcl/source/filter/ipdf/pdfread.cxx
index 87bfdc60b629..e1d5c5b9b890 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -292,6 +292,7 @@ size_t ImportPDF(const OUString& rURL, std::vector& 
rBitmaps,
 size_t ImportPDFUnloaded(const OUString& rURL, std::vector>& rGraphics,
  const double fResolutionDPI)
 {
+#if HAVE_FEATURE_PDFIUM
 std::unique_ptr xStream(
 ::utl::UcbStreamHelper::CreateStream(rURL, StreamMode::READ | 
StreamMode::SHARE_DENYNONE));
 
@@ -359,6 +360,13 @@ size_t ImportPDFUnloaded(const OUString& rURL, 
std::vectorhttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

minutes of ESC call ...

2019-04-04 Thread Michael Meeks

* Present:
+ Stephan, Caolan, Christian, Michael M, Gabriel, Eduard A, Miklos,
  Heiko, Kendy, Xisco, Sophie, Olivier, Michael S, Eike, Sophie,
  Thorsten, Olivier, Michael W

* Completed Action Items:
+ take a look at symbol / crashtest bits (Markus, Christian)
  [ server ran out of disk-space so couldn’t process them → now fixed ]
+ get Laurent Alonso commit access (Miklos)
+ talk to Tor / Nicolas if avoiding UNCONFIRMED for iOS makes sense (Miklos)
  [ seems like it is sorted ]
+ looking for mentor for idea “Calc Functions Sidebar” (Heiko)
  + 
https://lists.freedesktop.org/archives/libreoffice/2019-March/082315.html
  [ too late ]
+ review/update GSOC ideas page! (Mentors)
  + https://wiki.documentfoundation.org/Development/GSoC/Ideas
  [ also expired ]

* Pending Action Items:
+ add monitoring for build bot daily failure rates (Christian)
[ done manually for now – should be done next week ]

* Release Engineering update (Christian)
+ no release this week.
+ 6.2.3 rc1 available on mirrors
+ 6.2.3 rc2 – available next week.
+ 6.1.6 rc1: April 9 next week
   + tagging Thur after 6.2.3
+ 6.3 alpha1: early May
+ Remotes → no updates
+ Android viewer
   + Maven repo is published up to 6.0.4 – rest later today (Christian)
+ Online:

* Documentation (Olivier)
+ New Help
   + Replacement icons now in gbuild (ohallot, buovjaga)
   + have a donation button in the help too now.
+ Help contents 2
   + Housekeeping and maintenance (ohallot, libreofficiant, A.Gelmini)
+ Google season of Code / Docs
   + registered TDF as organization (ohallot)
   + working on projects (ohallot djredaux)
   + would love suggestions for simple projects so 
 we can find tech. writers
   + “Easy-doc”.
   + not for students but for technical writers.
   + https://wiki.documentfoundation.org/Documentation/GSoDOC/2019
+ Guides 
   + more updated on Calc Guide (J. Weber)  

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
243(243) (topicUI) bugs open, 225(225) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week   1 month   3 months   12 months  
 added  5(0) 14(0) 31(1)   78(-1) 
 commented 47(-7)   175(9)497(55)1384(8)  
   removed  1(1)  6(1) 10(1)   20(0)  
  resolved  4(-4)21(-3)60(1)  133(1)  
+ top 10 contributors:
  Tietze, Heiko made 70 changes in 1 month, and 567 changes in 1 year
  dieterp made 39 changes in 1 month, and 157 changes in 1 year
  Foote, V Stuart made 32 changes in 1 month, and 217 changes in 1 year
  Roman Kuznetsov made 31 changes in 1 month, and 144 changes in 1 year
  Xisco Faulí made 29 changes in 1 month, and 241 changes in 1 year
  Mehrbrodt, Samuel made 25 changes in 1 month, and 80 changes in 1 year
  Cor Nouws made 10 changes in 1 month, and 108 changes in 1 year
  Jim Raykowski made 9 changes in 1 month, and 27 changes in 1 year
  和尚蟹 made 9 changes in 1 month, and 17 changes in 1 year
  Alexander Farrow made 8 changes in 1 month, and 8 changes in 1 year
  New needsUXEval between Mar/28-Apr/04

* Sidebar Separator lines
  + https://bugs.documentfoundation.org/show_bug.cgi?id=124376
* calc menubar: SheetCommentMenu should be in EditMenu instead of
  SheetMenu
  + https://bugs.documentfoundation.org/show_bug.cgi?id=124523
* LO request to enhancement: make the '?' sign workable in Help -> About
  + https://bugs.documentfoundation.org/show_bug.cgi?id=124541
=> in discussion

* Tabbed: Missing Some Required Functions from Previous Pop Up Toolbar
  in Tabbed interface
  + https://bugs.documentfoundation.org/show_bug.cgi?id=122751
* FRAME-DIALOG: Add an apply button
  + https://bugs.documentfoundation.org/show_bug.cgi?id=124278
   ->   * 'Pick a Color' dialog: Give option to add a color to the custom
  palette
  + https://bugs.documentfoundation.org/show_bug.cgi?id=124418
   ->   * Change case -> Sentence case doesn't honor selection; case of entire
  sentence changes
  + https://bugs.documentfoundation.org/show_bug.cgi?id=49033
* Redundant undo/redo items in grouped compact bar
  + https://bugs.documentfoundation.org/show_bug.cgi?id=124392
=> accepted/forwarded

   ->   * Change bullet styles names in Style section of Sidebar in Writer
  + https://bugs.documentfoundation.org/show_bug.cgi?id=124471
=> fixed today.

* toggeling settings - e.g. threaded calculations - need restart, UI
  unclear about this
  + https://bugs.documentfoundation.org/show_bug.cgi?id=124323
* Unable to use keyboard navigation to

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2-3' - configure.ac download.lst external/python3

2019-04-04 Thread Michael Stahl (via logerrit)

 configure.ac|2 
 download.lst|4 -
 external/python3/UnpackedTarball_python3.mk |1 
 external/python3/python-3.5.7-c99.patch.1   |   62 
 4 files changed, 66 insertions(+), 3 deletions(-)

New commits:
commit e4fcef6ee19755b93213beb0d853a513c619f377
Author: Michael Stahl 
AuthorDate: Wed Apr 3 11:03:17 2019 +0200
Commit: Caolán McNamara 
CommitDate: Thu Apr 4 16:31:23 2019 +0200

python3: upgrade to release 3.5.7

Fixes CVE-2019-9636 CVE-2019-5010 CVE-2018-14647

Change-Id: If0a115960aed1ee90b63e6716c844669f0ec91e5
Reviewed-on: https://gerrit.libreoffice.org/70182
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 3c7354a85a9bd47a2676aadaad2f6622fe2d959c)
Reviewed-on: https://gerrit.libreoffice.org/70192
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 746a749a675859107bf959c0fce128f3b13188d8)
Reviewed-on: https://gerrit.libreoffice.org/70224
Reviewed-by: Michael Weghorn 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/configure.ac b/configure.ac
index 758dac7d2454..f544308bdcc3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8443,7 +8443,7 @@ internal)
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=5
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.6
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.7
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index bc6adeabc8c5..877497006626 100644
--- a/download.lst
+++ b/download.lst
@@ -210,8 +210,8 @@ export POPPLER_SHA256SUM := 
92e09fd3302567fd36146b36bb707db43ce436e8841219025a82
 export POPPLER_TARBALL := poppler-0.74.0.tar.xz
 export POSTGRESQL_SHA256SUM := 
a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126
 export POSTGRESQL_TARBALL := postgresql-9.2.24.tar.bz2
-export PYTHON_SHA256SUM := 
f55cde04f521f273c7cba08912921cc5642cfc15ca7b22d5829f0aff4371155f
-export PYTHON_TARBALL := Python-3.5.6.tar.xz
+export PYTHON_SHA256SUM := 
285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc
+export PYTHON_TARBALL := Python-3.5.7.tar.xz
 export QXP_SHA256SUM := 
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
 export QXP_TARBALL := libqxp-0.0.2.tar.xz
 export RAPTOR_SHA256SUM := 
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
diff --git a/external/python3/UnpackedTarball_python3.mk 
b/external/python3/UnpackedTarball_python3.mk
index ec1bdabe4fdd..66a82955e440 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/ubsan.patch.0 \
external/python3/python-3.5.tweak.strip.soabi.patch \

external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1
 \
+   external/python3/python-3.5.7-c99.patch.1 \
 ))
 
 ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),)
diff --git a/external/python3/python-3.5.7-c99.patch.1 
b/external/python3/python-3.5.7-c99.patch.1
new file mode 100644
index ..558166d9953f
--- /dev/null
+++ b/external/python3/python-3.5.7-c99.patch.1
@@ -0,0 +1,62 @@
+remove C99 which isn't suppored by all compilers yet
+
+--- python3/Modules/_pickle.c.orig 2019-04-03 16:34:01.380124314 +0200
 python3/Modules/_pickle.c  2019-04-03 16:35:18.579005171 +0200
+@@ -674,9 +674,12 @@
+ PyErr_NoMemory();
+ return NULL;
+ }
+-for (size_t i = 0; i < self->mt_allocated; i++) {
++{
++size_t i;
++for (i = 0; i < self->mt_allocated; i++) {
+ Py_XINCREF(self->mt_table[i].me_key);
+ }
++}
+ memcpy(new->mt_table, self->mt_table,
+sizeof(PyMemoEntry) * self->mt_allocated);
+ 
+@@ -4204,7 +4207,9 @@
+ return NULL;
+ 
+ memo = self->pickler->memo;
+-for (size_t i = 0; i < memo->mt_allocated; ++i) {
++{
++size_t i;
++for (i = 0; i < memo->mt_allocated; ++i) {
+ PyMemoEntry entry = memo->mt_table[i];
+ if (entry.me_key != NULL) {
+ int status;
+@@ -4225,6 +4230,7 @@
+ goto error;
+ }
+ }
++}
+ return new_memo;
+ 
+   error:
+@@ -6791,10 +6797,13 @@
+ if (new_memo == NULL)
+ return -1;
+ 
+-for (size_t i = 0; i < new_memo_size; i++) {
++{
++size_t i;
++for (i = 0; i < new_memo_size; i++) {
+ Py_XINCREF(unpickler->memo[i]);
+ new_memo[i] = unpickler->memo[i];
+ }
++}
+ }
+ else if (PyDict_Check(obj)) {
+ Py_ssize_t i = 0;
+@@ -6839,7 +6848,8 @@
+ 
+   error:
+ if (new_memo_s

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - vcl/Package_theme_definitions.mk vcl/uiconfig

2019-04-04 Thread Tomaž Vajngerl (via logerrit)

 vcl/Package_theme_definitions.mk  |2 
 vcl/uiconfig/theme_definitions/ios/definition.xml |   19 
 vcl/uiconfig/theme_definitions/ios/spinbox-left-disabled.svg  |2 
 vcl/uiconfig/theme_definitions/ios/spinbox-left-pressed.svg   |5 
 vcl/uiconfig/theme_definitions/ios/spinbox-left-rollover.svg  |4 
 vcl/uiconfig/theme_definitions/ios/spinbox-left.svg   |2 
 vcl/uiconfig/theme_definitions/ios/spinbox-right-disabled.svg |4 
 vcl/uiconfig/theme_definitions/ios/spinbox-right-pressed.svg  |7 
 vcl/uiconfig/theme_definitions/ios/spinbox-right-rollover.svg |5 
 vcl/uiconfig/theme_definitions/ios/spinbox-right.svg  |4 
 vcl/uiconfig/theme_definitions/ios/switch-off-disabled.svg|  192 -
 vcl/uiconfig/theme_definitions/ios/switch-off-pressed.svg |  170 
 vcl/uiconfig/theme_definitions/ios/switch-off.svg |  193 --
 vcl/uiconfig/theme_definitions/ios/switch-on-disabled.svg |  157 
 vcl/uiconfig/theme_definitions/ios/switch-on-pressed.svg  |  155 
 vcl/uiconfig/theme_definitions/ios/switch-on.svg  |  157 
 vcl/uiconfig/theme_definitions/ios/tick-off-disabled.svg  |   95 
 vcl/uiconfig/theme_definitions/ios/tick-off-pressed.svg   |  135 --
 vcl/uiconfig/theme_definitions/ios/tick-off.svg   |  124 --
 vcl/uiconfig/theme_definitions/ios/tick-on-disabled.svg   |  134 --
 vcl/uiconfig/theme_definitions/ios/tick-on-pressed.svg|  125 --
 vcl/uiconfig/theme_definitions/ios/tick-on.svg|  127 --
 22 files changed, 153 insertions(+), 1665 deletions(-)

New commits:
commit ad75f60e5fb00b4c7583c74c835ffcbc3058afe8
Author: Tomaž Vajngerl 
AuthorDate: Thu Apr 4 21:51:22 2019 +0900
Commit: Tomaž Vajngerl 
CommitDate: Thu Apr 4 22:47:27 2019 +0900

ios widget defs: update combobox, checkbox, spinbox SVGs

In addition remove spinbox pressed state (it wasn't useful) and
draw white filled empty rect for spinbox as we don't draw the
background automatically.

Change-Id: I892108c5839dc463cdb9e4f4f09276fc184f4944

diff --git a/vcl/Package_theme_definitions.mk b/vcl/Package_theme_definitions.mk
index dbb0a92fe268..395a90b19b6e 100644
--- a/vcl/Package_theme_definitions.mk
+++ b/vcl/Package_theme_definitions.mk
@@ -25,11 +25,9 @@ $(eval $(call 
gb_Package_add_files_with_dir,vcl_theme_definitions,$(LIBO_SHARE_F
ios/tick-on-disabled.svg \
ios/spinbox-left.svg \
ios/spinbox-left-pressed.svg \
-   ios/spinbox-left-rollover.svg \
ios/spinbox-left-disabled.svg \
ios/spinbox-right.svg \
ios/spinbox-right-pressed.svg \
-   ios/spinbox-right-rollover.svg \
ios/spinbox-right-disabled.svg \
ios/common-rect.svg \
ios/common-rect-disabled.svg \
diff --git a/vcl/uiconfig/theme_definitions/ios/definition.xml 
b/vcl/uiconfig/theme_definitions/ios/definition.xml
index 5b4aa12b44ea..61d6aa21578e 100644
--- a/vcl/uiconfig/theme_definitions/ios/definition.xml
+++ b/vcl/uiconfig/theme_definitions/ios/definition.xml
@@ -102,7 +102,7 @@
 
 
 
-
+
 
 
 
@@ -113,7 +113,7 @@
 
 
 
-
+

 
 
@@ -130,7 +130,7 @@
 
 
 
-
+
 
 
 
@@ -192,8 +192,7 @@
 
 
 
-
-
+ 
 
 
 
@@ -212,7 +211,9 @@
 
 
 
- 
+
+
+
 
 
  
@@ -224,9 +225,6 @@
 
 
 
-
-
-
 
 
 
@@ -238,9 +236,6 @@
 
 
 
-
-
-
 
 
 
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-left-disabled.svg 
b/vcl/uiconfig/theme_definitions/ios/spinbox-left-disabled.svg
index b239b8e239b9..01cac0c3e881 100644
--- a/vcl/uiconfig/theme_definitions/ios/spinbox-left-disabled.svg
+++ b/vcl/uiconfig/theme_definitions/ios/spinbox-left-disabled.svg
@@ -1,4 +1,4 @@
 http://www.w3.org/2000/svg";>
  
- 
+ 
 
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-left-pressed.svg 
b/vcl/uiconfig/theme_definitions/ios/spinbox-left-pressed.svg
index 1ddc6503b087..df8c90cccb89 100644
--- a/vcl/uiconfig/theme_definitions/ios/spinbox-left-pressed.svg
+++ b/vcl/uiconfig/theme_definitions/ios/spinbox-left-pressed.svg
@@ -1,4 +1,5 @@
 http://www.w3.org/2000/svg";>
- 
- 
+ 
+ 
+ 
 
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-left-rollover.svg 
b/vcl/uiconfig/theme_definitions/ios/spinbox-left-rollo

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 3 commits - cui/source cui/uiconfig include/tools include/vcl vcl/Package_theme_definitions.mk vcl/source vcl/uiconfig

2019-04-04 Thread Tomaž Vajngerl (via logerrit)

 cui/source/inc/cuitabarea.hxx |2 
 cui/source/tabpages/tparea.cxx|2 
 cui/source/tabpages/tpgradnt.cxx  |   27 +-
 cui/uiconfig/ui/gradientpage.ui   |  112 --
 include/tools/gen.hxx |6 
 include/vcl/slider.hxx|1 
 vcl/Package_theme_definitions.mk  |1 
 vcl/source/control/slider.cxx |   55 +++-
 vcl/uiconfig/theme_definitions/ios/definition.xml |   15 +
 vcl/uiconfig/theme_definitions/ios/slider-button-disabled.svg |3 
 10 files changed, 136 insertions(+), 88 deletions(-)

New commits:
commit c19d924a3abefe396beda2772ab8a7cf3c9527f8
Author: Tomaž Vajngerl 
AuthorDate: Thu Apr 4 10:56:40 2019 +0900
Commit: Tomaž Vajngerl 
CommitDate: Thu Apr 4 22:22:43 2019 +0900

ios theme definition: add slider disabled state

Change-Id: Ie4388f00c4a0c11df77782691fe9ea7f706d2b5c
Reviewed-on: https://gerrit.libreoffice.org/70231
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit aa5abc875934990d1ecec17abc6c58d51afd10b1)

diff --git a/vcl/Package_theme_definitions.mk b/vcl/Package_theme_definitions.mk
index 8f551ebaa8ce..dbb0a92fe268 100644
--- a/vcl/Package_theme_definitions.mk
+++ b/vcl/Package_theme_definitions.mk
@@ -53,6 +53,7 @@ $(eval $(call 
gb_Package_add_files_with_dir,vcl_theme_definitions,$(LIBO_SHARE_F
ios/arrow-up.svg \
ios/arrow-down.svg \
ios/slider-button.svg \
+   ios/slider-button-disabled.svg \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/uiconfig/theme_definitions/ios/definition.xml 
b/vcl/uiconfig/theme_definitions/ios/definition.xml
index 0f0823193857..5b4aa12b44ea 100644
--- a/vcl/uiconfig/theme_definitions/ios/definition.xml
+++ b/vcl/uiconfig/theme_definitions/ios/definition.xml
@@ -295,14 +295,20 @@
 
 
 
-
+
 
 
+
+
+
 
 
-
+
 
 
+
+
+
 
 
 
@@ -310,9 +316,12 @@
 
 
 
-
+
 
 
+
+
+
 
 
 
diff --git a/vcl/uiconfig/theme_definitions/ios/slider-button-disabled.svg 
b/vcl/uiconfig/theme_definitions/ios/slider-button-disabled.svg
new file mode 100644
index ..3c3b9fc56c2e
--- /dev/null
+++ b/vcl/uiconfig/theme_definitions/ios/slider-button-disabled.svg
@@ -0,0 +1,3 @@
+http://www.w3.org/2000/svg";>
+ 
+
commit 3a2cfc646afe5e2b8a1ff0bdb215897931268ba6
Author: Tomaž Vajngerl 
AuthorDate: Wed Apr 3 22:11:41 2019 +0900
Commit: Tomaž Vajngerl 
CommitDate: Thu Apr 4 22:21:41 2019 +0900

tdf#124155 fix slider to not go beyond rect bounds

We need to ask the NWF for the size of the thumb and not just use
the hard-coded value.

Reviewed-on: https://gerrit.libreoffice.org/70201
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 9956cf0692058414ef3efdb0e8058fbb0b39f6bc)

Change-Id: I98c6b5782c6a043fc358198ddf844d36d7aa90d6

diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx
index 426727c15ae7..ab7c035e52cc 100644
--- a/include/vcl/slider.hxx
+++ b/include/vcl/slider.hxx
@@ -36,6 +36,7 @@ private:
 longmnThumbPixOffset;
 longmnThumbPixRange;
 longmnThumbPixPos;
+longmnThumbSize;
 longmnChannelPixOffset;
 longmnChannelPixRange;
 longmnChannelPixTop;
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index c2af3bf820bc..f5f3984ad158 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -29,7 +29,6 @@
 #define SLIDER_STATE_THUMB_DOWN ((sal_uInt16)0x0004)
 
 #define SLIDER_THUMB_SIZE   9
-#define SLIDER_THUMB_HALFSIZE   4
 #define SLIDER_CHANNEL_OFFSET   0
 #define SLIDER_CHANNEL_SIZE 4
 #define SLIDER_CHANNEL_HALFSIZE 2
@@ -43,6 +42,7 @@ void Slider::ImplInit( vcl::Window* pParent, WinBits nStyle )
 mnThumbPixOffset= 0;
 mnThumbPixRange = 0;
 mnThumbPixPos   = 0;// between mnThumbPixOffset and 
mnThumbPixOffset+mnThumbPixRange
+mnThumbSize = SLIDER_THUMB_SIZE;
 mnChannelPixOffset  = 0;
 mnChannelPixRange   = 0;
 mnChannelPixTop = 0;
@@ -116,8 +116,8 @@ void Slider::ImplUpdateRects( bool bUpdate )
 {
 if ( GetStyle() & WB_HORZ )
 {
-maThumbRect.Left()  = mnThumbPixPos-SLIDER_THUMB_HALFSIZE;
-maThumbRect.Right() = maThumbRect.Left()+SLIDER_THUMB_SIZE-1;

[Libreoffice-commits] core.git: sfx2/source

2019-04-04 Thread Caolán McNamara (via logerrit)

 sfx2/source/dialog/dinfdlg.cxx |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 9db7130e05b79fdcb9a60a3f1f4801e5401427de
Author: Caolán McNamara 
AuthorDate: Thu Apr 4 13:09:17 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 4 15:29:27 2019 +0200

Resolves: tdf#122780 limit massive template names in ui to a sane length

Change-Id: I053b30b00dbda67819af68020e2f6fa4a5b5134e
Reviewed-on: https://gerrit.libreoffice.org/70255
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 5e411b37fb82..a3d0fedd6531 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -948,8 +948,14 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet )
 const SfxDocumentInfoItem& rInfoItem = rSet->Get(SID_DOCINFO);
 
 // template data
-if ( rInfoItem.HasTemplate() )
-m_xTemplValFt->set_label( rInfoItem.getTemplateName() );
+if (rInfoItem.HasTemplate())
+{
+const OUString& rName = rInfoItem.getTemplateName();
+if (rName.getLength() > SAL_MAX_INT16) // tdf#122780 pick some 
~arbitrary max size
+m_xTemplValFt->set_label(rName.copy(0, SAL_MAX_INT16));
+else
+m_xTemplValFt->set_label(rName);
+}
 else
 {
 m_xTemplFt->hide();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/oox oox/source sd/source sw/source

2019-04-04 Thread Mike Kaganski (via logerrit)

 include/oox/export/utils.hxx |2 -
 oox/source/export/chartexport.cxx|   11 ---
 oox/source/export/drawingml.cxx  |   38 ++-
 oox/source/export/shapes.cxx |   17 +++-
 sd/source/filter/eppt/pptx-animations.cxx|   23 
 sd/source/filter/eppt/pptx-epptooxml.cxx |   22 +++
 sw/source/filter/ww8/docxattributeoutput.cxx |2 -
 7 files changed, 61 insertions(+), 54 deletions(-)

New commits:
commit 4a4b1df72909fe96acdbcb95f90e30bd1a79c5eb
Author: Mike Kaganski 
AuthorDate: Wed Mar 27 10:07:31 2019 +0100
Commit: Mike Kaganski 
CommitDate: Thu Apr 4 15:24:49 2019 +0200

Get rid of USS macro

The helper marco is used in export code to convert UTF-16 internal
string representation to UTF-8 used in XML encoding. I suppose that all
strings here should be already valid UTF-16 (an invalid input should
have been validated at import/input stage). An invalid string at this
stage means a programming error in another part of code that breaks this
precondition, and should not be handled at export stage.
(See also commit 0267a2326b5282023e8b08a147eca178c5db1980.)

This effectively changes flags used in conversion from UTF-16 to UTF-8,
so that now RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR is used instead of
RTL_UNICODETOTEXT_FLAGS_INVALID_DEFAULT, so that the result would be
truncated on invalid bytes instead of inserting U+FFFD, and would fail
assertion in debug builds.
Other changed flags don't affect UTF-16-to-UTF-8 conversion.

Change-Id: I12b2cc5378208904c3266924187d6402700ed6f3
Reviewed-on: https://gerrit.libreoffice.org/69801
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/include/oox/export/utils.hxx b/include/oox/export/utils.hxx
index fbe4c806dd70..fa758089136e 100644
--- a/include/oox/export/utils.hxx
+++ b/include/oox/export/utils.hxx
@@ -59,8 +59,6 @@ static constexpr const char* ToPsz10(bool b)
 return b ? "1" : "0";
 }
 
-#define USS(x) OUStringToOString( x, RTL_TEXTENCODING_UTF8 ).getStr()
-
 static constexpr sal_Int64 PPTtoEMU( sal_Int32 nPPT )
 {
 return static_cast( static_cast(nPPT) * 1587.5 );
diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 062636c91d62..5641d62119a1 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -457,7 +457,7 @@ void ChartExport::WriteChartObj( const Reference< XShape >& 
xShape, sal_Int32 nI
 
 pFS->singleElementNS( mnXmlNamespace, XML_cNvPr,
   XML_id, I32S( nID ),
-  XML_name,   USS( sName ),
+  XML_name,   sName.toUtf8(),
   FSEND );
 
 pFS->singleElementNS( mnXmlNamespace, XML_cNvGraphicFramePr,
@@ -526,9 +526,9 @@ void ChartExport::WriteChartObj( const Reference< XShape >& 
xShape, sal_Int32 nI
 
 XmlFilterBase* pFB = GetFB();
 pFS->singleElement(  FSNS( XML_c, XML_chart ),
-FSNS( XML_xmlns, XML_c ), 
OUStringToOString(pFB->getNamespaceURL(OOX_NS(dmlChart)), 
RTL_TEXTENCODING_UTF8).getStr(),
-FSNS( XML_xmlns, XML_r ), 
OUStringToOString(pFB->getNamespaceURL(OOX_NS(officeRel)), 
RTL_TEXTENCODING_UTF8).getStr(),
-FSNS( XML_r, XML_id ), USS( sId ),
+FSNS(XML_xmlns, XML_c), 
pFB->getNamespaceURL(OOX_NS(dmlChart)).toUtf8(),
+FSNS(XML_xmlns, XML_r), 
pFB->getNamespaceURL(OOX_NS(officeRel)).toUtf8(),
+FSNS(XML_r, XML_id), sId.toUtf8(),
 FSEND );
 
 pFS->endElement( FSNS( XML_a, XML_graphicData ) );
@@ -3082,7 +3082,8 @@ void writeCustomLabel( const FSHelperPtr& pFS, 
ChartExport* pChartExport,
 else
 {
 // Field
-pFS->startElement(FSNS(XML_a, XML_fld), XML_id, 
USS(rField->getGuid()), XML_type, USS(sFieldType), FSEND);
+pFS->startElement(FSNS(XML_a, XML_fld), XML_id, 
rField->getGuid().toUtf8(), XML_type,
+  sFieldType.toUtf8(), FSEND);
 writeRunProperties(pChartExport, xPropertySet);
 
 pFS->startElement(FSNS(XML_a, XML_t), FSEND);
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 4c1077b265f8..b5047b80eb15 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -190,7 +190,7 @@ bool DrawingML::GetProperty( const Reference< XPropertySet 
>& rXPropertySet, con
 }
 catch( const Exception& )
 {
-/* printf ("exception when trying to get value of property: %s\n", 
USS(aName)); */
+/* printf ("exception when trying to get value of property: %s\n", 
aName.toUtf8()); */
 }
 return false;
 }
@@ -208,7 +208,7 @@ bool DrawingML::GetPropertyAndState( const Reference< 
XPropertySet >& rXProperty
 }
 catch( const Exception& )
 {
-/* printf ("exception wh

[Libreoffice-commits] core.git: include/svx reportdesign/source sd/inc sd/source svx/source

2019-04-04 Thread Caolán McNamara (via logerrit)

 include/svx/svdundo.hxx|2 +-
 reportdesign/source/core/inc/ReportUndoFactory.hxx |2 +-
 reportdesign/source/core/sdr/ReportUndoFactory.cxx |4 ++--
 sd/inc/undo/undofactory.hxx|2 +-
 sd/inc/undo/undoobjects.hxx|2 +-
 sd/source/core/undo/undofactory.cxx|4 ++--
 sd/source/core/undo/undoobjects.cxx|4 ++--
 svx/source/svdraw/svdundo.cxx  |4 ++--
 8 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 3154770b49f84981432ccc3756ceb1840ff8d8a0
Author: Caolán McNamara 
AuthorDate: Thu Apr 4 12:27:30 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 4 15:11:34 2019 +0200

CreateUndoRemoveObject default arg is always used

Change-Id: I5676281be56ff454962900fe7500d078b1f9e7e9
Reviewed-on: https://gerrit.libreoffice.org/70252
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index 0e30f39c4661..9c89285f7da2 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -709,7 +709,7 @@ public:
 virtual std::unique_ptr CreateUndoMoveObject( SdrObject& 
rObject, const Size& rDist );
 virtual std::unique_ptr CreateUndoGeoObject( SdrObject& 
rObject );
 virtual std::unique_ptr CreateUndoAttrObject( SdrObject& 
rObject, bool bStyleSheet1 = false, bool bSaveText = false );
-virtual std::unique_ptr CreateUndoRemoveObject( SdrObject& 
rObject, bool bOrdNumDirect = false);
+virtual std::unique_ptr CreateUndoRemoveObject(SdrObject& 
rObject);
 virtual std::unique_ptr CreateUndoInsertObject( SdrObject& 
rObject, bool bOrdNumDirect = false);
 virtual std::unique_ptr CreateUndoDeleteObject( SdrObject& 
rObject, bool bOrdNumDirect = false);
 virtual std::unique_ptr CreateUndoNewObject( SdrObject& 
rObject, bool bOrdNumDirect = false);
diff --git a/reportdesign/source/core/inc/ReportUndoFactory.hxx 
b/reportdesign/source/core/inc/ReportUndoFactory.hxx
index 501bf68140b3..473f8ebe90c7 100644
--- a/reportdesign/source/core/inc/ReportUndoFactory.hxx
+++ b/reportdesign/source/core/inc/ReportUndoFactory.hxx
@@ -38,7 +38,7 @@ namespace rptui
 virtual std::unique_ptr CreateUndoMoveObject( 
SdrObject& rObject, const Size& rDist ) override;
 virtual std::unique_ptr CreateUndoGeoObject( SdrObject& 
rObject ) override;
 virtual std::unique_ptr CreateUndoAttrObject( 
SdrObject& rObject, bool bStyleSheet1 = false, bool bSaveText = false ) 
override;
-virtual std::unique_ptr CreateUndoRemoveObject( 
SdrObject& rObject, bool bOrdNumDirect = false) override;
+virtual std::unique_ptr 
CreateUndoRemoveObject(SdrObject& rObject) override;
 virtual std::unique_ptr CreateUndoInsertObject( 
SdrObject& rObject, bool bOrdNumDirect = false) override;
 virtual std::unique_ptr CreateUndoDeleteObject( 
SdrObject& rObject, bool bOrdNumDirect = false) override;
 virtual std::unique_ptr CreateUndoNewObject( SdrObject& 
rObject, bool bOrdNumDirect = false) override;
diff --git a/reportdesign/source/core/sdr/ReportUndoFactory.cxx 
b/reportdesign/source/core/sdr/ReportUndoFactory.cxx
index 3ceba3851749..068e8ca8dcad 100644
--- a/reportdesign/source/core/sdr/ReportUndoFactory.cxx
+++ b/reportdesign/source/core/sdr/ReportUndoFactory.cxx
@@ -63,9 +63,9 @@ std::unique_ptr 
OReportUndoFactory::CreateUndoAttrObject( SdrObje
 return m_pUndoFactory->CreateUndoAttrObject( rObject, bStyleSheet1, 
bSaveText );
 }
 
-std::unique_ptr OReportUndoFactory::CreateUndoRemoveObject( 
SdrObject& rObject, bool bOrdNumDirect )
+std::unique_ptr 
OReportUndoFactory::CreateUndoRemoveObject(SdrObject& rObject)
 {
-return m_pUndoFactory->CreateUndoRemoveObject( rObject, bOrdNumDirect );
+return m_pUndoFactory->CreateUndoRemoveObject(rObject);
 }
 
 std::unique_ptr OReportUndoFactory::CreateUndoInsertObject( 
SdrObject& rObject, bool /*bOrdNumDirect*/ )
diff --git a/sd/inc/undo/undofactory.hxx b/sd/inc/undo/undofactory.hxx
index 742d0b358e76..e06f1e9ae029 100644
--- a/sd/inc/undo/undofactory.hxx
+++ b/sd/inc/undo/undofactory.hxx
@@ -28,7 +28,7 @@ namespace sd
 class UndoFactory : public SdrUndoFactory
 {
 public:
-virtual std::unique_ptr CreateUndoRemoveObject( SdrObject& 
rObject, bool bOrdNumDirect = false) override;
+virtual std::unique_ptr CreateUndoRemoveObject(SdrObject& 
rObject) override;
 virtual std::unique_ptr CreateUndoDeleteObject( SdrObject& 
rObject, bool bOrdNumDirect = false) override;
 virtual std::unique_ptr CreateUndoObjectSetText( SdrObject& 
rNewObj, sal_Int32 nText ) override;
 virtual std::unique_ptr CreateUndoReplaceObject( SdrObject& 
rOldObject, SdrObject& rNewObject, bool bOrdNumDirect = false ) override;
diff --git a/sd/inc/undo/undoobjects.hxx b/sd/inc/undo/undoobjects.hxx
index 5121bc40c5f7..ad2f3d63fb00 100644
--- a/sd/inc/un

[Libreoffice-commits] core.git: include/vcl vcl/qa vcl/source

2019-04-04 Thread Tomaž Vajngerl (via logerrit)

 include/vcl/bitmap.hxx|6 ++--
 vcl/qa/cppunit/BitmapTest.cxx |   20 +-
 vcl/source/bitmap/BitmapColorQuantizationFilter.cxx   |2 -
 vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx |2 -
 4 files changed, 13 insertions(+), 17 deletions(-)

New commits:
commit dc7fdd7e75ba4089e3c385479fd6b303d518efe5
Author: Tomaž Vajngerl 
AuthorDate: Thu Apr 4 17:53:47 2019 +0900
Commit: Tomaž Vajngerl 
CommitDate: Thu Apr 4 15:04:01 2019 +0200

change GetColorCount to use sal_Int64

Hopefully fixes problems on 32-bit linux.

Change-Id: I1fc22f1bb37c8297bd3bd6828206d1ffa9ae722d
Reviewed-on: https://gerrit.libreoffice.org/70241
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 16dad0e6601d..71007c86b33d 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -131,7 +131,7 @@ public:
 SizeGetSizePixel() const;
 
 sal_uInt16  GetBitCount() const;
-inline sal_uLongGetColorCount() const;
+inline sal_Int64GetColorCount() const;
 inline sal_uLongGetSizeBytes() const;
 boolHasGreyPalette() const;
 /** get system dependent bitmap data
@@ -574,9 +574,9 @@ inline void Bitmap::SetPrefSize( const Size& rSize )
 maPrefSize = rSize;
 }
 
-inline sal_uLong Bitmap::GetColorCount() const
+inline sal_Int64 Bitmap::GetColorCount() const
 {
-return( sal_uLong(1) << static_cast(GetBitCount()) );
+return sal_Int64(1) << sal_Int64(GetBitCount());
 }
 
 inline sal_uLong Bitmap::GetSizeBytes() const
diff --git a/vcl/qa/cppunit/BitmapTest.cxx b/vcl/qa/cppunit/BitmapTest.cxx
index 11cfea33f2d6..632a243af0cf 100644
--- a/vcl/qa/cppunit/BitmapTest.cxx
+++ b/vcl/qa/cppunit/BitmapTest.cxx
@@ -77,8 +77,7 @@ void BitmapTest::testCreation()
 CPPUNIT_ASSERT_MESSAGE("Not empty", aBmp.IsEmpty());
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong bit count", 
static_cast(0),
  aBmp.GetBitCount());
-CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong color count", 
static_cast(1),
- aBmp.GetColorCount());
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong color count", sal_Int64(1), 
aBmp.GetColorCount());
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong byte size", 
static_cast(0),
  aBmp.GetSizeBytes());
 }
@@ -92,8 +91,7 @@ void BitmapTest::testCreation()
 CPPUNIT_ASSERT_MESSAGE("Empty bitmap", !aBmp.IsEmpty());
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong bit count", 
static_cast(1),
  aBmp.GetBitCount());
-CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong color count", 
static_cast(2),
- aBmp.GetColorCount());
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong color count", sal_Int64(2), 
aBmp.GetColorCount());
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong byte size", 
static_cast(12),
  aBmp.GetSizeBytes());
 }
@@ -107,8 +105,7 @@ void BitmapTest::testCreation()
 CPPUNIT_ASSERT_MESSAGE("Empty bitmap", !aBmp.IsEmpty());
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong bit count", 
static_cast(4),
  aBmp.GetBitCount());
-CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong color count", 
static_cast(16),
- aBmp.GetColorCount());
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong color count", sal_Int64(16), 
aBmp.GetColorCount());
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong byte size", 
static_cast(50),
  aBmp.GetSizeBytes());
 }
@@ -122,8 +119,7 @@ void BitmapTest::testCreation()
 CPPUNIT_ASSERT_MESSAGE("Empty bitmap", !aBmp.IsEmpty());
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong bit count", 
static_cast(8),
  aBmp.GetBitCount());
-CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong color count", 
static_cast(256),
- aBmp.GetColorCount());
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong color count", sal_Int64(256), 
aBmp.GetColorCount());
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong byte size", 
static_cast(100),
  aBmp.GetSizeBytes());
 }
@@ -137,7 +133,7 @@ void BitmapTest::testCreation()
 CPPUNIT_ASSERT_MESSAGE("Empty bitmap", !aBmp.IsEmpty());
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong bit count", 
static_cast(24),
  aBmp.GetBitCount());
-CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong color count", 
static_cast(16777216),
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong color count", sal_Int64(16777216),
  aBmp.GetColorCount());
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong byte size", 
static_cast(300),

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - toolkit/source

2019-04-04 Thread Vasily Melenchuk (via logerrit)

 toolkit/source/controls/tabpagemodel.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b8412f1d8b70ee097f8cf00bf159514bd443ea07
Author: Vasily Melenchuk 
AuthorDate: Wed Feb 6 00:41:25 2019 +0300
Commit: Thorsten Behrens 
CommitDate: Thu Apr 4 15:02:17 2019 +0200

basic: fix for UnoControlTabPageModel get/set properties

The userformscontainers is required property to pass checks in
getter/setter, but returning true instead of actual type is
not a best idea. So let's return actually expected dummy empty
container.

Change-Id: I5cc3e5462ed82f6f2f8e5a45d9fc2d9f9ce1c76f
Reviewed-on: https://gerrit.libreoffice.org/67431
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 24e7d98219191ccdab3673ac96fa866c449cac5f)
Reviewed-on: https://gerrit.libreoffice.org/70235
Reviewed-by: Thorsten Behrens 

diff --git a/toolkit/source/controls/tabpagemodel.cxx 
b/toolkit/source/controls/tabpagemodel.cxx
index 044da501575e..5ddbe3d0f8ef 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -87,9 +87,10 @@ Any UnoControlTabPageModel::ImplGetDefaultValue( sal_uInt16 
nPropId ) const
 break;
 case BASEPROPERTY_USERFORMCONTAINEES:
 {
-// We do not have here any usercontainers (yet?), but let's return 
something back
+// We do not have here any usercontainers (yet?), but let's return 
empty container back
 // so normal properties could be set without triggering 
UnknownPropertyException
-return makeAny(true);
+aAny <<= uno::Reference< XNameContainer >();
+break;
 }
 default:
 aAny = UnoControlModel::ImplGetDefaultValue( nPropId );
___
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' - 2 commits - toolkit/source

2019-04-04 Thread Vasily Melenchuk (via logerrit)

 toolkit/source/controls/controlmodelcontainerbase.cxx |9 -
 toolkit/source/controls/tabpagemodel.cxx  |5 +++--
 2 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 7bb607467ff983a7d418537e06596263da733d74
Author: Vasily Melenchuk 
AuthorDate: Wed Feb 6 00:41:25 2019 +0300
Commit: Thorsten Behrens 
CommitDate: Thu Apr 4 15:02:03 2019 +0200

basic: fix for UnoControlTabPageModel get/set properties

The userformscontainers is required property to pass checks in
getter/setter, but returning true instead of actual type is
not a best idea. So let's return actually expected dummy empty
container.

Change-Id: I5cc3e5462ed82f6f2f8e5a45d9fc2d9f9ce1c76f
Reviewed-on: https://gerrit.libreoffice.org/67431
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 24e7d98219191ccdab3673ac96fa866c449cac5f)
Reviewed-on: https://gerrit.libreoffice.org/70234
Reviewed-by: Thorsten Behrens 

diff --git a/toolkit/source/controls/tabpagemodel.cxx 
b/toolkit/source/controls/tabpagemodel.cxx
index dc1730ea04a7..a8b45f108331 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -86,9 +86,10 @@ Any UnoControlTabPageModel::ImplGetDefaultValue( sal_uInt16 
nPropId ) const
 break;
 case BASEPROPERTY_USERFORMCONTAINEES:
 {
-// We do not have here any usercontainers (yet?), but let's return 
something back
+// We do not have here any usercontainers (yet?), but let's return 
empty container back
 // so normal properties could be set without triggering 
UnknownPropertyException
-return makeAny(true);
+aAny <<= uno::Reference< XNameContainer >();
+break;
 }
 default:
 aAny = UnoControlModel::ImplGetDefaultValue( nPropId );
commit 5b9d543b7255eab74c401dee803bbac4a4ceef8a
Author: Vasily Melenchuk 
AuthorDate: Tue Mar 26 15:23:28 2019 +0300
Commit: Thorsten Behrens 
CommitDate: Thu Apr 4 15:01:48 2019 +0200

tdf#124385: toolkit: do not fail if ResourceListener is not defined

If current control (for example TabPageContainer) is missing
resource listener property we should not fail script with
exception. Just behave as with empty ResourceListener.

Change-Id: I260feec775a5d197bebc9414b652dd6f89e35035
Reviewed-on: https://gerrit.libreoffice.org/69740
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 4abb7335529a66346a2a68a089b9c8438faa2e39)
Reviewed-on: https://gerrit.libreoffice.org/70233

diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx 
b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 4d05caa81ff8..51f78d826a26 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -1743,6 +1743,9 @@ void 
ControlContainerBase::ImplStartListingForResourceEvents()
 {
 Reference< resource::XStringResourceResolver > xStringResourceResolver;
 
+if ( !ImplHasProperty(PROPERTY_RESOURCERESOLVER) )
+return;
+
 ImplGetPropertyValue( PROPERTY_RESOURCERESOLVER ) >>= 
xStringResourceResolver;
 
 // Add our helper as listener to retrieve notifications about changes
@@ -1759,7 +1762,11 @@ void ControlContainerBase::ImplUpdateResourceResolver()
 {
 Reference< resource::XStringResourceResolver > xStringResourceResolver;
 
-ImplGetPropertyValue( PROPERTY_RESOURCERESOLVER ) >>= 
xStringResourceResolver;
+if ( !ImplHasProperty(PROPERTY_RESOURCERESOLVER) )
+return;
+
+ImplGetPropertyValue(PROPERTY_RESOURCERESOLVER) >>= 
xStringResourceResolver;
+
 if ( !xStringResourceResolver.is() )
 return;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/html

2019-04-04 Thread Libreoffice Gerrit user

 loleaflet/html/loading.html |   32 
 1 file changed, 32 deletions(-)

New commits:
commit afcfd7a616561decda77ab68bb756851a06038e7
Author: Alexandru Vlăduţu 
AuthorDate: Thu Apr 4 15:32:47 2019 +0300
Commit: Szymon Kłos 
CommitDate: Thu Apr 4 14:55:23 2019 +0200

loleaflet: remove loading html page leftover

loading.html resource made obsolete by commit 
51e849bf5dcb4bcef1fd042bb45f07b4383cb461

Change-Id: I2308e4c121520f6ed293d5e86805c4daeec3fca6
Reviewed-on: https://gerrit.libreoffice.org/70257
Reviewed-by: Szymon Kłos 
Tested-by: Szymon Kłos 

diff --git a/loleaflet/html/loading.html b/loleaflet/html/loading.html
deleted file mode 100644
index a99cc7315..0
--- a/loleaflet/html/loading.html
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-  
-
-
-
-  .body {
-background: #FF;
-  }
-  .spinner
-  {
-position: absolute;
-text-align: center;
-margin: auto;
-top: 0;
-right: 0;
-bottom: 0;
-left: 0;
-width: 100px;
-height: 100px;
-  }
-
-  
-  
-
-  
-
-
-  var spinnerInterval = 
window.parent.L.LOUtil.startSpinner(document.getElementById('spinner'), 1.5);
-
-  
-
___
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-3' - sw/source

2019-04-04 Thread Armin Le Grand (via logerrit)

 sw/source/core/doc/notxtfrm.cxx |   29 +++--
 1 file changed, 27 insertions(+), 2 deletions(-)

New commits:
commit 1100ca5407e7ffd9ce58fc0c2f4afe7e8e60e0f8
Author: Armin Le Grand 
AuthorDate: Tue Apr 2 17:59:40 2019 +0200
Commit: Michael Stahl 
CommitDate: Thu Apr 4 14:39:14 2019 +0200

tdf#124272 use ClipRegion's geometry if not a rectangle

By error the ClipRegion's geometry was replaced by it's
BoundRect expanded to PixelBounds. If the ClipRegion
is not a rectangle, this will create wrong results. To
do both - extend to PixelBounds and have the original
geometry included - use the PolyPolygon topology as
needed (see comment in code for details)

Change-Id: If3f75223144eba8eb23909a7c701ad544346099b
Reviewed-on: https://gerrit.libreoffice.org/70146
Tested-by: Jenkins
Reviewed-by: Armin Le Grand 
(cherry picked from commit 362c1cf2bd580f6dc8bf27bdcd79174111bc1b5c)
Reviewed-on: https://gerrit.libreoffice.org/70154
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 2b7b1a1501b88474ed5d691bafb45d465d8ab9f6)
Reviewed-on: https://gerrit.libreoffice.org/70181
Tested-by: Xisco Faulí 
Tested-by: Thorsten Behrens 
Reviewed-by: Xisco Faulí 
Reviewed-by: Michael Stahl 

diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 51c43fa0e2a1..04e556277738 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -982,9 +982,34 @@ void paintGraphicUsingPrimitivesHelper(
 ceil(aClipRange.getMaxX() + aSinglePixelXY.getX()),
 ceil(aClipRange.getMaxY() + aSinglePixelXY.getY()));
 
+// create the enclosing rectangle as polygon
+basegfx::B2DPolyPolygon 
aTarget(basegfx::utils::createPolygonFromRect(aExpandedClipRange));
+
+// tdf#124272 the fix above (tdf#114076) was too rough - the
+// clip region used may be a PolyPolygon. In that case that
+// PolyPolygon would have to be scaled to mentioned PixelBounds.
+// Since that is not really possible geometrically (would need
+// more some 'grow in outside direction' but with unequal grow
+// values in all directions - just maaany problems
+// involved), use a graphical trick: The topology of the
+// PolyPolygon uses the stndard FillRule, so adding the now
+// guaranteed to be bigger or equal bounding (enclosing)
+// rectangle twice as polygon will expand the BoundRange, but
+// not change the geometry visualization at all
+if(!rOutputDevice.GetClipRegion().IsRectangle())
+{
+// double the outer rectangle range polygon to have it
+// included twice
+aTarget.append(aTarget.getB2DPolygon(0));
+
+// add the original clip 'inside' (due to being smaller
+// or equal). That PolyPolygon may have an unknown number
+// of polygons (>=1)
+aTarget.append(aClip);
+}
+
 aContent[0] = new drawinglayer::primitive2d::MaskPrimitive2D(
-basegfx::B2DPolyPolygon(
-basegfx::utils::createPolygonFromRect(aExpandedClipRange)),
+aTarget,
 aContent);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - include/svtools svtools/source

2019-04-04 Thread Katarina Behrens (via logerrit)

 include/svtools/prnsetup.hxx|1 +
 svtools/source/dialogs/prnsetup.cxx |7 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit eaaf6f4f925bf04833a464176d376efe92cdcd69
Author: Katarina Behrens 
AuthorDate: Thu Apr 4 12:27:23 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Apr 4 14:34:13 2019 +0200

Redirect printer setup into the main thread

and avoid deadlock when called from extension in a non-main thread

Change-Id: I9fc0c02f580655015d583219b886c6b24af59c18
Reviewed-on: https://gerrit.libreoffice.org/70256
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx
index 007294e52656..267274d8d61a 100644
--- a/include/svtools/prnsetup.hxx
+++ b/include/svtools/prnsetup.hxx
@@ -47,6 +47,7 @@ private:
 AutoTimer  maStatusTimer;
 VclPtrmpPrinter;
 VclPtrmpTempPrinter;
+short solar_execute();
 
 SVT_DLLPRIVATE void ImplSetInfo();
 
diff --git a/svtools/source/dialogs/prnsetup.cxx 
b/svtools/source/dialogs/prnsetup.cxx
index cf8a3f5c5eb9..e7362e7bc44c 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 
 
 void ImplFillPrnDlgListBox( const Printer* pPrinter,
@@ -331,6 +332,10 @@ void PrinterSetupDialog::DataChanged( const 
DataChangedEvent& rDCEvt )
 ModalDialog::DataChanged( rDCEvt );
 }
 
+short PrinterSetupDialog::solar_execute()
+{
+return ModalDialog::Execute();
+}
 
 short PrinterSetupDialog::Execute()
 {
@@ -347,7 +352,7 @@ short PrinterSetupDialog::Execute()
 maStatusTimer.Start();
 
 // start dialog
-short nRet = ModalDialog::Execute();
+short nRet = 
vcl::solarthread::syncExecute(std::bind(&PrinterSetupDialog::solar_execute, 
this));
 
 // update data if the dialog was terminated with OK
 if ( nRet == RET_OK )
___
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-3' - vcl/source

2019-04-04 Thread Noel Grandin (via logerrit)

 vcl/source/edit/textundo.cxx |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 0d66d95df3bf930926e888dfe8a8060d7c037d6e
Author: Noel Grandin 
AuthorDate: Mon Apr 1 14:38:01 2019 +0200
Commit: Noel Grandin 
CommitDate: Thu Apr 4 14:32:10 2019 +0200

tdf#124413 Crash on undo / redo in Basic IDE

regression from
commit 3a9d3f271c445641bebd057c4c91279f9b3cd7d5
Date:   Mon Apr 23 09:38:41 2018 +0200
loplugin:useuniqueptr in TextDoc

Change-Id: I51ab5de7571e4ec358442e54d590adf88fbeb12d
Reviewed-on: https://gerrit.libreoffice.org/70061
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 3ebdb97a305ada182af045ea6438432adfe74e80)
Reviewed-on: https://gerrit.libreoffice.org/70076
Tested-by: Xisco Faulí 
Reviewed-by: Michael Stahl 

diff --git a/vcl/source/edit/textundo.cxx b/vcl/source/edit/textundo.cxx
index 80e26d34c577..adbf8be9076c 100644
--- a/vcl/source/edit/textundo.cxx
+++ b/vcl/source/edit/textundo.cxx
@@ -163,14 +163,19 @@ void TextUndoDelPara::Undo()
 
 void TextUndoDelPara::Redo()
 {
+auto & rDocNodes = GetDoc()->GetNodes();
 // pNode is not valid anymore in case an Undo joined paragraphs
-mpNode = GetDoc()->GetNodes()[ mnPara ].get();
+mpNode = rDocNodes[ mnPara ].get();
 
 GetTEParaPortions()->Remove( mnPara );
 
 // do not delete Node because of Undo!
-GetDoc()->GetNodes().erase( ::std::find_if( GetDoc()->GetNodes().begin(), 
GetDoc()->GetNodes().end(),
-[&] (std::unique_ptr 
const & p) { return p.get() == mpNode; } ) );
+auto it = ::std::find_if( rDocNodes.begin(), rDocNodes.end(),
+  [&] (std::unique_ptr const & p) { 
return p.get() == mpNode; } );
+assert(it != rDocNodes.end());
+it->release();
+GetDoc()->GetNodes().erase( it );
+
 GetTextEngine()->ImpParagraphRemoved( mnPara );
 
 mbDelObject = true; // belongs again to the Undo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [GSOC] LibreOffice appliances idea

2019-04-04 Thread Rasmus Jonsson


Figured I'll post my proposal. Any input, positive or negative, from
anyone, is welcome.

https://docs.google.com/document/d/1FZKM2I_5Fc2ENsLxlMmkWTo6GJaS8_QHiYEERIVxVfY/edit?usp=sharing
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/inc vcl/qt5 vcl/unx

2019-04-04 Thread Jan-Marek Glogowski (via logerrit)

 vcl/inc/qt5/Qt5Instance.hxx  |   22 +++-
 vcl/qt5/Qt5Instance.cxx  |  104 ++-
 vcl/unx/kde5/KDE5SalInstance.cxx |   82 +++---
 vcl/unx/kde5/KDE5SalInstance.hxx |4 +
 4 files changed, 92 insertions(+), 120 deletions(-)

New commits:
commit 810e62b8ba9c0fa5152592ef6b01400bfcfe59c0
Author: Jan-Marek Glogowski 
AuthorDate: Sat Mar 23 04:05:04 2019 +
Commit: Jan-Marek Glogowski 
CommitDate: Thu Apr 4 14:19:43 2019 +0200

Qt5 / KDE5 refactor create_SalInstance

Move most common code into Qt5Instance (static) functions.
Not much saved with regard to LOC, but since the code was
95% C'n'P, I hope it'll be less error prone this way.

Also handle all QApplication argument pointers via
std::unique_ptr from the beginning.

Change-Id: I87b2f571d398db7ccce3e740f16205b251be4ced
Reviewed-on: https://gerrit.libreoffice.org/69578
Tested-by: Jenkins
Reviewed-by: Aleksei Nikiforov 

diff --git a/vcl/inc/qt5/Qt5Instance.hxx b/vcl/inc/qt5/Qt5Instance.hxx
index 52153846faa1..a9be3581f64b 100644
--- a/vcl/inc/qt5/Qt5Instance.hxx
+++ b/vcl/inc/qt5/Qt5Instance.hxx
@@ -27,12 +27,21 @@
 
 #include 
 
+#include 
 #include 
+#include 
+#include 
 
 class QApplication;
 class SalYieldMutex;
 class SalFrame;
 
+struct StdFreeCStr
+{
+void operator()(char* arg) const noexcept { std::free(arg); }
+};
+using FreeableCStr = std::unique_ptr;
+
 class VCLPLUG_QT5_PUBLIC Qt5Instance : public QObject,
public SalGenericInstance,
public SalUserEventList
@@ -44,9 +53,8 @@ class VCLPLUG_QT5_PUBLIC Qt5Instance : public QObject,
 const bool m_bUseCairo;
 std::unordered_map> 
m_aClipboards;
 
-public:
 std::unique_ptr m_pQApplication;
-std::unique_ptr m_pFakeArgvFreeable;
+std::vector m_pFakeArgvFreeable;
 std::unique_ptr m_pFakeArgv;
 std::unique_ptr m_pFakeArgc;
 
@@ -61,9 +69,17 @@ Q_SIGNALS:
 void deleteObjectLaterSignal(QObject* pObject);
 
 public:
-explicit Qt5Instance(bool bUseCairo = false);
+explicit Qt5Instance(std::unique_ptr& pQApp, bool bUseCairo 
= false);
 virtual ~Qt5Instance() override;
 
+// handle common SalInstance setup
+static void AllocFakeCmdlineArgs(std::unique_ptr& rFakeArgv,
+ std::unique_ptr& rFakeArgc,
+ std::vector& 
rFakeArgvFreeable);
+void MoveFakeCmdlineArgs(std::unique_ptr& rFakeArgv, 
std::unique_ptr& rFakeArgc,
+ std::vector& rFakeArgvFreeable);
+static std::unique_ptr CreateQApplication(int& nArgc, char** 
pArgv);
+
 void RunInMainThread(std::function func);
 
 virtual SalFrame* CreateFrame(SalFrame* pParent, SalFrameStyleFlags 
nStyle) override;
diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
index f0d42666e3ce..dd0edddc97cf 100644
--- a/vcl/qt5/Qt5Instance.cxx
+++ b/vcl/qt5/Qt5Instance.cxx
@@ -200,10 +200,11 @@ void Qt5Instance::ImplRunInMain()
 (void)this; // suppress unhelpful [loplugin:staticmethods]; can't be static
 }
 
-Qt5Instance::Qt5Instance(bool bUseCairo)
+Qt5Instance::Qt5Instance(std::unique_ptr& pQApp, bool bUseCairo)
 : SalGenericInstance(std::make_unique())
 , m_postUserEventId(-1)
 , m_bUseCairo(bUseCairo)
+, m_pQApplication(std::move(pQApp))
 {
 ImplSVData* pSVData = ImplGetSVData();
 if (bUseCairo)
@@ -232,8 +233,6 @@ Qt5Instance::~Qt5Instance()
 // force freeing the QApplication before freeing the arguments,
 // as it uses references to the provided arguments!
 m_pQApplication.reset();
-for (int i = 0; i < *m_pFakeArgc; i++)
-free(m_pFakeArgvFreeable[i]);
 }
 
 void Qt5Instance::deleteObjectLater(QObject* pObject) { 
pObject->deleteLater(); }
@@ -441,18 +440,16 @@ Reference Qt5Instance::CreateDropTarget()
 return Reference(static_cast(new 
Qt5DropTarget()));
 }
 
-extern "C" {
-VCLPLUG_QT5_PUBLIC SalInstance* create_SalInstance()
+void Qt5Instance::AllocFakeCmdlineArgs(std::unique_ptr& rFakeArgv,
+   std::unique_ptr& rFakeArgc,
+   std::vector& 
rFakeArgvFreeable)
 {
 OString aVersion(qVersion());
 SAL_INFO("vcl.qt5", "qt version string is " << aVersion);
 
-QApplication* pQApplication;
-char** pFakeArgvFreeable = nullptr;
-
-int nFakeArgc = 2;
 const sal_uInt32 nParams = osl_getCommandArgCount();
 OString aDisplay;
+sal_uInt32 nDisplayValueIdx = 0;
 OUString aParam, aBin;
 
 for (sal_uInt32 nIdx = 0; nIdx < nParams; ++nIdx)
@@ -460,66 +457,85 @@ VCLPLUG_QT5_PUBLIC SalInstance* create_SalInstance()
 osl_getCommandArg(nIdx, &aParam.pData);
 if (aParam != "-display")
 continue;
-if (!pFakeArgvFreeable)
-{
-pFakeArgvFreeable = new char*[nFakeArgc + 2];
-pFakeArg

[Libreoffice-commits] core.git: vcl/Library_vclplug_kde5.mk vcl/qt5 vcl/unx

2019-04-04 Thread Jan-Marek Glogowski (via logerrit)

 vcl/Library_vclplug_kde5.mk  |1 
 vcl/qt5/Qt5Data.cxx  |   15 +-
 vcl/unx/kde5/KDE5SalData.cxx |   56 ---
 vcl/unx/kde5/KDE5SalData.hxx |   33 --
 vcl/unx/kde5/KDE5SalInstance.cxx |8 ++---
 5 files changed, 16 insertions(+), 97 deletions(-)

New commits:
commit ae1e23651a6d2e97d39bbe46bab83b7982d19611
Author: Jan-Marek Glogowski 
AuthorDate: Sun Mar 31 11:29:30 2019 +
Commit: Jan-Marek Glogowski 
CommitDate: Thu Apr 4 14:17:55 2019 +0200

KDE5 merge KDE5SalData into Qt5Data

Currently there is no point for a seperate KDE5 SalData class.
The additional NWF settings fix the wrong popup menu for qt5, so
this just moves all the NWF data and gets rid of KDE5SalData.

Change-Id: I1c02d1f660df288a0d2e1c6607b34fc1ce593727
Reviewed-on: https://gerrit.libreoffice.org/70005
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/vcl/Library_vclplug_kde5.mk b/vcl/Library_vclplug_kde5.mk
index 704557150ae5..f011f397d7d3 100644
--- a/vcl/Library_vclplug_kde5.mk
+++ b/vcl/Library_vclplug_kde5.mk
@@ -80,7 +80,6 @@ $(eval $(call gb_Library_add_libs,vclplug_kde5,\
 
 $(eval $(call gb_Library_add_exception_objects,vclplug_kde5,\
 vcl/unx/kde5/KDE5FilePicker2 \
-vcl/unx/kde5/KDE5SalData \
 vcl/unx/kde5/KDE5SalFrame \
 vcl/unx/kde5/KDE5SalGraphics \
 vcl/unx/kde5/KDE5SalInstance \
diff --git a/vcl/qt5/Qt5Data.cxx b/vcl/qt5/Qt5Data.cxx
index 597a0a4d0a77..9f9bf2557c3d 100644
--- a/vcl/qt5/Qt5Data.cxx
+++ b/vcl/qt5/Qt5Data.cxx
@@ -19,8 +19,10 @@
 
 #include 
 
-#include 
 #include 
+#include 
+#include 
+#include 
 
 #include 
 
@@ -156,8 +158,17 @@ Qt5Data::Qt5Data(SalInstance* pInstance)
 {
 ImplSVData* pSVData = ImplGetSVData();
 
-// draw toolbars on separate lines
 pSVData->maNWFData.mbDockingAreaSeparateTB = true;
+pSVData->maNWFData.mbFlatMenu = true;
+pSVData->maNWFData.mbRolloverMenubar = true;
+pSVData->maNWFData.mbNoFocusRects = true;
+pSVData->maNWFData.mbNoFocusRectsForFlatButtons = true;
+
+QStyle* style = QApplication::style();
+pSVData->maNWFData.mnMenuFormatBorderX = 
style->pixelMetric(QStyle::PM_MenuPanelWidth)
+ + 
style->pixelMetric(QStyle::PM_MenuHMargin);
+pSVData->maNWFData.mnMenuFormatBorderY = 
style->pixelMetric(QStyle::PM_MenuPanelWidth)
+ + 
style->pixelMetric(QStyle::PM_MenuVMargin);
 }
 
 // outline dtor b/c of GlyphCache incomplete type
diff --git a/vcl/unx/kde5/KDE5SalData.cxx b/vcl/unx/kde5/KDE5SalData.cxx
deleted file mode 100644
index 587bf021410b..
--- a/vcl/unx/kde5/KDE5SalData.cxx
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include 
-#include 
-
-#undef Region
-
-#include "KDE5SalData.hxx"
-
-KDE5SalData::KDE5SalData(SalInstance* pInstance)
-: Qt5Data(pInstance)
-{
-}
-
-KDE5SalData::~KDE5SalData() {}
-
-void KDE5SalData::initNWF()
-{
-ImplSVData* pSVData = ImplGetSVData();
-
-// draw toolbars on separate lines
-pSVData->maNWFData.mbDockingAreaSeparateTB = true;
-// no borders for menu, theming does that
-pSVData->maNWFData.mbFlatMenu = true;
-// Qt theme engines may support a rollover menubar
-pSVData->maNWFData.mbRolloverMenubar = true;
-
-pSVData->maNWFData.mbNoFocusRects = true;
-pSVData->maNWFData.mbNoFocusRectsForFlatButtons = true;
-
-// Styled menus need additional space
-QStyle* style = QApplication::style();
-pSVData->maNWFData.mnMenuFormatBorderX = 
style->pixelMetric(QStyle::PM_MenuPanelWidth)
- + 
style->pixelMetric(QStyle::PM_MenuHMargin);
-pSVData->maNWFData.mnMenuFormatBorderY = 
style->pixelMetric(QStyle::PM_MenuPanelWidth)
- + 
style->pixelMetric(QStyle::PM_MenuVMargin);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/kde5/KDE5SalData.hxx b/vcl/unx/kde5/KDE5SalData.hxx
deleted file mode 100644
index

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - scp2/source

2019-04-04 Thread Jim Jagielski (via logerrit)

 scp2/source/ooo/module_systemint.scp |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit d06353475daf23b5afdaabf6784e0b7c26e8e350
Author: Jim Jagielski 
AuthorDate: Thu Apr 4 11:28:00 2019 +
Commit: Jim Jagielski 
CommitDate: Thu Apr 4 11:28:00 2019 +

Merge r1856914 from trunk:

Reviewed by: jim

diff --git a/scp2/source/ooo/module_systemint.scp 
b/scp2/source/ooo/module_systemint.scp
index 684febdea109..dcb87b7130f3 100644
--- a/scp2/source/ooo/module_systemint.scp
+++ b/scp2/source/ooo/module_systemint.scp
@@ -36,7 +36,14 @@ Module gid_Module_Optional_Systemintegration
   #else
 Styles = 
(SYSTEMMODULE,NOTRELOCATABLE,DONTSHOWINUSERINSTALL,INSTALLCANFAIL,USEFORCE);
   #endif
-  #if (defined(LINUX)) || (defined(SOLARIS))
+/*
+ * Hardcode name as 'openoffice' to handle Beta and Dev builds which
+ * would result in openoffice_beta, for example.
+ * See sysui/desktop/productversion.mk
+ */
+  #if (defined(LINUX))
+PackageName = "openoffice-desktop-integration.tar.gz";
+  #elif (defined(SOLARIS))
 PackageName = "${SYSTEMINTUNIXPACKAGENAME}-desktop-integration.tar.gz";
   #else
 PackageName = "";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: comphelper/StaticLibrary_windows_process.mk desktop/Executable_minidump_upload.mk desktop/Executable_sbase.mk desktop/Executable_scalc.mk desktop/Executable_sdraw.mk de

2019-04-04 Thread Mike Kaganski (via logerrit)

 comphelper/StaticLibrary_windows_process.mk|4 
 desktop/Executable_minidump_upload.mk  |4 
 desktop/Executable_sbase.mk|4 
 desktop/Executable_scalc.mk|4 
 desktop/Executable_sdraw.mk|4 
 desktop/Executable_simpress.mk |4 
 desktop/Executable_smath.mk|4 
 desktop/Executable_sweb.mk |4 
 desktop/Executable_swriter.mk  |4 
 desktop/StaticLibrary_winlauncher.mk   |4 
 dtrans/Library_sysdtrans.mk|5 -
 fpicker/Library_fps.mk |5 -
 onlineupdate/Executable_mar.mk |1 -
 onlineupdate/Executable_mbsdiff.mk |4 
 onlineupdate/Executable_test_updater_dialog.mk |4 
 onlineupdate/Executable_update_service.mk  |4 
 onlineupdate/Executable_updater.mk |1 -
 onlineupdate/StaticLibrary_libmar.mk   |4 
 onlineupdate/StaticLibrary_libmarverify.mk |6 +-
 onlineupdate/StaticLibrary_updatehelper.mk |1 -
 setup_native/Library_reg4allmsdoc.mk   |2 --
 setup_native/Library_shlxtmsi.mk   |2 --
 setup_native/StaticLibrary_quickstarter.mk |2 --
 shell/Library_ooofilt.mk   |2 --
 shell/Library_ooofilt_x64.mk   |2 --
 shell/Library_propertyhdl.mk   |2 --
 shell/Library_propertyhdl_x64.mk   |2 --
 shell/Library_shlxthdl.mk  |2 --
 shell/Library_shlxthdl_x64.mk  |2 --
 shell/Library_spsupp.mk|5 -
 shell/Library_spsupp_x64.mk|5 -
 shell/StaticLibrary_shlxthandler_common.mk |2 --
 shell/StaticLibrary_shlxthandler_common_x64.mk |2 --
 winaccessibility/Library_uacccom.mk|2 --
 34 files changed, 1 insertion(+), 108 deletions(-)

New commits:
commit 558956dc811a1f0f07411e348f7081a467bbc3b5
Author: Mike Kaganski 
AuthorDate: Wed Apr 3 14:10:16 2019 +0300
Commit: Mike Kaganski 
CommitDate: Thu Apr 4 13:57:59 2019 +0200

Drop UNICODE/_UNICODE defines

The code is using expicit (mostly W) Windows API, and is independent
from the macro. Removing it here allows to catch places where some
UNICODE-dependent macro is used unintentionally.

Change-Id: I5dff40aecfc3c3dc7fc4cf7271a995a675943a45
Reviewed-on: https://gerrit.libreoffice.org/70237
Reviewed-by: Michael Stahl 
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/comphelper/StaticLibrary_windows_process.mk 
b/comphelper/StaticLibrary_windows_process.mk
index 1b086eac952b..2ef95e46a071 100644
--- a/comphelper/StaticLibrary_windows_process.mk
+++ b/comphelper/StaticLibrary_windows_process.mk
@@ -13,10 +13,6 @@ $(eval $(call gb_StaticLibrary_set_include,windows_process,\
$$(INCLUDE) \
 ))
 
-$(eval $(call gb_StaticLibrary_add_defs,windows_process,\
-   -DUNICODE \
-))
-
 $(eval $(call gb_StaticLibrary_add_exception_objects,windows_process,\
comphelper/source/windows/windows_process \
 ))
diff --git a/desktop/Executable_minidump_upload.mk 
b/desktop/Executable_minidump_upload.mk
index 959d4af8c7c1..ccdcc97e743d 100644
--- a/desktop/Executable_minidump_upload.mk
+++ b/desktop/Executable_minidump_upload.mk
@@ -14,10 +14,6 @@ $(eval $(call gb_Executable_use_libraries,minidump_upload,\
 sal \
 ))
 
-$(eval $(call gb_Executable_add_defs,minidump_upload,\
-   -DUNICODE \
-))
-
 $(eval $(call gb_Executable_use_external,minidump_upload,curl))
 
 $(eval $(call gb_Executable_add_exception_objects,minidump_upload,\
diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk
index 4dd6be02a9ee..d3a4fafea810 100644
--- a/desktop/Executable_sbase.mk
+++ b/desktop/Executable_sbase.mk
@@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,sbase))
 
 $(eval $(call gb_Executable_set_targettype_gui,sbase,YES))
 
-$(eval $(call gb_Executable_add_defs,sbase,\
--DUNICODE \
-))
-
 $(eval $(call gb_Executable_add_ldflags,sbase,\
 /ENTRY:wWinMainCRTStartup \
 ))
diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk
index fc066770b945..1a21840a3306 100644
--- a/desktop/Executable_scalc.mk
+++ b/desktop/Executable_scalc.mk
@@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,scalc))
 
 $(eval $(call gb_Executable_set_targettype_gui,scalc,YES))
 
-$(eval $(call gb_Executable_add_defs,scalc,\
--DUNICODE \
-))
-
 $(eval $(call gb_Executable_add_ldflags,scalc,\
 /ENTRY:wWinMainCRTStartup \
 ))
diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk
index 1b12bb0f2467..c6fd96373de1 100644
--- a/desktop/Executable_sdraw.mk
+++ b/desktop/Executable_sdraw.mk
@@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,sdraw))
 
 $(eval $(ca

[Libreoffice-commits] core.git: configure.ac vcl/headless vcl/source

2019-04-04 Thread Caolán McNamara (via logerrit)

 configure.ac  |2 +-
 vcl/headless/svpgdi.cxx   |8 
 vcl/source/bitmap/BitmapTools.cxx |4 
 3 files changed, 1 insertion(+), 13 deletions(-)

New commits:
commit 50580f452cc7c88a231831619a3f05958ce56460
Author: Caolán McNamara 
AuthorDate: Thu Apr 4 10:18:57 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 4 13:51:36 2019 +0200

raise cairo baseline to 1.12.0

Change-Id: I1816f23fea88e6b840539a88504956b00a546522
Reviewed-on: https://gerrit.libreoffice.org/70243
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/configure.ac b/configure.ac
index c2fbe8c6e0da..02ea8809de4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11600,7 +11600,7 @@ if test "$test_cairo" = "yes"; then
 SYSTEM_CAIRO=TRUE
 AC_MSG_RESULT([yes])
 
-PKG_CHECK_MODULES( CAIRO, cairo >= 1.10.0 )
+PKG_CHECK_MODULES( CAIRO, cairo >= 1.12.0 )
 CAIRO_CFLAGS=$(printf '%s' "$CAIRO_CFLAGS" | sed -e 
"s/-I/${ISYSTEM?}/g")
 FilterLibs "${CAIRO_LIBS}"
 CAIRO_LIBS="${filteredlibs}"
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 6ea82e67ee55..b072bf946cdc 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -1739,11 +1739,7 @@ std::shared_ptr SvpSalGraphics::getBitmap( 
long nX, long nY, long nWi
 
 Color SvpSalGraphics::getPixel( long nX, long nY )
 {
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0)
 cairo_surface_t *target = cairo_surface_create_similar_image(m_pSurface, 
CAIRO_FORMAT_ARGB32, 1, 1);
-#else
-cairo_surface_t *target = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 
1, 1);
-#endif
 
 cairo_t* cr = cairo_create(target);
 
@@ -1977,11 +1973,7 @@ cairo_surface_t* 
SvpSalGraphics::createCairoSurface(const BitmapBuffer *pBuffer)
 
 cairo_t* SvpSalGraphics::createTmpCompatibleCairoContext() const
 {
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0)
 cairo_surface_t *target = cairo_surface_create_similar_image(m_pSurface,
-#else
-cairo_surface_t *target = cairo_image_surface_create(
-#endif
 CAIRO_FORMAT_ARGB32,
 m_aFrameSize.getX() * m_fScale,
 m_aFrameSize.getY() * m_fScale);
diff --git a/vcl/source/bitmap/BitmapTools.cxx 
b/vcl/source/bitmap/BitmapTools.cxx
index 6f14c3526d42..212557d3c28a 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -236,11 +236,7 @@ BitmapEx* CreateFromCairoSurface(Size aSize, 
cairo_surface_t * pSurface)
 // FIXME: if we could teach VCL/ about cairo handles, life could
 // be significantly better here perhaps.
 
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0)
 cairo_surface_t *pPixels = cairo_surface_create_similar_image(pSurface,
-#else
-cairo_surface_t *pPixels = cairo_image_surface_create(
-#endif
 CAIRO_FORMAT_ARGB32, aSize.Width(), aSize.Height());
 cairo_t *pCairo = cairo_create( pPixels );
 if( !pPixels || !pCairo || cairo_status(pCairo) != CAIRO_STATUS_SUCCESS )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac vcl/headless

2019-04-04 Thread Caolán McNamara (via logerrit)

 configure.ac|2 +-
 vcl/headless/svpgdi.cxx |   15 +--
 2 files changed, 2 insertions(+), 15 deletions(-)

New commits:
commit 58a0e60dee0d27a699f856827c20b792417d3478
Author: Caolán McNamara 
AuthorDate: Thu Apr 4 10:02:11 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 4 13:50:54 2019 +0200

raise cairo baseline to 1.10.0

Change-Id: I721b80d7ce28d36babbd2bd1957fcbd6a2d27a27
Reviewed-on: https://gerrit.libreoffice.org/70242
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/configure.ac b/configure.ac
index f35fe56c02f6..c2fbe8c6e0da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11600,7 +11600,7 @@ if test "$test_cairo" = "yes"; then
 SYSTEM_CAIRO=TRUE
 AC_MSG_RESULT([yes])
 
-PKG_CHECK_MODULES( CAIRO, cairo >= 1.2.0 )
+PKG_CHECK_MODULES( CAIRO, cairo >= 1.10.0 )
 CAIRO_CFLAGS=$(printf '%s' "$CAIRO_CFLAGS" | sed -e 
"s/-I/${ISYSTEM?}/g")
 FilterLibs "${CAIRO_LIBS}"
 CAIRO_LIBS="${filteredlibs}"
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 2cf49ca17696..6ea82e67ee55 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -47,12 +47,6 @@
 #include 
 #include 
 
-#if ENABLE_CAIRO_CANVAS
-#   if defined CAIRO_VERSION && CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 10, 0)
-#  define CAIRO_OPERATOR_DIFFERENCE (static_cast(23))
-#   endif
-#endif
-
 namespace
 {
 basegfx::B2DRange getClipBox(cairo_t* cr)
@@ -1805,14 +1799,7 @@ void SvpSalGraphics::invert(const basegfx::B2DPolygon 
&rPoly, SalInvert nFlags)
 
 cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
 
-if (cairo_version() >= CAIRO_VERSION_ENCODE(1, 10, 0))
-{
-cairo_set_operator(cr, CAIRO_OPERATOR_DIFFERENCE);
-}
-else
-{
-SAL_WARN("vcl.gdi", "SvpSalGraphics::invert, archaic cairo");
-}
+cairo_set_operator(cr, CAIRO_OPERATOR_DIFFERENCE);
 
 if (nFlags & SalInvert::TrackFrame)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/css loleaflet/Makefile.am loleaflet/src

2019-04-04 Thread Libreoffice Gerrit user

 loleaflet/Makefile.am  |1 +
 loleaflet/css/leaflet-spinner.css  |3 +++
 loleaflet/src/map/handler/Map.SlideShow.js |2 --
 3 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 51e849bf5dcb4bcef1fd042bb45f07b4383cb461
Author: Alexandru Vlăduţu 
AuthorDate: Thu Apr 4 13:57:23 2019 +0300
Commit: Szymon Kłos 
CommitDate: Thu Apr 4 13:46:29 2019 +0200

loleaflet: optimize slideshow spinner

This commit fixes 2 issues:

- a UX issue described by tdf#124544 (slideshow spinner is not
displayed for the correct duration - user shown a blank screen while the
browser downloads slideshow.svg)

- an additional HTTP request is being made to loading.html just to
display an ordinary spinner (that can be otherwise loaded via css for
example)

tdf#124544

Change-Id: I90d1e73d1514d736dd58a53caa5921b42bc1bd75
Reviewed-on: https://gerrit.libreoffice.org/70250
Reviewed-by: Szymon Kłos 
Tested-by: Szymon Kłos 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index b3e084148..d6cff247e 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -63,6 +63,7 @@ LOLEAFLET_CSS =\
$(builddir)/node_modules/select2/dist/css/select2.css \
$(srcdir)/css/w2ui-1.5.rc1.css \
$(srcdir)/css/leaflet.css \
+   $(srcdir)/css/leaflet-spinner.css \
$(srcdir)/css/selectionMarkers.css \
$(srcdir)/css/loleaflet.css \
$(srcdir)/css/toolbar.css \
diff --git a/loleaflet/css/leaflet-spinner.css 
b/loleaflet/css/leaflet-spinner.css
new file mode 100644
index 0..39899a71e
--- /dev/null
+++ b/loleaflet/css/leaflet-spinner.css
@@ -0,0 +1,3 @@
+.leaflet-slideshow {
+   background: 
url(data:image/gif;base64,R0lGODlhMgAyAPZBAICAgIWFhYGBgf7+/pSUlPHx8YODg4aGhp+fn6qqqoiIiM7OzoKCgpiYmPv7++Dg4JGRke/v76amppycnLa2tqioqN/f352dnezs7MLCwtfX14eHh8nJyb6+vsDAwJaWlqGhodTU1KOjo/r6+ouLi+7u7rCwsLKysvb29pCQkPj4+I6Ojvn5+ZWVlZmZmbq6uvz8/Kurq66urvPz88XFxeXl5czMzLy8vOPj493d3dnZ2dvb28rKyomJidHR0cfHx7S0tP39/dLS0tzc3MvLy4qKipqamtDQ0K2trbOzs9jY2OTk5KSkpI+Pj8bGxr29vdXV1dra2q+vr7u7u9bW1vX19fDw8PLy8vT09Pf397W1tYyMjKKiop6enqenp7+/v8jIyO3t7cPDw6Wlpc3NzaCgoJubm5eXl42NjbGxscTExKysrN7e3tPT08/Pz7e3t6mpqeLi4sHBwebm5pOTk+Hh4efn5+rq6uvr6+np6bm5uYSEhLi4uOjo6JKSkgAAACH/C05FVFNDQVBFMi4wAwEh+QQJAwBBACH+GU9wdGltaXplZCB1c2luZyBlemdpZi5jb20ALAAyADIAAAf/gEGCg4SFgjAFPi8iJACOjhcyNAWGlZaXgxaKAo+dngAXNiOYpJUSQAGfqp8eKqWlLzQbq7SsKK+VAyErtb2fD7iEAzK+xZ40wUEOIMbNjyIsryouztWgMKTDxjc+OCojETU2zL4JpDe+C7eXKD89va2WO/ADuA7utSG5CrQX68kFqPUzRGwVhXrJBsE4MVAYJ1UUEppqKMiEQYQShSEwqPDhJ1cZDaHgp8pHxVU6QsrjGKTBKpWXBH6cgRLmypL4PtrcB7GgJwk7LfnsFGNCyaCVNDirgVTk0qaFBjiDaohkMaqFDDSjhFXZ064WDB4FK/aTiK4tIdpYNYrqyJ
 
IYQWpSzVBTJqQf0ajyUnXyLkaoAcc+YBCDKdpD6Dz9+3e44zNCHhonJcAgguRSughe3sy5s+fPoEOLHk26tOnTQQIBACH5BAkDAAQALAAyACcAAAf/gASCg4SFg0EFQlMiJACOCi0VNz4ohpaXmIMWPoyPnp8AXTYjmaWWEloBoKugHpWmmAMEU04brLetr7CEAzIhK7jBoLu8IMLHnxbEBCguyM+PYru90NWhpKU3z09CSygjiTbGwkGZQ8cLupYoP0W4MZcFkLg/P7KwI+23roYy7+rTnLEKYQiDgH33lgkKkmRfIX+stCg8FZHXwVVlEk48hKCiIA8DAW5cOO+ThEFnMI7ExGMgM5crLbVcJe3XqnIxKd58oTKnzIEVaPpcd4Bmi1VLhuo0aQtUAaUFoUGN+mxqoQHQnlpF+SzpVkEGMAr9Kk8sKBFfXxq9+ZUMRoNjPK3GECrQk72tzYTWekRF41QxrCpZYBDDa1oCwFYdOnyoUatBHhgf0pZMcrygjiQScmJ5Mx0GWjvHyzEoEAAh+QQJAwAEACwAMgAnAAAH/4AEgoOEhYIWbkEFbS9MWwABTWcJHW51WYaZmpsEElqRXAKQo6SjBZyomi80G6Wur102DqmoA22Sr7m5X5i0hgNIusK7vb6CDqHDyq4WxgRZZsvSpTS+wNPYo0zFmzfSZk9tS1kOVjU2ycJms5tDw2B0iZxZ8OrtCrpdWM++Re8Dv4IRc/asni4qhkyIgkWQUIFougpZWegKAcCGg4IkyUfoiy5uGAUJrEjoTC4dIQPueoYlYspf+EjWWfkykw1iudjVLGTyVYYODHcaUpKzgk+hMF/VoKMUaUKf/pg5lQj11VSq0646xHZKq6CYpRA09UrAQFVqZAucDKrVAqwwOTy93iQJEa3WGD5ZMQMpFJpPt2sgUbkoN+6+GmQH4drbKXHGqK4cZ6JnltSLjpIfk9qXWRNgLZ3n5bAyKBAAIfkECQM
 
ABQAsADIAKAAAB/+ABYKDhIWDD0dcV203TFsGEBMxX21LVkGGmZqbY1oBAKChoqFSNFabqJoDBTc0G6OwsV02I6m2A2shK7G8vB61tpkjXL3FvU/BhcPGzLFYyYK4zdOjD9A31NmkwTvNCwBGT5Uj5DU2zEzAqq/FP6vPmsTGRpiZa8Vd8Nw/RfjCAsdWQSswgl87gYNMHBuozMhCQlYAykLIMNqJh4I89FJXkdA9WdEKNJClo6MwBL4Izkhp8h/IOAZh1WtpiB0sVh9HeaGpiYevJ7Fs8OQU1IuzoT19HUXasGgspvaCQroJtZASWf1kVoWoVOvWaF2rfR1kU9Q5WFzGCppajRdHqFdAsAZV+4AkLHd07YKaQIXi1hgkReZSe4hB0BoECXt0+8yDYrAgZz4WOTfh5IJsQembDLHCNs49CTA4BVpVDkKBAAAh+QQJAwALACwAMgApAAAH/4ALgoOEhYMWPiICAC9MJABoCGlgFiUwhpiZmi80EloBkKGioRdSNFeaqZkDIWijr7ChZKq0CwNIsbmwI7WaDly6waMdKr2FKmbCyqLExo3L0KIWtUPQydGyqlcKymRVCx1CSyojlspMqrjBYAOpZMDBLL6LuRfftVlgPfWXmCb1WtoZs6UvVgJMVui9QiBw4KFczQZ1yFXMoaFrsKAQahBLh0WESSAKwpLrYyZ1sJIQ7GgSpEFbKEf1a3mM28IFQzCKkkAzE4+ONB69mtXTX0opGYv6NLhLKcID0JyejCq1kJKU+16hqvoQq1augwYwHQp2kE1hIsqahcar7LaFOkCzuT0qjZU8sGSAMoixZKRacCzv/R3JIGUBcIMldpyZeEEKlogTFxD6qvGxFwaGWa4pbTMmUp6fMrASGuGQQoEAACH5BAkDAAkALAAyACkAAAf/gAmCg4SFgmMJOUciAgBTjBsXSUR1LIaXmJmHP5EBAJ+goZ+SUFmap4YDUCuira6fqKgO
 
s2uvtqKSlrGpLre+rh6mu4IDZr/HrcOHyMygwrE5zdJFddAKx0dVCU/ZWSzIapoYjbcXCj8DmBE1RCDkryK6hibl6cNZnLcOqe+tFMqDHPjaV8iDLQT2AG4rYutSA1vPFCbqBSxhlls6JBYKkuQVlEGrgGnEVEvkQlcER26EN9Gkynnworl8Seiav5OtatA0RMRjR5Q7Yfozliwoz2ZG+TG7krSgKwRAmwrS8ZTCzKRYmImQG

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/headless vcl/inc vcl/unx

2019-04-04 Thread Caolán McNamara (via logerrit)

 vcl/headless/svpgdi.cxx  |   40 
 vcl/headless/svpvd.cxx   |8 ++--
 vcl/inc/headless/svpgdi.hxx  |3 +++
 vcl/unx/gtk3/gtk3gtkinst.cxx |2 +-
 4 files changed, 34 insertions(+), 19 deletions(-)

New commits:
commit 0edf02fc88a444157713874686b1c7409a13f04c
Author: Caolán McNamara 
AuthorDate: Thu Apr 4 09:38:47 2019 +0100
Commit: Michael Stahl 
CommitDate: Thu Apr 4 13:42:19 2019 +0200

Resolves: tdf#124219 check at runtime for availability of cairo functions

Change-Id: I0ab3055760d8be690bdfff560212db368a0fa261
Reviewed-on: https://gerrit.libreoffice.org/70246
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 502aa43c792f..3a785d642301 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -43,6 +43,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #if ENABLE_CAIRO_CANVAS
 #   if defined CAIRO_VERSION && CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 10, 0)
@@ -613,9 +614,7 @@ void SvpSalGraphics::setSurface(cairo_surface_t* pSurface, 
const basegfx::B2IVec
 {
 m_pSurface = pSurface;
 m_aFrameSize = rSize;
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
-cairo_surface_get_device_scale(pSurface, &m_fScale, nullptr);
-#endif
+dl_cairo_surface_get_device_scale(pSurface, &m_fScale, nullptr);
 ResetClipRegion();
 }
 
@@ -1598,9 +1597,7 @@ void SvpSalGraphics::copyBits( const SalTwoRect& rTR,
 
cairo_surface_get_content(m_pSurface),
 aTR.mnSrcWidth * m_fScale,
 aTR.mnSrcHeight * m_fScale);
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
-cairo_surface_set_device_scale(pCopy, m_fScale, m_fScale);
-#endif
+dl_cairo_surface_set_device_scale(pCopy, m_fScale, m_fScale);
 cairo_t* cr = cairo_create(pCopy);
 cairo_set_source_surface(cr, source, -aTR.mnSrcX, -aTR.mnSrcY);
 cairo_rectangle(cr, 0, 0, aTR.mnSrcWidth, aTR.mnSrcHeight);
@@ -1893,9 +1890,7 @@ void SvpSalGraphics::invert(const basegfx::B2DPolygon 
&rPoly, SalInvert nFlags)
 
extents.getWidth() * m_fScale,
 
extents.getHeight() * m_fScale);
 
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
-cairo_surface_set_device_scale(surface, m_fScale, m_fScale);
-#endif
+dl_cairo_surface_set_device_scale(surface, m_fScale, m_fScale);
 cairo_t* stipple_cr = cairo_create(surface);
 cairo_set_source_rgb(stipple_cr, 1.0, 1.0, 1.0);
 cairo_mask(stipple_cr, pattern);
@@ -2049,9 +2044,7 @@ cairo_t* 
SvpSalGraphics::createTmpCompatibleCairoContext() const
 m_aFrameSize.getX() * m_fScale,
 m_aFrameSize.getY() * m_fScale);
 
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
-cairo_surface_set_device_scale(target, m_fScale, m_fScale);
-#endif
+dl_cairo_surface_set_device_scale(target, m_fScale, m_fScale);
 
 return cairo_create(target);
 }
@@ -2247,4 +2240,27 @@ GlyphCache& SvpSalGraphics::getPlatformGlyphCache()
 return *pSalData->GetGlyphCache();
 }
 
+void dl_cairo_surface_set_device_scale(cairo_surface_t *surface, double 
x_scale, double y_scale)
+{
+static auto func = reinterpret_cast(
+dlsym(nullptr, "cairo_surface_set_device_scale"));
+if (func)
+func(surface, x_scale, y_scale);
+}
+
+void dl_cairo_surface_get_device_scale(cairo_surface_t *surface, double* 
x_scale, double* y_scale)
+{
+static auto func = reinterpret_cast(
+dlsym(nullptr, "cairo_surface_get_device_scale"));
+if (func)
+func(surface, x_scale, y_scale);
+else
+{
+if (x_scale)
+*x_scale = 1.0;
+if (y_scale)
+*y_scale = 1.0;
+}
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx
index 875f22a5d7fc..eeccf2c014a9 100644
--- a/vcl/headless/svpvd.cxx
+++ b/vcl/headless/svpvd.cxx
@@ -89,7 +89,6 @@ bool SvpSalVirtualDevice::SetSizeUsingBuffer( long nNewDX, 
long nNewDY,
 }
 else if (pBuffer)
 {
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
 double fXScale, fYScale;
 if (comphelper::LibreOfficeKit::isActive())
 {
@@ -98,18 +97,15 @@ bool SvpSalVirtualDevice::SetSizeUsingBuffer( long nNewDX, 
long nNewDY,
 }
 else
 {
-cairo_surface_get_device_scale(m_pRefSurface, &fXScale, 
&fYScale);
+dl_cairo_surface_get_device_scale(m_pRefSurface, &fXScale, 
&fYScale);
 nNewDX *= fXScale;
 nNewDY *= fYScale;
 }
-#endif
 
 m_pSurface = cairo_image_surface_create_for_data(pBuffer,

[Libreoffice-commits] core.git: officecfg/registry

2019-04-04 Thread Andras Timar (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 244e60ec32d593fe92f2c93b9934762067243947
Author: Andras Timar 
AuthorDate: Thu Apr 4 13:41:21 2019 +0200
Commit: Andras Timar 
CommitDate: Thu Apr 4 13:41:21 2019 +0200

typo: openning -> opening

Change-Id: I7da07503badec82ffb227424819a0f19eabfbbe5

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 191d92eebaa2..59adc563ef6f 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3830,7 +3830,7 @@
   
 
   Specifies if LO should create MSO lock files next to the 
LO lock files
-  when openning a file. This makes MSO to be able to read the user 
name from
+  when opening a file. This makes MSO to be able to read the user 
name from
   the lock file and show it for the user.
 
 false
___
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' - shell/source

2019-04-04 Thread Stephan Bergmann (via logerrit)

 shell/source/unix/exec/shellexec.cxx |   37 +++
 shell/source/win32/SysShExec.cxx |  114 +++
 2 files changed, 151 insertions(+)

New commits:
commit 441f2d56d6f7d1d36ec515c03a54a789fa767958
Author: Stephan Bergmann 
AuthorDate: Fri Mar 29 14:01:19 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 4 13:25:51 2019 +0200

Filter out problematic file URLs

Change-Id: I87fd37e56326bef4888354b923407530c6f70760
Reviewed-on: https://gerrit.libreoffice.org/70186
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/shell/source/unix/exec/shellexec.cxx 
b/shell/source/unix/exec/shellexec.cxx
index 7deeb5caa8a7..7355eaea0db6 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -43,6 +43,10 @@
 #include 
 #include 
 
+#if defined MACOSX
+#include 
+#endif
+
 using com::sun::star::system::XSystemShellExecute;
 using com::sun::star::system::SystemShellExecuteException;
 
@@ -113,6 +117,39 @@ void SAL_CALL ShellExec::execute( const OUString& 
aCommand, const OUString& aPar
 }
 
 #ifdef MACOSX
+if (uri->getScheme().equalsIgnoreAsciiCase("file")) {
+OUString pathname;
+auto const e1 = osl::FileBase::getSystemPathFromFileURL(aCommand, 
pathname);
+if (e1 != osl::FileBase::E_None) {
+throw css::lang::IllegalArgumentException(
+("XSystemShellExecute.execute, getSystemPathFromFileURL <" 
+ aCommand
+ + "> failed with " + OUString::number(e1)),
+{}, 0);
+}
+OString pathname8;
+if (!pathname.convertToString(
+&pathname8, RTL_TEXTENCODING_UTF8,
+(RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR
+ | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR)))
+{
+throw css::lang::IllegalArgumentException(
+"XSystemShellExecute.execute, cannot convert \"" + 
pathname + "\" to UTF-8", {},
+0);
+}
+struct stat st;
+auto const e2 = stat(pathname8.getStr(), &st);
+if (e2 != 0) {
+auto const e3 = errno;
+SAL_INFO("shell", "stat(" << pathname8 << ") failed with errno 
" << e3);
+}
+if (e2 != 0 || !S_ISREG(st.st_mode)
+|| (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) != 0)
+{
+throw css::lang::IllegalArgumentException(
+"XSystemShellExecute.execute, cannot process <" + aCommand 
+ ">", {}, 0);
+}
+}
+
 //TODO: Using open(1) with an argument that syntactically is an 
absolute
 // URI reference does not necessarily give expected results:
 // 1  If the given URI reference matches a supported scheme (e.g.,
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index 11ca42005b10..4786e4ddedc7 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -18,8 +18,10 @@
  */
 
 #include 
+#include 
 
 #include 
+#include 
 #include 
 #include "SysShExec.hxx"
 #include 
@@ -30,12 +32,16 @@
 #include 
 #include 
 #include 
+#include 
 
 #define WIN32_LEAN_AND_MEAN
 #include 
 #include 
+#include 
 #include 
 
+#include 
+
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::RuntimeException;
 using com::sun::star::uno::Sequence;
@@ -242,6 +248,18 @@ CSysShExec::CSysShExec( const Reference< 
css::uno::XComponentContext >& xContext
 
 namespace
 {
+bool checkExtension(OUString const & extension, OUString const & blacklist) {
+assert(!extension.isEmpty());
+for (sal_Int32 i = 0; i != -1;) {
+OUString tok = blacklist.getToken(0, ';', i);
+tok.startsWith(".", &tok);
+if (extension.equalsIgnoreAsciiCase(tok)) {
+return false;
+}
+}
+return true;
+}
+
 // This callback checks if the found window is the specified process's 
top-level window,
 // and activates the first found such window.
 BOOL CALLBACK FindAndActivateProcWnd(HWND hwnd, LPARAM lParam)
@@ -295,6 +313,102 @@ void SAL_CALL CSysShExec::execute( const OUString& 
aCommand, const OUString& aPa
  + aCommand,
 static_cast< cppu::OWeakObject * >(this), 0);
 }
+if (uri->getScheme().equalsIgnoreAsciiCase("file")) {
+OUString pathname;
+auto const e1 = osl::FileBase::getSystemPathFromFileURL(aCommand, 
pathname);
+if (e1 != osl::FileBase::E_None) {
+throw css::lang::IllegalArgumentException(
+("XSystemShellExecute.execute, getSystemPathFromFileURL <" 
+ aCommand
+ + "> failed with " + OUString::number(e1)),
+{}, 0);
+}
+for (int i = 0;; ++i) {
+SHFILE

Re: compiling Libreoffice with internationalization

2019-04-04 Thread Regina Henschel


Hi Adrien,

Adrien Ollier schrieb am 04-Apr-19 um 12:36:

Hello everybody,

I am a French C++ developper and I want to contribute to Libreoffice.
I downloaded the Libreoffice source code and compiled it on my Ubuntu 
desktop computer with is configured in French but all the text in the 
menus is in English. I can't get the User Interface in French as you can 
see in the following screenshot:




You need to add the configure "with-lang" option. For me, German, it is 
--with-lang="de".

More details on configure options use ./autogen.sh --help

Kind regards
Regina
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-0' - 2 commits - configure.ac download.lst external/python3

2019-04-04 Thread Michael Stahl (via logerrit)

 configure.ac|2 
 download.lst|4 -
 external/python3/UnpackedTarball_python3.mk |1 
 external/python3/python-3.5.7-c99.patch.1   |   62 
 4 files changed, 66 insertions(+), 3 deletions(-)

New commits:
commit b3cbb433ca8e1d9c49ed64c3cd2b6fa6e3432fa5
Author: Michael Stahl 
AuthorDate: Wed Apr 3 11:03:17 2019 +0200
Commit: Michael Stahl 
CommitDate: Thu Apr 4 11:00:52 2019 +0200

python3: upgrade to release 3.5.7

Fixes CVE-2019-9636 CVE-2019-5010 CVE-2018-14647

Change-Id: If0a115960aed1ee90b63e6716c844669f0ec91e5
Reviewed-on: https://gerrit.libreoffice.org/70182
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 3c7354a85a9bd47a2676aadaad2f6622fe2d959c)
Reviewed-on: https://gerrit.libreoffice.org/70194
Reviewed-by: Thorsten Behrens 
(cherry picked from commit a072b91c03f7e24cc5fe99e4b7462d37ef8d703b)

diff --git a/configure.ac b/configure.ac
index 2991bb9bd76d..3272b4058624 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8055,7 +8055,7 @@ internal)
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=5
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.6
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.7
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index 1187df986ece..c225e0c227f4 100644
--- a/download.lst
+++ b/download.lst
@@ -206,8 +206,8 @@ export POPPLER_SHA256SUM := 
92e09fd3302567fd36146b36bb707db43ce436e8841219025a82
 export POPPLER_TARBALL := poppler-0.74.0.tar.xz
 export POSTGRESQL_SHA256SUM := 
db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461
 export POSTGRESQL_TARBALL := 
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
-export PYTHON_SHA256SUM := 
f55cde04f521f273c7cba08912921cc5642cfc15ca7b22d5829f0aff4371155f
-export PYTHON_TARBALL := Python-3.5.6.tar.xz
+export PYTHON_SHA256SUM := 
285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc
+export PYTHON_TARBALL := Python-3.5.7.tar.xz
 export QXP_SHA256SUM := 
8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73
 export QXP_TARBALL := libqxp-0.0.1.tar.xz
 export RAPTOR_SHA256SUM := 
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
diff --git a/external/python3/UnpackedTarball_python3.mk 
b/external/python3/UnpackedTarball_python3.mk
index ec1bdabe4fdd..66a82955e440 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/ubsan.patch.0 \
external/python3/python-3.5.tweak.strip.soabi.patch \

external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1
 \
+   external/python3/python-3.5.7-c99.patch.1 \
 ))
 
 ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),)
diff --git a/external/python3/python-3.5.7-c99.patch.1 
b/external/python3/python-3.5.7-c99.patch.1
new file mode 100644
index ..558166d9953f
--- /dev/null
+++ b/external/python3/python-3.5.7-c99.patch.1
@@ -0,0 +1,62 @@
+remove C99 which isn't suppored by all compilers yet
+
+--- python3/Modules/_pickle.c.orig 2019-04-03 16:34:01.380124314 +0200
 python3/Modules/_pickle.c  2019-04-03 16:35:18.579005171 +0200
+@@ -674,9 +674,12 @@
+ PyErr_NoMemory();
+ return NULL;
+ }
+-for (size_t i = 0; i < self->mt_allocated; i++) {
++{
++size_t i;
++for (i = 0; i < self->mt_allocated; i++) {
+ Py_XINCREF(self->mt_table[i].me_key);
+ }
++}
+ memcpy(new->mt_table, self->mt_table,
+sizeof(PyMemoEntry) * self->mt_allocated);
+ 
+@@ -4204,7 +4207,9 @@
+ return NULL;
+ 
+ memo = self->pickler->memo;
+-for (size_t i = 0; i < memo->mt_allocated; ++i) {
++{
++size_t i;
++for (i = 0; i < memo->mt_allocated; ++i) {
+ PyMemoEntry entry = memo->mt_table[i];
+ if (entry.me_key != NULL) {
+ int status;
+@@ -4225,6 +4230,7 @@
+ goto error;
+ }
+ }
++}
+ return new_memo;
+ 
+   error:
+@@ -6791,10 +6797,13 @@
+ if (new_memo == NULL)
+ return -1;
+ 
+-for (size_t i = 0; i < new_memo_size; i++) {
++{
++size_t i;
++for (i = 0; i < new_memo_size; i++) {
+ Py_XINCREF(unpickler->memo[i]);
+ new_memo[i] = unpickler->memo[i];
+ }
++}
+ }
+ else if (PyDict_Check(obj)) {
+ Py_ssize_t i = 0;
+@@ -6839,7 +6848,8 @@
+ 
+   error:
+ if (new_memo_size) {
+-for (size_t i = new_memo_size - 1; i != SIZE_MAX; i--) {
++size_t i;
++for (i = new_memo_s

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-4' - 2 commits - configure.ac download.lst external/python3

2019-04-04 Thread Michael Stahl (via logerrit)

 configure.ac|2 
 download.lst|4 -
 external/python3/UnpackedTarball_python3.mk |1 
 external/python3/python-3.5.7-c99.patch.1   |   62 
 4 files changed, 66 insertions(+), 3 deletions(-)

New commits:
commit 7ae324c221b868ad7e232319542c7ae95ed8ec14
Author: Michael Stahl 
AuthorDate: Wed Apr 3 11:03:17 2019 +0200
Commit: Michael Stahl 
CommitDate: Thu Apr 4 11:04:01 2019 +0200

python3: upgrade to release 3.5.7

Fixes CVE-2019-9636 CVE-2019-5010 CVE-2018-14647

Reviewed-on: https://gerrit.libreoffice.org/70182
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 3c7354a85a9bd47a2676aadaad2f6622fe2d959c)
Reviewed-on: https://gerrit.libreoffice.org/70194
Reviewed-by: Thorsten Behrens 
(cherry picked from commit a072b91c03f7e24cc5fe99e4b7462d37ef8d703b)

Change-Id: If0a115960aed1ee90b63e6716c844669f0ec91e5

diff --git a/configure.ac b/configure.ac
index 1f9294e4b606..b0ed14027b4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8274,7 +8274,7 @@ internal)
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=5
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.6
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.7
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index 1c5f12bc95cf..8d2e9d2cca21 100644
--- a/download.lst
+++ b/download.lst
@@ -194,8 +194,8 @@ export POPPLER_SHA256SUM := 
92e09fd3302567fd36146b36bb707db43ce436e8841219025a82
 export POPPLER_TARBALL := poppler-0.74.0.tar.xz
 export POSTGRESQL_SHA256SUM := 
db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461
 export POSTGRESQL_TARBALL := 
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
-export PYTHON_SHA256SUM := 
f55cde04f521f273c7cba08912921cc5642cfc15ca7b22d5829f0aff4371155f
-export PYTHON_TARBALL := Python-3.5.6.tar.xz
+export PYTHON_SHA256SUM := 
285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc
+export PYTHON_TARBALL := Python-3.5.7.tar.xz
 export RAPTOR_SHA256SUM := 
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
 export RAPTOR_TARBALL := a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz
 export RASQAL_SHA256SUM := 
6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c
diff --git a/external/python3/UnpackedTarball_python3.mk 
b/external/python3/UnpackedTarball_python3.mk
index ec1bdabe4fdd..66a82955e440 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/ubsan.patch.0 \
external/python3/python-3.5.tweak.strip.soabi.patch \

external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1
 \
+   external/python3/python-3.5.7-c99.patch.1 \
 ))
 
 ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),)
diff --git a/external/python3/python-3.5.7-c99.patch.1 
b/external/python3/python-3.5.7-c99.patch.1
new file mode 100644
index ..558166d9953f
--- /dev/null
+++ b/external/python3/python-3.5.7-c99.patch.1
@@ -0,0 +1,62 @@
+remove C99 which isn't suppored by all compilers yet
+
+--- python3/Modules/_pickle.c.orig 2019-04-03 16:34:01.380124314 +0200
 python3/Modules/_pickle.c  2019-04-03 16:35:18.579005171 +0200
+@@ -674,9 +674,12 @@
+ PyErr_NoMemory();
+ return NULL;
+ }
+-for (size_t i = 0; i < self->mt_allocated; i++) {
++{
++size_t i;
++for (i = 0; i < self->mt_allocated; i++) {
+ Py_XINCREF(self->mt_table[i].me_key);
+ }
++}
+ memcpy(new->mt_table, self->mt_table,
+sizeof(PyMemoEntry) * self->mt_allocated);
+ 
+@@ -4204,7 +4207,9 @@
+ return NULL;
+ 
+ memo = self->pickler->memo;
+-for (size_t i = 0; i < memo->mt_allocated; ++i) {
++{
++size_t i;
++for (i = 0; i < memo->mt_allocated; ++i) {
+ PyMemoEntry entry = memo->mt_table[i];
+ if (entry.me_key != NULL) {
+ int status;
+@@ -4225,6 +4230,7 @@
+ goto error;
+ }
+ }
++}
+ return new_memo;
+ 
+   error:
+@@ -6791,10 +6797,13 @@
+ if (new_memo == NULL)
+ return -1;
+ 
+-for (size_t i = 0; i < new_memo_size; i++) {
++{
++size_t i;
++for (i = 0; i < new_memo_size; i++) {
+ Py_XINCREF(unpickler->memo[i]);
+ new_memo[i] = unpickler->memo[i];
+ }
++}
+ }
+ else if (PyDict_Check(obj)) {
+ Py_ssize_t i = 0;
+@@ -6839,7 +6848,8 @@
+ 
+   error:
+ if (new_memo_size) {
+-for (size_t i = new_memo_size - 1; i != SIZE_MAX; i--) {
++

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-2' - 2 commits - configure.ac download.lst external/python3

2019-04-04 Thread Michael Stahl (via logerrit)

 configure.ac|2 
 download.lst|4 -
 external/python3/UnpackedTarball_python3.mk |1 
 external/python3/python-3.5.7-c99.patch.1   |   62 
 4 files changed, 66 insertions(+), 3 deletions(-)

New commits:
commit 1cd2c3eb800f6ba2363f1033736b9dc5dcacf22c
Author: Michael Stahl 
AuthorDate: Wed Apr 3 11:03:17 2019 +0200
Commit: Michael Stahl 
CommitDate: Thu Apr 4 12:15:36 2019 +0200

python3: upgrade to release 3.5.7

Fixes CVE-2019-9636 CVE-2019-5010 CVE-2018-14647

Reviewed-on: https://gerrit.libreoffice.org/70182
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 3c7354a85a9bd47a2676aadaad2f6622fe2d959c)
Reviewed-on: https://gerrit.libreoffice.org/70194
Reviewed-by: Thorsten Behrens 
(cherry picked from commit a072b91c03f7e24cc5fe99e4b7462d37ef8d703b)

Change-Id: If0a115960aed1ee90b63e6716c844669f0ec91e5

diff --git a/configure.ac b/configure.ac
index 75f9946e22c0..4473502848af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8420,7 +8420,7 @@ internal)
 PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.5
 else
 PYTHON_VERSION_MINOR=5
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.6
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.7
 fi
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
diff --git a/download.lst b/download.lst
index 1b6009a6a63d..a49c54719c4d 100644
--- a/download.lst
+++ b/download.lst
@@ -139,8 +139,8 @@ ifeq ($(PYTHON_VERSION_MINOR),3)
 export PYTHON_MD5SUM := 803a75927f8f241ca78633890c798021
 export PYTHON_TARBALL := Python-3.3.5.tgz
 else
-export PYTHON_MD5SUM := f5a99f765e765336a3ebbb2a24ca2be3
-export PYTHON_TARBALL := Python-3.5.6.tar.xz
+export PYTHON_MD5SUM := b1b4949786732494f4d6675c184aa765
+export PYTHON_TARBALL := Python-3.5.7.tar.xz
 endif
 
 export RAPTOR_TARBALL := 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz
diff --git a/external/python3/UnpackedTarball_python3.mk 
b/external/python3/UnpackedTarball_python3.mk
index 04def4429860..5fe0212d86e3 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/ubsan.patch.0 \
external/python3/python-3.5.tweak.strip.soabi.patch \

external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1
 \
+   external/python3/python-3.5.7-c99.patch.1 \
 ))
 
 ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),)
diff --git a/external/python3/python-3.5.7-c99.patch.1 
b/external/python3/python-3.5.7-c99.patch.1
new file mode 100644
index ..558166d9953f
--- /dev/null
+++ b/external/python3/python-3.5.7-c99.patch.1
@@ -0,0 +1,62 @@
+remove C99 which isn't suppored by all compilers yet
+
+--- python3/Modules/_pickle.c.orig 2019-04-03 16:34:01.380124314 +0200
 python3/Modules/_pickle.c  2019-04-03 16:35:18.579005171 +0200
+@@ -674,9 +674,12 @@
+ PyErr_NoMemory();
+ return NULL;
+ }
+-for (size_t i = 0; i < self->mt_allocated; i++) {
++{
++size_t i;
++for (i = 0; i < self->mt_allocated; i++) {
+ Py_XINCREF(self->mt_table[i].me_key);
+ }
++}
+ memcpy(new->mt_table, self->mt_table,
+sizeof(PyMemoEntry) * self->mt_allocated);
+ 
+@@ -4204,7 +4207,9 @@
+ return NULL;
+ 
+ memo = self->pickler->memo;
+-for (size_t i = 0; i < memo->mt_allocated; ++i) {
++{
++size_t i;
++for (i = 0; i < memo->mt_allocated; ++i) {
+ PyMemoEntry entry = memo->mt_table[i];
+ if (entry.me_key != NULL) {
+ int status;
+@@ -4225,6 +4230,7 @@
+ goto error;
+ }
+ }
++}
+ return new_memo;
+ 
+   error:
+@@ -6791,10 +6797,13 @@
+ if (new_memo == NULL)
+ return -1;
+ 
+-for (size_t i = 0; i < new_memo_size; i++) {
++{
++size_t i;
++for (i = 0; i < new_memo_size; i++) {
+ Py_XINCREF(unpickler->memo[i]);
+ new_memo[i] = unpickler->memo[i];
+ }
++}
+ }
+ else if (PyDict_Check(obj)) {
+ Py_ssize_t i = 0;
+@@ -6839,7 +6848,8 @@
+ 
+   error:
+ if (new_memo_size) {
+-for (size_t i = new_memo_size - 1; i != SIZE_MAX; i--) {
++size_t i;
++for (i = new_memo_size - 1; i != SIZE_MAX; i--) {
+ Py_XDECREF(new_memo[i]);
+ }
+ PyMem_FREE(new_memo);
commit e0122f0cfe8b38da214dac76ecff13e0ee0f6a6b
Author: Caolán McNamara 
AuthorDate: Thu Jan 17 10:50:42 2019 +
Commit: Michael Stahl 
CommitDate: Thu Apr 4 12:15:36 2019 +0200

upgrade to python 3.5.6

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - 3 commits - configure.ac download.lst external/python3

2019-04-04 Thread Michael Stahl (via logerrit)

 configure.ac|5 +-
 download.lst|4 -
 external/python3/UnpackedTarball_python3.mk |1 
 external/python3/python-3.5.7-c99.patch.1   |   62 
 4 files changed, 69 insertions(+), 3 deletions(-)

New commits:
commit 1cbb2dbff27c603583a4132537c2b8967c489bb0
Author: Michael Stahl 
AuthorDate: Wed Apr 3 11:03:17 2019 +0200
Commit: Michael Stahl 
CommitDate: Thu Apr 4 11:36:47 2019 +0200

python3: upgrade to release 3.5.7

Fixes CVE-2019-9636 CVE-2019-5010 CVE-2018-14647

Change-Id: If0a115960aed1ee90b63e6716c844669f0ec91e5
Reviewed-on: https://gerrit.libreoffice.org/70182
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 3c7354a85a9bd47a2676aadaad2f6622fe2d959c)
Reviewed-on: https://gerrit.libreoffice.org/70194
Reviewed-by: Thorsten Behrens 
(cherry picked from commit a072b91c03f7e24cc5fe99e4b7462d37ef8d703b)

diff --git a/configure.ac b/configure.ac
index cab75d8e4a15..0a912c2bf238 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8449,7 +8449,7 @@ internal)
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=5
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.6
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.7
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index 581ad04965f4..98e55295f5c5 100644
--- a/download.lst
+++ b/download.lst
@@ -134,8 +134,8 @@ export PNG_TARBALL := libpng-1.6.28.tar.gz
 export POPPLER_MD5SUM := 1ce581bde2f23fa55bee13d8c61ac0df
 export POPPLER_TARBALL := poppler-0.74.0.tar.xz
 export POSTGRESQL_TARBALL := 
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
-export PYTHON_MD5SUM := f5a99f765e765336a3ebbb2a24ca2be3
-export PYTHON_TARBALL := Python-3.5.6.tar.xz
+export PYTHON_MD5SUM := b1b4949786732494f4d6675c184aa765
+export PYTHON_TARBALL := Python-3.5.7.tar.xz
 export RAPTOR_TARBALL := 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz
 export RASQAL_TARBALL := b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
 export REDLAND_TARBALL := 
32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz
diff --git a/external/python3/UnpackedTarball_python3.mk 
b/external/python3/UnpackedTarball_python3.mk
index 04def4429860..5fe0212d86e3 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/ubsan.patch.0 \
external/python3/python-3.5.tweak.strip.soabi.patch \

external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1
 \
+   external/python3/python-3.5.7-c99.patch.1 \
 ))
 
 ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),)
diff --git a/external/python3/python-3.5.7-c99.patch.1 
b/external/python3/python-3.5.7-c99.patch.1
new file mode 100644
index ..558166d9953f
--- /dev/null
+++ b/external/python3/python-3.5.7-c99.patch.1
@@ -0,0 +1,62 @@
+remove C99 which isn't suppored by all compilers yet
+
+--- python3/Modules/_pickle.c.orig 2019-04-03 16:34:01.380124314 +0200
 python3/Modules/_pickle.c  2019-04-03 16:35:18.579005171 +0200
+@@ -674,9 +674,12 @@
+ PyErr_NoMemory();
+ return NULL;
+ }
+-for (size_t i = 0; i < self->mt_allocated; i++) {
++{
++size_t i;
++for (i = 0; i < self->mt_allocated; i++) {
+ Py_XINCREF(self->mt_table[i].me_key);
+ }
++}
+ memcpy(new->mt_table, self->mt_table,
+sizeof(PyMemoEntry) * self->mt_allocated);
+ 
+@@ -4204,7 +4207,9 @@
+ return NULL;
+ 
+ memo = self->pickler->memo;
+-for (size_t i = 0; i < memo->mt_allocated; ++i) {
++{
++size_t i;
++for (i = 0; i < memo->mt_allocated; ++i) {
+ PyMemoEntry entry = memo->mt_table[i];
+ if (entry.me_key != NULL) {
+ int status;
+@@ -4225,6 +4230,7 @@
+ goto error;
+ }
+ }
++}
+ return new_memo;
+ 
+   error:
+@@ -6791,10 +6797,13 @@
+ if (new_memo == NULL)
+ return -1;
+ 
+-for (size_t i = 0; i < new_memo_size; i++) {
++{
++size_t i;
++for (i = 0; i < new_memo_size; i++) {
+ Py_XINCREF(unpickler->memo[i]);
+ new_memo[i] = unpickler->memo[i];
+ }
++}
+ }
+ else if (PyDict_Check(obj)) {
+ Py_ssize_t i = 0;
+@@ -6839,7 +6848,8 @@
+ 
+   error:
+ if (new_memo_size) {
+-for (size_t i = new_memo_size - 1; i != SIZE_MAX; i--) {
++size_t i;
++for (i = new_memo_size - 1; i != SIZE_MAX; i--) {
+ Py_XDECREF(new_memo[i]);
+ }
+ PyMem_FREE(new_memo);
commit dac227e03db6

[Libreoffice-commits] core.git: sw/inc sw/qa

2019-04-04 Thread Roman Kuznetsov (via logerrit)

 sw/inc/strings.hrc|   15 ++-
 sw/qa/uitest/writer_tests2/formatParagraph.py |4 ++--
 2 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit 43c44f7c82fdcf7e5e6eccb0a80d5bb0e1e3a86c
Author: Roman Kuznetsov 
AuthorDate: Tue Apr 2 08:30:17 2019 +0100
Commit: Mike Kaganski 
CommitDate: Thu Apr 4 12:42:00 2019 +0200

tdf#124471 Change bullet styles names in Style section of Sidebar

Change-Id: I1a6acd3b9496cf83cd0e1ef6d808443cd40ae2c3
Reviewed-on: https://gerrit.libreoffice.org/70121
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 93a8fcc1fcd2..5ee7196700e5 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -203,11 +203,16 @@
 #define STR_POOLNUMRULE_NUM3NC_("STR_POOLNUMRULE_NUM3", 
"Numbering abc")
 #define STR_POOLNUMRULE_NUM4NC_("STR_POOLNUMRULE_NUM4", 
"Numbering IVX")
 #define STR_POOLNUMRULE_NUM5NC_("STR_POOLNUMRULE_NUM5", 
"Numbering ivx")
-#define STR_POOLNUMRULE_BUL1NC_("STR_POOLNUMRULE_BUL1", 
"List 1")
-#define STR_POOLNUMRULE_BUL2NC_("STR_POOLNUMRULE_BUL2", 
"List 2")
-#define STR_POOLNUMRULE_BUL3NC_("STR_POOLNUMRULE_BUL3", 
"List 3")
-#define STR_POOLNUMRULE_BUL4NC_("STR_POOLNUMRULE_BUL4", 
"List 4")
-#define STR_POOLNUMRULE_BUL5NC_("STR_POOLNUMRULE_BUL5", 
"List 5")
+//Bullet \u2022
+#define STR_POOLNUMRULE_BUL1NC_("STR_POOLNUMRULE_BUL1", 
"Bullet •")
+//Bullet \u2013
+#define STR_POOLNUMRULE_BUL2NC_("STR_POOLNUMRULE_BUL2", 
"Bullet –")
+//Bullet \uE4C4
+#define STR_POOLNUMRULE_BUL3NC_("STR_POOLNUMRULE_BUL3", 
"Bullet ")
+//Bullet \uE49E
+#define STR_POOLNUMRULE_BUL4NC_("STR_POOLNUMRULE_BUL4", 
"Bullet ")
+//Bullet \uE20B
+#define STR_POOLNUMRULE_BUL5NC_("STR_POOLNUMRULE_BUL5", 
"Bullet ")
 #define STR_COLUMN_VALUESET_ITEM0   
NC_("STR_COLUMN_VALUESET_ITEM0", "1 column")
 #define STR_COLUMN_VALUESET_ITEM1   
NC_("STR_COLUMN_VALUESET_ITEM1", "2 columns with equal size")
 #define STR_COLUMN_VALUESET_ITEM2   
NC_("STR_COLUMN_VALUESET_ITEM2", "3 columns with equal size")
diff --git a/sw/qa/uitest/writer_tests2/formatParagraph.py 
b/sw/qa/uitest/writer_tests2/formatParagraph.py
index 22f985caed9e..916d6ce71c97 100644
--- a/sw/qa/uitest/writer_tests2/formatParagraph.py
+++ b/sw/qa/uitest/writer_tests2/formatParagraph.py
@@ -281,7 +281,7 @@ class formatParagraph(UITestCase):
 props = {"TEXT": "Level 1"}
 actionProps = mkPropertyValues(props)
 xOutline.executeAction("SELECT", actionProps)
-props2 = {"TEXT": "List 1"}
+props2 = {"TEXT": "Bullet •"}
 actionProps2 = mkPropertyValues(props2)
 xNumbering.executeAction("SELECT", actionProps2)
 xPara.executeAction("CLICK", tuple())
@@ -301,7 +301,7 @@ class formatParagraph(UITestCase):
 xParaSpin = xDialog.getChild("spinNF_RESTART_PARA")
 
 self.assertEqual(get_state_as_dict(xOutline)["SelectEntryText"], 
"Level 1")
-self.assertEqual(get_state_as_dict(xNumbering)["SelectEntryText"], 
"List 1")
+self.assertEqual(get_state_as_dict(xNumbering)["SelectEntryText"], 
"Bullet •")
 self.assertEqual(get_state_as_dict(xPara)["Selected"], "true")
 self.assertEqual(get_state_as_dict(xParaSpin)["Text"], "2")
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: GSoC Proposal - LibreOffice '19

2019-04-04 Thread shubham goyal

Heiko,
First of all, thankyou very much for this wonderful review.

On Thu, 4 Apr 2019 at 10:48, Heiko Tietze  wrote:

> I miss the different types of QR, guess it comes from the library.
>
 I read about different types of QR code here
https://www.qrcode.com/en/codes/ . The library
 generates QR code of 1st type
only. But yeah, it can generate different versions of QR codes based on the
input text.

> Regarding the workflow I wonder if an integration into the hyperlink
> dialog makes sense- and a similar workflow.

Yes, I too find this exciting.

> Border (aka margins) around an image makes not much sense as the object
> itself has it.

Ok, I will remove this option.

> And I never heard about the error correction level so it might be an
> expert feature.

Yes, it is. So, I think I would create confusions among users. What do you
think?

> If you do SVG please allow manipulation of the object, eg. color,
> background... (check also HCC2D).
>
Yes, Features like foreground color and background color wold be good.
I surfed about HCC2D and found out that it still is a proposal. Btw thanks
a lot to make me know about it.

>
> Since actually no input is needed I would also think about a command to
> 'Convert to QR code' without any further interaction.

I didn't got it.

> BZ Ticket for your work is tdf#62168, the QR code is not limited to Writer
> and should in particular also work in Draw.
>
Sure.

>
> Last but not least "try out different APIs" sounds like a hard showstopper
> to me if you don't find a suitable.

It was just the timeline.

> We build and ship many libs, btw. and would do so here too I guess.
>
Yes.

>
> Great project anyway, it will advance LibreOffice a lot.
>
Thanks.

>
> PS: We have this extension
> https://extensions.libreoffice.org/extensions/goqr-me-integration
>
> On 04.04.19 04:31, shubham goyal (via Google Docs) wrote:
> > shubham goyal  has shared a link to the
> following document:
> > GSoC Proposal - LibreOffice '19 <
> https://docs.google.com/document/d/1QoJ3sJxOEjfMDS6iv2nu6vW9tlSq6TRbqIj4hMnhBSQ/edit?usp=sharing_eil&ts=5ca56c98
> >
> > Open in Docs <
> https://docs.google.com/document/d/1QoJ3sJxOEjfMDS6iv2nu6vW9tlSq6TRbqIj4hMnhBSQ/edit?usp=sharing_eip&ts=5ca56c98
> >
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/headless vcl/inc vcl/unx

2019-04-04 Thread Caolán McNamara (via logerrit)

 vcl/headless/svpgdi.cxx  |   40 
 vcl/headless/svpvd.cxx   |8 ++--
 vcl/inc/headless/svpgdi.hxx  |3 +++
 vcl/unx/gtk3/gtk3gtkinst.cxx |2 +-
 4 files changed, 34 insertions(+), 19 deletions(-)

New commits:
commit cb7ff6bc57b542a27f6bdcfcaacc2cdf66cdb456
Author: Caolán McNamara 
AuthorDate: Thu Apr 4 09:38:47 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 4 12:12:12 2019 +0200

Resolves: tdf#124219 check at runtime for availability of cairo functions

Change-Id: I0ab3055760d8be690bdfff560212db368a0fa261
Reviewed-on: https://gerrit.libreoffice.org/70240
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 3ec663c8706b..2cf49ca17696 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -45,6 +45,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #if ENABLE_CAIRO_CANVAS
 #   if defined CAIRO_VERSION && CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 10, 0)
@@ -614,9 +615,7 @@ void SvpSalGraphics::setSurface(cairo_surface_t* pSurface, 
const basegfx::B2IVec
 {
 m_pSurface = pSurface;
 m_aFrameSize = rSize;
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
-cairo_surface_get_device_scale(pSurface, &m_fScale, nullptr);
-#endif
+dl_cairo_surface_get_device_scale(pSurface, &m_fScale, nullptr);
 ResetClipRegion();
 }
 
@@ -1599,9 +1598,7 @@ void SvpSalGraphics::copyBits( const SalTwoRect& rTR,
 
cairo_surface_get_content(m_pSurface),
 aTR.mnSrcWidth * m_fScale,
 aTR.mnSrcHeight * m_fScale);
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
-cairo_surface_set_device_scale(pCopy, m_fScale, m_fScale);
-#endif
+dl_cairo_surface_set_device_scale(pCopy, m_fScale, m_fScale);
 cairo_t* cr = cairo_create(pCopy);
 cairo_set_source_surface(cr, source, -aTR.mnSrcX, -aTR.mnSrcY);
 cairo_rectangle(cr, 0, 0, aTR.mnSrcWidth, aTR.mnSrcHeight);
@@ -1848,9 +1845,7 @@ void SvpSalGraphics::invert(const basegfx::B2DPolygon 
&rPoly, SalInvert nFlags)
 
extents.getWidth() * m_fScale,
 
extents.getHeight() * m_fScale);
 
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
-cairo_surface_set_device_scale(surface, m_fScale, m_fScale);
-#endif
+dl_cairo_surface_set_device_scale(surface, m_fScale, m_fScale);
 cairo_t* stipple_cr = cairo_create(surface);
 cairo_set_source_rgb(stipple_cr, 1.0, 1.0, 1.0);
 cairo_mask(stipple_cr, pattern);
@@ -2004,9 +1999,7 @@ cairo_t* 
SvpSalGraphics::createTmpCompatibleCairoContext() const
 m_aFrameSize.getX() * m_fScale,
 m_aFrameSize.getY() * m_fScale);
 
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
-cairo_surface_set_device_scale(target, m_fScale, m_fScale);
-#endif
+dl_cairo_surface_set_device_scale(target, m_fScale, m_fScale);
 
 return cairo_create(target);
 }
@@ -2202,4 +2195,27 @@ GlyphCache& SvpSalGraphics::getPlatformGlyphCache()
 return *pSalData->GetGlyphCache();
 }
 
+void dl_cairo_surface_set_device_scale(cairo_surface_t *surface, double 
x_scale, double y_scale)
+{
+static auto func = reinterpret_cast(
+dlsym(nullptr, "cairo_surface_set_device_scale"));
+if (func)
+func(surface, x_scale, y_scale);
+}
+
+void dl_cairo_surface_get_device_scale(cairo_surface_t *surface, double* 
x_scale, double* y_scale)
+{
+static auto func = reinterpret_cast(
+dlsym(nullptr, "cairo_surface_get_device_scale"));
+if (func)
+func(surface, x_scale, y_scale);
+else
+{
+if (x_scale)
+*x_scale = 1.0;
+if (y_scale)
+*y_scale = 1.0;
+}
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx
index 875f22a5d7fc..eeccf2c014a9 100644
--- a/vcl/headless/svpvd.cxx
+++ b/vcl/headless/svpvd.cxx
@@ -89,7 +89,6 @@ bool SvpSalVirtualDevice::SetSizeUsingBuffer( long nNewDX, 
long nNewDY,
 }
 else if (pBuffer)
 {
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
 double fXScale, fYScale;
 if (comphelper::LibreOfficeKit::isActive())
 {
@@ -98,18 +97,15 @@ bool SvpSalVirtualDevice::SetSizeUsingBuffer( long nNewDX, 
long nNewDY,
 }
 else
 {
-cairo_surface_get_device_scale(m_pRefSurface, &fXScale, 
&fYScale);
+dl_cairo_surface_get_device_scale(m_pRefSurface, &fXScale, 
&fYScale);
 nNewDX *= fXScale;
 nNewDY *= fYScale;
 }
-#endif
 
 m_pSurface = cairo_im

[Libreoffice-commits] core.git: sfx2/source

2019-04-04 Thread Caolán McNamara (via logerrit)

 sfx2/source/appl/workwin.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 7aa14e80d2d9d94ba468b83db32fc1049d1d8b65
Author: Caolán McNamara 
AuthorDate: Thu Apr 4 09:07:29 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 4 11:31:37 2019 +0200

rhbz#1696037 null-deref

Change-Id: I1a9eb5b1b38e2ec651f2d0286337106ab565a9dc
Reviewed-on: https://gerrit.libreoffice.org/70239
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 4bc31eb3de44..a4e281e67c83 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -1493,6 +1493,11 @@ void SfxWorkWindow::HidePopups_Impl(bool bHide, 
sal_uInt16 nId )
 {
 vcl::Window *pWin = pCW->GetWindow();
 SfxChild_Impl *pChild = FindChild_Impl(*pWin);
+if (!pChild)
+{
+SAL_WARN("sfx.appl", "missing SfxChild_Impl child!");
+continue;
+}
 if (bHide)
 {
 pChild->nVisible &= ~SfxChildVisibility::ACTIVE;
___
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' - vcl/unx

2019-04-04 Thread Caolán McNamara (via logerrit)

 vcl/unx/gtk3/gtk3gtkframe.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit eaaec2de4eef3fd283f387d2d5888a6d4f46c25b
Author: Caolán McNamara 
AuthorDate: Mon Apr 1 13:49:12 2019 +0100
Commit: Xisco Faulí 
CommitDate: Thu Apr 4 11:27:03 2019 +0200

Resolves: tdf#124411 default dnd to MOVE for internal and COPY for external

which what the macosx version appears to also do

Change-Id: Icff9cada2c821544d0130e28cc3e3862154a57dc
Reviewed-on: https://gerrit.libreoffice.org/70064
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index f8e629037820..184102e74b17 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -3665,10 +3665,16 @@ gboolean GtkSalFrame::signalDragMotion(GtkWidget 
*pWidget, GdkDragContext *conte
 GdkModifierType mask;
 gdk_window_get_pointer(widget_get_window(pWidget), nullptr, nullptr, 
&mask);
 
+// tdf#124411 default to move if drag originates within LO itself, default
+// to copy if it comes from outside, this is similar to srcAndDestEqual
+// in macosx DropTarget::determineDropAction equivalent
+sal_Int8 nNewDropAction = GtkDragSource::g_ActiveDragSource ?
+
css::datatransfer::dnd::DNDConstants::ACTION_MOVE :
+
css::datatransfer::dnd::DNDConstants::ACTION_COPY;
+
 // tdf#109227 if a modifier is held down, default to the matching
 // action for that modifier combo, otherwise pick the preferred
 // default from the possible source actions
-sal_Int8 nNewDropAction = 
css::datatransfer::dnd::DNDConstants::ACTION_MOVE;
 if ((mask & GDK_SHIFT_MASK) && !(mask & GDK_CONTROL_MASK))
 nNewDropAction = css::datatransfer::dnd::DNDConstants::ACTION_MOVE;
 else if ((mask & GDK_CONTROL_MASK) && !(mask & GDK_SHIFT_MASK))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/README

2019-04-04 Thread Samuel Mehrbrodt (via logerrit)

 odk/README |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 9e772cffcf373620114f005993c56c38e7ac84f2
Author: Samuel Mehrbrodt 
AuthorDate: Wed Apr 3 12:27:23 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Thu Apr 4 11:27:03 2019 +0200

odk: Add hint to test this in instdir/sdk

Change-Id: I8881f33a024cb5b9e36d4a6a668d8a32aea2ed1a
Reviewed-on: https://gerrit.libreoffice.org/70189
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/odk/README b/odk/README
index 5a8dd16f7bdd..4370e63e594f 100644
--- a/odk/README
+++ b/odk/README
@@ -6,6 +6,8 @@ Part of the SDK; to build you need to add --enable-odk.
 Testing the examples:
 =
 
+* Go to instdir/sdk (Don't try directly in odk/)
+
 * See  how to set up the SDK.
 
 ** When asked about it during configuration, tell the SDK to do automatic
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svtools sc/source svtools/source svtools/uiconfig

2019-04-04 Thread Xisco Fauli (via logerrit)

 include/svtools/restartdialog.hxx|3 +++
 sc/source/ui/optdlg/tpcalc.cxx   |6 ++
 svtools/source/dialogs/restartdialog.cxx |3 +++
 svtools/uiconfig/ui/restartdialog.ui |   19 +--
 4 files changed, 29 insertions(+), 2 deletions(-)

New commits:
commit d186417395b29a5404aed3f819dd81aa92385f20
Author: Xisco Fauli 
AuthorDate: Wed Apr 3 18:16:01 2019 +0200
Commit: Xisco Faulí 
CommitDate: Thu Apr 4 10:54:31 2019 +0200

tdf#124323: show restart dialog when toggling multi-threaded...

calculation

Change-Id: I853ae21d4c085488232a375ef42480453c01880b
Reviewed-on: https://gerrit.libreoffice.org/70210
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/include/svtools/restartdialog.hxx 
b/include/svtools/restartdialog.hxx
index 2e7c481e1ef7..83b0a8cad218 100644
--- a/include/svtools/restartdialog.hxx
+++ b/include/svtools/restartdialog.hxx
@@ -60,6 +60,9 @@ enum RestartReason {
 // For the OpenCL changes to take effect,
 // %PRODUCTNAME must be restarted:
 RESTART_REASON_OPENCL,
+// For the multi-threaded calculation changes to take effect,
+// %PRODUCTNAME must be restarted:
+RESTART_REASON_THREADING,
 // For restructuring the Forms menu,
 // %PRODUCTNAME must be restarted:
 RESTART_REASON_MSCOMPATIBLE_FORMS_MENU,
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index cc29f7ce7789..5f294aa51d68 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -206,6 +207,11 @@ bool ScTpCalcOptions::FillItemSet( SfxItemSet* rCoreAttrs )
 std::shared_ptr 
xBatch(comphelper::ConfigurationChanges::create());
 
officecfg::Office::Calc::Formula::Calculation::UseThreadedCalculationForFormulaGroups::set(bShouldEnableThreading,
 xBatch);
 xBatch->commit();
+SolarMutexGuard aGuard;
+if (svtools::executeRestartDialog(
+ comphelper::getProcessComponentContext(), GetFrameWeld(),
+ svtools::RESTART_REASON_THREADING))
+GetParentDialog()->EndDialog(RET_OK);
 }
 if ( *pLocalOptions != *pOldOptions )
 {
diff --git a/svtools/source/dialogs/restartdialog.cxx 
b/svtools/source/dialogs/restartdialog.cxx
index 3e665ede47c0..23a7f592f54e 100644
--- a/svtools/source/dialogs/restartdialog.cxx
+++ b/svtools/source/dialogs/restartdialog.cxx
@@ -65,6 +65,9 @@ public:
 case svtools::RESTART_REASON_OPENCL:
 reason_ = m_xBuilder->weld_widget("reason_opencl");
 break;
+case svtools::RESTART_REASON_THREADING:
+reason_ = m_xBuilder->weld_widget("reason_threading");
+break;
 case svtools::RESTART_REASON_MSCOMPATIBLE_FORMS_MENU:
 reason_ = m_xBuilder->weld_widget("reason_mscompatible_formsmenu");
 break;
diff --git a/svtools/uiconfig/ui/restartdialog.ui 
b/svtools/uiconfig/ui/restartdialog.ui
index 5962da9940bc..6db5793a260b 100644
--- a/svtools/uiconfig/ui/restartdialog.ui
+++ b/svtools/uiconfig/ui/restartdialog.ui
@@ -244,6 +244,21 @@
   
 
 
+  
+False
+True
+For the multi-threaded calculation 
changes to take effect, %PRODUCTNAME must be restarted.
+True
+50
+0
+  
+  
+False
+True
+12
+  
+
+
   
 False
 True
@@ -255,7 +270,7 @@
   
 False
 True
-12
+13
   
 
 
@@ -269,7 +284,7 @@
   
 False
 True
-13
+14
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 17/f80c1c474faef188849ba1b250c70e6c4f6d98

2019-04-04 Thread Caolán McNamara (via logerrit)

 17/f80c1c474faef188849ba1b250c70e6c4f6d98 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit aa574e48be3750fbab6300a6abfe85aa8f94dbc5
Author: Caolán McNamara 
AuthorDate: Thu Apr 4 09:37:53 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 4 09:37:53 2019 +0100

Notes added by 'git notes add'

diff --git a/17/f80c1c474faef188849ba1b250c70e6c4f6d98 
b/17/f80c1c474faef188849ba1b250c70e6c4f6d98
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/17/f80c1c474faef188849ba1b250c70e6c4f6d98
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: GSOC 2019 - Project Proposal

2019-04-04 Thread David Tardon

Dear Sir/Ma'am,

On Mon, 2019-04-01 at 18:22 +0530, Apoorv Jain wrote:
> I am interested in contributing to the libre-office as it has some
> really great projects to work upon and also they align with my
> experience. I am mainly interested in "Improve Adobe Pagemaker import
> filter".
> 
> The project is based on Python, which is my domain of interest.

It's plain to us that you haven't even read the description of the
task, as it clearly says that the library is implemented in C++ (Python
is only needed for OLEToy, a tool we use to help us with reverse-
engineering). In addition, you're very late; you were supposed to
appear during the previous phase. Nevertheless, we'll give you a chance
to qualify: There are two PageMaker documents in 
https://people.freedesktop.org/~dtardon/pm/, one in 6.5 and the other
in 6(.0) format. Kindly download them and fix the libpagemaker code so
they are displayed correctly. Once you've done that, we can talk about
application.

Hoping to see your change requests (and potential pull requests for
oletoy) at your earliest possible convenience.

D.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: include/svx svx/source

2019-04-04 Thread Caolán McNamara (via logerrit)

 include/svx/ClassificationDialog.hxx   |2 ++
 svx/source/dialog/ClassificationDialog.cxx |   17 ++---
 2 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit c371d8ba8960e7830027d4d8d9155bab94722952
Author: Caolán McNamara 
AuthorDate: Wed Apr 3 21:25:13 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 4 10:32:32 2019 +0200

expand async to allow it to resize to optimal size

Change-Id: I87c413108a41f994c0e8d86f469fc361d4cd42e5
Reviewed-on: https://gerrit.libreoffice.org/70220
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/svx/ClassificationDialog.hxx 
b/include/svx/ClassificationDialog.hxx
index 2aaed9d16fca..0c083d794d41 100644
--- a/include/svx/ClassificationDialog.hxx
+++ b/include/svx/ClassificationDialog.hxx
@@ -30,6 +30,7 @@ private:
 const bool m_bPerParagraph;
 const std::function m_aParagraphSignHandler;
 
+ImplSVEvent* m_nAsyncExpandEvent;
 sal_Int32 m_nCurrentSelectedCategory;
 
 std::vector> 
m_aRecentlyUsedValuesCollection;
@@ -61,6 +62,7 @@ private:
 DECL_LINK(EditWindowModifiedHdl, LinkParamNone*, void);
 DECL_STATIC_LINK(ClassificationDialog, ExpandedHdl, weld::Expander&, void);
 DECL_STATIC_LINK(ClassificationDialog, KeyInput, const KeyEvent&, bool);
+DECL_LINK(OnAsyncExpandHdl, void*, void);
 
 void insertField(ClassificationType eType, OUString const & rString, 
OUString const & rFullString, OUString const & rIdentifier = OUString());
 void insertCategoryField(sal_Int32 nID);
diff --git a/svx/source/dialog/ClassificationDialog.cxx 
b/svx/source/dialog/ClassificationDialog.cxx
index d83a6b044a54..9cde1e8c7249 100644
--- a/svx/source/dialog/ClassificationDialog.cxx
+++ b/svx/source/dialog/ClassificationDialog.cxx
@@ -23,8 +23,8 @@
 #include 
 #include 
 #include 
-#include 
 #include 
+#include 
 #include 
 
 #include 
@@ -232,15 +232,26 @@ ClassificationDialog::ClassificationDialog(weld::Window* 
pParent, const bool bPe
 
m_xRecentlyUsedListBox->set_size_request(m_xRecentlyUsedListBox->get_approximate_digit_width()
 * 5, -1);
 m_xRecentlyUsedListBox->connect_changed(LINK(this, ClassificationDialog, 
SelectRecentlyUsedHdl));
 
-bool bExpand = 
officecfg::Office::Common::Classification::IntellectualPropertySectionExpanded::get();
-m_xIntellectualPropertyExpander->set_expanded(bExpand);
 m_xIntellectualPropertyExpander->connect_expanded(LINK(this, 
ClassificationDialog, ExpandedHdl));
+if 
(officecfg::Office::Common::Classification::IntellectualPropertySectionExpanded::get())
+m_nAsyncExpandEvent = Application::PostUserEvent(LINK(this, 
ClassificationDialog, OnAsyncExpandHdl));
+else
+m_nAsyncExpandEvent = nullptr;
 
 m_xEditWindow->SetModifyHdl(LINK(this, ClassificationDialog, 
EditWindowModifiedHdl));
 }
 
+//do it async so gtk has a chance to shrink it to best size, otherwise its 
larger than min
+IMPL_LINK_NOARG(ClassificationDialog, OnAsyncExpandHdl, void*, void)
+{
+m_nAsyncExpandEvent = nullptr;
+m_xIntellectualPropertyExpander->set_expanded(true);
+}
+
 ClassificationDialog::~ClassificationDialog()
 {
+if (m_nAsyncExpandEvent)
+Application::RemoveUserEvent(m_nAsyncExpandEvent);
 }
 
 short ClassificationDialog::run()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: editeng/source extras/source include/editeng include/svx include/vcl sd/source solenv/bin solenv/sanitizers svx/source svx/uiconfig sw/source vcl/source vcl/unx

2019-04-04 Thread Caolán McNamara (via logerrit)

 editeng/source/editeng/editeng.cxx |6 
 editeng/source/editeng/editview.cxx|8 
 editeng/source/editeng/impedit.cxx |   81 
 editeng/source/editeng/impedit.hxx |4 
 editeng/source/editeng/impedit2.cxx|3 
 extras/source/glade/libreoffice-catalog.xml.in |8 
 include/editeng/editview.hxx   |7 
 include/svx/ClassificationDialog.hxx   |   79 +++-
 include/svx/ClassificationEditView.hxx |   37 ++-
 include/svx/svdedxv.hxx|3 
 include/vcl/cursor.hxx |4 
 include/vcl/weld.hxx   |3 
 sd/source/ui/view/drviews2.cxx |   10 -
 solenv/bin/native-code.py  |2 
 solenv/sanitizers/ui/svx.suppr |3 
 svx/source/dialog/ClassificationDialog.cxx |  243 ++---
 svx/source/dialog/ClassificationEditView.cxx   |   99 ++
 svx/source/svdraw/svdedxv.cxx  |9 
 svx/source/svdraw/svdoutl.cxx  |2 
 svx/uiconfig/ui/classificationdialog.ui|  187 ++-
 sw/source/uibase/app/docsh2.cxx|   16 -
 vcl/source/app/salvtables.cxx  |6 
 vcl/source/window/cursor.cxx   |   48 +++-
 vcl/unx/gtk3/gtk3gtkinst.cxx   |   29 ++
 24 files changed, 528 insertions(+), 369 deletions(-)

New commits:
commit b9c10ee923308f336a694bbc0212396ed5317b6a
Author: Caolán McNamara 
AuthorDate: Wed Apr 3 12:02:13 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 4 10:31:58 2019 +0200

weld ClassificationDialog

with the extra problem of hosting an EditView/EditEngine within a
weld::DrawingArea

Change-Id: Id48a57ed0dfd2d92217209c43f752edd9cf8e1bd
Reviewed-on: https://gerrit.libreoffice.org/70219
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index a301145d9473..6b7157215730 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1105,8 +1105,10 @@ bool EditEngine::PostKeyEvent( const KeyEvent& 
rKeyEvent, EditView* pEditView, v
 aCurSel = pImpEditEngine->MoveCursor( rKeyEvent, pEditView 
);
 
 if ( aCurSel.HasRange() ) {
-Reference 
aSelection(pEditView->GetWindow()->GetPrimarySelection());
-pEditView->pImpEditView->CutCopy( aSelection, false );
+if (vcl::Window* pWindow = pEditView->GetWindow()) {
+
Reference 
aSelection(pWindow->GetPrimarySelection());
+pEditView->pImpEditView->CutCopy( aSelection, 
false );
+}
 }
 
 bMoved = true;
diff --git a/editeng/source/editeng/editview.cxx 
b/editeng/source/editeng/editview.cxx
index 5e89f4f8f565..8e02caf8fb5d 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -171,9 +171,9 @@ void EditView::setEditViewCallbacks(const 
EditViewCallbacks* pEditViewCallbacks)
 pImpEditView->setEditViewCallbacks(pEditViewCallbacks);
 }
 
-bool EditView::hasEditViewCallbacks() const
+const EditViewCallbacks* EditView::getEditViewCallbacks() const
 {
-return pImpEditView->hasEditViewCallbacks();
+return pImpEditView->getEditViewCallbacks();
 }
 
 ImpEditEngine* EditView::GetImpEditEngine() const
@@ -204,12 +204,12 @@ tools::Rectangle EditView::GetInvalidateRect() const
 
 void EditView::InvalidateWindow(const tools::Rectangle& rClipRect)
 {
-if (pImpEditView->hasEditViewCallbacks())
+if (const EditViewCallbacks* pEditViewCallbacks = 
pImpEditView->getEditViewCallbacks())
 {
 // do not invalidate and trigger a global repaint, but forward
 // the need for change to the applied EditViewCallback, can e.g.
 // be used to visualize the active edit text in an OverlayObject
-pImpEditView->mpEditViewCallbacks->EditViewInvalidate();
+pEditViewCallbacks->EditViewInvalidate(rClipRect);
 }
 else
 {
diff --git a/editeng/source/editeng/impedit.cxx 
b/editeng/source/editeng/impedit.cxx
index fea76c05896f..cf8a6ee5bb0b 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -189,10 +189,10 @@ static void lcl_translateTwips(vcl::Window const & 
rParent, vcl::Window& rChild)
 // change/update the Selection visualization for enhanced mechanisms
 void ImpEditView::SelectionChanged()
 {
-if (hasEditViewCallbacks())
+if (getEditViewCallbacks())
 {
 // use callback to tell about change in selection visualisation
-mpEditViewCallbacks->EditViewSelectionChange();
+getEditViewCallbacks()->EditViewSelectionChange();
 }
 }
 
@@ -207,7 +207,7 @@ void ImpEdit

[Libreoffice-commits] core.git: vcl/source

2019-04-04 Thread Caolán McNamara (via logerrit)

 vcl/source/window/cursor.cxx |   33 +++--
 1 file changed, 19 insertions(+), 14 deletions(-)

New commits:
commit c8c0292c2152df8c353aeff32896f0cfa8a53a64
Author: Caolán McNamara 
AuthorDate: Wed Apr 3 16:22:28 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 4 10:30:45 2019 +0200

split cursor drawing into Window/OutputDevice parts

Change-Id: I6027abd3c385f838dc02cc85fda0eef212d2541f
Reviewed-on: https://gerrit.libreoffice.org/70218
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx
index d790c59266b4..e7ce47559b81 100644
--- a/vcl/source/window/cursor.cxx
+++ b/vcl/source/window/cursor.cxx
@@ -43,14 +43,8 @@ struct ImplCursorData
 VclPtr mpWindow;   // assigned window
 };
 
-static void ImplCursorInvert( ImplCursorData const * pData )
+static tools::Rectangle ImplCursorInvert(vcl::RenderContext* pRenderContext, 
ImplCursorData const * pData)
 {
-vcl::Window* pWindow  = pData->mpWindow;
-std::unique_ptr pGuard;
-const bool bDoubleBuffering = pWindow->SupportsDoubleBuffering();
-if (bDoubleBuffering)
-pGuard.reset(new 
PaintBufferGuard(pWindow->ImplGetWindowImpl()->mpFrameData, pWindow));
-vcl::RenderContext* pRenderContext = bDoubleBuffering ? 
pGuard->GetRenderContext() : pWindow;
 tools::Rectangle aPaintRect;
 boolbMapMode = pRenderContext->IsMapModeEnabled();
 pRenderContext->EnableMapMode( false );
@@ -106,17 +100,28 @@ static void ImplCursorInvert( ImplCursorData const * 
pData )
 if ( pData->mnOrientation )
 aPoly.Rotate( pData->maPixRotOff, pData->mnOrientation );
 pRenderContext->Invert( aPoly, nInvertStyle );
-if (bDoubleBuffering)
-aPaintRect = aPoly.GetBoundRect();
+aPaintRect = aPoly.GetBoundRect();
 }
 }
 else
 {
 pRenderContext->Invert( aRect, nInvertStyle );
-if (bDoubleBuffering)
-aPaintRect = aRect;
+aPaintRect = aRect;
 }
 pRenderContext->EnableMapMode( bMapMode );
+return aPaintRect;
+}
+
+static void ImplCursorInvert(vcl::Window* pWindow, ImplCursorData const * 
pData)
+{
+std::unique_ptr pGuard;
+const bool bDoubleBuffering = pWindow->SupportsDoubleBuffering();
+if (bDoubleBuffering)
+pGuard.reset(new 
PaintBufferGuard(pWindow->ImplGetWindowImpl()->mpFrameData, pWindow));
+
+vcl::RenderContext* pRenderContext = bDoubleBuffering ? 
pGuard->GetRenderContext() : pWindow;
+
+tools::Rectangle aPaintRect = ImplCursorInvert(pRenderContext, pData);
 if (bDoubleBuffering)
 pGuard->SetPaintRect(pRenderContext->PixelToLogic(aPaintRect));
 }
@@ -125,7 +130,7 @@ void vcl::Cursor::ImplDraw()
 {
 if ( mpData && mpData->mpWindow && !mpData->mbCurVisible )
 {
-vcl::Window* pWindow = mpData->mpWindow;
+vcl::Window* pWindow= mpData->mpWindow;
 mpData->maPixPos= pWindow->LogicToPixel( maPos );
 mpData->maPixSize   = pWindow->LogicToPixel( maSize );
 mpData->mnOrientation   = mnOrientation;
@@ -139,7 +144,7 @@ void vcl::Cursor::ImplDraw()
 mpData->maPixSize.setWidth( 
pWindow->GetSettings().GetStyleSettings().GetCursorSize() );
 
 // calculate output area and display
-ImplCursorInvert( mpData.get() );
+ImplCursorInvert(pWindow, mpData.get());
 mpData->mbCurVisible = true;
 }
 }
@@ -148,7 +153,7 @@ void vcl::Cursor::ImplRestore()
 {
 assert( mpData && mpData->mbCurVisible );
 
-ImplCursorInvert( mpData.get() );
+ImplCursorInvert(mpData->mpWindow, mpData.get());
 mpData->mbCurVisible = false;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

2019-04-04 Thread Caolán McNamara (via logerrit)

 vcl/source/window/seleng.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e14c61e617eb221653c176fb91c5ddc074459929
Author: Caolán McNamara 
AuthorDate: Wed Apr 3 15:18:41 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 4 10:30:21 2019 +0200

allow SelMouseButton[Down|Up] without pWin

Change-Id: If5031390ac4a0cdd3dad3b43b23f4319c2dfc53a
Reviewed-on: https://gerrit.libreoffice.org/70217
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx
index 415999a80fa2..84481d6e1933 100644
--- a/vcl/source/window/seleng.cxx
+++ b/vcl/source/window/seleng.cxx
@@ -115,7 +115,7 @@ void SelectionEngine::CursorPosChanging( bool bShift, bool 
bMod1 )
 bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt )
 {
 nFlags &= ~SelectionEngineFlags::CMDEVT;
-if ( !pFunctionSet || !pWin || rMEvt.GetClicks() > 1 || rMEvt.IsRight() )
+if ( !pFunctionSet || rMEvt.GetClicks() > 1 || rMEvt.IsRight() )
 return false;
 
 sal_uInt16 nModifier = rMEvt.GetModifier() | nLockedMods;
@@ -237,7 +237,7 @@ bool SelectionEngine::SelMouseButtonDown( const MouseEvent& 
rMEvt )
 bool SelectionEngine::SelMouseButtonUp( const MouseEvent& rMEvt )
 {
 aWTimer.Stop();
-if( !pFunctionSet || !pWin )
+if (!pFunctionSet)
 {
 const SelectionEngineFlags nMask = SelectionEngineFlags::CMDEVT | 
SelectionEngineFlags::WAIT_UPEVT | SelectionEngineFlags::IN_SEL;
 nFlags &= ~nMask;
@@ -349,7 +349,7 @@ void SelectionEngine::Reset()
 void SelectionEngine::Command( const CommandEvent& rCEvt )
 {
 // Timer aWTimer is active during enlarging a selection
-if ( !pFunctionSet || !pWin || aWTimer.IsActive() )
+if ( !pFunctionSet || aWTimer.IsActive() )
 return;
 aWTimer.Stop();
 if ( rCEvt.GetCommand() == CommandEventId::StartDrag )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

2019-04-04 Thread Caolán McNamara (via logerrit)

 vcl/source/window/seleng.cxx |   22 ++
 1 file changed, 10 insertions(+), 12 deletions(-)

New commits:
commit 59c15729bdd6b3fb15f66ad9f3cb96292fd0eba9
Author: Caolán McNamara 
AuthorDate: Wed Apr 3 15:14:55 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 4 10:29:24 2019 +0200

SelectionEngine::ReleaseMouse checks for null pWin

Change-Id: I80e6a304d07fcc290e73e6251f520926398a7ecb
Reviewed-on: https://gerrit.libreoffice.org/70215
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx
index a7ff02889bf6..4f7630b54e06 100644
--- a/vcl/source/window/seleng.cxx
+++ b/vcl/source/window/seleng.cxx
@@ -149,7 +149,7 @@ bool SelectionEngine::SelMouseButtonDown( const MouseEvent& 
rMEvt )
 {
 nFlags |= SelectionEngineFlags::WAIT_UPEVT;
 nFlags &= ~SelectionEngineFlags::IN_SEL;
-pWin->ReleaseMouse();
+ReleaseMouse();
 return true;  // wait for STARTDRAG-Command-Event
 }
 if ( eSelMode != SelectionMode::Single )
@@ -170,7 +170,7 @@ bool SelectionEngine::SelMouseButtonDown( const MouseEvent& 
rMEvt )
 case KEY_SHIFT:
 if ( eSelMode == SelectionMode::Single )
 {
-pWin->ReleaseMouse();
+ReleaseMouse();
 nFlags &= ~SelectionEngineFlags::IN_SEL;
 return false;
 }
@@ -194,7 +194,7 @@ bool SelectionEngine::SelMouseButtonDown( const MouseEvent& 
rMEvt )
 if ( eSelMode != SelectionMode::Multiple )
 {
 nFlags &= ~SelectionEngineFlags::IN_SEL;
-pWin->ReleaseMouse();
+ReleaseMouse();
 return true;  // skip Mouse-Click
 }
 if ( nFlags & SelectionEngineFlags::HAS_ANCH )
@@ -217,7 +217,7 @@ bool SelectionEngine::SelMouseButtonDown( const MouseEvent& 
rMEvt )
 case KEY_SHIFT + KEY_MOD1:
 if ( eSelMode != SelectionMode::Multiple )
 {
-pWin->ReleaseMouse();
+ReleaseMouse();
 nFlags &= ~SelectionEngineFlags::IN_SEL;
 return false;
 }
@@ -244,10 +244,8 @@ bool SelectionEngine::SelMouseButtonUp( const MouseEvent& 
rMEvt )
 return false;
 }
 
-if( !rMEvt.IsRight() )
-{
-   ReleaseMouse();
-}
+if (!rMEvt.IsRight())
+ReleaseMouse();
 
 if( (nFlags & SelectionEngineFlags::WAIT_UPEVT) && !(nFlags & 
SelectionEngineFlags::CMDEVT) &&
 eSelMode != SelectionMode::Single)
@@ -324,8 +322,8 @@ void SelectionEngine::SetWindow( vcl::Window* pNewWin )
 {
 if( pNewWin != pWin )
 {
-if ( pWin && (nFlags & SelectionEngineFlags::IN_SEL) )
-pWin->ReleaseMouse();
+if (nFlags & SelectionEngineFlags::IN_SEL)
+ReleaseMouse();
 pWin = pNewWin;
 if ( pWin && ( nFlags & SelectionEngineFlags::IN_SEL ) )
 pWin->CaptureMouse();
@@ -335,8 +333,8 @@ void SelectionEngine::SetWindow( vcl::Window* pNewWin )
 void SelectionEngine::Reset()
 {
 aWTimer.Stop();
-if ( nFlags & SelectionEngineFlags::IN_SEL )
-pWin->ReleaseMouse();
+if (nFlags & SelectionEngineFlags::IN_SEL)
+ReleaseMouse();
 nFlags &= ~SelectionEngineFlags(SelectionEngineFlags::HAS_ANCH | 
SelectionEngineFlags::IN_SEL);
 nLockedMods = 0;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/vcl vcl/source

2019-04-04 Thread Caolán McNamara (via logerrit)

 include/vcl/seleng.hxx   |1 +
 vcl/source/window/seleng.cxx |   13 ++---
 2 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 3259c1058913887f51af456918927a50d139d70d
Author: Caolán McNamara 
AuthorDate: Wed Apr 3 15:17:15 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 4 10:29:48 2019 +0200

add nullchecking SelectionEngine::CaptureMouse

Change-Id: Ie8594c8fe2a9e2d84121f3a6a1ee8afab265b14f
Reviewed-on: https://gerrit.libreoffice.org/70216
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/vcl/seleng.hxx b/include/vcl/seleng.hxx
index 800e767c7cba..472226fbb661 100644
--- a/include/vcl/seleng.hxx
+++ b/include/vcl/seleng.hxx
@@ -104,6 +104,7 @@ public:
 //context menu via "Command" which is delivered after
 //mouse down but before mouse up, then use this
 voidReleaseMouse();
+voidCaptureMouse();
 
 // Keyboard
 voidCursorPosChanging( bool bShift, bool bMod1 );
diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx
index 4f7630b54e06..415999a80fa2 100644
--- a/vcl/source/window/seleng.cxx
+++ b/vcl/source/window/seleng.cxx
@@ -131,7 +131,7 @@ bool SelectionEngine::SelMouseButtonDown( const MouseEvent& 
rMEvt )
 
 if( !rMEvt.IsRight() )
 {
-pWin->CaptureMouse();
+CaptureMouse();
 nFlags |= SelectionEngineFlags::IN_SEL;
 }
 else
@@ -284,6 +284,13 @@ void SelectionEngine::ReleaseMouse()
 pWin->ReleaseMouse();
 }
 
+void SelectionEngine::CaptureMouse()
+{
+if (!pWin || pWin->IsMouseCaptured())
+return;
+pWin->CaptureMouse();
+}
+
 bool SelectionEngine::SelMouseMove( const MouseEvent& rMEvt )
 {
 
@@ -325,8 +332,8 @@ void SelectionEngine::SetWindow( vcl::Window* pNewWin )
 if (nFlags & SelectionEngineFlags::IN_SEL)
 ReleaseMouse();
 pWin = pNewWin;
-if ( pWin && ( nFlags & SelectionEngineFlags::IN_SEL ) )
-pWin->CaptureMouse();
+if (nFlags & SelectionEngineFlags::IN_SEL)
+CaptureMouse();
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/unx

2019-04-04 Thread Caolán McNamara (via logerrit)

 vcl/unx/gtk3/gtk3gtkinst.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 592a729790c737389673cd3c743df12a9e3cbd4c
Author: Caolán McNamara 
AuthorDate: Wed Apr 3 13:58:49 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 4 10:28:56 2019 +0200

aRect is always in pixels

Change-Id: Ib122a2f970a7852e2979a5301f635f9f1a4ce87b
Reviewed-on: https://gerrit.libreoffice.org/70214
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index d02fbad31146..4041202ed6cd 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -7500,7 +7500,7 @@ private:
 if (!gdk_cairo_get_clip_rectangle(cr, &rect))
 return;
 tools::Rectangle aRect(Point(rect.x, rect.y), Size(rect.width, 
rect.height));
-m_xDevice->Erase(aRect);
+m_xDevice->Erase(m_xDevice->PixelToLogic(aRect));
 m_aDrawHdl.Call(std::pair(*m_xDevice, aRect));
 cairo_surface_mark_dirty(m_pSurface);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: editeng/source

2019-04-04 Thread Caolán McNamara (via logerrit)

 editeng/source/editeng/impedit2.cxx |   14 ++
 1 file changed, 2 insertions(+), 12 deletions(-)

New commits:
commit 397271c7ddc02cea2688da4ea33c47a44f5d4800
Author: Caolán McNamara 
AuthorDate: Wed Apr 3 12:08:47 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 4 10:28:32 2019 +0200

LOK logic is good for non-lok here

Change-Id: I7ad351800a55798e822596733f7fcb057e2e9aff
Reviewed-on: https://gerrit.libreoffice.org/70213
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index eb8961ced3ac..b5746f6ab2eb 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -582,18 +582,8 @@ bool ImpEditEngine::MouseButtonUp( const MouseEvent& 
rMEvt, EditView* pView )
 {
 if ( ( rMEvt.GetClicks() == 1 ) && rMEvt.IsLeft() && !rMEvt.IsMod2() )
 {
-
-const SvxFieldItem* pFld;
-if ( comphelper::LibreOfficeKit::isActive() )
-{
-Point aLogicClick = pView->GetWindow()->PixelToLogic( 
rMEvt.GetPosPixel() );
-pFld = pView->GetField( aLogicClick );
-}
-else
-{
-pFld = pView->GetFieldUnderMousePointer();
-}
-if ( pFld )
+Point aLogicClick = 
pView->GetWindow()->PixelToLogic(rMEvt.GetPosPixel());
+if (const SvxFieldItem* pFld = pView->GetField(aLogicClick))
 {
 EditPaM aPaM( aCurSel.Max() );
 sal_Int32 nPara = GetEditDoc().GetPos( aPaM.GetNode() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: editeng/source

2019-04-04 Thread Caolán McNamara (via logerrit)

 editeng/source/editeng/editview.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 57a93c8cabff4581301d26d736f0cb078cf86d11
Author: Caolán McNamara 
AuthorDate: Wed Apr 3 12:03:18 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Apr 4 10:28:05 2019 +0200

this line is equivalent to InvalidateAtWindow

Change-Id: I4f718710c778e25f92f97ed2e7e7d9d01ed99e6b
Reviewed-on: https://gerrit.libreoffice.org/70212
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/editeng/source/editeng/editview.cxx 
b/editeng/source/editeng/editview.cxx
index 18408c38d9bf..5e89f4f8f565 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -234,8 +234,8 @@ void EditView::InvalidateOtherViewWindows( const 
tools::Rectangle& rInvRect )
 void EditView::Invalidate()
 {
 const tools::Rectangle& rInvRect = GetInvalidateRect();
-pImpEditView->GetWindow()->Invalidate( rInvRect );
-InvalidateOtherViewWindows( rInvRect );
+pImpEditView->InvalidateAtWindow(rInvRect);
+InvalidateOtherViewWindows(rInvRect);
 }
 
 void EditView::SetReadOnly( bool bReadOnly )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - shell/source

2019-04-04 Thread Stephan Bergmann (via logerrit)

 shell/source/unix/exec/shellexec.cxx |   37 +++
 shell/source/win32/SysShExec.cxx |  114 +++
 2 files changed, 151 insertions(+)

New commits:
commit d41e6052aaf31b918ce3e0316c44f19513015b65
Author: Stephan Bergmann 
AuthorDate: Fri Mar 29 14:01:19 2019 +0100
Commit: Andras Timar 
CommitDate: Thu Apr 4 10:23:11 2019 +0200

Filter out problematic file URLs

Change-Id: I87fd37e56326bef4888354b923407530c6f70760
Reviewed-on: https://gerrit.libreoffice.org/70177
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/shell/source/unix/exec/shellexec.cxx 
b/shell/source/unix/exec/shellexec.cxx
index fd9932353e0c..23899e491d84 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -42,6 +42,10 @@
 #include 
 #include 
 
+#if defined MACOSX
+#include 
+#endif
+
 using com::sun::star::system::XSystemShellExecute;
 using com::sun::star::system::SystemShellExecuteException;
 
@@ -127,6 +131,39 @@ void SAL_CALL ShellExec::execute( const OUString& 
aCommand, const OUString& aPar
 }
 
 #ifdef MACOSX
+if (uri->getScheme().equalsIgnoreAsciiCase("file")) {
+OUString pathname;
+auto const e1 = osl::FileBase::getSystemPathFromFileURL(aCommand, 
pathname);
+if (e1 != osl::FileBase::E_None) {
+throw css::lang::IllegalArgumentException(
+("XSystemShellExecute.execute, getSystemPathFromFileURL <" 
+ aCommand
+ + "> failed with " + OUString::number(e1)),
+{}, 0);
+}
+OString pathname8;
+if (!pathname.convertToString(
+&pathname8, RTL_TEXTENCODING_UTF8,
+(RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR
+ | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR)))
+{
+throw css::lang::IllegalArgumentException(
+"XSystemShellExecute.execute, cannot convert \"" + 
pathname + "\" to UTF-8", {},
+0);
+}
+struct stat st;
+auto const e2 = stat(pathname8.getStr(), &st);
+if (e2 != 0) {
+auto const e3 = errno;
+SAL_INFO("shell", "stat(" << pathname8 << ") failed with errno 
" << e3);
+}
+if (e2 != 0 || !S_ISREG(st.st_mode)
+|| (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) != 0)
+{
+throw css::lang::IllegalArgumentException(
+"XSystemShellExecute.execute, cannot process <" + aCommand 
+ ">", {}, 0);
+}
+}
+
 //TODO: Using open(1) with an argument that syntactically is an 
absolute
 // URI reference does not necessarily give expected results:
 // 1  If the given URI reference matches a supported scheme (e.g.,
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index 05daf97586d8..33554bd5608f 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -18,8 +18,11 @@
  */
 
 #include 
+#include 
 
 #include 
+#include 
+#include 
 #include "SysShExec.hxx"
 #include 
 #include 
@@ -29,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define WIN32_LEAN_AND_MEAN
 #if defined _MSC_VER
@@ -36,7 +40,9 @@
 #endif
 #include 
 #include 
+#include 
 #include 
+#include 
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif
@@ -247,6 +253,18 @@ CSysShExec::CSysShExec( const Reference< 
css::uno::XComponentContext >& xContext
 
 namespace
 {
+bool checkExtension(OUString const & extension, OUString const & blacklist) {
+assert(!extension.isEmpty());
+for (sal_Int32 i = 0; i != -1;) {
+OUString tok = blacklist.getToken(0, ';', i);
+tok.startsWith(".", &tok);
+if (extension.equalsIgnoreAsciiCase(tok)) {
+return false;
+}
+}
+return true;
+}
+
 // This callback checks if the found window is the specified process's 
top-level window,
 // and activates the first found such window.
 BOOL CALLBACK FindAndActivateProcWnd(HWND hwnd, LPARAM lParam)
@@ -300,6 +318,102 @@ void SAL_CALL CSysShExec::execute( const OUString& 
aCommand, const OUString& aPa
  + aCommand,
 static_cast< cppu::OWeakObject * >(this), 0);
 }
+if (uri->getScheme().equalsIgnoreAsciiCase("file")) {
+OUString pathname;
+auto const e1 = osl::FileBase::getSystemPathFromFileURL(aCommand, 
pathname);
+if (e1 != osl::FileBase::E_None) {
+throw css::lang::IllegalArgumentException(
+("XSystemShellExecute.execute, getSystemPathFromFileURL <" 
+ aCommand
+ + "> failed with " + OUString::number(e1)),
+{}, 0);
+}
+for (int i = 0;; ++i) {
+SHFILEINFOW info;
+if (SHGetFileInfoW(
+

[Libreoffice-commits] core.git: sd/Module_sd.mk sd/UITest_findReplace.mk sd/UITest_sd_findReplace.mk sw/Module_sw.mk sw/UITest_findReplace.mk sw/UITest_sw_findReplace.mk

2019-04-04 Thread Miklos Vajna (via logerrit)

 sd/Module_sd.mk |2 +-
 sd/UITest_sd_findReplace.mk |6 +++---
 sw/Module_sw.mk |2 +-
 sw/UITest_sw_findReplace.mk |6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit a3fdb6c5c2899a3d5ed9c60f35cc3ef53ce85acd
Author: Miklos Vajna 
AuthorDate: Thu Apr 4 08:52:23 2019 +0200
Commit: Miklos Vajna 
CommitDate: Thu Apr 4 09:53:12 2019 +0200

uitest: disambiguate UITest_findReplace

There was an sw and an sd one as well.

Change-Id: I3d031674f6866a779d44ce642339ec59bf2c82cb
Reviewed-on: https://gerrit.libreoffice.org/70236
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index 7bfb9f8a2c08..bd2796ae818e 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -61,6 +61,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sd,\
 
 $(eval $(call gb_Module_add_uicheck_targets,sd,\
UITest_impress_tests \
-   UITest_findReplace \
+   UITest_sd_findReplace \
 ))
 # vim: set noet sw=4 ts=4:
diff --git a/sd/UITest_findReplace.mk b/sd/UITest_sd_findReplace.mk
similarity index 65%
rename from sd/UITest_findReplace.mk
rename to sd/UITest_sd_findReplace.mk
index 245468975771..87e5aca342fe 100644
--- a/sd/UITest_findReplace.mk
+++ b/sd/UITest_sd_findReplace.mk
@@ -5,12 +5,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call  gb_UITest_UITest,findReplace))
+$(eval $(call  gb_UITest_UITest,sd_findReplace))
 
-$(eval $(call gb_UITest_add_modules,findReplace,$(SRCDIR)/sd/qa/uitest,\
+$(eval $(call gb_UITest_add_modules,sd_findReplace,$(SRCDIR)/sd/qa/uitest,\
findReplace/ \
 ))
 
-$(eval $(call gb_UITest_set_defs,findReplace, \
+$(eval $(call gb_UITest_set_defs,sd_findReplace, \
 TDOC="$(SRCDIR)/sd/qa/uitest/impress_tests/data" \
 ))
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 4385e05a1a65..eee1b09e97e6 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -146,7 +146,7 @@ $(eval $(call gb_Module_add_uicheck_targets,sw,\
UITest_writer_tests4 \
UITest_writer_tests5 \
UITest_table \
-   UITest_findReplace \
+   UITest_sw_findReplace \
UITest_chapterNumbering \
UITest_librelogo \
UITest_options \
diff --git a/sw/UITest_findReplace.mk b/sw/UITest_sw_findReplace.mk
similarity index 65%
rename from sw/UITest_findReplace.mk
rename to sw/UITest_sw_findReplace.mk
index 82716c953a25..6218c2e423c8 100644
--- a/sw/UITest_findReplace.mk
+++ b/sw/UITest_sw_findReplace.mk
@@ -5,12 +5,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call  gb_UITest_UITest,findReplace))
+$(eval $(call  gb_UITest_UITest,sw_findReplace))
 
-$(eval $(call gb_UITest_add_modules,findReplace,$(SRCDIR)/sw/qa/uitest,\
+$(eval $(call gb_UITest_add_modules,sw_findReplace,$(SRCDIR)/sw/qa/uitest,\
findReplace/ \
 ))
 
-$(eval $(call gb_UITest_set_defs,findReplace, \
+$(eval $(call gb_UITest_set_defs,sw_findReplace, \
 TDOC="$(SRCDIR)/sw/qa/uitest/writer_tests/data" \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - shell/source

2019-04-04 Thread Mike Kaganski (via logerrit)

 shell/source/win32/SysShExec.cxx |   49 +++
 1 file changed, 35 insertions(+), 14 deletions(-)

New commits:
commit e132f392594037ec9524c2da5304138405158744
Author: Mike Kaganski 
AuthorDate: Sun Oct 28 19:14:28 2018 +0300
Commit: Andras Timar 
CommitDate: Thu Apr 4 09:34:22 2019 +0200

tdf#120703 PVS: V547 Fix activation of launched process' window

V547 Expression 'procHandle != nullptr' is always false.

The code was nonsensical overall. First, the launched process handle
was never returned by ShellExecuteExW, because SEE_MASK_NOCLOSEPROCESS
wasn't used, so GetProcessId couldn't succeed. Then, nullptr window
handle was passed to GetWindowThreadProcessId, thus never returning a
meaningful result.

This reimplements this to find the launched process' main window by
first waiting for process idle (up to 1-second delay is possible),
then enumerating all the top-level windows and checking their process.

Change-Id: I5fb4c04147b3f9414e27650a023f7844523c18bd
Reviewed-on: https://gerrit.libreoffice.org/62478
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index 55b20e62fc46..05daf97586d8 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -245,6 +245,34 @@ CSysShExec::CSysShExec( const Reference< 
css::uno::XComponentContext >& xContext
 CoInitialize( nullptr );
 }
 
+namespace
+{
+// This callback checks if the found window is the specified process's 
top-level window,
+// and activates the first found such window.
+BOOL CALLBACK FindAndActivateProcWnd(HWND hwnd, LPARAM lParam)
+{
+if (!IsWindowVisible(hwnd))
+return TRUE; // continue enumeration
+if (GetWindow(hwnd, GW_OWNER)) // not a top-level window
+return TRUE; // continue enumeration
+const DWORD nParamProcId = static_cast(lParam);
+assert(nParamProcId != 0);
+DWORD nWndProcId = 0;
+(void)GetWindowThreadProcessId(hwnd, &nWndProcId);
+if (nWndProcId != nParamProcId)
+return TRUE; // continue enumeration
+
+// Found it! Bring it to front
+if (IsIconic(hwnd))
+{
+ShowWindow(hwnd, SW_RESTORE);
+}
+SetForegroundWindow(hwnd);
+SetActiveWindow(hwnd);
+return FALSE; // stop enumeration
+}
+}
+
 void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& 
aParameter, sal_Int32 nFlags )
 {
 // parameter checking
@@ -301,9 +329,10 @@ void SAL_CALL CSysShExec::execute( const OUString& 
aCommand, const OUString& aPa
 sei.lpFile   = o3tl::toW(preprocessed_command.getStr());
 sei.lpParameters = o3tl::toW(aParameter.getStr());
 sei.nShow= SW_SHOWNORMAL;
+sei.fMask = SEE_MASK_NOCLOSEPROCESS; // we need sei.hProcess
 
 if (NO_SYSTEM_ERROR_MESSAGE & nFlags)
-sei.fMask = SEE_MASK_FLAG_NO_UI;
+sei.fMask |= SEE_MASK_FLAG_NO_UI;
 
 SetLastError( 0 );
 
@@ -327,20 +356,12 @@ void SAL_CALL CSysShExec::execute( const OUString& 
aCommand, const OUString& aPa
 else
 {
 // Get Permission make changes to the Window of the created Process
-HWND procHandle = nullptr;
-DWORD procId = GetProcessId(sei.hProcess);
-AllowSetForegroundWindow(procId);
-
-// Get the handle of the created Window
-DWORD check = 0;
-GetWindowThreadProcessId(procHandle, &check);
-SAL_WARN_IF(check != procId, "shell", "Could not get handle of process 
called by shell.");
-
-// Move created Window into the foreground
-if(procHandle != nullptr)
+const DWORD procId = GetProcessId(sei.hProcess);
+if (procId != 0)
 {
-SetForegroundWindow(procHandle);
-SetActiveWindow(procHandle);
+AllowSetForegroundWindow(procId);
+WaitForInputIdle(sei.hProcess, 1000); // so that main window is 
created; imperfect
+EnumWindows(FindAndActivateProcWnd, static_cast(procId));
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/uiconfig icon-themes/colibre icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_svg officecfg/registry

2019-04-04 Thread andreas kainz (via logerrit)

 chart2/uiconfig/menubar/menubar.xml|   21 ++--
 dev/null   |binary
 icon-themes/colibre/links.txt  |   13 ++
 icon-themes/sifr/cmd/lc_diagramaxisall.png |binary
 icon-themes/sifr/cmd/lc_formatselection.png|binary
 icon-themes/sifr/cmd/lc_insertmenutitles.png   |binary
 icon-themes/sifr/cmd/lc_mediapause.png |binary
 icon-themes/sifr/cmd/lc_mediaplay.png  |binary
 icon-themes/sifr/cmd/lc_ok.png |binary
 icon-themes/sifr/cmd/sc_ok.png |binary
 icon-themes/sifr/links.txt |   45 
++
 icon-themes/sifr_dark/cmd/lc_diagramaxisall.png|binary
 icon-themes/sifr_dark/cmd/lc_formatselection.png   |binary
 icon-themes/sifr_dark/cmd/lc_insertmenutitles.png  |binary
 icon-themes/sifr_dark/cmd/lc_mediapause.png|binary
 icon-themes/sifr_dark/cmd/lc_mediaplay.png |binary
 icon-themes/sifr_dark/cmd/lc_ok.png|binary
 icon-themes/sifr_dark/cmd/sc_ok.png|binary
 icon-themes/sifr_svg/cmd/lc_formatselection.svg|6 +
 icon-themes/sifr_svg/cmd/lc_insertmenutitles.svg   |6 +
 icon-themes/sifr_svg/cmd/lc_mediapause.svg |2 
 icon-themes/sifr_svg/cmd/lc_mediaplay.svg  |6 +
 icon-themes/sifr_svg/cmd/lc_ok.svg |2 
 icon-themes/sifr_svg/cmd/lc_togglelegend.svg   |   10 --
 icon-themes/sifr_svg/cmd/sc_diagramaxisall.svg |6 -
 icon-themes/sifr_svg/cmd/sc_ok.svg |2 
 icon-themes/sifr_svg/cmd/sc_togglelegend.svg   |6 -
 officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu |   18 
 28 files changed, 106 insertions(+), 37 deletions(-)

New commits:
commit a7d957d98edf6ea680f9ff086a1d0722f8d12408
Author: andreas kainz 
AuthorDate: Wed Apr 3 23:20:25 2019 +0200
Commit: andreas_kainz 
CommitDate: Thu Apr 4 09:43:10 2019 +0200

chart icon theme update sifr and colibre

Change-Id: Ib72500f24cbca406d258794d4e8ab2cee7ef5ed6
Reviewed-on: https://gerrit.libreoffice.org/70223
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/chart2/uiconfig/menubar/menubar.xml 
b/chart2/uiconfig/menubar/menubar.xml
index e36968e975e7..7172dcf373f5 100644
--- a/chart2/uiconfig/menubar/menubar.xml
+++ b/chart2/uiconfig/menubar/menubar.xml
@@ -45,7 +45,6 @@
 
   
   
-  
   
   
   
@@ -69,15 +68,6 @@
   
   
 
-  
-  
-  
-
-  
-  
-
-  
-  
   
 
   
@@ -127,7 +117,15 @@
 
 
 
-
+  
+  
+  
+  
+
+  
+  
+
+  
 
   
   
@@ -143,7 +141,6 @@
   
 
   
-  
   
   
   
diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index 0a9199971b5c..48b53e2124f7 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -28,6 +28,19 @@ chart2/res/dataeditor_icon08.png cmd/sc_insertcolumns.png
 chart2/res/dataeditor_icon09.png cmd/sc_insertrowsbefore.png
 chart2/res/selectrange.png formula/res/refinp1.png
 
+cmd/sc_insertmenulegend.png cmd/sc_legend.png
+cmd/sc_insertmenuaxes.png cmd/sc_diagramaxis.png
+cmd/sc_insertmenugrids.png cmd/sc_togglegridhorizontal.png
+cmd/sc_diagramaxisall.png cmd/sc_diagramaxisxyz.png
+cmd/lc_insertmenulegend.png cmd/lc_togglelegend.png
+cmd/lc_insertmenuaxes.png cmd/lc_diagramaxis.png
+cmd/lc_insertmenugrids.png cmd/lc_togglegridhorizontal.png
+cmd/lc_diagramaxisall.png cmd/lc_diagramaxisxyz.png
+
+cmd/sc_charttitlemenu.png cmd/sc_toggletitle.png
+cmd/sc_diagramaxismenu.png cmd/sc_diagramaxis.png
+cmd/sc_diagramgridmenu.png cmd/sc_togglegridhorizontal.png
+
 # cmd
 # ==
 
diff --git a/icon-themes/sifr/cmd/lc_diagramaxisall.png 
b/icon-themes/sifr/cmd/lc_diagramaxisall.png
new file mode 100644
index ..25fc017ea3c6
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_diagramaxisall.png differ
diff --git a/icon-themes/sifr/cmd/lc_formatselection.png 
b/icon-themes/sifr/cmd/lc_formatselection.png
new file mode 100644
index ..f572968c68de
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_formatselection.png differ
diff --git a/icon-themes/sifr/cmd/lc_togglelegend.png 
b/icon-themes/sifr/cmd/lc_insertmenutitles.png
similarity index 66%
rename from icon-themes/sifr/cmd/lc_togglelegend.png
rename to icon-themes/sifr/c

[Libreoffice-commits] core.git: vcl/Package_theme_definitions.mk vcl/uiconfig

2019-04-04 Thread Tomaž Vajngerl (via logerrit)

 vcl/Package_theme_definitions.mk  |1 
 vcl/uiconfig/theme_definitions/ios/definition.xml |   15 --
 vcl/uiconfig/theme_definitions/ios/slider-button-disabled.svg |3 ++
 3 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit aa5abc875934990d1ecec17abc6c58d51afd10b1
Author: Tomaž Vajngerl 
AuthorDate: Thu Apr 4 10:56:40 2019 +0900
Commit: Tomaž Vajngerl 
CommitDate: Thu Apr 4 09:26:35 2019 +0200

ios theme definition: add slider disabled state

Change-Id: Ie4388f00c4a0c11df77782691fe9ea7f706d2b5c
Reviewed-on: https://gerrit.libreoffice.org/70231
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/Package_theme_definitions.mk b/vcl/Package_theme_definitions.mk
index 8f551ebaa8ce..dbb0a92fe268 100644
--- a/vcl/Package_theme_definitions.mk
+++ b/vcl/Package_theme_definitions.mk
@@ -53,6 +53,7 @@ $(eval $(call 
gb_Package_add_files_with_dir,vcl_theme_definitions,$(LIBO_SHARE_F
ios/arrow-up.svg \
ios/arrow-down.svg \
ios/slider-button.svg \
+   ios/slider-button-disabled.svg \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/uiconfig/theme_definitions/ios/definition.xml 
b/vcl/uiconfig/theme_definitions/ios/definition.xml
index 0f0823193857..5b4aa12b44ea 100644
--- a/vcl/uiconfig/theme_definitions/ios/definition.xml
+++ b/vcl/uiconfig/theme_definitions/ios/definition.xml
@@ -295,14 +295,20 @@
 
 
 
-
+
 
 
+
+
+
 
 
-
+
 
 
+
+
+
 
 
 
@@ -310,9 +316,12 @@
 
 
 
-
+
 
 
+
+
+
 
 
 
diff --git a/vcl/uiconfig/theme_definitions/ios/slider-button-disabled.svg 
b/vcl/uiconfig/theme_definitions/ios/slider-button-disabled.svg
new file mode 100644
index ..3c3b9fc56c2e
--- /dev/null
+++ b/vcl/uiconfig/theme_definitions/ios/slider-button-disabled.svg
@@ -0,0 +1,3 @@
+http://www.w3.org/2000/svg";>
+ 
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'refs/tags/cd-4.0.3-2'

2019-04-04 Thread Libreoffice Gerrit user

Tag 'cd-4.0.3-2' created by Andras Timar  at 
2019-04-04 07:20 +

cd-4.0.3-2

Changes since cd-4.0.3-1:
Andras Timar (1):
  Bump package version to 4.0.3-2

---
 debian/changelog |6 ++
 debian/control   |2 +-
 loolwsd.spec.in  |4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-4' - debian/changelog debian/control loolwsd.spec.in

2019-04-04 Thread Libreoffice Gerrit user

 debian/changelog |6 ++
 debian/control   |2 +-
 loolwsd.spec.in  |4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 5e7e5ec2a56f80849358ed23dd339eda28313f0b
Author: Andras Timar 
AuthorDate: Thu Apr 4 09:20:28 2019 +0200
Commit: Andras Timar 
CommitDate: Thu Apr 4 09:20:28 2019 +0200

Bump package version to 4.0.3-2

Change-Id: I496eb63bfd89ac58f4487d874e9775750e36959e

diff --git a/debian/changelog b/debian/changelog
index 5e64c5a49..d4fb303c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (4.0.3-2) unstable; urgency=medium
+
+  * see the git log: http://col.la/coolcd4
+
+ -- Andras Timar   Thu, 04 Apr 2019 09:10:00 +0200
+
 loolwsd (4.0.3-1) unstable; urgency=medium
 
   * see the git log: http://col.la/coolcd4
diff --git a/debian/control b/debian/control
index 9cc21e560..bb5e4f5d4 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.7
 Package: loolwsd
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libcurl3-gnutls, libexpat1, 
libicu55, libjpeg-turbo8, libnss3, libpng12-0, libxml2, libxslt1.1, libsm6, 
libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, libxcb-render0, 
libxcb-shm0, locales-all, adduser, expat, fontconfig, cpio, libcap2-bin, 
collaboraofficebasis6.0-calc (>= 6.0.10.27), collaboraofficebasis6.0-core (>= 
6.0.10.27), collaboraofficebasis6.0-graphicfilter (>= 6.0.10.27), 
collaboraofficebasis6.0-images (>= 6.0.10.27), collaboraofficebasis6.0-impress 
(>= 6.0.10.27), collaboraofficebasis6.0-ooofonts (>= 6.0.10.27), 
collaboraofficebasis6.0-writer (>= 6.0.10.27), collaboraoffice6.0 (>= 
6.0.10.27), collaboraoffice6.0-ure (>= 6.0.10.27), 
collaboraofficebasis6.0-en-us (>= 6.0.10.27), collaboraofficebasis6.0-draw (>= 
6.0.10.27), collaboraofficebasis6.0-extension-pdf-import (>= 6.0.10.27), 
collaboraofficebasis6.0-ooolinguistic (>= 6.0.10.27)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libcurl3-gnutls, libexpat1, 
libicu55, libjpeg-turbo8, libnss3, libpng12-0, libxml2, libxslt1.1, libsm6, 
libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, libxcb-render0, 
libxcb-shm0, locales-all, adduser, expat, fontconfig, cpio, libcap2-bin, 
collaboraofficebasis6.0-calc (>= 6.0.10.28), collaboraofficebasis6.0-core (>= 
6.0.10.28), collaboraofficebasis6.0-graphicfilter (>= 6.0.10.28), 
collaboraofficebasis6.0-images (>= 6.0.10.28), collaboraofficebasis6.0-impress 
(>= 6.0.10.28), collaboraofficebasis6.0-ooofonts (>= 6.0.10.28), 
collaboraofficebasis6.0-writer (>= 6.0.10.28), collaboraoffice6.0 (>= 
6.0.10.28), collaboraoffice6.0-ure (>= 6.0.10.28), 
collaboraofficebasis6.0-en-us (>= 6.0.10.28), collaboraofficebasis6.0-draw (>= 
6.0.10.28), collaboraofficebasis6.0-extension-pdf-import (>= 6.0.10.28), 
collaboraofficebasis6.0-ooolinguistic (>= 6.0.10.28)
 Conflicts: collaboraofficebasis6.0-gnome-integration, 
collaboraofficebasis6.0-kde-integration
 Description: LibreOffice Online WebSocket Daemon
  LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 2e142b093..aabcd6cc3 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:   loolwsd%{name_suffix}
 Name:   loolwsd
 %endif
 Version:@PACKAGE_VERSION@
-Release:1%{?dist}
+Release:2%{?dist}
 %if 0%{?suse_version} == 1110
 Group:  Productivity/Office/Suite
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -38,7 +38,7 @@ BuildRequires:  libcap-progs linux-glibc-devel 
systemd-rpm-macros python-polib
 BuildRequires:  libcap-progs
 %endif
 
-Requires:   collaboraoffice6.0 >= 6.0.10.27 collaboraoffice6.0-ure >= 
6.0.10.27 collaboraofficebasis6.0-core >= 6.0.10.27 
collaboraofficebasis6.0-writer >= 6.0.10.27 collaboraofficebasis6.0-impress >= 
6.0.10.27 collaboraofficebasis6.0-graphicfilter >= 6.0.10.27 
collaboraofficebasis6.0-en-US >= 6.0.10.27 collaboraofficebasis6.0-calc >= 
6.0.10.27 collaboraofficebasis6.0-ooofonts >= 6.0.10.27 
collaboraofficebasis6.0-images >= 6.0.10.27 collaboraofficebasis6.0-draw >= 
6.0.10.27 collaboraofficebasis6.0-extension-pdf-import >= 6.0.10.27 
collaboraofficebasis6.0-ooolinguistic >= 6.0.10.27
+Requires:   collaboraoffice6.0 >= 6.0.10.28 collaboraoffice6.0-ure >= 
6.0.10.28 collaboraofficebasis6.0-core >= 6.0.10.28 
collaboraofficebasis6.0-writer >= 6.0.10.28 collaboraofficebasis6.0-impress >= 
6.0.10.28 collaboraofficebasis6.0-graphicfilter >= 6.0.10.28 
collaboraofficebasis6.0-en-US >= 6.0.10.28 collaboraofficebasis6.0-calc >= 
6.0.10.28 collaboraofficebasis6.0-ooofonts >= 6.0.10.28 
collaboraofficebasis6.0-images >= 6.0.10.28 collaboraofficebasis6.0-draw >= 
6.0.10.28 collaboraofficebasis6.0-extension-pdf-import >= 6.0.10.28 
collaboraofficebasis6.0-ooolinguistic >= 6.0.10.28
 Conflicts:  collaboraofficebasis6.0-kde-integration 
collaboraofficebasis6.0-gnome-integration
 Requires(post): coreutils grep

83 matches

Mail list logo