RE: libreoffice-6.2.2.2 component context fails to supply service com.sun.star.ui.ModuleUIConfigurationManager

[John Frankish]

> > Strace log attached
> >
> Hm, unfortunately doesn't give me a further clue.  The
>
> > 10691 access("/home/tc/.config/libreoffice/4/user/config/soffice.cfg", 
> > F_OK) = -1 ENOENT (No such file or directory)
> >
> may have been a false route after all; I was under the erroneous expression 
> that that part
> of the user profile gets copied over from the installation's preset/ tree, 
> but that isn't the case.
> So you need to go back to the debug suggestions I gave earlier.
>
Thanks for the suggestions.

Unfortunately gdb echoes the same error, but exits normally, even when re-run.

Since libreoffice-6.2.2.2 builds and runs on the 64-bit version of the same 
distro when compiled almost identically (the difference being "-mtune-generic" 
instead of "-march=i486 -mtune=i686"), this is puzzling.

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

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

[Stephan Bergmann (via logerrit)]

 sfx2/source/appl/appdde.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3f59a2df61620fbb7216fc66780620f142d81e66
Author: Stephan Bergmann 
AuthorDate: Tue Apr 16 13:35:08 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Apr 17 09:02:44 2019 +0200

Missing include (Windows --disable-pch)

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

diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index e405bf3635a8..2247c4a72c94 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/cib/libreoffice-6-2' - loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/src/control/Toolbar.js |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit a004938d3f54a718e17b523c78f4885b4fd0808e
Author: Samuel Mehrbrodt 
AuthorDate: Wed Apr 17 09:04:03 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Wed Apr 17 09:04:03 2019 +0200

About dialog: Add link to website

Can be modified by setting brandProductURL in branding.js

Change-Id: I6181f4f0d7c0f7e6cd9ab447d95f451711bfd561

diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index ba3cbb0ca..95b86b053 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -3,7 +3,7 @@
  * Toolbar handler
  */
 
-/* global $ window vex brandProductName _ */
+/* global $ window vex brandProductName brandProductURL _ */
 L.Map.include({
 
// a mapping of uno commands to more readable toolbar items
@@ -256,9 +256,11 @@ L.Map.include({
var content = $('#about-dialog').clone().css({display: 
'block'});
// fill product-name and product-string
var productName = (typeof brandProductName !== 'undefined') ? 
brandProductName : 'LibreOffice Online';
+   var productURL = (typeof brandProductURL !== 'undefined') ? 
brandProductURL : 'https://libreoffice.org';
+   var productNameWithURL = '' + productName + '';
content.find('#product-name').text(productName);
var productString = _('This version of %productName is powered 
by');
-   
content.find('#product-string').text(productString.replace('%productName', 
productName));
+   
content.find('#product-string').html(productString.replace('%productName', 
productNameWithURL));
var w;
var iw = window.innerWidth;
if (iw < 768) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx |   10 
 writerperfect/source/writer/exp/XMLSectionContext.cxx|6 
 writerperfect/source/writer/exp/XMLTextFrameContext.cxx  |   22 -
 writerperfect/source/writer/exp/XMLTextListContext.cxx   |2 
 writerperfect/source/writer/exp/XMLTextListItemContext.cxx   |4 
 writerperfect/source/writer/exp/txtparai.cxx |  127 +--
 writerperfect/source/writer/exp/txtstyli.cxx |   16 -
 writerperfect/source/writer/exp/xmlfmt.cxx   |   57 ++--
 writerperfect/source/writer/exp/xmlictxt.hxx |3 
 writerperfect/source/writer/exp/xmlimp.cxx   |   30 +-
 writerperfect/source/writer/exp/xmlmetai.cxx |   41 +--
 writerperfect/source/writer/exp/xmlmetai.hxx |3 
 writerperfect/source/writer/exp/xmltbli.cxx  |   40 +--
 writerperfect/source/writer/exp/xmltext.cxx  |6 
 14 files changed, 193 insertions(+), 174 deletions(-)

New commits:
commit 9a0934babd347c579c7f5f5c4094800cdc239063
Author: Miklos Vajna 
AuthorDate: Tue Apr 16 21:31:05 2019 +0200
Commit: Miklos Vajna 
CommitDate: Wed Apr 17 09:05:09 2019 +0200

EPUB export: make member variable private

In most cases these were public without a good reason, in other cases
setter / getters are added.

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

diff --git a/writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx 
b/writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx
index 5f1b53c804a8..15753306a97d 100644
--- a/writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx
+++ b/writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx
@@ -81,19 +81,19 @@ XMLFootnoteBodyImportContext::XMLFootnoteBodyImportContext(
 rtl::Reference 
XMLFootnoteBodyImportContext::CreateChildContext(
 const OUString& rName, const 
css::uno::Reference& /*xAttribs*/)
 {
-return CreateTextChildContext(mrImport, rName);
+return CreateTextChildContext(GetImport(), rName);
 }
 
 void XMLFootnoteBodyImportContext::startElement(
 const OUString& /*rName*/,
 const css::uno::Reference& /*xAttribs*/)
 {
-mrImport.GetGenerator().openFootnote(m_rProperties);
+GetImport().GetGenerator().openFootnote(m_rProperties);
 }
 
 void XMLFootnoteBodyImportContext::endElement(const OUString& /*rName*/)
 {
-mrImport.GetGenerator().closeFootnote();
+GetImport().GetGenerator().closeFootnote();
 }
 
 XMLFootnoteImportContext::XMLFootnoteImportContext(XMLImport& rImport)
@@ -105,9 +105,9 @@ rtl::Reference 
XMLFootnoteImportContext::CreateChildContext(
 const OUString& rName, const 
css::uno::Reference& /*xAttribs*/)
 {
 if (rName == "text:note-citation")
-return new XMLTextNoteCitationContext(mrImport, m_aProperties);
+return new XMLTextNoteCitationContext(GetImport(), m_aProperties);
 if (rName == "text:note-body")
-return new XMLFootnoteBodyImportContext(mrImport, m_aProperties);
+return new XMLFootnoteBodyImportContext(GetImport(), m_aProperties);
 SAL_WARN("writerperfect", "XMLFootnoteImportContext::CreateChildContext: 
unhandled " << rName);
 return nullptr;
 }
diff --git a/writerperfect/source/writer/exp/XMLSectionContext.cxx 
b/writerperfect/source/writer/exp/XMLSectionContext.cxx
index bf88d0e174fb..dbd1f9663539 100644
--- a/writerperfect/source/writer/exp/XMLSectionContext.cxx
+++ b/writerperfect/source/writer/exp/XMLSectionContext.cxx
@@ -26,19 +26,19 @@ XMLSectionContext::XMLSectionContext(XMLImport& rImport)
 rtl::Reference XMLSectionContext::CreateChildContext(
 const OUString& rName, const 
css::uno::Reference& /*xAttribs*/)
 {
-return CreateTextChildContext(mrImport, rName);
+return CreateTextChildContext(GetImport(), rName);
 }
 
 void XMLSectionContext::startElement(
 const OUString& /*rName*/,
 const css::uno::Reference& /*xAttribs*/)
 {
-mrImport.GetGenerator().openSection(librevenge::RVNGPropertyList());
+GetImport().GetGenerator().openSection(librevenge::RVNGPropertyList());
 }
 
 void XMLSectionContext::endElement(const OUString& /*rName*/)
 {
-mrImport.GetGenerator().closeSection();
+GetImport().GetGenerator().closeSection();
 }
 
 } // namespace exp
diff --git a/writerperfect/source/writer/exp/XMLTextFrameContext.cxx 
b/writerperfect/source/writer/exp/XMLTextFrameContext.cxx
index cb7d3f9a8340..dc62f8bf85ce 100644
--- a/writerperfect/source/writer/exp/XMLTextFrameContext.cxx
+++ b/writerperfect/source/writer/exp/XMLTextFrameContext.cxx
@@ -46,19 +46,19 @@ XMLTextBoxContext::XMLTextBoxContext(XMLImport& rImport)
 rtl::Reference XMLTextBoxContext::CreateChildContext(
 const OUString& rName, const 
css::uno::Reference& /*xAttribs*/)
 {
-return CreateTextChildContext(mrImpo

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-2' - 16 commits - sc/inc sc/qa sc/source sc/uiconfig sfx2/source shell/source solenv/flatpak-manifest.in sw/inc sw/qa sw/source vcl/inc

[Michael Stahl (via logerrit)]

 sc/inc/dpcache.hxx |1 
 sc/inc/dpsave.hxx  |2 
 sc/qa/unit/data/ods/caseinsensitive-duplicate-fields.ods   |binary
 sc/qa/unit/data/ods/tdf123421_1datafield.ods   |binary
 sc/qa/unit/data/ods/tdf123421_2datafields.ods  |binary
 sc/qa/unit/pivottable_filters_test.cxx |   80 +
 sc/source/core/data/dpcache.cxx|   97 ++
 sc/source/filter/excel/xepivotxml.cxx  |   11 
 sc/uiconfig/scalc/ui/sheetprintpage.ui |4 
 sfx2/source/dialog/mgetempl.cxx|4 
 shell/source/backends/desktopbe/desktopbackend.cxx |   21 -
 solenv/flatpak-manifest.in |   12 
 sw/inc/ndtxt.hxx   |3 
 sw/qa/extras/ooxmlimport/data/tdf124670.docx   |binary
 sw/qa/extras/ooxmlimport/ooxmlimport2.cxx  |   10 
 sw/qa/extras/rtfexport/data/para-style-bottom-margin-2.rtf |   12 
 sw/qa/extras/rtfexport/rtfexport2.cxx  |   27 +
 sw/qa/extras/rtfimport/data/para-style-bottom-margin.rtf   |   14 
 sw/qa/extras/rtfimport/rtfimport.cxx   |   31 ++
 sw/qa/extras/uiwriter/data2/floating-table-position.docx   |binary
 sw/qa/extras/uiwriter/uiwriter2.cxx|   92 ++
 sw/source/core/crsr/crstrvl.cxx|2 
 sw/source/core/doc/DocumentListItemsManager.cxx|2 
 sw/source/core/fields/reffld.cxx   |2 
 sw/source/core/text/txtfrm.cxx |2 
 sw/source/core/tox/txmsrt.cxx  |   10 
 sw/source/core/undo/undel.cxx  |6 
 sw/source/core/undo/undobj.cxx |   18 -
 sw/source/filter/ww8/docxattributeoutput.cxx   |  197 -
 sw/source/uibase/docvw/edtwin.cxx  |2 
 vcl/inc/printerinfomanager.hxx |2 
 vcl/inc/qt5/Qt5FilePicker.hxx  |4 
 vcl/inc/unx/gtk/gtkgdi.hxx |2 
 vcl/qt5/Qt5FilePicker.cxx  |   41 ++
 vcl/uiconfig/ui/cupspassworddialog.ui  |   43 ++
 vcl/unx/generic/printer/cupsmgr.cxx|  188 
 vcl/unx/gtk/salnativewidgets-gtk.cxx   |   28 +
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx  |   31 --
 writerfilter/source/ooxml/OOXMLFastContextHandler.hxx  |   15 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   63 +++-
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |2 
 writerfilter/source/rtftok/rtfsprm.cxx |   11 
 writerfilter/source/rtftok/rtfsprm.hxx |4 
 43 files changed, 810 insertions(+), 286 deletions(-)

New commits:
commit 1149d20ce9f8682b58f98d3fa3bf289fc5974087
Author: Michael Stahl 
AuthorDate: Mon Apr 15 18:18:27 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Apr 17 00:54:16 2019 +0200

tdf#124722 sw_redlinehide: don't set negative SwTextFrame offsets

nLen may be larger than the master SwTextFrame, but its follow can't
have negative offset.

(regression from 0acde7514e666fc04805fd36503bd174162336ca)

Change-Id: I6177c748480cdf61e8f15a7032ba52d3ae2ea52c
Reviewed-on: https://gerrit.libreoffice.org/70816
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 2ea6f385d36966de8e30b9a537ac2875075ca9eb)
Reviewed-on: https://gerrit.libreoffice.org/70821
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 7d4e077d58c2..99981405d297 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -1796,7 +1796,7 @@ static void lcl_ModifyOfst(SwTextFrame & rFrame,
 assert(nLen != TextFrameIndex(COMPLETE_STRING));
 if (rFrame.IsFollow() && nPos < rFrame.GetOfst())
 {
-rFrame.ManipOfst( op(rFrame.GetOfst(), nLen) );
+rFrame.ManipOfst( std::max(TextFrameIndex(0), op(rFrame.GetOfst(), 
nLen)) );
 }
 }
 
commit 51fb5ce0774c463caad7bcf9a6851161a56d60f7
Author: Michael Stahl 
AuthorDate: Mon Apr 15 17:11:51 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Apr 17 00:54:05 2019 +0200

tdf#123855 sw_redlinehide: fix GetExpandText() not expanding footnotes

... due to change of default argument; the XHTML export is calling it
from SwXTextPortion::getString().  This is complicated a bit by a
bunch of changes to GetExpandText() callers.

(regression from bf488abbf46da51d17c3ad7ccf9e39005a55c2d7)

Change-Id: I0b1e10e17c8f3824d6fa1f21fc74cc59b310474f
Reviewed-on: https://gerrit.libreoffice.org/707

RE: questions about LibreOffice API version and jars available on https://mvnrepository.com

[LORENZO Vincent]

Hello everybody, 
Sorry for my long answer delay. Indeed now all versions of the 
libraries I need have been pushed! 
I thank you everybody and mainly the people who did it.

Regards, 
-- 
Vincent

-Message d'origine-
De : Thorsten Behrens [mailto:t...@libreoffice.org] 
Envoyé : lundi 8 avril 2019 11:54
À : LORENZO Vincent 
Cc : libreoffice@lists.freedesktop.org
Objet : Re: questions about LibreOffice API version and jars available on 
https://mvnrepository.com

Hi Lorenzo,

LORENZO Vincent wrote:
>   Yes, of course, I could compile it myself, but I would prefer avoid 
> this step  :-).
>
Seems the maven repo got updated with the latest jars - e.g.
https://mvnrepository.com/artifact/org.libreoffice/jurt lists versions up to 
and including 6.2

HTH,

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

Re: libreoffice-6.2.2.2 component context fails to supply service com.sun.star.ui.ModuleUIConfigurationManager

[Stephan Bergmann]

On 17/04/2019 09:00, John Frankish wrote:

Unfortunately gdb echoes the same error, but exits normally, even when re-run.


Yeah, you'll need to put breakpoints at the mentioned places, and step 
into the code there to find out why it fails.  (Tedious, but I have no 
better suggestion.)


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

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

[Tomaž Vajngerl (via logerrit)]

 vcl/source/control/edit.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1e917af27d18d934f3e9122aa98cd950b74ca246
Author: Tomaž Vajngerl 
AuthorDate: Wed Apr 17 12:24:17 2019 +0900
Commit: Tomaž Vajngerl 
CommitDate: Wed Apr 17 09:23:26 2019 +0200

tdf#124032 fix Edit background drawing

IsPaintTransparent() is preventing to paint the background but
not sure why this is needed. removing this condition doesn't
seem to have any ill effects.

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

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 0ced8a8675ca..3f20145b5736 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -329,6 +329,7 @@ void Edit::ImplInit(vcl::Window* pParent, WinBits nStyle)
 SetCursor( new vcl::Cursor );
 
 SetPointer( PointerStyle::Text );
+ApplySettings(*this);
 
 uno::Reference< datatransfer::dnd::XDragGestureListener> xDGL( 
mxDnDListener, uno::UNO_QUERY );
 uno::Reference< datatransfer::dnd::XDragGestureRecognizer > xDGR = 
GetDragGestureRecognizer();
@@ -382,7 +383,7 @@ void Edit::ApplySettings(vcl::RenderContext& rRenderContext)
 Color aTextColor = rStyleSettings.GetFieldTextColor();
 ApplyControlForeground(rRenderContext, aTextColor);
 
-if (ImplUseNativeBorder(rRenderContext, GetStyle()) || 
IsPaintTransparent())
+if (ImplUseNativeBorder(rRenderContext, GetStyle()))
 {
 // Transparent background
 rRenderContext.SetBackground();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sax/qa sax/source sc/source

[Noel Grandin (via logerrit)]

 sax/qa/cppunit/xmlimport.cxx   |3 --
 sax/source/fastparser/fastparser.cxx   |3 --
 sc/source/core/data/dpfilteredcache.cxx|3 --
 sc/source/core/data/drwlayer.cxx   |3 --
 sc/source/core/tool/address.cxx|3 --
 sc/source/core/tool/callform.cxx   |3 --
 sc/source/core/tool/chartpos.cxx   |3 --
 sc/source/core/tool/chgtrack.cxx   |3 --
 sc/source/core/tool/interpr5.cxx   |6 +
 sc/source/filter/excel/excform.cxx |9 ++-
 sc/source/filter/excel/excform8.cxx|6 +
 sc/source/filter/excel/xecontent.cxx   |3 --
 sc/source/filter/excel/xicontent.cxx   |   33 +
 sc/source/filter/html/htmlexp.cxx  |3 --
 sc/source/filter/lotus/tool.cxx|3 --
 sc/source/ui/app/inputwin.cxx  |3 --
 sc/source/ui/dataprovider/dataprovider.cxx |3 --
 sc/source/ui/dbgui/csvgrid.cxx |3 --
 sc/source/ui/docshell/docfunc.cxx  |3 --
 sc/source/ui/docshell/docsh.cxx|2 -
 sc/source/ui/drawfunc/fuconrec.cxx |3 --
 sc/source/ui/unoobj/linkuno.cxx|3 --
 sc/source/ui/vba/vbafont.cxx   |3 --
 sc/source/ui/vba/vbainterior.cxx   |3 --
 sc/source/ui/vba/vbarange.cxx  |6 +
 sc/source/ui/vba/vbaworksheets.cxx |3 --
 sc/source/ui/view/tabvwshf.cxx |6 +
 27 files changed, 43 insertions(+), 85 deletions(-)

New commits:
commit 185e01c015528cafbddcda5dfdabf816ce8be20e
Author: Noel Grandin 
AuthorDate: Sat Apr 13 21:24:41 2019 +0200
Commit: Noel Grandin 
CommitDate: Wed Apr 17 09:29:50 2019 +0200

loplugin:sequentialassign in sc

Change-Id: I9287d266cd5267e194f2539f95a7efff3824e9b1
Reviewed-on: https://gerrit.libreoffice.org/70715
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sax/qa/cppunit/xmlimport.cxx b/sax/qa/cppunit/xmlimport.cxx
index 6e011c1e971b..7ab34ed763c9 100644
--- a/sax/qa/cppunit/xmlimport.cxx
+++ b/sax/qa/cppunit/xmlimport.cxx
@@ -370,8 +370,7 @@ void XMLImportTest::setUp()
 namespaceArgs[0] <<= OUString( "registerNamespaces" );
 for (sal_Int32 i = 1; i <= nNamespaceCount; i++ )
 {
-css::beans::Pair  rPair;
-rPair = css::beans::Pair( 
DummyTokenHandler::namespaceURIs[i - 1], i << 16 );
+css::beans::Pair rPair( 
DummyTokenHandler::namespaceURIs[i - 1], i << 16 );
 namespaceArgs[i] <<= rPair;
 }
 xInit->initialize( namespaceArgs );
diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index 92a5f7a87b38..f255147f131b 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -806,8 +806,7 @@ void FastSaxParserImpl::parseStream(const InputSource& 
rStructSource)
 
 if (rEntity.mbEnableThreads)
 {
-rtl::Reference xParser;
-xParser = new ParserThread(this);
+rtl::Reference xParser = new ParserThread(this);
 xParser->launch();
 aEnsureFree.setThread(xParser);
 bool done = false;
diff --git a/sc/source/core/data/dpfilteredcache.cxx 
b/sc/source/core/data/dpfilteredcache.cxx
index 0763aee3152b..a0fce6afdbbc 100644
--- a/sc/source/core/data/dpfilteredcache.cxx
+++ b/sc/source/core/data/dpfilteredcache.cxx
@@ -308,8 +308,7 @@ void ScDPFilteredCache::filterTable(const 
vector& rCriteria, Sequence
 Sequence headerRow(nColSize);
 for (SCCOL  nCol = 0; nCol < nColSize; ++nCol)
 {
-OUString str;
-str = getFieldName( nCol);
+OUString str = getFieldName( nCol);
 Any any;
 any <<= str;
 headerRow[nCol] = any;
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 259e76fe08fa..985267b8929d 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -2093,8 +2093,7 @@ void ScDrawLayer::UpdateCellAnchorFromPositionEnd( const 
SdrObject &rObj, ScDraw
 ScDrawObjData* pAnchor = &rAnchor;
 pAnchor->maEnd = aRange.aEnd;
 
-tools::Rectangle aCellRect;
-aCellRect = rDoc.GetMMRect( aRange.aEnd.Col(), aRange.aEnd.Row(),
+tools::Rectangle aCellRect = rDoc.GetMMRect( aRange.aEnd.Col(), 
aRange.aEnd.Row(),
   aRange.aEnd.Col(), aRange.aEnd.Row(), aRange.aEnd.Tab() );
 pAnchor->maEndOffset.setY( aObjRect.Bottom()-aCellRect.Top() );
 if (!rDoc.IsNegativePage(nTab))
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 666e22ad2910..3b3a997050df 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -1087,8 +1087,7 @@ static ScRefFlags lcl_ScRange_Parse_XL_A1( ScRange& r,
 return nFlags;
 }
 
-p = tmp2;
-p = lcl_eatWhiteSpace( p+1 );   // after ':'
+p = lcl_eatWhiteSpace( tmp2+1 );   // after ':'
 tmp1 = lcl_a1_get_col( p, &r.aEnd, &nFlags2, pEr

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

[tundet (via logerrit)]

 include/oox/export/chartexport.hxx|3 ++
 include/oox/export/drawingml.hxx  |   10 
 include/oox/export/shapes.hxx |   10 
 oox/source/export/chartexport.cxx |   26 +-
 oox/source/export/drawingml.cxx   |   14 
 oox/source/export/shapes.cxx  |   24 
 sc/qa/unit/data/xlsx/chart_hyperlink.xlsx |binary
 sc/qa/unit/subsequent_export-test.cxx |   24 
 sc/source/filter/excel/xeescher.cxx   |7 --
 sc/source/filter/inc/xcl97rec.hxx |   14 
 sc/source/filter/inc/xeescher.hxx |4 ++-
 sc/source/filter/xcl97/xcl97esc.cxx   |2 -
 sc/source/filter/xcl97/xcl97rec.cxx   |   35 --
 13 files changed, 118 insertions(+), 55 deletions(-)

New commits:
commit dc091e7fd952b0530db8583247c2f910d627700a
Author: tundet 
AuthorDate: Fri Apr 12 10:21:42 2019 +0200
Commit: László Németh 
CommitDate: Wed Apr 17 10:17:47 2019 +0200

tdf#123645 XLSX export: fix hyperlink inserted to chart

Hyperlink inserted to chart lost after export.

chart_hyperlink.xlsx: Test file from Excel 2016.

Change-Id: Ideca10e544193ba43d7c2ef6e9dd8e393383edc1
Reviewed-on: https://gerrit.libreoffice.org/70648
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/include/oox/export/chartexport.hxx 
b/include/oox/export/chartexport.hxx
index c5f9e6ebd188..b39b3f52b455 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -101,6 +101,7 @@ private:
 css::uno::Reference< css::frame::XModel > mxChartModel;
 css::uno::Reference< css::chart::XDiagram > mxDiagram;
 css::uno::Reference< css::chart2::XDiagram > mxNewDiagram;
+std::shared_ptr mpURLTransformer;
 
 // members filled by InitRangeSegmentationProperties (retrieved from 
DataProvider)
 bool mbHasCategoryLabels; //if the categories are only automatically 
generated this will be false
@@ -214,6 +215,8 @@ public:
  ::oox::core::XmlFilterBase* pFB, DocumentType eDocumentType );
 virtual ~ChartExport() {}
 
+void SetURLTranslator(const std::shared_ptr& pTransformer);
+
 const css::uno::Reference< css::frame::XModel >& getModel(){ return 
mxChartModel; }
 
 void WriteChartObj( const css::uno::Reference< css::drawing::XShape >& 
xShape, sal_Int32 nID, sal_Int32 nChartCount );
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index b3cdbb3600ba..8ed1aaf0d702 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -96,6 +96,16 @@ namespace core {
 
 namespace drawingml {
 
+class OOX_DLLPUBLIC URLTransformer
+{
+public:
+virtual ~URLTransformer();
+
+virtual OUString getTransformedString(const OUString& rURL) const;
+
+virtual bool isExternalURL(const OUString& rURL) const;
+};
+
 // Our rotation is counter-clockwise and is in 100ths of a degree.
 // drawingML rotation is clockwise and is in 6ths of a degree.
 template  T ExportRotateClockwisify(T input)
diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx
index aa0ca2cd1a62..b7755ccee9d2 100644
--- a/include/oox/export/shapes.hxx
+++ b/include/oox/export/shapes.hxx
@@ -78,16 +78,6 @@ OOX_DLLPUBLIC css::uno::Reference 
GetOLEObjectStream(
 
 namespace oox { namespace drawingml {
 
-class OOX_DLLPUBLIC URLTransformer
-{
-public:
-virtual ~URLTransformer();
-
-virtual OUString getTransformedString(const OUString& rURL) const;
-
-virtual bool isExternalURL(const OUString& rURL) const;
-};
-
 class OOX_DLLPUBLIC ShapeExport : public DrawingML {
 
 private:
diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 15e9bca1c1c9..672ae2579d99 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -376,6 +376,7 @@ ChartExport::ChartExport( sal_Int32 nXmlNamespace, 
FSHelperPtr pFS, Reference< f
 , mnXmlNamespace( nXmlNamespace )
 , mnSeriesCount(0)
 , mxChartModel( xModel )
+, mpURLTransformer(new URLTransformer)
 , mbHasCategoryLabels( false )
 , mbHasZAxis( false )
 , mbIs3DChart( false )
@@ -384,6 +385,11 @@ ChartExport::ChartExport( sal_Int32 nXmlNamespace, 
FSHelperPtr pFS, Reference< f
 {
 }
 
+void ChartExport::SetURLTranslator(const std::shared_ptr& 
pTransformer)
+{
+mpURLTransformer = pTransformer;
+}
+
 sal_Int32 ChartExport::getChartType( )
 {
 OUString sChartType = mxDiagram->getDiagramType();
@@ -445,6 +451,8 @@ void ChartExport::WriteChartObj( const Reference< XShape >& 
xShape, sal_Int32 nI
 {
 FSHelperPtr pFS = GetFS();
 
+Reference< XPropertySet > xShapeProps( xShape, UNO_QUERY );
+
 pFS->startElementNS( mnXmlNamespace, XML_graphicFrame, FSEND );
 
 pFS->startElementNS( mnXmlNamespace, XML_nvGraphicFramePr, FSEND );
@@ -455,11 +463,27 @@ void ChartExport::

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

[Gabor Kelemen (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6607e2915e64e9d371be96632431959e5fd86b76
Author: Gabor Kelemen 
AuthorDate: Wed Apr 17 08:09:04 2019 +0200
Commit: Katarina Behrens 
CommitDate: Wed Apr 17 10:43:05 2019 +0200

tdf#120273 Ctrl-N should open a new document when a chart is selected

and Ctrl-Shift-N should go to the Templates dialog

Actually, since the latter is a global keybinding
this - and the 4 other uno:NewDoc - entry is redundant a bit

Change-Id: I3c36b0b98f04033c8214e9c3c23f8cf5e99451d6
Reviewed-on: https://gerrit.libreoffice.org/70857
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 3d52e550dfc4..3139f766b20b 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -1428,7 +1428,7 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some 
emoji thing
 .uno:FullScreen
   
 
-
+
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:NewDoc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

[Andrea Gelmini (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8a64a0a5819532517cf4a3f7e18b9d323e1aa31d
Author: Andrea Gelmini 
AuthorDate: Wed Apr 10 16:05:25 2019 +
Commit: Julien Nabet 
CommitDate: Wed Apr 17 10:47:50 2019 +0200

Fix typo

Change-Id: I633047306372ce285bf3531c609f364addf927c8
Reviewed-on: https://gerrit.libreoffice.org/70854
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/configure.ac b/configure.ac
index 71e75103d38f..355e85bedff9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7240,7 +7240,7 @@ if test "$ENABLE_JAVA" != ""; then
 # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
 if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then
 if basename $(readlink $(readlink $JAVACOMPILER)) >/dev/null 
2>/dev/null; then
-   # try to recover first by looking whether we have a alternatives
+   # try to recover first by looking whether we have an alternative
# system as in Debian or newer SuSEs where following /usr/bin/javac
# over /etc/alternatives/javac leads to the right bindir where we
# just need to strip a bit away to get a valid JAVA_HOME
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

[Andrea Gelmini (via logerrit)]

 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 01e61ac30405697e2d48163850410cf1d9565ea3
Author: Andrea Gelmini 
AuthorDate: Tue Apr 16 13:55:50 2019 +
Commit: Julien Nabet 
CommitDate: Wed Apr 17 10:48:20 2019 +0200

Fix typo

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

diff --git a/configure.ac b/configure.ac
index 355e85bedff9..1366ed2e0086 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9752,8 +9752,8 @@ else
 DISABLE_OPENSSL=TRUE
 
 # warn that although OpenSSL is disabled, system libraries may depend on it
-AC_MSG_WARN([OpenSSL has been disabled. No code compiled by LibO will make 
use of it but system librares may create indirect dependencies])
-add_warning "OpenSSL has been disabled. No code compiled by LibO will make 
use of it but system librares may create indirect dependencies"
+AC_MSG_WARN([OpenSSL has been disabled. No code compiled by LibO will make 
use of it but system libraries may create indirect dependencies])
+add_warning "OpenSSL has been disabled. No code compiled by LibO will make 
use of it but system libraries may create indirect dependencies"
 fi
 
 AC_SUBST([DISABLE_OPENSSL])
___
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' - desktop/source

[Noel Grandin (via logerrit)]

 desktop/source/app/officeipcthread.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1fb3a433264e34fc48e351d21d93a7bb4f431113
Author: Noel Grandin 
AuthorDate: Sat Sep 8 09:26:12 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Wed Apr 17 11:59:46 2019 +0300

clang-tidy bugprone-unused-raii in RequestHandler

The message from clang-tidy is:
warning: object destroyed immediately after creation; did you mean
to name the object?

The guard in
RequestHandler::ExecuteCmdLineRequests
comes from
commit cf333a878ceed18d0343520a2c65be69fc433b1f
Date:   Sun Jan 21 22:10:09 2018 +0300
tdf#38915: set cProcessed condition on any process outcome
and I'm sure it's intention was to set the flag on exit from the
function, not immediately.

Reviewed-on: https://gerrit.libreoffice.org/60183
Reviewed-by: Mike Kaganski 
Tested-by: Jenkins
(cherry picked from commit 867ee21fe4c0c9216aea57850efec4de3c3fc554)

Change-Id: Ibf874a5774770df00b9db7f673554e7ffda55072
Reviewed-on: https://gerrit.libreoffice.org/66168
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/desktop/source/app/officeipcthread.cxx 
b/desktop/source/app/officeipcthread.cxx
index a128a073ea0b..64098a758058 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -1324,7 +1324,7 @@ bool RequestHandler::ExecuteCmdLineRequests(
 osl::ClearableMutexGuard aGuard( GetMutex() );
 
 // ensure that Processed flag (if exists) is signaled in any outcome
-ConditionSetGuard(aRequest.pcProcessed);
+ConditionSetGuard aSetGuard(aRequest.pcProcessed);
 
 static std::vector aDispatchList;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/redland

[Tomoyuki Kubota (via logerrit)]

 external/redland/Library_raptor.mk|2 +
 external/redland/Library_rasqal.mk|6 +
 external/redland/raptor/raptor-msvc.patch.1   |   13 +++
 external/redland/rasqal/rasqal-msvc.patch.1   |   15 +
 external/redland/redland/redland-msvc.patch.1 |   29 ++
 5 files changed, 65 insertions(+)

New commits:
commit a96167f88aa68651f055aa9096e63c9e48c8e4fa
Author: Tomoyuki Kubota 
AuthorDate: Tue Apr 16 22:23:32 2019 +0900
Commit: Michael Stahl 
CommitDate: Wed Apr 17 11:00:32 2019 +0200

avoid C4013 and C4117

calloc,free,clock,time,ceil,frexp,fabs,ldex,access,getpid for C4013
__FUNCTION__ for C4117

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

diff --git a/external/redland/Library_raptor.mk 
b/external/redland/Library_raptor.mk
index 1f171c1bc752..146a46e90cfe 100644
--- a/external/redland/Library_raptor.mk
+++ b/external/redland/Library_raptor.mk
@@ -32,6 +32,8 @@ $(eval $(call gb_Library_add_defs,raptor2,\
-D_USRDLL \
-DWIN32_EXPORTS \
-DYY_NO_UNISTD_H \
+   -DHAVE__ACCESS \
+   -UHAVE_ACCESS \
 ))
 
 $(eval $(call gb_Library_add_generated_cobjects,raptor2,\
diff --git a/external/redland/Library_rasqal.mk 
b/external/redland/Library_rasqal.mk
index a62a5491b721..46b37c2116a3 100644
--- a/external/redland/Library_rasqal.mk
+++ b/external/redland/Library_rasqal.mk
@@ -26,6 +26,12 @@ $(eval $(call gb_Library_add_defs,rasqal,\
-D_USRDLL \
-DWIN32_EXPORTS \
-D_MT \
+   -DHAVE_STDLIB_H \
+   -DHAVE_STDINT_H \
+   -DHAVE_TIME_H \
+   -DHAVE_MATH_H \
+   -DHAVE_FLOAT_H \
+   -DHAVE___FUNCTION__ \
 ))
 
 $(eval $(call gb_Library_set_include,rasqal,\
diff --git a/external/redland/raptor/raptor-msvc.patch.1 
b/external/redland/raptor/raptor-msvc.patch.1
index e62f4d005fec..245b19bdca70 100644
--- a/external/redland/raptor/raptor-msvc.patch.1
+++ b/external/redland/raptor/raptor-msvc.patch.1
@@ -8,3 +8,16 @@
  void raptor_sort_r(void *base, size_t nel, size_t width, 
raptor_data_compare_arg_handler compar, void *user_data);
  
  
+--- raptor/src/raptor_uri.c2016-08-26 23:45:34.543400074 +0200
 raptor/src/raptor_uri.c2016-08-26 23:45:40.479399614 +0200
+@@ -51,6 +51,10 @@
+ #include 
+ #endif
+ 
++#if !defined(HAVE_ACCESS) && defined(HAVE__ACCESS)
++#include 
++#endif
++
+ /* Raptor includes */
+ #include "raptor2.h"
+ #include "raptor_internal.h"
diff --git a/external/redland/rasqal/rasqal-msvc.patch.1 
b/external/redland/rasqal/rasqal-msvc.patch.1
index fbdaf32b25a7..f32f6720b8e1 100644
--- a/external/redland/rasqal/rasqal-msvc.patch.1
+++ b/external/redland/rasqal/rasqal-msvc.patch.1
@@ -9,6 +9,21 @@ diff -ru rasqal.orig/src/win32_rasqal_config.h 
rasqal/src/win32_rasqal_config.h
  #define access _access
  #define stricmp _stricmp
  #define strnicmp _strnicmp
+@@ -42,10 +43,10 @@
+ int rasqal_gettimeofday(struct timeval *tv, struct timezone *tz);
+ #undef HAVE_GETTIMEOFDAY
+ 
+-#include 
+-#define isnan(n) _isnan(n)
+-/* no round function available */
+-#define round(x) floor(x+0.5)
++// #include 
++// #define isnan(n) _isnan(n)
++// /* no round function available */
++// #define round(x) floor(x+0.5)
+ 
+ /* These are SPARQL token definitions */
+ #ifdef OPTIONAL
 --- rasqal/src/rasqal_ntriples.c.orig  2016-08-26 23:29:58.343472683 +0200
 +++ rasqal/src/rasqal_ntriples.c   2016-08-26 23:30:10.553471736 +0200
 @@ -25,6 +25,10 @@
diff --git a/external/redland/redland/redland-msvc.patch.1 
b/external/redland/redland/redland-msvc.patch.1
index 1b170989fd1e..1cdc6cf48775 100644
--- a/external/redland/redland/redland-msvc.patch.1
+++ b/external/redland/redland/redland-msvc.patch.1
@@ -93,3 +93,32 @@
  
  /* Building 3store storage */
  /*#undef STORAGE_TSTORE*/
+@@ -288,11 +288,11 @@
+ #include 
+ #include 
+ 
+-/* get _isnan() since it is not in math.h */
+-#include 
+-#ifndef isnan
+-#define isnan(d) (_isnan(d))
+-#endif
++// /* get _isnan() since it is not in math.h */
++// #include 
++// #ifndef isnan
++// #define isnan(d) (_isnan(d))
++// #endif
+ 
+ #ifdef __cplusplus
+ }
+--- redland.orig/src/rdf_init.c2015-09-02 23:12:12.894126138 +0200
 redland/src/rdf_init.c 2015-09-02 23:23:54.600173246 +0200
+@@ -42,6 +42,8 @@
+ #endif
+ #ifdef HAVE_UNISTD_H
+ #include  /* for getpid() */
++#else
++#include 
+ #endif
+ 
+ /* for gettimeofday */
+ 
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 include/sfx2/basedlgs.hxx |4 
 sc/source/ui/dbgui/consdlg.cxx|   20 ---
 sc/source/ui/dbgui/filtdlg.cxx|2 
 sc/source/ui/dbgui/foptmgr.cxx|  249 --
 sc/source/ui/dbgui/sfiltdlg.cxx   |2 
 sc/source/ui/inc/areasdlg.hxx |3 
 sc/source/ui/inc/consdlg.hxx  |4 
 sc/source/ui/inc/filtdlg.hxx  |6 
 sc/source/ui/inc/foptmgr.hxx  |   53 
 sc/source/ui/pagedlg/areasdlg.cxx |   15 --
 sfx2/source/dialog/basedlgs.cxx   |4 
 11 files changed, 22 insertions(+), 340 deletions(-)

New commits:
commit 6e204253d4cf3be0b9ad136e922ec4fbb2523fe6
Author: Caolán McNamara 
AuthorDate: Wed Apr 17 08:16:38 2019 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 17 11:23:49 2019 +0200

use Deactivate

which is closer to how it was before welding

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

diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index d04cbb44a998..272ad3fae082 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -110,7 +110,7 @@ public:
 // dialog gets focus
 virtual void Activate() {}
 // dialog loses focus
-virtual void DeActivate() {}
+virtual void Deactivate() {}
 
 // when the dialog has an associated SfxChildWin, typically for Modeless 
interaction
 virtual void ChildWinDispose() {} // called from the associated 
SfxChildWin dtor
@@ -141,7 +141,7 @@ public:
 virtual voidClose() override;
 virtual voidEndDialog() override;
 virtual voidActivate() override;
-virtual voidDeActivate() override;
+virtual voidDeactivate() override;
 virtual voidChildWinDispose() override;
 SfxBindings&GetBindings() { return *m_pBindings; }
 };
diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index 127d18dfde66..26778575f672 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -122,14 +122,8 @@ void ScConsolidateDlg::Init()
 
 m_xEdDataArea->SetGetFocusHdl( LINK( this, ScConsolidateDlg, 
GetEditFocusHdl ) );
 m_xEdDestArea->SetGetFocusHdl( LINK( this, ScConsolidateDlg, 
GetEditFocusHdl ) );
-m_xEdDataArea->SetLoseFocusHdl( LINK( this, ScConsolidateDlg, 
LoseEditFocusHdl ) );
-m_xEdDestArea->SetLoseFocusHdl( LINK( this, ScConsolidateDlg, 
LoseEditFocusHdl ) );
-m_xRbDataArea->SetLoseFocusHdl( LINK( this, ScConsolidateDlg, 
LoseButtonFocusHdl ) );
-m_xRbDestArea->SetLoseFocusHdl( LINK( this, ScConsolidateDlg, 
LoseButtonFocusHdl ) );
 m_xLbDataArea->connect_focus_in( LINK( this, ScConsolidateDlg, GetFocusHdl 
) );
 m_xLbDestArea->connect_focus_in( LINK( this, ScConsolidateDlg, GetFocusHdl 
) );
-m_xLbDataArea->connect_focus_out( LINK( this, ScConsolidateDlg, 
LoseFocusHdl ) );
-m_xLbDestArea->connect_focus_out( LINK( this, ScConsolidateDlg, 
LoseFocusHdl ) );
 m_xEdDataArea->SetModifyHdl( LINK( this, ScConsolidateDlg, ModifyHdl ) );
 m_xEdDestArea->SetModifyHdl( LINK( this, ScConsolidateDlg, ModifyHdl ) );
 m_xLbConsAreas->connect_changed( LINK( this, ScConsolidateDlg, SelectTVHdl 
) );
@@ -284,19 +278,9 @@ void ScConsolidateDlg::SetActive()
 RefInputDone();
 }
 
-IMPL_LINK_NOARG(ScConsolidateDlg, LoseFocusHdl, weld::Widget&, void)
+void ScConsolidateDlg::Deactivate()
 {
-bDlgLostFocus = !m_xDialog->has_toplevel_focus();
-}
-
-IMPL_LINK_NOARG(ScConsolidateDlg, LoseEditFocusHdl, formula::WeldRefEdit&, 
void)
-{
-bDlgLostFocus = !m_xDialog->has_toplevel_focus();
-}
-
-IMPL_LINK_NOARG(ScConsolidateDlg, LoseButtonFocusHdl, formula::WeldRefButton&, 
void)
-{
-bDlgLostFocus = !m_xDialog->has_toplevel_focus();
+bDlgLostFocus = true;
 }
 
 bool ScConsolidateDlg::VerifyEdit( formula::WeldRefEdit* pEd )
diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx
index 694e0447d78a..f006d3bdee8d 100644
--- a/sc/source/ui/inc/areasdlg.hxx
+++ b/sc/source/ui/inc/areasdlg.hxx
@@ -40,6 +40,7 @@ public:
 virtual boolIsTableLocked() const override;
 
 virtual voidSetActive() override;
+virtual voidDeactivate() override;
 virtual voidClose() override;
 
 private:
@@ -83,8 +84,6 @@ private:
 DECL_LINK( Impl_ModifyHdl, formula::WeldRefEdit&, void  );
 DECL_LINK( Impl_BtnHdl,weld::Button&, void );
 DECL_LINK( Impl_GetEditFocusHdl, formula::WeldRefEdit&, void );
-DECL_LINK( Impl_LoseEditFocusHdl, formula::WeldRefEdit&, void );
-DECL_LINK( Impl_LoseButtonFocusHdl, formula::WeldRefButton&, void );
 DECL_LINK( Impl_GetFocusHdl, weld::Widget&, void );
 };
 
diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx
index 673122ea1a93..ccb943e4c1ad 100644
--- a/sc/source/ui/inc/consdlg.hxx
+++

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

[Caolán McNamara (via logerrit)]

 include/vcl/weld.hxx|4 
 sfx2/source/doc/templatedlg.cxx |5 +
 vcl/source/app/salvtables.cxx   |   12 
 vcl/unx/gtk3/gtk3gtkinst.cxx|5 +
 4 files changed, 26 insertions(+)

New commits:
commit d17d9500a23705a315992ff42cb7c449894fc2ce
Author: Caolán McNamara 
AuthorDate: Tue Apr 16 14:49:46 2019 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 17 11:24:11 2019 +0200

tdf#124597 template select dialog launched before parent gets final size

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

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 77205ced1f69..d2929d69bc9a 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -332,6 +332,10 @@ public:
 virtual bool get_resizable() const = 0;
 virtual Size get_size() const = 0;
 virtual Point get_position() const = 0;
+// ensure window will be centered on its parent, taking into account that
+// there may currently be pending geometry requests for the parent
+// not yet processed by the underlying toolkit
+virtual void set_centered_on_parent_geometry_request() = 0;
 virtual bool has_toplevel_focus() const = 0;
 virtual void present() = 0;
 virtual void set_window_state(const OString& rStr) = 0;
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 0136c425f987..77ca1eb9b7dc 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1385,6 +1385,11 @@ SfxTemplateSelectionDlg::~SfxTemplateSelectionDlg()
 
 short SfxTemplateSelectionDlg::run()
 {
+// tdf#124597 at startup this dialog is launched before its parent window
+// has taken its final size. The parent size request is processed during
+// the dialogs event loop so configure this dialog to center to
+// the parents pending geometry request
+m_xDialog->set_centered_on_parent_geometry_request();
 return weld::GenericDialogController::run();
 }
 
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 310254b1cfeb..59a9ab3b527a 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -970,6 +970,18 @@ public:
 return m_xWindow->GetPosPixel();
 }
 
+virtual void set_centered_on_parent_geometry_request() override
+{
+if (vcl::Window* pParent = m_xWidget->GetParent())
+{
+Size aParentGeometry(pParent->GetSizePixel());
+Size aGeometry(m_xWidget->get_preferred_size());
+auto nX = (aParentGeometry.Width() - aGeometry.Width()) / 2;
+auto nY = (aParentGeometry.Height() - aGeometry.Height()) / 2;
+m_xWidget->SetPosPixel(Point(nX, nY));
+}
+}
+
 virtual bool get_resizable() const override
 {
 return m_xWindow->GetStyle() & WB_SIZEABLE;
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 19a3ed29edc4..cb816b751cd9 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -2498,6 +2498,11 @@ public:
 return Point(current_x, current_y);
 }
 
+virtual void set_centered_on_parent_geometry_request() override
+{
+gtk_window_set_position(m_pWindow, GTK_WIN_POS_CENTER_ALWAYS);
+}
+
 virtual bool get_resizable() const override
 {
 return gtk_window_get_resizable(m_pWindow);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 connectivity/source/commontools/dbtools.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6d3204e9b1c7ececff7100c3ffa0aa6dade6b9f6
Author: Andrea Gelmini 
AuthorDate: Wed Apr 10 16:05:22 2019 +
Commit: Julien Nabet 
CommitDate: Wed Apr 17 11:25:45 2019 +0200

Fix typo

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

diff --git a/connectivity/source/commontools/dbtools.cxx 
b/connectivity/source/commontools/dbtools.cxx
index c7d817329664..1e3f51ec00e2 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -890,7 +890,7 @@ Reference< XNumberFormatsSupplier> getNumberFormats(
 bool _bAlloweDefault,
 const Reference< XComponentContext>& _rxContext)
 {
-// ask the parent of the connection (should be an DatabaseAccess)
+// ask the parent of the connection (should be a DatabaseAccess)
 Reference< XNumberFormatsSupplier> xReturn;
 Reference< XChild> xConnAsChild(_rxConn, UNO_QUERY);
 OUString sPropFormatsSupplier( "NumberFormatsSupplier" );
@@ -1040,7 +1040,7 @@ try
 // The Effective-Properties should always be void or string or 
double 
 
 if (hasProperty(sPropDefaultDate, xNewProps) && !bIsString)
-{   // (to convert a OUString into a date will not always succeed, 
because it might be bound to a text-column,
+{   // (to convert an OUString into a date will not always 
succeed, because it might be bound to a text-column,
 // but we can work with a double)
 Date aDate = 
DBTypeConversion::toDate(getDouble(aEffectiveDefault));
 xNewProps->setPropertyValue(sPropDefaultDate, makeAny(aDate));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - connectivity/source

[Andrea Gelmini (via logerrit)]

 connectivity/source/commontools/statementcomposer.cxx |2 +-
 connectivity/source/drivers/flat/ETable.cxx   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e8c992258ad53274099fa770e0aaefb79c7c6c60
Author: Andrea Gelmini 
AuthorDate: Wed Apr 10 16:05:21 2019 +
Commit: Julien Nabet 
CommitDate: Wed Apr 17 11:26:54 2019 +0200

Fix typo

Change-Id: Ic29460926173ed37c60d8626872dda15cc1f76ec
Reviewed-on: https://gerrit.libreoffice.org/70851
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/connectivity/source/commontools/statementcomposer.cxx 
b/connectivity/source/commontools/statementcomposer.cxx
index a6d6c1155925..e3346e031775 100644
--- a/connectivity/source/commontools/statementcomposer.cxx
+++ b/connectivity/source/commontools/statementcomposer.cxx
@@ -203,7 +203,7 @@ namespace dbtools
 
 if ( !sStatement.isEmpty() )
 {
-// create an composer
+// create a composer
 Reference< XMultiServiceFactory > xFactory( 
_rData.xConnection, UNO_QUERY_THROW );
 Reference< XSingleSelectQueryComposer > xComposer( 
xFactory->createInstance("com.sun.star.sdb.SingleSelectQueryComposer"),
 UNO_QUERY_THROW );
commit 494b91e04255ddab4fe8d94d79d6c10d74aedaff
Author: Andrea Gelmini 
AuthorDate: Wed Apr 10 16:05:16 2019 +
Commit: Julien Nabet 
CommitDate: Wed Apr 17 11:26:13 2019 +0200

Fix typo

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

diff --git a/connectivity/source/drivers/flat/ETable.cxx 
b/connectivity/source/drivers/flat/ETable.cxx
index 8dc7903cd11c..550fb6c9dcff 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -256,7 +256,7 @@ void 
OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString const & aFirs
 }
 if (cDecimalDelimiter && c == cDecimalDelimiter)
 {
-io_nPrecisions = 15; // we have an decimal value
+io_nPrecisions = 15; // we have a decimal value
 io_nScales = 2;
 ++nDecimalDelCount;
 } // if (cDecimalDelimiter && c == cDecimalDelimiter)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter2.cxx   |   53 ++
 sw/source/core/doc/DocumentRedlineManager.cxx |   20 +++--
 2 files changed, 61 insertions(+), 12 deletions(-)

New commits:
commit f83e22f535c1c9482c5d3f566d5d0283355dd98f
Author: Michael Stahl 
AuthorDate: Tue Apr 16 19:00:50 2019 +0200
Commit: Michael Stahl 
CommitDate: Wed Apr 17 11:28:36 2019 +0200

tdf#109376 sw: fix redline SwUndoDelete with end pos on SwTableNode crash

... that happens when you accept a delete redline (or reject an insert
redline) with such end pos.

The problem is that first a DeleteRange() will move the anchor position
onto the table node (because check in SwUndoSaveContent::DelContentIndex()
is surprisingly asymmetric and so the fly not deleted by the previous
bugfix), then DelFullPara() creates a second SwUndoDelete then deleting
the fly crashes because its anchors was moved.

The code in lcl_AcceptRedline() / lcl_RejectRedline() doesn't make much
sense (but always was like this), if we just call DeleteFullPara() once
instead, the problem is avoided, and we don't even have to worry about
why DelContentIndex() is so asymmetric (is "selection direction"
really a meaningful concept?).

Reportedly this started to crash with commit
e07feb9457f2ffb373ae69b73dda290140e4005f, previously it was just wrong.

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

diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index f58819aee41c..ba15c9001d51 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -51,6 +51,7 @@ public:
 void testTdf47471_paraStyleBackground();
 void testTdf101534();
 void testTdf54819();
+void testTdf109376_redline();
 void testTdf109376();
 void testTdf64242_optimizeTable();
 void testTdf108687_tabstop();
@@ -82,6 +83,7 @@ public:
 CPPUNIT_TEST(testTdf47471_paraStyleBackground);
 CPPUNIT_TEST(testTdf101534);
 CPPUNIT_TEST(testTdf54819);
+CPPUNIT_TEST(testTdf109376_redline);
 CPPUNIT_TEST(testTdf109376);
 CPPUNIT_TEST(testTdf64242_optimizeTable);
 CPPUNIT_TEST(testTdf108687_tabstop);
@@ -347,6 +349,57 @@ void SwUiWriterTest2::testTdf54819()
  getProperty(getParagraph(1), 
"ParaStyleName"));
 }
 
+void SwUiWriterTest2::testTdf109376_redline()
+{
+SwDoc* pDoc = createDoc();
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+CPPUNIT_ASSERT(pWrtShell);
+// need 2 paragraphs to get to the bMoveNds case
+pWrtShell->Insert("foo");
+pWrtShell->SplitNode();
+pWrtShell->Insert("bar");
+pWrtShell->SplitNode();
+pWrtShell->StartOfSection(false);
+
+// add AT_PARA fly at 1st to be deleted node
+SwFormatAnchor anchor(RndStdIds::FLY_AT_PARA);
+anchor.SetAnchor(pWrtShell->GetCursor()->GetPoint());
+SfxItemSet flySet(pDoc->GetAttrPool(),
+  svl::Items{});
+flySet.Put(anchor);
+SwFormatFrameSize size(ATT_MIN_SIZE, 1000, 1000);
+flySet.Put(size); // set a size, else we get 1 char per line...
+SwFrameFormat const* pFly = pWrtShell->NewFlyFrame(flySet, 
/*bAnchValid=*/true);
+CPPUNIT_ASSERT(pFly != nullptr);
+
+pWrtShell->SttEndDoc(false);
+SwInsertTableOptions tableOpt(SwInsertTableFlags::DefaultBorder, 0);
+const SwTable& rTable = pWrtShell->InsertTable(tableOpt, 1, 1);
+
+pWrtShell->StartOfSection(false);
+SwPaM pam(*pWrtShell->GetCursor()->GetPoint());
+pam.SetMark();
+pam.GetPoint()->nNode = *rTable.GetTableNode();
+pam.GetPoint()->nContent.Assign(nullptr, 0);
+pam.Exchange(); // same selection direction as in doc compare...
+
+IDocumentRedlineAccess& rIDRA(pDoc->getIDocumentRedlineAccess());
+rIDRA.SetRedlineFlags(RedlineFlags::On | RedlineFlags::ShowInsert | 
RedlineFlags::ShowDelete);
+rIDRA.AppendRedline(new SwRangeRedline(nsRedlineType_t::REDLINE_DELETE, 
pam), true);
+// this used to assert/crash with m_pAnchoredFlys mismatch because the
+// fly was not deleted but its anchor was moved to the SwTableNode
+rIDRA.AcceptAllRedline(true);
+
+CPPUNIT_ASSERT_EQUAL(size_t(0), pWrtShell->GetFlyCount(FLYCNTTYPE_FRM));
+sw::UndoManager& rUndoManager = pDoc->GetUndoManager();
+rUndoManager.Undo();
+CPPUNIT_ASSERT_EQUAL(size_t(1), pWrtShell->GetFlyCount(FLYCNTTYPE_FRM));
+rUndoManager.Redo();
+CPPUNIT_ASSERT_EQUAL(size_t(0), pWrtShell->GetFlyCount(FLYCNTTYPE_FRM));
+rUndoManager.Undo();
+CPPUNIT_ASSERT_EQUAL(size_t(1), pWrtShell->GetFlyCount(FLYCNTTYPE_FRM));
+}
+
 void SwUiWriterTest2::testTdf109376()
 {
 SwDoc* pDoc = createDoc();
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx 
b/sw/source/core/doc/DocumentRedlineManager.cxx
index b5431a0a79e7..47

[Libreoffice-commits] core.git: sd/uiconfig

[Muhammet Kara (via logerrit)]

 sd/uiconfig/sdraw/toolbar/redactionbar.xml |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 06eb265dd65d64b608a71cba5e5fbd906a781e1c
Author: Muhammet Kara 
AuthorDate: Wed Apr 17 12:24:27 2019 +0300
Commit: Andras Timar 
CommitDate: Wed Apr 17 11:30:55 2019 +0200

Add direct pdf export to the Redaction toolbar

Users need an in-process copy of pdf to share
with peers and discuss the redacted areas

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

diff --git a/sd/uiconfig/sdraw/toolbar/redactionbar.xml 
b/sd/uiconfig/sdraw/toolbar/redactionbar.xml
index e25e53d4414b..062288a66c70 100644
--- a/sd/uiconfig/sdraw/toolbar/redactionbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/redactionbar.xml
@@ -22,4 +22,5 @@
  
  
  
+ 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Weghorn (via logerrit)]

 vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 4640575bd33c2d1010f3acd4fdf3cce510091716
Author: Michael Weghorn 
AuthorDate: Tue Apr 16 16:48:58 2019 +0200
Commit: Michael Weghorn 
CommitDate: Wed Apr 17 11:32:55 2019 +0200

gtk3_kde5: No longer kill fpicker process on timeout

In some observed cases, 100 ms were not enough for the separate
'lo_kde5filepicker' process to terminate properly, in particular
on slow or busy hardware.
Drop the timeout here and just wait for the process to finish
to avoid killing it unnecessarily, which could e.g. lead to file
dialog settings/state not properly being saved by the native KDE
Plasma QFileDialog (plasma-integration, e.g. in
'KDEPlatformFileDialogHelper::saveSize'), so that the last
used mode or size would not be remembered.

The assumption is that the separate fpicker process should now
properly finish in all cases, in particular since commit
93815c2b04f1905e43c695caf5cc2c594bb897ce.

Should that assumption not hold, let's rather fix the underlying
issues than increasing the timeout here.

Change-Id: I0a58c1425940fbfaecb5012a24fd9a0222cbaccb
Reviewed-on: https://gerrit.libreoffice.org/70834
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx 
b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
index 044a92d06c86..6ca43ee3a78e 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
@@ -139,9 +139,7 @@ Gtk3KDE5FilePickerIpc::~Gtk3KDE5FilePickerIpc()
 return;
 
 sendCommand(Commands::Quit);
-TimeValue timeValue(std::chrono::milliseconds(100));
-if (osl_joinProcessWithTimeout(m_process, &timeValue) != 
osl_Process_E_None)
-osl_terminateProcess(m_process);
+osl_joinProcess(m_process);
 
 if (m_inputWrite)
 osl_closeFile(m_inputWrite);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Muhammet Kara (via logerrit)]

 sd/uiconfig/sdraw/toolbar/redactionbar.xml |1 +
 1 file changed, 1 insertion(+)

New commits:
commit dea0c123952e6b07afc2458f61fce77de7a5e8cb
Author: Muhammet Kara 
AuthorDate: Wed Apr 17 12:24:27 2019 +0300
Commit: Andras Timar 
CommitDate: Wed Apr 17 11:32:43 2019 +0200

Add direct pdf export to the Redaction toolbar

Users need an in-process copy of pdf to share
with peers and discuss the redacted areas

Change-Id: I68c16c6f09690a9d5cd2df191963107029e5ed88
Reviewed-on: https://gerrit.libreoffice.org/70863
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit 06eb265dd65d64b608a71cba5e5fbd906a781e1c)
Reviewed-on: https://gerrit.libreoffice.org/70864

diff --git a/sd/uiconfig/sdraw/toolbar/redactionbar.xml 
b/sd/uiconfig/sdraw/toolbar/redactionbar.xml
index e25e53d4414b..062288a66c70 100644
--- a/sd/uiconfig/sdraw/toolbar/redactionbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/redactionbar.xml
@@ -22,4 +22,5 @@
  
  
  
+ 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

minutes of ESC call ...

[Michael Meeks]

From last Thursday - somehow I forgot to post; thanks to
buovjaga for the reminder:

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

* Completed Action Items:
+ add monitoring for build bot daily failure rates (Christian)
  [ have a script that creates number of consecutive failures,
needs to be hooked up to alerts ]

* Pending Action Items:

* Release Engineering update (Christian)
+ 6.2.3 rc2 – status
   + tagged and built; being up-loaded to pre-releases then mirrors
+ 6.1.6 rc1 - status
   + tagging later today – final release for 6.1.x line
+ 6.3 alpha1: early May
+ Remotes
+ Android viewer
   + Maven repo is published up to 6.0.4 – rest later today (Christian)
+ Online:
   + 6.2.3 release up-loaded.

* Documentation (Olivier)
+ New Help
 + Reverted proposed patch for makefile (ohallot)
+ Helpcontent2
 + page for ‘–convert-to’ filters names (buovjaga, ohallot)
 + Pages for handling events in Python (libreofficiant)
 + Fixes in pages (ohallot)
+ GSoDOC
 + Compiling projects
+ Guides
 + On going Calc Guide

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
248(248) (topicUI) bugs open, 206(206) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week   1 month   3 months   12 months  
 added  5(0) 12(-2)27(-4)  70(-8) 
 commented 78(31)   203(28)   482(-15)   1326(-58)
   removed  1(0)  6(0) 11(1)   21(1)  
  resolved  2(-2)21(0) 60(0)  130(-3) 
+ top 10 contributors:
  Tietze, Heiko made 75 changes in 1 month, and 539 changes in 1 year
  Roman Kuznetsov made 60 changes in 1 month, and 171 changes in 1 year
  Xisco Faulí made 33 changes in 1 month, and 241 changes in 1 year
  Kainz, Andreas made 30 changes in 1 month, and 175 changes in 1 year
  Dieter Praas made 28 changes in 1 month, and 136 changes in 1 year
  Thomas Lendo made 26 changes in 1 month, and 233 changes in 1 year
  Jim Raykowski made 19 changes in 1 month, and 37 changes in 1 year
  Mehrbrodt, Samuel made 15 changes in 1 month, and 64 changes in 1 year
  Foote, V Stuart made 14 changes in 1 month, and 175 changes in 1 year
  Cor Nouws made 13 changes in 1 month, and 107 changes in 1 year

   New needsUXEval between Apr/04-Apr/11

   * why toggle function DrawText, HyperlinkDialog and Horizontal Line
 + https://bugs.documentfoundation.org/show_bug.cgi?id=124673 
   * remove formular toolbar from writer -> view -> toolbars
 + https://bugs.documentfoundation.org/show_bug.cgi?id=124642 
   * tabs in calc (for sheets) and draw (for layer) style
 + https://bugs.documentfoundation.org/show_bug.cgi?id=124572 
   => in discussion

   * 7x
   => resolved dup, wfm, nab, wf

   * OPTION DIALOG: Add option to show page margins
 + https://bugs.documentfoundation.org/show_bug.cgi?id=124510 
   * jumping ui in calc (pastespecial drop down menu with/without arrow)
  -> + https://bugs.documentfoundation.org/show_bug.cgi?id=124561 
   => new

   * writer>menubar>Edit> .uno:ShadowCursor isn't related to select subgroup
 + https://bugs.documentfoundation.org/show_bug.cgi?id=124665 
   * HideWhiteSpace should be positive Show Whitespace
 + https://bugs.documentfoundation.org/show_bug.cgi?id=124686 
   * Menubar: Show icons for the most important items
 + https://bugs.documentfoundation.org/show_bug.cgi?id=124649 
   * Add a spellout outline numbering style
  -> + https://bugs.documentfoundation.org/show_bug.cgi?id=124608 
   * Easier use of CSV in Wizards->Address Data Source
 + https://bugs.documentfoundation.org/show_bug.cgi?id=113753 
   * FORMATTING: paragraph alignment options position is unintuitive
 + https://bugs.documentfoundation.org/show_bug.cgi?id=65473 
   * UX: Handling of empty textboxes
  -> + https://bugs.documentfoundation.org/show_bug.cgi?id=107825 
   => accepted, easyhack

   * Fix accessibility warnings in .ui files
 + https://bugs.documentfoundation.org/show_bug.cgi?id=119931 
   * Print dialog: margin and distance input are mixed up
 + https://bugs.documentfoundation.org/show_bug.cgi?id=124567 
   => fixed, work in progress

   + always a good idea to test the defaults (Michael)
 + same used for file I/O & UI (Miklos)
+ test this with documents.

* Crash Testing (Caolan)
+ Google / ossfuzz:
  - 10 (+20,-21) issues
+ dynamic calc col change seems to cause these
  + back to where we started.
+ Crash testing:
  + 27(+21) import failure, 6(+5) export failures
 + jump her

[Libreoffice-commits] core.git: configure.ac

[Mike Kaganski (via logerrit)]

 configure.ac |   20 
 1 file changed, 20 insertions(+)

New commits:
commit 4ea0059bca6dd84f10abcf52f6d6b81c1afec397
Author: Mike Kaganski 
AuthorDate: Wed Apr 17 11:16:55 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Apr 17 11:56:02 2019 +0200

VS detection: Fallback to old registry check if vswhere failed

... since on some boxes vswhere returns no results when VS 2017 is present

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

diff --git a/configure.ac b/configure.ac
index 1366ed2e0086..04e7389eebd9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3291,6 +3291,26 @@ find_msvc()
 fi
 done
 
+# This fallback is needed on *some* (but not all) VS 2017 installations, 
where vswhere turns up
+# with the empty list for unclear reason. The below hack does not work for 
VS 2019 anyway, so
+# should be removed when upgrading baseline.
+if ! test -n "$vctest"; then
+for ver in $vsversions; do
+reg_get_value_32 
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver.0/Setup/VC/ProductDir
+if test -n "$regvalue"; then
+vctest=$regvalue
+break
+fi
+reg_get_value_32 
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/SxS/VS7/$ver.0
+if test -n "$regvalue"; then
+AC_MSG_RESULT([found: $regvalue])
+PathFormat "$regvalue"
+vctest=$formatted_path
+break
+fi
+done
+fi
+
 if test -n "$vctest"; then
 vcnumwithdot="$ver.0"
 case "$vcnumwithdot" in
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

 sc/qa/unit/data/ods/pivot-table-num-fmt.ods |binary
 sc/qa/unit/pivottable_filters_test.cxx  |   27 +
 sc/source/filter/excel/xepivotxml.cxx   |   44 +---
 3 files changed, 61 insertions(+), 10 deletions(-)

New commits:
commit 26e85974a0287ab5869e7ff0145a66b853d66a02
Author: Mike Kaganski 
AuthorDate: Wed Apr 17 11:11:58 2019 +0300
Commit: Mike Kaganski 
CommitDate: Wed Apr 17 13:01:47 2019 +0200

tdf#124772: export data field number format to XLSX

... otherwise Excel would reset data formatting e.g. from currency
to plain numbers upon refresh.

Excel relies on per-field format setting in pivot tables, while Calc
takes fields formatting from source.

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

diff --git a/sc/qa/unit/data/ods/pivot-table-num-fmt.ods 
b/sc/qa/unit/data/ods/pivot-table-num-fmt.ods
new file mode 100644
index ..e6cfd138c12d
Binary files /dev/null and b/sc/qa/unit/data/ods/pivot-table-num-fmt.ods differ
diff --git a/sc/qa/unit/pivottable_filters_test.cxx 
b/sc/qa/unit/pivottable_filters_test.cxx
index e6ccb4914ef9..f9d10f9f4451 100644
--- a/sc/qa/unit/pivottable_filters_test.cxx
+++ b/sc/qa/unit/pivottable_filters_test.cxx
@@ -88,6 +88,7 @@ public:
 void testTdf123939();
 void testTdf124651();
 void testTdf124736();
+void tesTtdf124772NumFmt();
 
 CPPUNIT_TEST_SUITE(ScPivotTableFiltersTest);
 
@@ -133,6 +134,7 @@ public:
 CPPUNIT_TEST(testTdf123939);
 CPPUNIT_TEST(testTdf124651);
 CPPUNIT_TEST(testTdf124736);
+CPPUNIT_TEST(tesTtdf124772NumFmt);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -2538,6 +2540,31 @@ void ScPivotTableFiltersTest::testTdf124736()
 "t", "default");
 }
 
+void ScPivotTableFiltersTest::tesTtdf124772NumFmt()
+{
+ScDocShellRef xDocSh = loadDoc("pivot-table-num-fmt.", FORMAT_ODS);
+CPPUNIT_ASSERT(xDocSh.is());
+
+std::shared_ptr pXPathFile
+= ScBootstrapFixture::exportTo(xDocSh.get(), FORMAT_XLSX);
+xDocSh->DoClose();
+
+xmlDocPtr pTable
+= XPathHelper::parseExport(pXPathFile, m_xSFactory, 
"xl/pivotTables/pivotTable1.xml");
+CPPUNIT_ASSERT(pTable);
+
+// This asserts that numFmtId attribute is present
+const OUString sXclNumFmt
+= getXPath(pTable, "/x:pivotTableDefinition/x:dataFields/x:dataField", 
"numFmtId");
+
+pTable = XPathHelper::parseExport(pXPathFile, m_xSFactory, 
"xl/styles.xml");
+CPPUNIT_ASSERT(pTable);
+
+// Check that we refer to correct format
+assertXPath(pTable, "/x:styleSheet/x:numFmts/x:numFmt[@numFmtId='" + 
sXclNumFmt.toUtf8() + "']",
+"formatCode", "\\$#,##0");
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(ScPivotTableFiltersTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/filter/excel/xepivotxml.cxx 
b/sc/source/filter/excel/xepivotxml.cxx
index 2161f68d6478..43dc30196160 100644
--- a/sc/source/filter/excel/xepivotxml.cxx
+++ b/sc/source/filter/excel/xepivotxml.cxx
@@ -16,6 +16,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -23,10 +26,12 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -1063,6 +1068,10 @@ void XclExpXmlPivotTables::SavePivotTableXml( 
XclExpXmlStream& rStrm, const ScDP
 
 if (!aDataFields.empty())
 {
+css::uno::Reference xDimsByName;
+if (auto xDimSupplier = const_cast(rDPObj).GetSource())
+xDimsByName = xDimSupplier->getDimensions();
+
 pPivotStrm->startElement(XML_dataFields,
 XML_count, OString::number(static_cast(aDataFields.size())),
 FSEND);
@@ -1077,17 +1086,32 @@ void XclExpXmlPivotTables::SavePivotTableXml( 
XclExpXmlStream& rStrm, const ScDP
 // Excel (at least 2016) seems to insist on the presence of "name" 
attribute in
 // dataField element, even if empty
 const OString sName = pName ? pName->toUtf8() : "";
-pPivotStrm->write("<")->writeId(XML_dataField);
-rStrm.WriteAttributes(XML_name, sName, FSEND);
-
-rStrm.WriteAttributes(XML_fld, OString::number(nDimIdx).getStr(), 
FSEND);
-
-ScGeneralFunction eFunc = rDim.GetFunction();
-const char* pSubtotal = toOOXMLSubtotalType(eFunc);
+auto pItemAttList = 
sax_fastparser::FastSerializerHelper::createAttrList();
+pItemAttList->add(XML_name, sName);
+pItemAttList->add(XML_fld, OString::number(nDimIdx));
+const char* pSubtotal = toOOXMLSubtotalType(rDim.GetFunction());
 if (pSubtotal)
-rStrm.WriteAttributes(XML_subtotal, pSubtotal, FSEND);
-
-pPivotStrm->write("/>");
+pItemAttList->add(XML_subtotal, pSubtotal);
+if (xDimsByName)
+   

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

[Michael Weghorn (via logerrit)]

 vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 5ad88c0d8a713da33b1b43a01b08cabf858b1303
Author: Michael Weghorn 
AuthorDate: Tue Apr 16 16:48:58 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Apr 17 13:03:20 2019 +0200

gtk3_kde5: No longer kill fpicker process on timeout

In some observed cases, 100 ms were not enough for the separate
'lo_kde5filepicker' process to terminate properly, in particular
on slow or busy hardware.
Drop the timeout here and just wait for the process to finish
to avoid killing it unnecessarily, which could e.g. lead to file
dialog settings/state not properly being saved by the native KDE
Plasma QFileDialog (plasma-integration, e.g. in
'KDEPlatformFileDialogHelper::saveSize'), so that the last
used mode or size would not be remembered.

The assumption is that the separate fpicker process should now
properly finish in all cases, in particular since commit
93815c2b04f1905e43c695caf5cc2c594bb897ce.

Should that assumption not hold, let's rather fix the underlying
issues than increasing the timeout here.

Change-Id: I0a58c1425940fbfaecb5012a24fd9a0222cbaccb
Reviewed-on: https://gerrit.libreoffice.org/70834
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
(cherry picked from commit 4640575bd33c2d1010f3acd4fdf3cce510091716)
Reviewed-on: https://gerrit.libreoffice.org/70866
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx 
b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
index 36ddcaf40f6e..d873789be25f 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
@@ -139,9 +139,7 @@ Gtk3KDE5FilePickerIpc::~Gtk3KDE5FilePickerIpc()
 return;
 
 sendCommand(Commands::Quit);
-TimeValue timeValue(std::chrono::milliseconds(100));
-if (osl_joinProcessWithTimeout(m_process, &timeValue) != 
osl_Process_E_None)
-osl_terminateProcess(m_process);
+osl_joinProcess(m_process);
 
 if (m_inputWrite)
 osl_closeFile(m_inputWrite);
___
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

[Michael Weghorn (via logerrit)]

 vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 3a1d55ba036e76c47cd86ae324e2448b86c231db
Author: Michael Weghorn 
AuthorDate: Tue Apr 16 16:48:58 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Apr 17 13:02:58 2019 +0200

gtk3_kde5: No longer kill fpicker process on timeout

In some observed cases, 100 ms were not enough for the separate
'lo_kde5filepicker' process to terminate properly, in particular
on slow or busy hardware.
Drop the timeout here and just wait for the process to finish
to avoid killing it unnecessarily, which could e.g. lead to file
dialog settings/state not properly being saved by the native KDE
Plasma QFileDialog (plasma-integration, e.g. in
'KDEPlatformFileDialogHelper::saveSize'), so that the last
used mode or size would not be remembered.

The assumption is that the separate fpicker process should now
properly finish in all cases, in particular since commit
93815c2b04f1905e43c695caf5cc2c594bb897ce.

Should that assumption not hold, let's rather fix the underlying
issues than increasing the timeout here.

Change-Id: I0a58c1425940fbfaecb5012a24fd9a0222cbaccb
Reviewed-on: https://gerrit.libreoffice.org/70834
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
(cherry picked from commit 4640575bd33c2d1010f3acd4fdf3cce510091716)
Reviewed-on: https://gerrit.libreoffice.org/70867
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx 
b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
index a190e522e500..f88f79ad8ffb 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
@@ -143,9 +143,7 @@ Gtk3KDE5FilePickerIpc::~Gtk3KDE5FilePickerIpc()
 return;
 
 sendCommand(Commands::Quit);
-TimeValue timeValue(std::chrono::milliseconds(100));
-if (osl_joinProcessWithTimeout(m_process, &timeValue) != 
osl_Process_E_None)
-osl_terminateProcess(m_process);
+osl_joinProcess(m_process);
 
 if (m_inputWrite)
 osl_closeFile(m_inputWrite);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Tagging text as being in arbitrary complex-script languages

[Eike Rathke]

Hi Richard,

On Tuesday, 2019-04-16 21:04:42 +0100, Richard Wordingham wrote:

> On Mon, 15 Apr 2019 15:14:49 +
> jonathon  wrote:
> > On 4/15/19 12:26 PM, Eike Rathke wrote:
> 
> > > Adding arbitrary dictionary languages (as long as they strictly
> > > follow the BCP 47 language tag specification) works since quite a
> > > while (2014?) already.
> 
> Only if you hacked the text to declare the CTL or CJK language as
> appropriate to be the one of the dictionary. Otherwise, you could only
> use such a dictionary for a 'Western' script.

Well, that's what I wrote.. and that specifying the internal scripttype
category Western/CJK/CTL was added later.

> > > New(er) in the mentioned mechanism is the
> > > ability to add a language also to the CTL or CJK sections where
> > > previously it was only possible to add to the (misnamed) "Western"
> > > section, and give the language list entries a proper UI name
> > > instead of showing just the language tag.
> 
> > Thanks.
> > I wasn't aware that that functionality was present.
> 
> > I'll play with over the next month or so, then write about in my
> > long-neglected blog.
> 
> An interesting experiment would be to try adding a language to both
> Western and CTL (as with Mongolian and some minor SEA languages) or
> Western and CJK (various Zhuang writing systems), though I suppose it
> won't hurt to simply disambiguate by script.

In fact you have to, or use an ISO 639-1/2/3 language code that implies
a default script for one and specify an ISO 15924 script code for the
other, which I was referring with "correct BCP 47 language tags".

Mongolian is slightly more complicated because historically it uses the
'mn' macrolanguage code (that probably better should had been 'khk'),
'mn-Cyrl' for Mongolian in Cyrillic script (so instead of 'mn-Cyrl-MN'
it could had been 'khk-MN'). For Mongolian in Mongolian script there is
'mn-Mong' for example with 'mn-Mong-CN'.

See the tables in i18nlangtag/source/isolang/isolang.cxx for our known
mappings.

Note also that used language tag attributes are saved with the document,
so once introduced they will have to be supported for ~ever, just
changing them later without having at least a forward mapping (in said
isolang.cxx) to load existing documents using them is a no-no.

  Eike

-- 
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

tdf124710, unexpected result for function IFS when argument NA() is followed by an argument that needs interpreting

[Winfried Donkers]

Hi Eike,

Upon debugging IFS( 0, NA(), 1+0, "output" ) I came to the following 
preliminary conclusions:
Before ScInterpreter::ScIfs_MS() is called, ScInterpreter::Interpret is called 
for argument '1+0' .
That leads to a call to scInterpreter::CalculateAddSub( false ) and there the 
problem starts.
0 and 1 are popped and added, but after PushDouble( ::rtl::math::approxAdd( 0, 
1 ) )
the raw stacktype is svError.
Unfortunately most of the time I have only a machine with 4GB available for 
debugging, giving 5 minutes max before freezing, so the simple question what 
the raw stacktype is before PushDouble (when NA() is on top of the stack) will 
take me up to an hour -which I don't have right now.

Do you happen to know if in the case of a token on top of the stack of type 
svError (like NA()), this stacktype is remained when pushing new values/tokens 
to the stack?
If that is the case, I wouldn't know a proper way to fix this, unless there are 
no use cases where this behaviour is desired.
Any thoughts?

Winfried

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

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

[Michael Meeks (via logerrit)]

 desktop/source/lib/init.cxx |  146 +++-
 1 file changed, 131 insertions(+), 15 deletions(-)

New commits:
commit 74cd1675d80bc1c1609655148546fc960fb99af8
Author: Michael Meeks 
AuthorDate: Tue Apr 16 23:01:50 2019 +0100
Commit: Michael Meeks 
CommitDate: Wed Apr 17 14:14:32 2019 +0200

lok: add profile zones.

NB. outside of the often contended SolarMutexGuard.

Change-Id: Ieb651e2ed4349e692010a7588721f461af7d2b5b
Reviewed-on: https://gerrit.libreoffice.org/70848
Tested-by: Jenkins
Reviewed-by: Michael Meeks 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 327be8ab2bdd..0842c98ed3e4 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -942,6 +942,8 @@ void CallbackFlushHandler::callback(const int type, const 
char* payload, void* d
 
 void CallbackFlushHandler::queue(const int type, const char* data)
 {
+comphelper::ProfileZone aZone("CallbackFlushHander::queue");
+
 CallbackData aCallbackData(type, (data ? data : "(nil)"));
 const std::string& payload = aCallbackData.PayloadString;
 SAL_INFO("lok", "Queue: " << type << " : " << payload);
@@ -1391,6 +1393,8 @@ void CallbackFlushHandler::queue(const int type, const 
char* data)
 
 void CallbackFlushHandler::Invoke()
 {
+comphelper::ProfileZone aZone("CallbackFlushHander::Invoke");
+
 if (m_pCallback && !m_bEventLatch)
 {
 std::unique_lock lock(m_mutex);
@@ -1475,6 +1479,8 @@ void CallbackFlushHandler::removeViewStates(int viewId)
 
 static void doc_destroy(LibreOfficeKitDocument *pThis)
 {
+comphelper::ProfileZone aZone("doc_destroy");
+
 SolarMutexGuard aGuard;
 
 LibLODocument_Impl *pDocument = static_cast(pThis);
@@ -1564,6 +1570,8 @@ static LibreOfficeKitDocument* 
lo_documentLoad(LibreOfficeKit* pThis, const char
 
 static LibreOfficeKitDocument* lo_documentLoadWithOptions(LibreOfficeKit* 
pThis, const char* pURL, const char* pOptions)
 {
+comphelper::ProfileZone aZone("lo_documentLoadWithOptions");
+
 SolarMutexGuard aGuard;
 
 LibLibreOffice_Impl* pLib = static_cast(pThis);
@@ -1672,6 +1680,8 @@ static LibreOfficeKitDocument* 
lo_documentLoadWithOptions(LibreOfficeKit* pThis,
 
 static int lo_runMacro(LibreOfficeKit* pThis, const char *pURL)
 {
+comphelper::ProfileZone aZone("lo_runMacro");
+
 SolarMutexGuard aGuard;
 
 LibLibreOffice_Impl* pLib = static_cast(pThis);
@@ -1758,12 +1768,14 @@ static int lo_runMacro(LibreOfficeKit* pThis, const 
char *pURL)
 }
 
 static bool lo_signDocument(LibreOfficeKit* /*pThis*/,
-   const char* pURL,
-   const unsigned char* pCertificateBinary,
-   const int nCertificateBinarySize,
-   const unsigned char* pPrivateKeyBinary,
-   const int nPrivateKeyBinarySize)
+const char* pURL,
+const unsigned char* pCertificateBinary,
+const int nCertificateBinarySize,
+const unsigned char* pPrivateKeyBinary,
+const int nPrivateKeyBinarySize)
 {
+comphelper::ProfileZone aZone("lo_signDocument");
+
 OUString aURL(getAbsoluteURL(pURL));
 if (aURL.isEmpty())
return false;
@@ -1838,6 +1850,8 @@ static void lo_registerCallback (LibreOfficeKit* pThis,
 
 static int doc_saveAs(LibreOfficeKitDocument* pThis, const char* sUrl, const 
char* pFormat, const char* pFilterOptions)
 {
+comphelper::ProfileZone aZone("doc_saveAs");
+
 SolarMutexGuard aGuard;
 if (gImpl)
 gImpl->maLastExceptionMsg.clear();
@@ -2137,6 +2151,8 @@ static void doc_iniUnoCommands ()
 
 static int doc_getDocumentType (LibreOfficeKitDocument* pThis)
 {
+comphelper::ProfileZone aZone("doc_getDocumentType");
+
 SolarMutexGuard aGuard;
 if (gImpl)
 gImpl->maLastExceptionMsg.clear();
@@ -2177,6 +2193,8 @@ static int doc_getDocumentType (LibreOfficeKitDocument* 
pThis)
 
 static int doc_getParts (LibreOfficeKitDocument* pThis)
 {
+comphelper::ProfileZone aZone("doc_getParts");
+
 SolarMutexGuard aGuard;
 
 ITiledRenderable* pDoc = getTiledRenderable(pThis);
@@ -2191,6 +2209,8 @@ static int doc_getParts (LibreOfficeKitDocument* pThis)
 
 static int doc_getPart (LibreOfficeKitDocument* pThis)
 {
+comphelper::ProfileZone aZone("doc_getPart");
+
 SolarMutexGuard aGuard;
 if (gImpl)
 gImpl->maLastExceptionMsg.clear();
@@ -2207,6 +2227,8 @@ static int doc_getPart (LibreOfficeKitDocument* pThis)
 
 static void doc_setPart(LibreOfficeKitDocument* pThis, int nPart)
 {
+comphelper::ProfileZone aZone("doc_setPart");
+
 SolarMutexGuard aGuard;
 if (gImpl)
 gImpl->maLastExceptionMsg.clear();
@@ -2223,6 +2245,8 @@ static void doc_setPart(LibreOfficeKitDocument*

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

[Balazs Varga (via logerrit)]

 chart2/qa/extras/chart2export.cxx |   44 ++
 chart2/qa/extras/data/ods/combined_chart_secondary_axis.ods   |binary
 chart2/qa/extras/data/xlsx/combined_chart_secondary_axis.xlsx |binary
 oox/source/export/chartexport.cxx |   31 +--
 4 files changed, 68 insertions(+), 7 deletions(-)

New commits:
commit 9be1b6cf5b97727135c7f5e48c971edd8dc45e70
Author: Balazs Varga 
AuthorDate: Tue Apr 16 11:19:55 2019 +0200
Commit: László Németh 
CommitDate: Wed Apr 17 14:30:17 2019 +0200

tdf#123828 XLSX combined chart export: fix order of axis types

Also fix tdf#123833 and tdf#123837.

In combined charts, now axis types are exported in the right order
(catAx[1], valAx[1], catAx[2], valAx[2]). The Y axes are exported
correctly with the correct axIDs of the chart types: the first one with
the primary axId, the second one with the secondary axId. X category
axis crosses the Y axis at the right place, all data series are attached
to the right Y axis, and the Y major grid doesn't disappear.

Note: don't export the CrossoverPosition/CrossoverValue, if the axis
is deleted and invisible, because MSO will show the secondary X axis,
even if the axis doesn't exist. The problem was the unnecessary export
of the axis with the default css::chart::ChartAxisPosition_END
CrossoverPosition value.

Change-Id: Id429e654ff0ba45b5f9db877b7c4dd6e65433408
Reviewed-on: https://gerrit.libreoffice.org/70814
Reviewed-by: László Németh 
Tested-by: László Németh 

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 6dd8d7d9e9c1..a5c42530a0b6 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -114,6 +114,8 @@ public:
 void testMultipleAxisXLSX();
 void testSecondaryAxisXLSX();
 void testSetSeriesToSecondaryAxisXLSX();
+void testCombinedChartSecondaryAxisXLSX();
+void testCombinedChartSecondaryAxisODS();
 void testAxisTitleRotationXLSX();
 void testAxisCrossBetweenXSLX();
 void testPieChartDataPointExplosionXLSX();
@@ -208,6 +210,8 @@ public:
 CPPUNIT_TEST(testMultipleAxisXLSX);
 CPPUNIT_TEST(testSecondaryAxisXLSX);
 CPPUNIT_TEST(testSetSeriesToSecondaryAxisXLSX);
+CPPUNIT_TEST(testCombinedChartSecondaryAxisXLSX);
+CPPUNIT_TEST(testCombinedChartSecondaryAxisODS);
 CPPUNIT_TEST(testAxisTitleRotationXLSX);
 CPPUNIT_TEST(testAxisCrossBetweenXSLX);
 CPPUNIT_TEST(testPieChartDataPointExplosionXLSX);
@@ -1782,6 +1786,46 @@ void Chart2ExportTest::testSetSeriesToSecondaryAxisXLSX()
 assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart", 2);
 }
 
+void Chart2ExportTest::testCombinedChartSecondaryAxisXLSX()
+{
+// Original file was created with MS Office
+load("/chart2/qa/extras/data/xlsx/", "combined_chart_secondary_axis.xlsx");
+xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
+CPPUNIT_ASSERT(pXmlDoc);
+// Collect barchart axID on secondary Axis
+OUString XValueIdOfBarchart = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:axId[1]", "val");
+OUString YValueIdOfBarchart = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:axId[2]", "val");
+// Collect linechart axID on primary Axis
+OUString XValueIdOfLinechart = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:axId[1]", "val");
+OUString YValueIdOfLinechart = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:axId[2]", "val");
+// Check which c:catAx and c:valAx contain the AxisId of charttypes
+assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx[1]/c:axId", 
"val", XValueIdOfLinechart);
+assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[1]/c:axId", 
"val", YValueIdOfLinechart);
+assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx[2]/c:axId", 
"val", XValueIdOfBarchart);
+assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[2]/c:axId", 
"val", YValueIdOfBarchart);
+}
+
+void Chart2ExportTest::testCombinedChartSecondaryAxisODS()
+{
+// Original file was created with LibreOffice
+load("/chart2/qa/extras/data/ods/", "combined_chart_secondary_axis.ods");
+xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
+CPPUNIT_ASSERT(pXmlDoc);
+// Collect barchart axID on secondary Axis
+OUString XValueIdOfBarchart = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:axId[1]", "val");
+OUString YValueIdOfBarchart = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:axId[2]", "val");
+// Collect linechart axID on primary Axis
+OUString XValueIdOfLinechart = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:axId[1]", "val");
+OUString YValueIdOfLinechart = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c

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

[Henry Castro (via logerrit)]

 sw/qa/extras/tiledrendering/tiledrendering.cxx |   25 +
 1 file changed, 25 insertions(+)

New commits:
commit 70981db28e1f2bde08911059495d3ea0980481d6
Author: Henry Castro 
AuthorDate: Tue Apr 16 09:01:01 2019 -0400
Commit: Henry Castro 
CommitDate: Wed Apr 17 14:47:37 2019 +0200

sw lok: add unit test for deselect custom shape

Change-Id: I41a9ff0d281d9032ddaafbbcb55352254a809efe
Reviewed-on: https://gerrit.libreoffice.org/70824
Tested-by: Jenkins
Reviewed-by: Henry Castro 

diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index ceed820f4a66..07ec78c3e542 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -111,6 +111,7 @@ public:
 void testSplitNodeRedlineCallback();
 void testDeleteNodeRedlineCallback();
 void testVisCursorInvalidation();
+void testDeselectCustomShape();
 
 CPPUNIT_TEST_SUITE(SwTiledRenderingTest);
 CPPUNIT_TEST(testRegisterCallback);
@@ -167,6 +168,7 @@ public:
 CPPUNIT_TEST(testSplitNodeRedlineCallback);
 CPPUNIT_TEST(testDeleteNodeRedlineCallback);
 CPPUNIT_TEST(testVisCursorInvalidation);
+CPPUNIT_TEST(testDeselectCustomShape);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -2400,6 +2402,29 @@ void SwTiledRenderingTest::testVisCursorInvalidation()
 comphelper::LibreOfficeKit::setActive(false);
 }
 
+void SwTiledRenderingTest::testDeselectCustomShape()
+{
+comphelper::LibreOfficeKit::setActive();
+
+SwXTextDocument* pXTextDocument = createDoc("dummy.fodt");
+SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
+SwShellCursor* pShellCursor = pWrtShell->getShellCursor(false);
+Point aStart = pShellCursor->GetSttPos();
+aStart.setX(aStart.getX() - 1000);
+aStart.setY(aStart.getY() - 1000);
+
+comphelper::dispatchCommand(".uno:BasicShapes.hexagon", 
uno::Sequence());
+Scheduler::ProcessEventsToIdle();
+CPPUNIT_ASSERT_EQUAL(static_cast(1), 
pWrtShell->GetDrawView()->GetMarkedObjectList().GetMarkCount());
+
+pXTextDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN, 
aStart.getX(), aStart.getY(), 1, MOUSE_LEFT, 0);
+pXTextDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONUP, 
aStart.getX(), aStart.getY(), 1, MOUSE_LEFT, 0);
+Scheduler::ProcessEventsToIdle();
+CPPUNIT_ASSERT_EQUAL(static_cast(0), 
pWrtShell->GetDrawView()->GetMarkedObjectList().GetMarkCount());
+
+comphelper::LibreOfficeKit::setActive(false);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwTiledRenderingTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 sc/source/core/data/table2.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6ba15ac96bf143bdc7ab480fd0273060862e8662
Author: Noel Grandin 
AuthorDate: Wed Apr 17 11:25:13 2019 +0200
Commit: Noel Grandin 
CommitDate: Wed Apr 17 14:59:48 2019 +0200

tdf#124778 View - Comments causes crash

regression from
commit 7282014e362a1529a36c88eb308df8ed359c2cfa
Date:   Fri Feb 1 15:15:16 2019 +0100
tdf#50916 Makes numbers of columns dynamic.

Change-Id: I5ecc52dd709455718a2f3e245b1d41e0c30e7f80
Reviewed-on: https://gerrit.libreoffice.org/70862
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index e48f2393977f..fa35ef22e2e5 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1643,7 +1643,8 @@ void ScTable::GetNotesInRange( const ScRange& rRange, 
std::vector
 {
 SCROW nStartRow = rRange.aStart.Row();
 SCROW nEndRow = rRange.aEnd.Row();
-for (SCCOL nCol = rRange.aStart.Col(); nCol <= rRange.aEnd.Col(); ++nCol)
+SCCOL nEndCol = ClampToAllocatedColumns(rRange.aEnd.Col());
+for (SCCOL nCol = rRange.aStart.Col(); nCol <= nEndCol; ++nCol)
 {
 aCol[nCol].GetNotesInRange(nStartRow, nEndRow, rNotes);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 loleaflet/src/control/Toolbar.js |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 065d2487cc6d26ec7efbde6f1e1177616b0b7cd7
Author: Samuel Mehrbrodt 
AuthorDate: Wed Apr 17 09:04:03 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Wed Apr 17 15:10:28 2019 +0200

About dialog: Add link to website

Can be modified by setting brandProductURL in branding.js

Change-Id: I6181f4f0d7c0f7e6cd9ab447d95f451711bfd561
Reviewed-on: https://gerrit.libreoffice.org/70859
Reviewed-by: Jan Holesovsky 
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 3a2a2ddd2..b33e2433d 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -3,7 +3,7 @@
  * Toolbar handler
  */
 
-/* global $ window vex brandProductName _ */
+/* global $ window vex sanitizeUrl brandProductName brandProductURL _ */
 L.Map.include({
 
// a mapping of uno commands to more readable toolbar items
@@ -265,9 +265,13 @@ L.Map.include({
} else {
productName = (typeof brandProductName !== 'undefined') 
? brandProductName : 'LibreOffice Online';
}
+   var productURL = (typeof brandProductURL !== 'undefined') ? 
brandProductURL : 'https://libreoffice.org';
content.find('#product-name').text(productName);
var productString = _('This version of %productName is powered 
by');
-   
content.find('#product-string').text(productString.replace('%productName', 
productName));
+   var productNameWithURL = '' + productName + '';
+   
content.find('#product-string').html(productString.replace('%productName', 
productNameWithURL));
+
var w;
var iw = window.innerWidth;
if (iw < 768) {
___
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

[Henry Castro (via logerrit)]

 sw/source/uibase/uiview/viewdraw.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 916c5834d09a4f9742cbdd00ab5d53b140a97153
Author: Henry Castro 
AuthorDate: Tue Apr 9 16:33:40 2019 -0400
Commit: Jan Holesovsky 
CommitDate: Wed Apr 17 15:11:53 2019 +0200

sw lok: fix "Cannot deselect the shape after inserting the first in a...

document"

Change-Id: I976318fe299306b65190b4f5ae0ed2565830c6f7
Reviewed-on: https://gerrit.libreoffice.org/70475
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 
Reviewed-by: Henry Castro 
Reviewed-on: https://gerrit.libreoffice.org/70794
Tested-by: Jan Holesovsky 

diff --git a/sw/source/uibase/uiview/viewdraw.cxx 
b/sw/source/uibase/uiview/viewdraw.cxx
index d0b4951886ec..09d49e3b52a5 100644
--- a/sw/source/uibase/uiview/viewdraw.cxx
+++ b/sw/source/uibase/uiview/viewdraw.cxx
@@ -353,6 +353,10 @@ void SwView::ExecDraw(SfxRequest& rReq)
 {
 m_pWrtShell->GotoObj(true);
 }
+else if (dynamic_cast(pTempFuncPtr))
+{
+pTempFuncPtr->CreateDefaultObject();
+}
 else
 {
 pFuncPtr->CreateDefaultObject();
___
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/qa

[Henry Castro (via logerrit)]

 sw/qa/extras/tiledrendering/tiledrendering.cxx |   25 +
 1 file changed, 25 insertions(+)

New commits:
commit 40c1bbd470fb35a3b6ba33009beec875c971ce04
Author: Henry Castro 
AuthorDate: Tue Apr 16 09:01:01 2019 -0400
Commit: Jan Holesovsky 
CommitDate: Wed Apr 17 15:12:44 2019 +0200

sw lok: add unit test for deselect custom shape

Change-Id: I41a9ff0d281d9032ddaafbbcb55352254a809efe
Reviewed-on: https://gerrit.libreoffice.org/70824
Tested-by: Jenkins
Reviewed-by: Henry Castro 
Reviewed-on: https://gerrit.libreoffice.org/70880
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 807efac9ea68..3db77a1c7f88 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -108,6 +108,7 @@ public:
 void testSplitNodeRedlineCallback();
 void testDeleteNodeRedlineCallback();
 void testVisCursorInvalidation();
+void testDeselectCustomShape();
 
 CPPUNIT_TEST_SUITE(SwTiledRenderingTest);
 CPPUNIT_TEST(testRegisterCallback);
@@ -163,6 +164,7 @@ public:
 CPPUNIT_TEST(testSplitNodeRedlineCallback);
 CPPUNIT_TEST(testDeleteNodeRedlineCallback);
 CPPUNIT_TEST(testVisCursorInvalidation);
+CPPUNIT_TEST(testDeselectCustomShape);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -2354,6 +2356,29 @@ void SwTiledRenderingTest::testVisCursorInvalidation()
 comphelper::LibreOfficeKit::setActive(false);
 }
 
+void SwTiledRenderingTest::testDeselectCustomShape()
+{
+comphelper::LibreOfficeKit::setActive();
+
+SwXTextDocument* pXTextDocument = createDoc("dummy.fodt");
+SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
+SwShellCursor* pShellCursor = pWrtShell->getShellCursor(false);
+Point aStart = pShellCursor->GetSttPos();
+aStart.setX(aStart.getX() - 1000);
+aStart.setY(aStart.getY() - 1000);
+
+comphelper::dispatchCommand(".uno:BasicShapes.hexagon", 
uno::Sequence());
+Scheduler::ProcessEventsToIdle();
+CPPUNIT_ASSERT_EQUAL(static_cast(1), 
pWrtShell->GetDrawView()->GetMarkedObjectList().GetMarkCount());
+
+pXTextDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN, 
aStart.getX(), aStart.getY(), 1, MOUSE_LEFT, 0);
+pXTextDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONUP, 
aStart.getX(), aStart.getY(), 1, MOUSE_LEFT, 0);
+Scheduler::ProcessEventsToIdle();
+CPPUNIT_ASSERT_EQUAL(static_cast(0), 
pWrtShell->GetDrawView()->GetMarkedObjectList().GetMarkCount());
+
+comphelper::LibreOfficeKit::setActive(false);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwTiledRenderingTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 connectivity/source/drivers/firebird/DatabaseMetaData.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e0ccbe72ed6eb0d309ed272a78fd67a512acff5d
Author: Stephan Bergmann 
AuthorDate: Wed Apr 17 14:04:45 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Apr 17 15:26:09 2019 +0200

Fix use of variable before its lifetime begins

This has been broken with 48314f25241e014a634dd5371543b90137ffd2bc "improve
function-local statics in basic..cui" (and has been found with a new plugin 
to
be commited).

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

diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx 
b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index f9bd2a2546df..28c2e71a9d1b 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -976,7 +976,7 @@ uno::Reference< XResultSet > SAL_CALL 
ODatabaseMetaData::getTypeInfo()
 aRow[12] = new ORowSetValueDecorator(false); // Autoincrement
 aRow[14] = ODatabaseMetaDataResultSet::get0Value(); // Minimum scale
 aRow[15] = ODatabaseMetaDataResultSet::get0Value(); // Max scale
-aResults.push_back(aRow);
+tmp.push_back(aRow);
 
 // SQL_TYPE_DATE
 aRow[1] = new ORowSetValueDecorator(OUString("DATE"));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt (via logerrit)]

 sw/qa/uitest/writer_tests5/xwindow.py |   16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 0fb575b34d039f7c732820467b6db6f8cebd485d
Author: Samuel Mehrbrodt 
AuthorDate: Wed Apr 17 14:42:28 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Wed Apr 17 15:34:30 2019 +0200

Wait for async events to be delivered

Follow-up fix for 6f43902b12dd36fa2b69401065df198ef9ffdb09

Also remove calling to super class (doesn't work and those methods return 
void anyway)

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

diff --git a/sw/qa/uitest/writer_tests5/xwindow.py 
b/sw/qa/uitest/writer_tests5/xwindow.py
index 0ed53f49c9c7..9187edc87cf6 100644
--- a/sw/qa/uitest/writer_tests5/xwindow.py
+++ b/sw/qa/uitest/writer_tests5/xwindow.py
@@ -31,26 +31,24 @@ class XMouseListenerExtended(unohelper.Base, 
XMouseListener):
 def mousePressed(self, xMouseEvent):
 global mouseEventsIntercepted
 mouseEventsIntercepted += 1
-return super(XMouseListenerExtended, self).mousePressed(xMouseEvent)
 
 # is invoked when a mouse button has been released on a window.
 @classmethod
 def mouseReleased(self, xMouseEvent):
 global mouseEventsIntercepted
 mouseEventsIntercepted += 1
-return super(XMouseListenerExtended, self).mouseReleased(xMouseEvent)
 
 # is invoked when the mouse enters a window.
 @classmethod
 def mouseEntered(self, xMouseEvent):
-# doesn't work in UI tests
-return super(XMouseListenerExtended, self).mouseEntered(xMouseEvent)
+global mouseEventsIntercepted
+mouseEventsIntercepted += 1
 
 # is invoked when the mouse exits a window.
 @classmethod
 def mouseExited(self, xMouseEvent):
-# doesn't work in UI tests
-return super(XMouseListenerExtended, self).mouseExited(xMouseEvent)
+global mouseEventsIntercepted
+mouseEventsIntercepted += 1
 
 
 class XKeyListenerExtended(unohelper.Base, XKeyListener):
@@ -135,13 +133,17 @@ class XWindow(UITestCase):
 xWindow.removeKeyListener(xKeyListener)
 del xKeyListener
 
+# Wait for async events to be processed
+xToolkit = 
self.xContext.ServiceManager.createInstance('com.sun.star.awt.Toolkit')
+xToolkit.processEventsToIdle()
+
 global keymouseEventsIntercepted
 # Not expected 2 interceptions
 self.assertEqual(0, keymouseEventsIntercepted)
 
 global mouseEventsIntercepted
 # mousePressed, mouseReleased and mouseEntered should be triggered
-self.assertEqual(2, mouseEventsIntercepted)
+self.assertEqual(3, mouseEventsIntercepted)
 
 # close document
 self.ui_test.close_doc()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: tdf124710, unexpected result for function IFS when argument NA() is followed by an argument that needs interpreting

[Eike Rathke]

Hi Winfried,

On Wednesday, 2019-04-17 11:54:13 +, Winfried Donkers wrote:

> Upon debugging IFS( 0, NA(), 1+0, "output" ) I came to the following 
> preliminary conclusions:
> Before ScInterpreter::ScIfs_MS() is called, ScInterpreter::Interpret is 
> called for argument '1+0' .
> That leads to a call to scInterpreter::CalculateAddSub( false ) and there the 
> problem starts.
> 0 and 1 are popped and added, but after PushDouble( ::rtl::math::approxAdd( 
> 0, 1 ) )
> the raw stacktype is svError.

That happens because nGlobalError is still set from the previous NA()
call, any Push...() pushes the error value instead of a result if
nGlobalError is set. Which is desired to propagate the error, and
normally doesn't happen this way (carrying over from the previous
argument) unless an OpCode is part of IsErrFunc() (which ocIfs_MS and
ocSwitch_MS are, likely because of similar reasons, but it's only
a partial workaround), otherwise calculation ends with the error.

The actual root cause here is that IFS() and SWITCH() are not compiled
into jumps so only the needed result would be calculated, but instead
all arguments are calculated beforehand as in usual function calls. We
had that discussion some while ago (and there exists some bug about it),
but I didn't get around to a different implementation. (right now I only
remember I had some idea for it to use existing means to compile an
IFS() call into some kind of nested or chained ocIf or ocChoose or some
such, would have to dig it out of my mail archive).

A workaround might be that for pre-calculated results of IFS() and
SWITCH() nGlobalError is cleared before stepping on to the next
argument, but that could get hairy determining the right spot when to do
it, i.e. when the same level of calls is reached. Maybe the place with
the IsErrFunc() handling in ScInterpreter::Interpret() can be used for
that, though determining whether the current OpCode is in the argument
level of IFS() or SWITCH() probably isn't too trivial.

Not treating IFS() and SWITCH() as jumps of course code paths are
unnecessarily executed and has other unwanted side effects (like there
were cases where someone used STYLE() within but not the actual final
result), so the best fix would actually be to change that.

  Eike

-- 
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Miklos Vajna (via logerrit)]

 slideshow/source/engine/shapes/viewmediashape.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit d7f4f5650dd2c7fe1ccec50efd806e695b8bc18a
Author: Miklos Vajna 
AuthorDate: Wed Apr 17 11:38:47 2019 +0200
Commit: Miklos Vajna 
CommitDate: Wed Apr 17 15:43:48 2019 +0200

tdf#124756 slideshow: avoid mbPaintDisabled for media windows

Commit 3e0092031b73bad107e3122d5d4be2f5bd487744 (tdf#112318 sd opengl:
fix lack of initial animation, 2019-04-05) enabled processing of idle
events between two updates of the slideshow to help OpenGL, which
uncovered a problem with media shapes.

On one hand,
slideshow::internal::ViewMediaShape::implInitializePlayerWindow() calls
EnablePaint(false) on the media window. OTOH,
vcl::Window::ImplCallPaint() handles mbPaintDisabled by invalidating the
relevant area of the window, which causes a paint<->invalidate loop.

Fix the problem by nominally still enabling paints on the media window:
nothing will change in practice (since the actual media overlay will be
on top of it), but this way the loop goes away.

mbPaintDisabled is handled like this since the initial import, the media
window flag was added much later, so it makes more sense to adapt the
later.

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

diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx 
b/slideshow/source/engine/shapes/viewmediashape.cxx
index 6aecf9502d1c..bd50a71b70cb 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -446,7 +446,6 @@ namespace slideshow
 mpMediaWindow->SetBackground( COL_BLACK );
 mpMediaWindow->SetParentClipMode( 
ParentClipMode::NoClip );
 mpMediaWindow->EnableEraseBackground( false );
-mpMediaWindow->EnablePaint( false );
 mpMediaWindow->SetForwardKey( true );
 mpMediaWindow->SetMouseTransparent( true );
 mpMediaWindow->Show();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/js loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/js/jquery.mCustomScrollbar.js |   27 +++
 loleaflet/src/control/Control.Scroll.js |5 -
 2 files changed, 23 insertions(+), 9 deletions(-)

New commits:
commit cff5791f2e410387212feac1305da7763f8ac90d
Author: Szymon Kłos 
AuthorDate: Thu Apr 11 13:32:24 2019 +0200
Commit: Szymon Kłos 
CommitDate: Wed Apr 17 16:28:55 2019 +0200

Prevent view from jumping on zoom in/out on mobile

Change-Id: I29262d518d61a4a06d66271033c958e56ff16a2b
Reviewed-on: https://gerrit.libreoffice.org/70592
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 
(cherry picked from commit 42a739a7bc53f9992056de4e00db90a5e613c04c)
Reviewed-on: https://gerrit.libreoffice.org/70887
Reviewed-by: Szymon Kłos 
Tested-by: Szymon Kłos 

diff --git a/loleaflet/js/jquery.mCustomScrollbar.js 
b/loleaflet/js/jquery.mCustomScrollbar.js
index 9437406d2..14bf9d9a2 100644
--- a/loleaflet/js/jquery.mCustomScrollbar.js
+++ b/loleaflet/js/jquery.mCustomScrollbar.js
@@ -284,6 +284,11 @@ and dependencies (minified).
*/
updateOnContentResize:true,
/*
+   prevent from updating view position after 
content resize to avoid jumping on mobile devices
+   values: boolean
+   */
+   jumpOnContentResize:true,
+   /*
auto-update scrollbars each time each image 
inside the element is fully loaded 
values: "auto", boolean
*/
@@ -561,31 +566,37 @@ and dependencies (minified).
var 
to=[Math.abs(mCSB_container[0].offsetTop),Math.abs(mCSB_container[0].offsetLeft)];
if(o.axis!=="x"){ /* y/yx axis 
*/
if(!d.overflowed[0]){ 
/* y scrolling is not required */
-   
_resetContentPosition.call(this); /* reset content position */
+   
if(o.advanced.jumpOnContentResize)
+   
_resetContentPosition.call(this); /* reset content position */

if(o.axis==="y"){

_unbindEvents.call(this);
-   }else 
if(o.axis==="yx" && d.overflowed[1]){
+   }else 
if(o.axis==="yx" && d.overflowed[1] && o.advanced.jumpOnContentResize){

_scrollTo($this,to[1].toString(),{dir:"x",dur:0,overwrite:"none"});
}
-   }else 
if(mCSB_dragger[0].height()>mCSB_dragger[0].parent().height()){
+   }else 
if(mCSB_dragger[0].height()>mCSB_dragger[0].parent().height()
+   && 
o.advanced.jumpOnContentResize){

_resetContentPosition.call(this); /* reset content position */
}else{ /* y scrolling 
is required */
-   
_scrollTo($this,to[0].toString(),{dir:"y",dur:0,overwrite:"none"});
+   
if(o.advanced.jumpOnContentResize)
+   
_scrollTo($this,to[0].toString(),{dir:"y",dur:0,overwrite:"none"});

d.contentReset.y=null;
}
}
if(o.axis!=="y"){ /* x/yx axis 
*/
if(!d.overflowed[1]){ 
/* x scrolling is not required */
-   
_resetContentPosition.call(this); /* reset content position */
+   
if(o.advanced.jumpOnContentResize)
+   
_resetContentPosition.call(this); /* reset content position */

if(o.axis==="x"){

_unbindEvents.call(this);
- 

Re: tdf124710, unexpected result for function IFS when argument NA() is followed by an argument that needs interpreting

[Winfried Donkers]

The actual root cause here is that IFS() and SWITCH() are not compiled
into jumps so only the needed result would be calculated, but instead
all arguments are calculated beforehand as in usual function calls. We
had that discussion some while ago (and there exists some bug about it),
but I didn't get around to a different implementation. (right now I only
remember I had some idea for it to use existing means to compile an
IFS() call into some kind of nested or chained ocIf or ocChoose or some
such, would have to dig it out of my mail archive).

[...]
Not treating IFS() and SWITCH() as jumps of course code paths are
unnecessarily executed and has other unwanted side effects (like there
were cases where someone used STYLE() within but not the actual final
result), so the best fix would actually be to change that.


Yes, I remember. I tried but did not succeed. I may try again this time.

Winfried

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

LibreOffice ESC call, Thur - 16:00 central European (local) time

[Michael Meeks]

Hi everyone,

Prototype agenda below, bug metrics also at the link below;
extra items appreciated as last-week:

https://demo.collaboracloudsuite.com/tdf/

Amazing to have no high prio. regressions as of now - thanks
to everyone that fixed one recently and Michael Stahl for nailing the
last one ! =)

For now we continue using the public jitsi server:

https://meet.jit.si/tdfesc

ATB,

Michael.

* Completed Action Items:

* Pending Action Items:
+ mentors to check through the list here (All)
+ https://summerofcode.withgoogle.com/

* Release Engineering update (Christian)
+ 6.2.4 rc1 - ?
+ 6.1.6 rc2
+ 6.3 alpha1: early May
+ Remotes
+ Android viewer
   + Maven repo is published up to 6.0.4 – rest later today (Christian)
+ Online:

* Documentation (Olivier)

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
250(250) (topicUI) bugs open, 207(207) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week1 month3 months   12 months  
 added 11(6)  17(5)  32(4)   74(3)  
 commented 46(-20)   192(-19)   481(-1)1351(19) 
   removed  3(3)   6(0)  13(2)   23(2)  
  resolved  3(2)  16(-5) 56(-3) 131(1)  
+ top 10 contributors:
  Tietze, Heiko made 67 changes in 1 month, and 539 changes in 1 year
  Roman Kuznetsov made 65 changes in 1 month, and 179 changes in 1 year
  Xisco Faulí made 47 changes in 1 month, and 259 changes in 1 year
  Dieter Praas made 36 changes in 1 month, and 147 changes in 1 year
  Kainz, Andreas made 36 changes in 1 month, and 181 changes in 1 year
  Foote, V Stuart made 22 changes in 1 month, and 187 changes in 1 year
  Thomas Lendo made 20 changes in 1 month, and 220 changes in 1 year
  Mehrbrodt, Samuel made 15 changes in 1 month, and 67 changes in 1 year
  Rasmus Jonsson made 10 changes in 1 month, and 10 changes in 1 year
  Cor Nouws made 9 changes in 1 month, and 105 changes in 1 year
* Crash Testing (Caolan)
+ Google / ossfuzz:
  - ?? 10 (+20,-21) issues
+ dynamic calc col change seems to cause these
  + back to where we started.
+ Crash testing:
  + 27(+0) import failure, 6(+0) export failures
 + jump here – prolly also related to calc columns.
+ ForcePoint, round 9
  + stalled for now on a few minor bits.
+ coverity suspended – until new version that supports c++17(?)
+ CNA bits – got 1st batch of CVE numbers.
  + discussing a potential minor issue; open a CVE ?
  + we can use our CVE-2019-9847 for this.

* Crash Reporting (Xisco)
  + http://crashreport.libreoffice.org/stats/version/6.1.4.2
+ 1117 1241 (-124)
  + http://crashreport.libreoffice.org/stats/version/6.1.5.2
+ 1144 (-112)
  + http://crashreport.libreoffice.org/stats/version/6.2.1.2
+ 1468 (-190)
  + http://crashreport.libreoffice.org/stats/version/6.2.2.2
+ 1998 (+358)

* Hackfests & Events (Thorsten)
   + this year hackfests coming up:
+ Paris in Summer (Sophie)
  + first week of July Fri/Sat 5th / 6th
+ near Gare de Nord, La Mouette working on communication
  + designing a flier – avoids stomping on exams at end of June
  + https://wiki.documentfoundation.org/Hackfest/Paris2019 
  + hope to have a Hackfest NG setup again – mentees, please speak up!
  + people are adding themselves to the wiki already.
+ tentative Dresden: late autumn (past mid-October, for having students)
   + hope to have one each quarter.

* GSOC 2019 (Thorsten/Xisco/Moggi/Heiko)
   + student application period started – runs until April 9th (coming Tuesday)
  + so far 31 proposals
  + triaged down to 14
   + we have around ~10 proposals without mentors
  + mentors to check through the list here (All)
+ https://summerofcode.withgoogle.com/
  + dashboard > click on the number of final proposals (29) to get 
the full list
   + last-chance for students to get easy-hacks in (Heiko_
  + before April 19th.

* C++ lectures (Xisco)
+ https://wiki.documentfoundation.org/Events/C%2B%2BLectures
+ NEXT SESSION: 

* mentoring/easyhack update
  committer...   1 week   1 month 3 months  12 months   
  open   72(24)  103(5)   106(4)116(4)  
   reviews 1267(-127)   4839(-76)   13451(-410)   47053(636)
merged  289(31) 1199(-15)3643(-82)14631(-3) 
 abandoned7(-4)   84(2)   186(3)811(-12)
   own commits  243(56)  990(-15)3202(-3) 14403(-65)
review commits   74(-17) 300(22)  907(-12) 3841(-1) 
contributor...   1 week 1 month   3 months   12 months   
 

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

[Stephan Bergmann (via logerrit)]

 comphelper/source/processfactory/processfactory.cxx |   38 +---
 1 file changed, 25 insertions(+), 13 deletions(-)

New commits:
commit 884ad0d1af88f9985d30ef0dfe92d89e82f8e576
Author: Stephan Bergmann 
AuthorDate: Wed Apr 17 14:29:18 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Apr 17 17:00:56 2019 +0200

Split localProcessFactory function into class with setter and getter

...which avoids a false positive from an upcoming loplugin that finds 
suspicious
uses of variables during their own initialization (as happened with xReturn 
in
getProcessServiceFactory).

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

diff --git a/comphelper/source/processfactory/processfactory.cxx 
b/comphelper/source/processfactory/processfactory.cxx
index 720ec6e0fb67..31a2e7adfe05 100644
--- a/comphelper/source/processfactory/processfactory.cxx
+++ b/comphelper/source/processfactory/processfactory.cxx
@@ -33,32 +33,44 @@ using namespace osl;
 namespace comphelper
 {
 
-/*
-This function preserves only that the xProcessFactory variable will not be 
create when
-the library is loaded.
-*/
-static Reference< XMultiServiceFactory > localProcessFactory( const Reference< 
XMultiServiceFactory >& xSMgr, bool bSet )
-{
-Guard< Mutex > aGuard( Mutex::getGlobalMutex() );
+namespace {
 
-static Reference< XMultiServiceFactory > xProcessFactory;
-if ( bSet )
+class LocalProcessFactory {
+public:
+void set( const Reference< XMultiServiceFactory >& xSMgr )
 {
+Guard< Mutex > aGuard( Mutex::getGlobalMutex() );
+
 xProcessFactory = xSMgr;
 }
 
-return xProcessFactory;
-}
+Reference< XMultiServiceFactory > get()
+{
+Guard< Mutex > aGuard( Mutex::getGlobalMutex() );
 
+return xProcessFactory;
+}
+
+private:
+Reference< XMultiServiceFactory > xProcessFactory;
+};
+
+/*
+This var preserves only that the above xProcessFactory variable will not 
be create when
+the library is loaded.
+*/
+LocalProcessFactory localProcessFactory;
+
+}
 
 void setProcessServiceFactory(const Reference< XMultiServiceFactory >& xSMgr)
 {
-localProcessFactory( xSMgr, true );
+localProcessFactory.set( xSMgr );
 }
 
 Reference< XMultiServiceFactory > getProcessServiceFactory()
 {
-Reference< XMultiServiceFactory> xReturn = localProcessFactory( xReturn, 
false );
+Reference< XMultiServiceFactory> xReturn = localProcessFactory.get();
 if ( !xReturn.is() )
 {
 throw DeploymentException( "null process service factory" );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 vcl/source/window/cursor.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 73979f5a45d937bc686be7e936a006e63f07536f
Author: Stephan Bergmann 
AuthorDate: Wed Apr 17 14:21:11 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Apr 17 17:02:49 2019 +0200

Initialize ImplCursorData members as required

mbCurVisible is immediately read in ImplPrepForDraw, which inits some more
members but not mnStyle which is then read in ImplCursorInvert.  Regression
introduced with b9c10ee923308f336a694bbc0212396ed5317b6a "weld
ClassificationDialog", found when valgrind'ing UITest_classification.

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

diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx
index 4839b7d56fc7..c5c64684f1b9 100644
--- a/vcl/source/window/cursor.cxx
+++ b/vcl/source/window/cursor.cxx
@@ -163,6 +163,8 @@ void vcl::Cursor::ImplDraw()
 void vcl::Cursor::DrawToDevice(OutputDevice& rRenderContext)
 {
 ImplCursorData aData;
+aData.mnStyle = 0;
+aData.mbCurVisible = false;
 // calculate output area
 if (ImplPrepForDraw(&rRenderContext, aData))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/libxslt

[Michael Stahl (via logerrit)]

 external/libxslt/UnpackedTarball_libxslt.mk   |1 
 external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 |  120 
++
 2 files changed, 121 insertions(+)

New commits:
commit 2d85b75b1220484aebd6e583d6d7aee71280e38e
Author: Michael Stahl 
AuthorDate: Wed Apr 17 14:50:10 2019 +0200
Commit: Michael Stahl 
CommitDate: Wed Apr 17 17:19:33 2019 +0200

libxslt: add patch for CVE-2019-11068

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

diff --git a/external/libxslt/UnpackedTarball_libxslt.mk 
b/external/libxslt/UnpackedTarball_libxslt.mk
index eae318ef74b9..beb591b8b2a8 100644
--- a/external/libxslt/UnpackedTarball_libxslt.mk
+++ b/external/libxslt/UnpackedTarball_libxslt.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libxslt,\
external/libxslt/libxslt-msvc.patch.2 \
external/libxslt/libxslt-1.1.26-memdump.patch \
external/libxslt/rpath.patch.0 \
+   external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 
b/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1
new file mode 100644
index ..260f35d1a35e
--- /dev/null
+++ b/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1
@@ -0,0 +1,120 @@
+From e03553605b45c88f0b4b2980adfbbb8f6fca2fd6 Mon Sep 17 00:00:00 2001
+From: Nick Wellnhofer 
+Date: Sun, 24 Mar 2019 09:51:39 +0100
+Subject: [PATCH] Fix security framework bypass
+
+xsltCheckRead and xsltCheckWrite return -1 in case of error but callers
+don't check for this condition and allow access. With a specially
+crafted URL, xsltCheckRead could be tricked into returning an error
+because of a supposedly invalid URL that would still be loaded
+succesfully later on.
+
+Fixes #12.
+
+Thanks to Felix Wilhelm for the report.
+---
+ libxslt/documents.c | 18 ++
+ libxslt/imports.c   |  9 +
+ libxslt/transform.c |  9 +
+ libxslt/xslt.c  |  9 +
+ 4 files changed, 25 insertions(+), 20 deletions(-)
+
+diff --git a/libxslt/documents.c b/libxslt/documents.c
+index 3f3a7312..4aad11bb 100644
+--- a/libxslt/documents.c
 b/libxslt/documents.c
+@@ -296,10 +296,11 @@ xsltLoadDocument(xsltTransformContextPtr ctxt, const 
xmlChar *URI) {
+   int res;
+ 
+   res = xsltCheckRead(ctxt->sec, ctxt, URI);
+-  if (res == 0) {
+-  xsltTransformError(ctxt, NULL, NULL,
+-   "xsltLoadDocument: read rights for %s denied\n",
+-   URI);
++  if (res <= 0) {
++if (res == 0)
++xsltTransformError(ctxt, NULL, NULL,
++ "xsltLoadDocument: read rights for %s denied\n",
++ URI);
+   return(NULL);
+   }
+ }
+@@ -372,10 +373,11 @@ xsltLoadStyleDocument(xsltStylesheetPtr style, const 
xmlChar *URI) {
+   int res;
+ 
+   res = xsltCheckRead(sec, NULL, URI);
+-  if (res == 0) {
+-  xsltTransformError(NULL, NULL, NULL,
+-   "xsltLoadStyleDocument: read rights for %s denied\n",
+-   URI);
++  if (res <= 0) {
++if (res == 0)
++xsltTransformError(NULL, NULL, NULL,
++ "xsltLoadStyleDocument: read rights for %s denied\n",
++ URI);
+   return(NULL);
+   }
+ }
+diff --git a/libxslt/imports.c b/libxslt/imports.c
+index 874870cc..3783b247 100644
+--- a/libxslt/imports.c
 b/libxslt/imports.c
+@@ -130,10 +130,11 @@ xsltParseStylesheetImport(xsltStylesheetPtr style, 
xmlNodePtr cur) {
+   int secres;
+ 
+   secres = xsltCheckRead(sec, NULL, URI);
+-  if (secres == 0) {
+-  xsltTransformError(NULL, NULL, NULL,
+-   "xsl:import: read rights for %s denied\n",
+-   URI);
++  if (secres <= 0) {
++if (secres == 0)
++xsltTransformError(NULL, NULL, NULL,
++ "xsl:import: read rights for %s denied\n",
++ URI);
+   goto error;
+   }
+ }
+diff --git a/libxslt/transform.c b/libxslt/transform.c
+index 13793914..0636dbd0 100644
+--- a/libxslt/transform.c
 b/libxslt/transform.c
+@@ -3493,10 +3493,11 @@ xsltDocumentElem(xsltTransformContextPtr ctxt, 
xmlNodePtr node,
+  */
+ if (ctxt->sec != NULL) {
+   ret = xsltCheckWrite(ctxt->sec, ctxt, filename);
+-  if (ret == 0) {
+-  xsltTransformError(ctxt, NULL, inst,
+-   "xsltDocumentElem: write rights for %s denied\n",
+-   filename);
++  if (ret <= 0) {
++if (ret == 0)
++xsltTransformError(ctxt, NULL, inst,
++ "xsltDocumentElem: write rig

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

[Katarina Behrens (via logerrit)]

 shell/source/backends/kde5be/kde5backend.cxx |   56 ---
 1 file changed, 42 insertions(+), 14 deletions(-)

New commits:
commit 5a64bc2b1214e6ad8424f57576aa5752a09815d4
Author: Katarina Behrens 
AuthorDate: Tue Apr 16 09:47:31 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Apr 17 17:37:52 2019 +0200

Stop qt event loop after KDE settings have been read

Two use-cases here in kde5backend
1) kde or qt vclplug has already started qt event loop => just use this
loop to read KDE settings
2) no qt event loop runs (we're most likely in gtk3_kde5 vclplug) =>
start a new event loop, read the settings and stop it

In case 2) letting qt event loop run means subsequently all UI ops
need to happen in main thread. This is problematic to enforce in
non-qt-based vclplugs

In both cases, cache those settings for future use - the assumption is,
most of them are static during a session anyway.

Change-Id: Ifa203f4cdb9a753db808f945762fb131ee83393c
Reviewed-on: https://gerrit.libreoffice.org/70808
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/shell/source/backends/kde5be/kde5backend.cxx 
b/shell/source/backends/kde5be/kde5backend.cxx
index e2f6e25c0764..101a21387a4c 100644
--- a/shell/source/backends/kde5be/kde5backend.cxx
+++ b/shell/source/backends/kde5be/kde5backend.cxx
@@ -120,7 +120,7 @@ private:
 {
 }
 
-bool enabled_;
+std::map> m_KDESettings;
 };
 
 OString getDisplayArg()
@@ -148,10 +148,28 @@ OString getExecutable()
 return OUStringToOString(aBin, osl_getThreadTextEncoding());
 }
 
+void readKDESettings(std::map>& 
rSettings)
+{
+const std::vector aKeys
+= { "EnableATToolSupport",  "ExternalMailer",   
"SourceViewFontHeight",
+"SourceViewFontName",   "WorkPathVariable", 
"ooInetFTPProxyName",
+"ooInetFTPProxyPort",   "ooInetHTTPProxyName",  
"ooInetHTTPProxyPort",
+"ooInetHTTPSProxyName", "ooInetHTTPSProxyPort", "ooInetNoProxy",
+"ooInetProxyType" };
+
+for (const OUString& aKey : aKeys)
+{
+css::beans::Optional aValue = 
kde5access::getValue(aKey);
+std::pair> elem
+= std::make_pair(aKey, aValue);
+rSettings.insert(elem);
+}
+}
+
 // init the QApplication when we load the kde5backend into a non-Qt vclplug 
(e.g. Gtk3KDE5)
 // TODO: use a helper process to read these values without linking to Qt 
directly?
 // TODO: share this code somehow with Qt5Instance.cxx?
-void initQApp()
+void initQApp(std::map>& 
rSettings)
 {
 const auto aDisplay = getDisplayArg();
 int nFakeArgc = aDisplay.isEmpty() ? 2 : 3;
@@ -169,36 +187,42 @@ void initQApp()
 unsetenv("SESSION_MANAGER");
 }
 
-auto app = new QApplication(nFakeArgc, pFakeArgv);
-QObject::connect(app, &QObject::destroyed, app, [nFakeArgc, pFakeArgv]() {
+std::unique_ptr app(new QApplication(nFakeArgc, pFakeArgv));
+QObject::connect(app.get(), &QObject::destroyed, app.get(), [nFakeArgc, 
pFakeArgv]() {
 for (int i = 0; i < nFakeArgc; ++i)
 delete pFakeArgv[i];
 delete[] pFakeArgv;
 });
 
+readKDESettings(rSettings);
+
 if (session_manager != nullptr)
 {
 // coverity[tainted_string] - trusted source for setenv
 setenv("SESSION_MANAGER", session_manager, 1);
 free(session_manager);
 }
-
-QApplication::setQuitOnLastWindowClosed(false);
 }
 
 Service::Service()
-: enabled_(false)
 {
 css::uno::Reference 
context(css::uno::getCurrentContext());
 if (context.is())
 {
-if (!qApp)
-{
-initQApp();
-}
 OUString desktop;
 context->getValueByName("system.desktop-environment") >>= desktop;
-enabled_ = desktop == "KDE5" && qApp != nullptr;
+
+if (desktop == "KDE5")
+{
+if (!qApp) // no qt event loop yet
+{
+// so we start one and read KDE settings
+initQApp(m_KDESettings);
+}
+else // someone else (most likely kde/qt vclplug) has started qt 
event loop
+// all that is left to do is to read KDE settings
+readKDESettings(m_KDESettings);
+}
 }
 }
 
@@ -218,8 +242,12 @@ css::uno::Any Service::getPropertyValue(OUString const& 
PropertyName)
 || PropertyName == "ooInetHTTPSProxyPort" || PropertyName == 
"ooInetNoProxy"
 || PropertyName == "ooInetProxyType")
 {
-return css::uno::makeAny(enabled_ ? kde5access::getValue(PropertyName)
-  : 
css::beans::Optional());
+std::map>::iterator it
+= m_KDESettings.find(PropertyName);
+if (it != m_KDESettings.end())
+return css::uno::makeAny(it->second);
+else
+return css::uno::makeAny(css::beans::Optional());
 }
 else if (PropertyName =

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

[Stephan Bergmann (via logerrit)]

 connectivity/source/drivers/firebird/DatabaseMetaData.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aba66a9965c68ad56bbc52a334f440edc9a946b4
Author: Stephan Bergmann 
AuthorDate: Wed Apr 17 15:47:06 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Apr 17 17:38:54 2019 +0200

Restrict lambda capture list

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

diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx 
b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index 28c2e71a9d1b..f3fad5ff3636 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -805,7 +805,7 @@ uno::Reference< XResultSet > SAL_CALL 
ODatabaseMetaData::getTypeInfo()
 ODatabaseMetaDataResultSet* pResultSet =
 new 
ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTypeInfo);
 uno::Reference< XResultSet > xResultSet = pResultSet;
-static ODatabaseMetaDataResultSet::ORows aResults = [&]()
+static ODatabaseMetaDataResultSet::ORows aResults = []()
 {
 ODatabaseMetaDataResultSet::ORows tmp;
 ODatabaseMetaDataResultSet::ORow aRow(19);
___
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' - 2 commits - include/svtools sfx2/source svtools/source

[Katarina Behrens (via logerrit)]

 include/svtools/prnsetup.hxx|1 -
 sfx2/source/doc/guisaveas.cxx   |   11 +--
 svtools/source/dialogs/prnsetup.cxx |7 +--
 3 files changed, 2 insertions(+), 17 deletions(-)

New commits:
commit dedd3c0b67d67c34bfe9418ba0356a3ba096974f
Author: Katarina Behrens 
AuthorDate: Wed Apr 17 12:02:13 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Apr 17 18:17:53 2019 +0200

Revert "Redirect filter options dialog to the main thread"

This reverts commit c2b4dcc46680db854fa1e5f3c490b88bd53b7f5e.

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

diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 9c1c9192b96a..a6219aa3947d 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -94,7 +94,6 @@
 #include 
 
 #include 
-#include 
 #include 
 #include 
 
@@ -267,8 +266,6 @@ class ModelData_Impl
 
 bool m_bRecommendReadOnly;
 
-bool solar_execute(uno::Reference< ui::dialogs::XExecutableDialog > 
xFilterDialog);
-
 public:
 ModelData_Impl( SfxStoringHelper& aOwner,
 const uno::Reference< frame::XModel >& xModel,
@@ -561,10 +558,6 @@ uno::Sequence< beans::PropertyValue > 
ModelData_Impl::GetPreselectedFilter_Impl(
 return aFilterProps;
 }
 
-bool ModelData_Impl::solar_execute( 
uno::Reference xFilterDialog)
-{
-return xFilterDialog->execute();
-}
 
 bool ModelData_Impl::ExecuteFilterDialog_Impl( const OUString& aFilterName )
 {
@@ -601,9 +594,7 @@ bool ModelData_Impl::ExecuteFilterDialog_Impl( const 
OUString& aFilterName )
 GetMediaDescr() >> aPropsForDialog;
 xFilterProperties->setPropertyValues( 
aPropsForDialog );
 
-bool bRet = 
vcl::solarthread::syncExecute(std::bind(&ModelData_Impl::solar_execute, this, 
xFilterDialog));
-
-if( bRet )
+if( xFilterDialog->execute() )
 {
 uno::Sequence< beans::PropertyValue > 
aPropsFromDialog =
 
xFilterProperties->getPropertyValues();
commit fae1a1e8be1122104bcfba5f5b19d7ab6a39a743
Author: Katarina Behrens 
AuthorDate: Wed Apr 17 11:48:53 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Apr 17 18:17:44 2019 +0200

Revert "Redirect printer setup into the main thread"

This reverts commit eaaf6f4f925bf04833a464176d376efe92cdcd69.

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

diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx
index 267274d8d61a..007294e52656 100644
--- a/include/svtools/prnsetup.hxx
+++ b/include/svtools/prnsetup.hxx
@@ -47,7 +47,6 @@ 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 e7362e7bc44c..cf8a3f5c5eb9 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -21,7 +21,6 @@
 #include 
 #include 
 #include 
-#include 
 
 
 void ImplFillPrnDlgListBox( const Printer* pPrinter,
@@ -332,10 +331,6 @@ void PrinterSetupDialog::DataChanged( const 
DataChangedEvent& rDCEvt )
 ModalDialog::DataChanged( rDCEvt );
 }
 
-short PrinterSetupDialog::solar_execute()
-{
-return ModalDialog::Execute();
-}
 
 short PrinterSetupDialog::Execute()
 {
@@ -352,7 +347,7 @@ short PrinterSetupDialog::Execute()
 maStatusTimer.Start();
 
 // start dialog
-short nRet = 
vcl::solarthread::syncExecute(std::bind(&PrinterSetupDialog::solar_execute, 
this));
+short nRet = ModalDialog::Execute();
 
 // 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 'distro/lhm/libreoffice-5-2+backports' - shell/source

[Katarina Behrens (via logerrit)]

 shell/source/backends/kde5be/kde5backend.cxx |   56 ---
 1 file changed, 42 insertions(+), 14 deletions(-)

New commits:
commit cf034c3db6aaf1417ab979fb97cf6068d3406c6c
Author: Katarina Behrens 
AuthorDate: Tue Apr 16 09:47:31 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Apr 17 18:18:06 2019 +0200

Stop qt event loop after KDE settings have been read

Two use-cases here in kde5backend
1) kde or qt vclplug has already started qt event loop => just use this
loop to read KDE settings
2) no qt event loop runs (we're most likely in gtk3_kde5 vclplug) =>
start a new event loop, read the settings and stop it

In case 2) letting qt event loop run means subsequently all UI ops
need to happen in main thread. This is problematic to enforce in
non-qt-based vclplugs

In both cases, cache those settings for future use - the assumption is,
most of them are static during a session anyway.

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

diff --git a/shell/source/backends/kde5be/kde5backend.cxx 
b/shell/source/backends/kde5be/kde5backend.cxx
index 9f9fb6f5c23b..a0093ed08039 100644
--- a/shell/source/backends/kde5be/kde5backend.cxx
+++ b/shell/source/backends/kde5be/kde5backend.cxx
@@ -120,7 +120,7 @@ private:
 {
 }
 
-bool enabled_;
+std::map> m_KDESettings;
 };
 
 OString getDisplayArg()
@@ -148,10 +148,28 @@ OString getExecutable()
 return OUStringToOString(aBin, osl_getThreadTextEncoding());
 }
 
+void readKDESettings(std::map>& 
rSettings)
+{
+const std::vector aKeys
+= { "EnableATToolSupport",  "ExternalMailer",   
"SourceViewFontHeight",
+"SourceViewFontName",   "WorkPathVariable", 
"ooInetFTPProxyName",
+"ooInetFTPProxyPort",   "ooInetHTTPProxyName",  
"ooInetHTTPProxyPort",
+"ooInetHTTPSProxyName", "ooInetHTTPSProxyPort", "ooInetNoProxy",
+"ooInetProxyType" };
+
+for (const OUString& aKey : aKeys)
+{
+css::beans::Optional aValue = 
kde5access::getValue(aKey);
+std::pair> elem
+= std::make_pair(aKey, aValue);
+rSettings.insert(elem);
+}
+}
+
 // init the QApplication when we load the kde5backend into a non-Qt vclplug 
(e.g. Gtk3KDE5)
 // TODO: use a helper process to read these values without linking to Qt 
directly?
 // TODO: share this code somehow with Qt5Instance.cxx?
-void initQApp()
+void initQApp(std::map>& 
rSettings)
 {
 const auto aDisplay = getDisplayArg();
 int nFakeArgc = aDisplay.isEmpty() ? 2 : 3;
@@ -169,36 +187,42 @@ void initQApp()
 unsetenv("SESSION_MANAGER");
 }
 
-auto app = new QApplication(nFakeArgc, pFakeArgv);
-QObject::connect(app, &QObject::destroyed, app, [nFakeArgc, pFakeArgv]() {
+std::unique_ptr app(new QApplication(nFakeArgc, pFakeArgv));
+QObject::connect(app.get(), &QObject::destroyed, app.get(), [nFakeArgc, 
pFakeArgv]() {
 for (int i = 0; i < nFakeArgc; ++i)
 delete pFakeArgv[i];
 delete[] pFakeArgv;
 });
 
+readKDESettings(rSettings);
+
 if (session_manager != nullptr)
 {
 // coverity[tainted_string] - trusted source for setenv
 setenv("SESSION_MANAGER", session_manager, 1);
 free(session_manager);
 }
-
-QApplication::setQuitOnLastWindowClosed(false);
 }
 
 Service::Service()
-: enabled_(false)
 {
 css::uno::Reference 
context(css::uno::getCurrentContext());
 if (context.is())
 {
-if (!qApp)
-{
-initQApp();
-}
 OUString desktop;
 context->getValueByName("system.desktop-environment") >>= desktop;
-enabled_ = desktop == "KDE5" && qApp != nullptr;
+
+if (desktop == "KDE5")
+{
+if (!qApp) // no qt event loop yet
+{
+// so we start one and read KDE settings
+initQApp(m_KDESettings);
+}
+else // someone else (most likely kde/qt vclplug) has started qt 
event loop
+// all that is left to do is to read KDE settings
+readKDESettings(m_KDESettings);
+}
 }
 }
 
@@ -218,8 +242,12 @@ css::uno::Any Service::getPropertyValue(OUString const& 
PropertyName) throw (com
 || PropertyName == "ooInetHTTPSProxyPort" || PropertyName == 
"ooInetNoProxy"
 || PropertyName == "ooInetProxyType")
 {
-return css::uno::makeAny(enabled_ ? kde5access::getValue(PropertyName)
-  : 
css::beans::Optional());
+std::map>::iterator it
+= m_KDESettings.find(PropertyName);
+if (it != m_KDESettings.end())
+return css::uno::makeAny(it->second);
+else
+return css::uno::makeAny(css::beans::Optional());
 }
 el

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

[Stephan Bergmann (via logerrit)]

 basic/source/classes/sbunoobj.cxx   |2 +-
 chart2/source/controller/main/ChartController_Tools.cxx |2 +-
 toolkit/source/controls/dialogcontrol.cxx   |2 +-
 tools/source/generic/b3dtrans.cxx   |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0e335af4d3f044511551fa2ede20911beaee9b41
Author: Stephan Bergmann 
AuthorDate: Wed Apr 17 14:00:30 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Apr 17 18:56:04 2019 +0200

Fix uses of variables before their lifetimes begin

All of those have been broken with recent loplugin:sequentialassign changes 
(and
have been found with a new plugin to be commited).

The code in SbUnoClass::Find (basic/source/classes/sbunoobj.cxx) looks
suspicious, but has been effectively like that ever since at least
c25ec0608a167bcf1d891043f02273761c351701 "initial import", so just marked it
with a TODO comment for now.

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

diff --git a/basic/source/classes/sbunoobj.cxx 
b/basic/source/classes/sbunoobj.cxx
index 3e150ebf0307..0ece9c2d24ea 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -3328,7 +3328,7 @@ SbxVariable* SbUnoClass::Find( const OUString& rName, 
SbxClassType )
 {
 try
 {
-Any aAny = xField->get( aAny );
+Any aAny = xField->get( {} ); //TODO: does this make sense?
 
 // Convert to Sbx
 pRes = new SbxVariable( SbxVARIANT );
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx 
b/chart2/source/controller/main/ChartController_Tools.cxx
index ff44fc36f224..f22a24f66cbf 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -255,7 +255,7 @@ void ChartController::executeDispatch_Paste()
 {
 Graphic aGraphic;
 // paste location: center of window
-Point aPos = pChartWindow->PixelToLogic( tools::Rectangle( aPos, 
pChartWindow->GetSizePixel()).Center());
+Point aPos = pChartWindow->PixelToLogic( tools::Rectangle( {}, 
pChartWindow->GetSizePixel()).Center());
 
 // handle different formats
 TransferableDataHelper aDataHelper( 
TransferableDataHelper::CreateFromSystemClipboard( pChartWindow ));
diff --git a/toolkit/source/controls/dialogcontrol.cxx 
b/toolkit/source/controls/dialogcontrol.cxx
index cb8b45afda8d..a2fc60f9c8e0 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -1054,7 +1054,7 @@ void UnoFrameControl::ImplSetPosSize( Reference< XControl 
>& rxCtrl )
 if ( pOutDev )
 {
 // Adjust Y based on height of Title
-::tools::Rectangle aRect = pOutDev->GetTextRect( aRect, sTitle );
+::tools::Rectangle aRect = pOutDev->GetTextRect( {}, sTitle );
 nY = nY + ( aRect.GetHeight() / 2 );
 }
 else
diff --git a/tools/source/generic/b3dtrans.cxx 
b/tools/source/generic/b3dtrans.cxx
index 1c3a420cbaf7..a896e9f1b7df 100644
--- a/tools/source/generic/b3dtrans.cxx
+++ b/tools/source/generic/b3dtrans.cxx
@@ -449,7 +449,7 @@ void B3dCamera::CalcFocalLength()
 double fWidth = GetDeviceRectangleWidth();
 
 // Adjust focal length based on given position
-basegfx::B3DPoint aOldPosition = WorldToEyeCoor(aOldPosition);
+basegfx::B3DPoint aOldPosition = WorldToEyeCoor({});
 if(fWidth != 0.0)
 fFocalLength = aOldPosition.getZ() / fWidth * 35.0;
 if(fFocalLength < 5.0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 sw/source/filter/ww8/ww8atr.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 34a151cbb926f78640360760ec6ccc2265538255
Author: Stephan Bergmann 
AuthorDate: Wed Apr 17 15:34:08 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Apr 17 19:05:14 2019 +0200

Better fix for 6340daac7b99c65249363a4bb61c492de31ef5d6

..."Revert broken loplugin:sequentialassign change"

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

diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 528634646659..886ea9dbc904 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -3225,8 +3225,8 @@ void AttributeOutputBase::TextFlyContent( const 
SwFormatFlyCnt& rFlyContent )
 {
 if ( auto pTextNd = dynamic_cast< const SwContentNode *>( 
GetExport().m_pOutFormatNode )  )
 {
-Point aLayPos;
-aLayPos = pTextNd->FindLayoutRect( false, &aLayPos ).Pos();
+Point const origin;
+Point aLayPos = pTextNd->FindLayoutRect( false, &origin ).Pos();
 
 SwPosition aPos( *pTextNd );
 ww8::Frame aFrame( *rFlyContent.GetFrameFormat(), aPos );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Luboš Luňák (via logerrit)]

 android/README |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 446fd75d3e6046d19223d0f1318db051f8444a41
Author: Luboš Luňák 
AuthorDate: Wed Apr 17 19:13:30 2019 +0200
Commit: Luboš Luňák 
CommitDate: Wed Apr 17 19:15:22 2019 +0200

update references about selective debuginfo in android/README

The second case is very likely mistaken though.

Change-Id: I6bfc55800a6b26ce0ae6d3645e4179dc5f683205

diff --git a/android/README b/android/README
index 21ede90e94e4..4ebfab6594ff 100644
--- a/android/README
+++ b/android/README
@@ -200,8 +200,8 @@ Debugging
 -
 
 First of all, you need to configure the build with --enable-debug or
---enable-dbgutil.  You may want to provide --enable-selective-debuginfo too,
-like --enable-selective-debuginfo="sw/" or so, in order to fit into the memory
+--enable-dbgutil.  You may want to provide --enable-symbols to limit debuginfo,
+like --enable-symbols="sw/" or so, in order to fit into the memory
 during linking.
 
 Building with all symbols is also possible but the linking is currently
@@ -291,7 +291,11 @@ SAL_INFO from cppuhelper/source/shlib.cxx in logcat and 
therefore identify
 what services are missing. To do so, you may want add the following
 when configuring the build.
 
---enable-selective-debuginfo="cppuhelper/ sal/"
+--enable-symbols="cppuhelper/ sal/"
+
+[TODO: This is nonsense. --enable-symbols enables the -g option, not SAL_INFO.
+Perhaps this was a misunderstanding of meaning of --enable-selective-debuginfo,
+the old name for the option.]
 
 Which services are combined in the android lib is determined by
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Ritchie Cunningham - Licence Statement.

[Ritchie Cunningham]

Ritchie Cunningham -

All of my past & future contributions to LibreOffice may be licensed under the 
MPLv2/LGPLv3+ dual license.

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

[Libreoffice-commits] core.git: compilerplugins/clang solenv/CompilerTest_compilerplugins_clang.mk

[Stephan Bergmann (via logerrit)]

 compilerplugins/clang/selfinit.cxx   |   88 +++
 compilerplugins/clang/test/selfinit.cxx  |   33 ++
 solenv/CompilerTest_compilerplugins_clang.mk |1 
 3 files changed, 122 insertions(+)

New commits:
commit 05a0c51ced86460b273a24f5884c99f46d8aae0d
Author: Stephan Bergmann 
AuthorDate: Wed Apr 17 19:08:16 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Apr 17 21:59:53 2019 +0200

New loplugin:selfinit

...to find more bugs like the one addressed in
6340daac7b99c65249363a4bb61c492de31ef5d6 "Revert broken
loplugin:sequentialassign change".  What it does is:  "Warn when a variable 
is
referenced from its own initializer.  This is not invalid in general (see 
C++17
[basic.life]), but is at least suspicious."  It found one false positive
(addressed with 884ad0d1af88f9985d30ef0dfe92d89e82f8e576 "Split
localProcessFactory function into class with setter and getter") and five 
true
positives (addressed with e0ccbe72ed6eb0d309ed272a78fd67a512acff5d "Fix use 
of
variable before its lifetime begins" and
0e335af4d3f044511551fa2ede20911beaee9b41 "Fix uses of variables before their
lifetimes begin").

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

diff --git a/compilerplugins/clang/selfinit.cxx 
b/compilerplugins/clang/selfinit.cxx
new file mode 100644
index ..35ce37278f2a
--- /dev/null
+++ b/compilerplugins/clang/selfinit.cxx
@@ -0,0 +1,88 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+
+#include "plugin.hxx"
+
+// Warn when a variable is referenced from its own initializer.  This is not 
invalid in general (see
+// C++17 [basic.life]), but is at least suspicious.
+
+namespace
+{
+class SelfInit : public loplugin::FilteringPlugin
+{
+public:
+explicit SelfInit(loplugin::InstantiationData const& data)
+: FilteringPlugin(data)
+{
+}
+
+bool TraverseVarDecl(VarDecl* decl)
+{
+decls_.push_back({ decl, decl->getCanonicalDecl() });
+auto const ret = FilteringPlugin::TraverseVarDecl(decl);
+decls_.pop_back();
+return ret;
+}
+
+bool TraverseUnaryExprOrTypeTraitExpr(UnaryExprOrTypeTraitExpr* expr)
+{
+if (expr->getKind() == UETT_SizeOf)
+{
+return true;
+}
+return FilteringPlugin::TraverseUnaryExprOrTypeTraitExpr(expr);
+}
+
+bool TraverseCXXTypeidExpr(CXXTypeidExpr const*) { return true; }
+
+bool TraverseCXXNoexceptExpr(CXXNoexceptExpr const*) { return true; }
+
+bool TraverseDecltypeTypeLoc(DecltypeTypeLoc) { return true; }
+
+bool VisitDeclRefExpr(DeclRefExpr const* expr)
+{
+if (ignoreLocation(expr))
+{
+return true;
+}
+for (auto const& i : decls_)
+{
+if (expr->getDecl()->getCanonicalDecl() == i.canonical)
+{
+report(
+DiagnosticsEngine::Warning,
+("referencing a variable during its own initialization is 
error-prone and thus"
+ " suspicious"),
+expr->getLocation())
+<< expr->getSourceRange();
+report(DiagnosticsEngine::Note, "variable declared here", 
i.current->getLocation())
+<< i.current->getSourceRange();
+}
+}
+return true;
+}
+
+private:
+void run() override { 
TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
+
+struct Decl
+{
+VarDecl const* current;
+VarDecl const* canonical;
+};
+
+std::vector decls_;
+};
+
+loplugin::Plugin::Registration X("selfinit");
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/compilerplugins/clang/test/selfinit.cxx 
b/compilerplugins/clang/test/selfinit.cxx
new file mode 100644
index ..412a65b7060f
--- /dev/null
+++ b/compilerplugins/clang/test/selfinit.cxx
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+
+extern int i;
+int i = i;
+// expected-error@-1 {{referencing a variable during its own initialization is 
error-prone and thus suspicious [l

[Libreoffice-commits] dev-tools.git: gerrit/gerrit_site

[Libreoffice Gerrit user]

 gerrit/gerrit_site/etc/GerritSite.css   |   21 
 gerrit/gerrit_site/etc/GerritSiteFooter.html|4 -
 gerrit/gerrit_site/etc/GerritSiteHeader.html|3 -
 gerrit/gerrit_site/etc/gerrit.config|   59 --
 gerrit/gerrit_site/etc/mail/Abandoned.vm|   44 
 gerrit/gerrit_site/etc/mail/ChangeFooter.vm |   52 ---
 gerrit/gerrit_site/etc/mail/ChangeSubject.vm|   37 --
 gerrit/gerrit_site/etc/mail/Comment.vm  |   53 
 gerrit/gerrit_site/etc/mail/MergeFail.vm|   44 
 gerrit/gerrit_site/etc/mail/Merged.vm   |   44 
 gerrit/gerrit_site/etc/mail/NewChange.vm|   63 
 gerrit/gerrit_site/etc/mail/RegisterNewEmail.vm |   49 --
 gerrit/gerrit_site/etc/mail/ReplacePatchSet.vm  |   54 
 13 files changed, 527 deletions(-)

New commits:
commit 404ca62a0e0c2e625f9505b91a23c62b4065457e
Author: Stephan Bergmann 
AuthorDate: Fri Apr 12 13:11:20 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Apr 17 22:01:54 2019 +0200

Remove obsolete gerrit/gerrit_site/etc/ tree

for the configuration of the gerrit.libreoffice.org instance, it has 
apparently
been supserseded by 


Change-Id: I38501ef8a0697027f736393a53f0bf9e89528262
Reviewed-on: https://gerrit.libreoffice.org/70656
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/gerrit/gerrit_site/etc/GerritSite.css 
b/gerrit/gerrit_site/etc/GerritSite.css
deleted file mode 100644
index 4525d33..000
--- a/gerrit/gerrit_site/etc/GerritSite.css
+++ /dev/null
@@ -1,21 +0,0 @@
-#gerrit_header {background-color: #ff; display:inline; position:absolute; 
top:-10px; margin-left:40%;margin-right:60%; width:400px}; 
-#gerrit_header h3 {font-family: 'PT Sans', sans-serif; font-weight: normal; 
letter-spacing: -1px}
-#gerrit_header h2 {font-family: 'PT Sans', sans-serif; font-weight: normal; 
letter-spacing: -1px}
-#gerrit_header h1 {font-family: 'PT Sans', sans-serif; font-weight: normal; 
letter-spacing: -1px}
-
-
-#gerrit_topmenu {background-color:#ff;}
-
-#gerrit_topmenu tbody tr td table.gwt-TabBar {color: #353535; border-bottom: 
1px solid #C5E2EA;}
-
-
-
-#gerrit_topmenu tbody tr td table {border: 0; color:#FCFEEF; border-bottom: 
1px solid #C5E2EA;}
-#gerrit_topmenu tbody tr td table.gwt-TabPanelBottom {color: #353535; 
border-bottom: 1px solid #C5E2EA;}
-
-
-#gerrit_topmenu tbody tr td table.gwt-TabBar {color: #353535; border-bottom: 
1px solid #C5E2EA;}
-#gerrit_topmenu .gwt-Button {padding: 3px 6px}
-#gerrit_topmenu .gwt-TextBox {width: 250px}
-
-
diff --git a/gerrit/gerrit_site/etc/GerritSiteFooter.html 
b/gerrit/gerrit_site/etc/GerritSiteFooter.html
deleted file mode 100644
index 87cf722..000
--- a/gerrit/gerrit_site/etc/GerritSiteFooter.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
-If you need help with your patch or want to discuss it, do not hesitate to 
join #libreoffice-dev on 
freenode IRC
-If you need help with gerrit itself, please send a email to mailto:ger...@otrs.documentfoundation.org";>ger...@otrs.documentfoundation.org
-
diff --git a/gerrit/gerrit_site/etc/GerritSiteHeader.html 
b/gerrit/gerrit_site/etc/GerritSiteHeader.html
deleted file mode 100644
index 6718d51..000
--- a/gerrit/gerrit_site/etc/GerritSiteHeader.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
-  Code Review
- 
diff --git a/gerrit/gerrit_site/etc/gerrit.config 
b/gerrit/gerrit_site/etc/gerrit.config
deleted file mode 100644
index 86339d1..000
--- a/gerrit/gerrit_site/etc/gerrit.config
+++ /dev/null
@@ -1,59 +0,0 @@
-[gerrit]
-   basePath = /home/gerrit2/projects/foo.git
-   canonicalWebUrl = http://idaia.de:8080/
-[database]
-   type = MYSQL
-   hostname = localhost
-   database = reviewdb
-   username = gerrit2
-[auth]
-   type = OPENID
-[sendemail]
-   smtpServer = mail.example.com
-   smtpUser = joe@example.de
-   includeDiff = true
-   maximumDiffSize = 131072
-[container]
-   user = gerrit2
-   javaHome = /usr/lib/jvm/java-6-sun-1.6.0.20/jre
-[sshd]
-   listenAddress = idaia.de:29418
-[httpd]
-   listenUrl = http://idaia.de:8080/
-[cache]
-   directory = cache
-
-[theme]
-backgroundColor = ff
-topMenuColor = ff
-textColor = 00
-trimColor = eef3f5
-selectionColor = d1e6ea
-changeTableOutdatedColor = f5
-tableOddRowColor = ff
-tableEvenRowColor = f5f5ff
-
-[gitweb]
-   revision = "?p=${project}.git;a=commitdiff;h=${commit}"
-
-[commentlink "freedesktop"]
-match = 
"(BUG|Bug|bug|BUGZILLA|Bugzilla|bugzilla|BZ|Bz|bz|TICKET|Ticket|ticket|ISSUE|fdo|FDO):?#?(\\d+)"
-link = https://bugs.libreoffice.org/show_bug.cgi?id=$2
-
-[commentlink "redhat"]
-m

[Libreoffice-commits] core.git: extras/source formula/source include/formula sc/inc sc/source sc/uiconfig solenv/bin solenv/sanitizers vcl/unx

[Caolán McNamara (via logerrit)]

 extras/source/glade/libreoffice-catalog.xml.in |4 
 formula/source/ui/dlg/funcutl.cxx  |1 
 include/formula/funcutl.hxx|2 
 sc/inc/scmod.hxx   |   11 
 sc/source/ui/app/scmod.cxx |   36 +-
 sc/source/ui/dbgui/validate.cxx|  397 +++--
 sc/source/ui/inc/anyrefdg.hxx  |   70 +---
 sc/source/ui/inc/reffact.hxx   |1 
 sc/source/ui/inc/validate.hxx  |  133 +++-
 sc/source/ui/miscdlgs/anyrefdg.cxx |6 
 sc/source/ui/view/cellsh2.cxx  |   29 +
 sc/source/ui/view/reffact.cxx  |   31 -
 sc/uiconfig/scalc/ui/validationcriteriapage.ui |  140 ++--
 sc/uiconfig/scalc/ui/validationdialog.ui   |  104 +-
 solenv/bin/native-code.py  |1 
 solenv/sanitizers/ui/modules/scalc.suppr   |7 
 vcl/unx/gtk3/gtk3gtkinst.cxx   |   36 ++
 17 files changed, 502 insertions(+), 507 deletions(-)

New commits:
commit e54762baa8019d02cadd311e750f6ff0d276f67b
Author: Caolán McNamara 
AuthorDate: Tue Apr 16 17:17:58 2019 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 17 22:21:54 2019 +0200

weld ScTPValidationValue and ScValidationDlg

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

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 0c2957caa44b..797dcfc4a753 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -290,10 +290,6 @@
 generic-name="Reference Button" parent="GtkButton"
 icon-name="widget-gtk-button"/>
 
-
-
 
diff --git a/formula/source/ui/dlg/funcutl.cxx 
b/formula/source/ui/dlg/funcutl.cxx
index 47c3d408d63e..698afeab405c 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -733,6 +733,7 @@ void WeldRefButton::SetReferences( 
IControlReferenceHandler* pDlg, WeldRefEdit*
 
 IMPL_LINK_NOARG(WeldRefButton, Click, weld::Button&, void)
 {
+maClickHdl.Call(*this);
 if( pAnyRefDlg )
 pAnyRefDlg->ToggleCollapsed( pRefEdit, this );
 }
diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx
index 3654d9ebd966..df1d8cb25897 100644
--- a/include/formula/funcutl.hxx
+++ b/include/formula/funcutl.hxx
@@ -219,6 +219,7 @@ private:
 Link maGetFocusHdl;
 Link maLoseFocusHdl;
 Link maActivateHdl;
+Link maClickHdl;
 
 protected:
 DECL_LINK(Click, weld::Button&, void);
@@ -240,6 +241,7 @@ public:
 void SetGetFocusHdl(const Link& rLink) { 
maGetFocusHdl = rLink; }
 void SetLoseFocusHdl(const Link& rLink) { 
maLoseFocusHdl = rLink; }
 void SetActivateHdl(const Link& rLink) { maActivateHdl 
= rLink; }
+void SetClickHdl(const Link& rLink) { maClickHdl = 
rLink; }
 };
 
 
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index 2a3fbc04b748..5b4e519fd693 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -75,7 +75,7 @@ class ScSelectionTransferObj;
 class ScFormEditData;
 class ScMarkData;
 struct ScDragData;
-class SfxModelessDialogController;
+class SfxDialogController;
 
 class ScModule: public SfxModule, public SfxListener, public 
utl::ConfigurationListener
 {
@@ -109,7 +109,8 @@ class ScModule: public SfxModule, public SfxListener, 
public utl::ConfigurationL
 boolm_bIsInSharedDocSaving:1;
 
 std::map > > m_mapRefWindow;
-std::map> 
m_mapRefController;
+// a way to find existing Dialogs for a given parent Window of the slot 
type
+std::map, weld::Window*>>> 
m_mapRefController;
 
 css::uno::Reference< ooo::vba::XSinkCaller > 
mxAutomationApplicationEventsCaller;
 
@@ -250,10 +251,10 @@ public:
 
 SC_DLLPUBLIC void   RegisterRefWindow( sal_uInt16 nSlotId, vcl::Window 
*pWnd );
 SC_DLLPUBLIC void   UnregisterRefWindow( sal_uInt16 nSlotId, vcl::Window 
*pWnd );
-SC_DLLPUBLIC vcl::Window * Find1RefWindow( sal_uInt16 nSlotId, vcl::Window 
*pWndAncestor );
 
-SC_DLLPUBLIC void   RegisterRefController( sal_uInt16 nSlotId, 
SfxModelessDialogController *pWnd );
-SC_DLLPUBLIC void   UnregisterRefController( sal_uInt16 nSlotId, 
SfxModelessDialogController *pWnd );
+SC_DLLPUBLIC void   RegisterRefController(sal_uInt16 nSlotId, 
std::shared_ptr& rWnd, weld::Window* pWndAncestor);
+SC_DLLPUBLIC void   UnregisterRefController(sal_uInt16 nSlotId, 
std::shared_ptr& rWnd);
+SC_DLLPUBLIC std::shared_ptr 
Find1RefWindow(sal_uInt16 nSlotId, weld::Window *pWndAncestor);
 
 SC_DLLPUBLIC void 
RegisterAutomationApplicationEventsCaller(css::uno::Reference< 
ooo::vba::XSinkCaller > const& xCaller);
 SC_DLLPUBLIC void CallAutomationApplicationEventSinks(con

[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source

[Caolán McNamara (via logerrit)]

 sc/inc/scmod.hxx  |4 ---
 sc/source/ui/app/scmod.cxx|   31 -
 sc/source/ui/inc/anyrefdg.hxx |   44 +-
 sc/source/ui/inc/validate.hxx |4 +--
 4 files changed, 12 insertions(+), 71 deletions(-)

New commits:
commit d69db73ec1de29ec5b72cdcd2a64873b92cac672
Author: Caolán McNamara 
AuthorDate: Wed Apr 17 15:59:22 2019 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 17 22:22:38 2019 +0200

m_mapRefWindow is unneeded now

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

diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index 5b4e519fd693..2c517eedf770 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -108,7 +108,6 @@ class ScModule: public SfxModule, public SfxListener, 
public utl::ConfigurationL
 boolm_bIsInSharedDocLoading:1;
 boolm_bIsInSharedDocSaving:1;
 
-std::map > > m_mapRefWindow;
 // a way to find existing Dialogs for a given parent Window of the slot 
type
 std::map, weld::Window*>>> 
m_mapRefController;
 
@@ -249,9 +248,6 @@ public:
 voidSetInSharedDocSaving( bool bNew )   { 
m_bIsInSharedDocSaving = bNew; }
 boolIsInSharedDocSaving() const { return 
m_bIsInSharedDocSaving; }
 
-SC_DLLPUBLIC void   RegisterRefWindow( sal_uInt16 nSlotId, vcl::Window 
*pWnd );
-SC_DLLPUBLIC void   UnregisterRefWindow( sal_uInt16 nSlotId, vcl::Window 
*pWnd );
-
 SC_DLLPUBLIC void   RegisterRefController(sal_uInt16 nSlotId, 
std::shared_ptr& rWnd, weld::Window* pWndAncestor);
 SC_DLLPUBLIC void   UnregisterRefController(sal_uInt16 nSlotId, 
std::shared_ptr& rWnd);
 SC_DLLPUBLIC std::shared_ptr 
Find1RefWindow(sal_uInt16 nSlotId, weld::Window *pWndAncestor);
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index c701866a66d4..082b4e32c929 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -2197,37 +2197,6 @@ IMPL_LINK( ScModule, CalcFieldValueHdl, EditFieldInfo*, 
pInfo, void )
 }
 }
 
-void ScModule::RegisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd )
-{
-std::vector > & rlRefWindow = m_mapRefWindow[nSlotId];
-
-if( std::find( rlRefWindow.begin(), rlRefWindow.end(), pWnd ) == 
rlRefWindow.end() )
-{
-rlRefWindow.emplace_back(pWnd );
-}
-
-}
-
-void  ScModule::UnregisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd )
-{
-auto iSlot = m_mapRefWindow.find( nSlotId );
-
-if( iSlot == m_mapRefWindow.end() )
-return;
-
-std::vector > & rlRefWindow = iSlot->second;
-
-auto i = std::find( rlRefWindow.begin(), rlRefWindow.end(), pWnd );
-
-if( i == rlRefWindow.end() )
-return;
-
-rlRefWindow.erase( i );
-
-if( rlRefWindow.empty() )
-m_mapRefWindow.erase( nSlotId );
-}
-
 void ScModule::RegisterRefController(sal_uInt16 nSlotId, 
std::shared_ptr& rWnd, weld::Window* pWndAncestor)
 {
 std::vector, 
weld::Window*>> & rlRefWindow = m_mapRefController[nSlotId];
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 7fd1c4b19381..978c733fb784 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -209,19 +209,16 @@ struct ScRefHdlrImpl: ScRefHdlrImplBase< TBase, bBindRef >
 ScRefHdlrImpl( const T1 & rt1, const T2 & rt2, const T3& rt3, const T4& 
rt4 )
 : ScRefHdlrImplBase(rt1, rt2, rt3, rt4)
 {
-SC_MOD()->RegisterRefWindow( static_cast( TDerived::SLOTID 
), this );
 }
 
 template
 ScRefHdlrImpl( const T1 & rt1, const T2 & rt2, const T3& rt3, const T4& 
rt4, const T5& rt5 )
 : ScRefHdlrImplBase(rt1, rt2, rt3, rt4, rt5)
 {
-SC_MOD()->RegisterRefWindow( static_cast( TDerived::SLOTID 
), this );
 }
 
 virtual void dispose() override
 {
-SC_MOD()->UnregisterRefWindow( static_cast( 
TDerived::SLOTID ), this );
 ScRefHdlrImplBase::disposeRefHandler();
 TBase::dispose();
 }
commit b6075c3afed5837a79a9c509f5b38f38eeacf6dc
Author: Caolán McNamara 
AuthorDate: Wed Apr 17 15:46:05 2019 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 17 22:22:18 2019 +0200

boil incomprehensible template spew down to its simpler reality

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

diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 99c57edf5320..7fd1c4b19381 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -241,49 +241,28 @@ struct ScAnyRefDlg : ::ScRefHdlrImpl< ScAnyRefDlg, 
SfxModelessDialog>
 }
 };
 
-template<  class TWindow, bool bBindRef = true >
-class ScRefHdlrControllerImplBas

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

[Zdeněk Crhonek (via logerrit)]

 sw/qa/uitest/writer_tests/data/tdf118540.docx |binary
 sw/qa/uitest/writer_tests5/tdf118540.py   |   36 ++
 2 files changed, 36 insertions(+)

New commits:
commit c0af0d16193ccc82536ed61fc0f76e2bcdfef1b1
Author: Zdeněk Crhonek 
AuthorDate: Tue Apr 16 21:15:56 2019 +0200
Commit: Zdenek Crhonek 
CommitDate: Wed Apr 17 22:54:53 2019 +0200

uitest for bug tdf#118540

Change-Id: I71f479c00e47c277fe08329b4abd20dba8d68224
Reviewed-on: https://gerrit.libreoffice.org/70840
Tested-by: Jenkins
Reviewed-by: Zdenek Crhonek 

diff --git a/sw/qa/uitest/writer_tests/data/tdf118540.docx 
b/sw/qa/uitest/writer_tests/data/tdf118540.docx
new file mode 100644
index ..64022073e92f
Binary files /dev/null and b/sw/qa/uitest/writer_tests/data/tdf118540.docx 
differ
diff --git a/sw/qa/uitest/writer_tests5/tdf118540.py 
b/sw/qa/uitest/writer_tests5/tdf118540.py
new file mode 100644
index ..0e00ad7ec0f3
--- /dev/null
+++ b/sw/qa/uitest/writer_tests5/tdf118540.py
@@ -0,0 +1,36 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-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/.
+#
+
+from uitest.framework import UITestCase
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict
+from uitest.debug import sleep
+import org.libreoffice.unotest
+import pathlib
+
+def get_url_for_data_file(file_name):
+   return 
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
+
+#Bug 118540 - LO6.1b2: DOCX crashes when properties are opened in print 
preview mode
+
+class tdf118540(UITestCase):
+   def test_tdf118540_preview_document_properties(self):
+writer_doc = 
self.ui_test.load_file(get_url_for_data_file("tdf118540.docx"))
+document = self.ui_test.get_component()
+self.xUITest.executeCommand(".uno:PrintPreview")  #open print preview
+
self.ui_test.execute_dialog_through_command(".uno:SetDocumentProperties") #open 
properties dialog
+xDialog = self.xUITest.getTopFocusWindow()
+xOkBtn = xDialog.getChild("ok")
+xOkBtn.executeAction("CLICK", tuple())
+self.xUITest.executeCommand(".uno:ClosePreview")  # close print preview
+#verify
+self.assertEqual(document.Text.String[0:4], "Test")
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Libreoffice Gerrit user]

 source/text/sbasic/python/python_import.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a1e2a03853bb6efebfc0e09679fef829d87745a9
Author: Olivier Hallot 
AuthorDate: Wed Apr 17 16:30:22 2019 +0200
Commit: Olivier Hallot 
CommitDate: Wed Apr 17 23:00:37 2019 +0200

Fix PRODUCTNAME

Change-Id: I11a5ac0e5c1a33eb6f28c32024dab0fceec91e14
Reviewed-on: https://gerrit.libreoffice.org/70888
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/sbasic/python/python_import.xhp 
b/source/text/sbasic/python/python_import.xhp
index 43ec28107..d8dc7a61d 100644
--- a/source/text/sbasic/python/python_import.xhp
+++ b/source/text/sbasic/python/python_import.xhp
@@ -22,7 +22,7 @@
 PythonLibraries
 
 Importing 
Python Modules
-LibreOffice Python scripts come in 
three distinct flavors, they can be personal, shared or embedded in documents. 
They are stored in varying places described in Python Scripts Organization and 
Location. In order to import Python modules, their locations must be 
known from Python at run time.
+%PRODUCTNAME Python scripts come in 
three distinct flavors, they can be personal, shared or embedded in documents. 
They are stored in varying places described in Python Scripts Organization and 
Location. In order to import Python modules, their locations must be 
known from Python at run time.
 This mechanism is illustrated for 
file system based modules and document based modules. Exception handling is 
omitted for clarity. The terms library or directory, scripts or modules are 
used interchangeably. A Python macro refers to a function inside a 
module.
 Note that /Scripts/python/pythonpath local directory is always 
explored when running a Python macro from /Scripts/python.
 File System module import
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8b1ab55b49efca270bea7aae0f538480bd5bb1e6
Author: Olivier Hallot 
AuthorDate: Wed Apr 17 16:30:22 2019 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Apr 17 23:00:37 2019 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - Fix PRODUCTNAME

Change-Id: I11a5ac0e5c1a33eb6f28c32024dab0fceec91e14
Reviewed-on: https://gerrit.libreoffice.org/70888
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 2876d94eb8de..a1e2a03853bb 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2876d94eb8de71136de6239dd5387a79002a6acc
+Subproject commit a1e2a03853bb6efebfc0e09679fef829d87745a9
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Tagging text as being in arbitrary complex-script languages

[Richard Wordingham]

On Wed, 17 Apr 2019 13:53:25 +0200
Eike Rathke  wrote:

> > > On 4/15/19 12:26 PM, Eike Rathke wrote:  
> > > > Adding arbitrary dictionary languages (as long as they strictly
> > > > follow the BCP 47 language tag specification) works since quite
> > > > a while (2014?) already.  

> > An interesting experiment would be to try adding a language to both
> > Western and CTL (as with Mongolian and some minor SEA languages) or
> > Western and CJK (various Zhuang writing systems), though I suppose
> > it won't hurt to simply disambiguate by script.  
> 
> In fact you have to, or use an ISO 639-1/2/3 language code that
> implies a default script for one and specify an ISO 15924 script code
> for the other, which I was referring with "correct BCP 47 language
> tags".

Is there a pointer as to which tag sequences that "strictly follow the
BCP 47 language tag specification" are "correct"?

As far as I can tell, the following all strictly follow the
specification:

"sa" Sanskrit, with no specification of the script or spelling
conventions.

"sa-IN" Sanskrit as used in India - so far as I can tell, that could be
in, for example, Devanagari, Grantha or even the Tamil script!  For
Devanagari at least, I understand that this implies that homorganic
nasals may be written using U+0902 DEVANAGARI SIGN ANUSVARA.

"sa-150" Sanskrit written using European conventions - so, any script,
but, at least for Devanagari, the anusvara sign is not used for
homorganic nasals.

"sa-Deva-150" Sanskrit written in Devanagari in the manner used in
Europe.

"sa-Latn" Sanskrit written in the Roman script.

"sa-Latf" Sanskrit written in Fraktur (I'm not sure that this exists.
It might need a hint as to where to find a Fraktur script with a
combining candrabindu.)

The only Sanskrit tag sequence I can find in isolang.cxx is "sa-IN".

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

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

[Tamás Zolnai (via logerrit)]

 desktop/qa/desktop_app/test_desktop_app.cxx |2 +-
 desktop/source/app/cmdlineargs.cxx  |8 
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit f6dc5636c1eda8aebeac3f7b85dd61499523d6a3
Author: Tamás Zolnai 
AuthorDate: Wed Apr 17 12:33:13 2019 +0200
Commit: Tamás Zolnai 
CommitDate: Wed Apr 17 23:36:58 2019 +0200

SharePoint connection: Better handling of encoded URLs

Handle %7c with small letters.
Make sure that the output parameter's content is not
affected by decoding.

Change-Id: Ie3faad2461815497c0edfb04a589fc57aeb7d66b
Reviewed-on: https://gerrit.libreoffice.org/70873
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai 

diff --git a/desktop/qa/desktop_app/test_desktop_app.cxx 
b/desktop/qa/desktop_app/test_desktop_app.cxx
index 055c8cf5434e..1a027dfade78 100644
--- a/desktop/qa/desktop_app/test_desktop_app.cxx
+++ b/desktop/qa/desktop_app/test_desktop_app.cxx
@@ -113,7 +113,7 @@ void Test::testTdf100837() {
 
 {
 // 3. Test enocded URLs
-TestSupplier supplier{ "foo", "ms-word:ofe%7Cu%7Cbar1", 
"ms-word:ofv%7Cu%7Cbar2", "ms-word:nft%7Cu%7Cbar3", "baz" };
+TestSupplier supplier{ "foo", "ms-word:ofe%7Cu%7cbar1", 
"ms-word:ofv%7cu%7Cbar2", "ms-word:nft%7Cu%7cbar3", "baz" };
 desktop::CommandLineArgs args(supplier);
 auto vOpenList = args.GetOpenList();
 auto vForceOpenList = args.GetForceOpenList();
diff --git a/desktop/source/app/cmdlineargs.cxx 
b/desktop/source/app/cmdlineargs.cxx
old mode 100755
new mode 100644
index acb266eb335e..30d0c3f4cced
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -131,25 +131,25 @@ CommandLineEvent CheckOfficeURI(/* in,out */ OUString& 
arg, CommandLineEvent cur
 long nURIlen = -1;
 
 // URL might be encoded
-rest1 = rest1.replaceAll("%7C", "|");
+OUString decoded_rest = rest1.replaceAll("%7C", "|").replaceAll("%7c", 
"|");
 
 // 2. Discriminate by command name (incl. 1st command argument descriptor)
 //Extract URI: everything up to possible next argument
-if (rest1.startsWith("ofv|u|", &rest2))
+if (decoded_rest.startsWith("ofv|u|", &rest2))
 {
 // Open for view - override only in default mode
 if (curEvt == CommandLineEvent::Open)
 curEvt = CommandLineEvent::View;
 nURIlen = rest2.indexOf("|");
 }
-else if (rest1.startsWith("ofe|u|", &rest2))
+else if (decoded_rest.startsWith("ofe|u|", &rest2))
 {
 // Open for editing - override only in default mode
 if (curEvt == CommandLineEvent::Open)
 curEvt = CommandLineEvent::ForceOpen;
 nURIlen = rest2.indexOf("|");
 }
-else if (rest1.startsWith("nft|u|", &rest2))
+else if (decoded_rest.startsWith("nft|u|", &rest2))
 {
 // New from template - override only in default mode
 if (curEvt == CommandLineEvent::Open)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Tagging text as being in arbitrary complex-script languages

[jonathon]

On 4/17/19 9:11 PM, Richard Wordingham wrote:

> "sa-Latf" Sanskrit written in Fraktur (I'm not sure that this exists.

It does.
I stumbled across it, recommended as a potential security measure, when
private individuals are prohibited by law from using encryption.

I've also seen it in either an alt-history novel, or a conlang/conscript
orientated book.

> It might need a hint as to where to find a Fraktur script with a combining 
> candrabindu.)

Modified NoTo font, with combining candrabindu in the private use area.

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

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

[Rasmus Jonsson (via logerrit)]

 include/svx/srchdlg.hxx   |2 +-
 svx/source/dialog/srchdlg.cxx |   25 +
 2 files changed, 26 insertions(+), 1 deletion(-)

New commits:
commit 96bf1e53fba51ad42742bba66469bea911b57325
Author: Rasmus Jonsson 
AuthorDate: Mon Apr 15 11:17:22 2019 +0200
Commit: Jim Raykowski 
CommitDate: Thu Apr 18 03:11:57 2019 +0200

tdf#106723 Improve visibility of not found search term

Move SetSearchLabel definition to srchdlg.cxx
Set control foreground to red on failed search and reset on text input
modification.
For the find & replace dialog, use set_entry_error for the same.
Reset "not found" search label on modification of search term.

Change-Id: Ia89d2e8d3ca35e2c184d5b7048af8267b57f2c17
Reviewed-on: https://gerrit.libreoffice.org/70662
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 
Reviewed-by: Jim Raykowski 

diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 5786c1e84c74..3d19b6e7cae5 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -130,7 +130,7 @@ public:
 bool GetSrchFlag() { return mbSuccess; }
 voidSetSaveToModule(bool b);
 
-void SetSearchLabel(const OUString& rStr) { 
m_xSearchLabel->set_label(rStr); }
+void SetSearchLabel(const OUString& rStr);
 
 private:
 boolmbSuccess;
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 5ba428cf433c..a0af88237f15 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -73,6 +73,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -543,6 +544,13 @@ void SvxSearchDialog::SetSaveToModule(bool b)
 pImpl->bSaveToModule = b;
 }
 
+void SvxSearchDialog::SetSearchLabel(const OUString& rStr)
+{
+m_xSearchLabel->set_label(rStr);
+
+if (rStr == SvxResId(RID_SVXSTR_SEARCH_NOT_FOUND))
+m_xSearchLB->set_entry_error(true);
+}
 
 void SvxSearchDialog::ApplyTransliterationFlags_Impl( TransliterationFlags 
nSettings )
 {
@@ -2174,7 +2182,11 @@ void SvxSearchDialog::PaintAttrText_Impl()
 void SvxSearchDialog::SetModifyFlag_Impl( const weld::Widget* pCtrl )
 {
 if (m_xSearchLB.get() == pCtrl)
+{
 nModifyFlag |= ModifyFlags::Search;
+m_xSearchLB->set_entry_error(false);
+SvxSearchDialogWrapper::SetSearchLabel("");
+}
 else if ( m_xReplaceLB.get() == pCtrl )
 nModifyFlag |= ModifyFlags::Replace;
 else if ( m_xWordBtn.get() == pCtrl )
@@ -2353,6 +2365,8 @@ static void lcl_SetSearchLabelWindow(const OUString& rStr)
 if (!pViewFrame)
 return;
 
+bool bNotFound = rStr == SvxResId(RID_SVXSTR_SEARCH_NOT_FOUND);
+
 css::uno::Reference< css::beans::XPropertySet > xPropSet(
 pViewFrame->GetFrame().GetFrameInterface(), 
css::uno::UNO_QUERY_THROW);
 css::uno::Reference< css::frame::XLayoutManager > xLayoutManager;
@@ -2377,6 +2391,17 @@ static void lcl_SetSearchLabelWindow(const OUString& 
rStr)
 else
 pSearchLabel->SetSizePixel(pSearchLabel->get_preferred_size());
 }
+
+if (pToolBox->GetItemCommand(id) == ".uno:FindText")
+{
+ComboBox* pFindText = 
dynamic_cast(pToolBox->GetItemWindow(id));
+assert(pFindText);
+Edit* pEdit = pFindText->GetSubEdit();
+if (bNotFound)
+pEdit->SetControlForeground(COL_LIGHTRED);
+else
+pEdit->SetControlForeground();
+}
 }
 xLayoutManager->doLayout();
 pToolBox->Resize();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jim Raykowski (via logerrit)]

 sw/source/core/crsr/crsrsh.cxx |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit aebf19251cef417b387c7830535542ff11d54cea
Author: Jim Raykowski 
AuthorDate: Thu Apr 11 23:42:25 2019 -0800
Commit: Jim Raykowski 
CommitDate: Thu Apr 18 04:11:34 2019 +0200

tdf#115600 Display not found message for Navigate by Selection

...if there is no selection found

Change-Id: Ie4857e8d1bb98e41565aef47d3a794dcbe9bbd66
Reviewed-on: https://gerrit.libreoffice.org/70645
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index f04c7a06e1f8..22a84c6b4f75 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -22,6 +22,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1343,8 +1344,14 @@ void SwCursorShell::NotifyCursor(SfxViewShell* 
pOtherShell) const
 /// go to the next SSelection
 bool SwCursorShell::GoNextCursor()
 {
+SvxSearchDialogWrapper::SetSearchLabel( SearchLabel::Empty );
+
 if( !m_pCurrentCursor->IsMultiSelection() )
+{
+if( !m_pCurrentCursor->HasMark() )
+SvxSearchDialogWrapper::SetSearchLabel( 
SearchLabel::NavElementNotFound );
 return false;
+}
 
 SET_CURR_SHELL( this );
 SwCallLink aLk( *this ); // watch Cursor-Moves; call Link if needed
@@ -1362,8 +1369,14 @@ bool SwCursorShell::GoNextCursor()
 /// go to the previous SSelection
 bool SwCursorShell::GoPrevCursor()
 {
+SvxSearchDialogWrapper::SetSearchLabel( SearchLabel::Empty );
+
 if( !m_pCurrentCursor->IsMultiSelection() )
+{
+if( !m_pCurrentCursor->HasMark() )
+SvxSearchDialogWrapper::SetSearchLabel( 
SearchLabel::NavElementNotFound );
 return false;
+}
 
 SET_CURR_SHELL( this );
 SwCallLink aLk( *this ); // watch Cursor-Moves; call Link if needed
___
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' - extensions/source

[Tomaž Vajngerl (via logerrit)]

 extensions/source/macosx/spotlight/OOoContentDataParser.m |4 
 1 file changed, 4 insertions(+)

New commits:
commit e6212862e3ace07136d4c68ee813696f3c6a2aef
Author: Tomaž Vajngerl 
AuthorDate: Mon Apr 15 13:14:53 2019 +0900
Commit: Tomaž Vajngerl 
CommitDate: Thu Apr 18 14:50:31 2019 +0900

tdf#122172 set textContent to nil in OOoContentDataProvider

This should prevent the crash - at least it did for me AFAICS.

Change-Id: I489264d8054e6577b948b0ab307c863d3140788a
Reviewed-on: https://gerrit.libreoffice.org/70755
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 9f392d0c09bd946e4660ccc2d48ee3ae1367343c)

diff --git a/extensions/source/macosx/spotlight/OOoContentDataParser.m 
b/extensions/source/macosx/spotlight/OOoContentDataParser.m
index d394115a3010..89d92a8c126a 100644
--- a/extensions/source/macosx/spotlight/OOoContentDataParser.m
+++ b/extensions/source/macosx/spotlight/OOoContentDataParser.m
@@ -98,6 +98,7 @@
 
 [textContent appendString:[NSString 
stringWithString:runningTextContent]];
 [runningTextContent release];
+runningTextContent = nil;
 }
 shouldReadCharacters = NO;
 }
@@ -125,9 +126,11 @@
 
 if (runningTextContent != nil) {
 [runningTextContent release];
+runningTextContent = nil;
 }
 if (textContent != nil) {
 [textContent release];
+textContent = nil;
 }
 }
 
@@ -137,6 +140,7 @@
 if (textContent != nil && [textContent length] > 0) {
 [mdiValues setObject:[NSString stringWithString:textContent] 
forKey:(NSString*)kMDItemTextContent];
 [textContent release];
+textContent = nil;
 }
 }
 
___
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' - vcl/source

[Tomaž Vajngerl (via logerrit)]

 vcl/source/control/edit.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a7764314bc3f84f0dc812b7bc6e860876dee5040
Author: Tomaž Vajngerl 
AuthorDate: Wed Apr 17 12:24:17 2019 +0900
Commit: Tomaž Vajngerl 
CommitDate: Thu Apr 18 14:59:51 2019 +0900

tdf#124032 fix Edit background drawing

IsPaintTransparent() is preventing to paint the background but
not sure why this is needed. removing this condition doesn't
seem to have any ill effects.

Reviewed-on: https://gerrit.libreoffice.org/70855
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 1e917af27d18d934f3e9122aa98cd950b74ca246)

Change-Id: I5ac54e208e4f1c9941beb4012aa44182d21dbed9
(cherry picked from commit 23d475949580d1b104f9bd34abe0441cfc0461ae)

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 7560860de9de..370808a9147d 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -339,6 +339,7 @@ void Edit::ImplInit(vcl::Window* pParent, WinBits nStyle)
 SetCursor( new vcl::Cursor );
 
 SetPointer( Pointer( PointerStyle::Text ) );
+ApplySettings(*this);
 
 uno::Reference< datatransfer::dnd::XDragGestureListener> xDGL( 
mxDnDListener, uno::UNO_QUERY );
 uno::Reference< datatransfer::dnd::XDragGestureRecognizer > xDGR = 
GetDragGestureRecognizer();
@@ -392,7 +393,7 @@ void Edit::ApplySettings(vcl::RenderContext& rRenderContext)
 Color aTextColor = rStyleSettings.GetFieldTextColor();
 ApplyControlForeground(rRenderContext, aTextColor);
 
-if (ImplUseNativeBorder(rRenderContext, GetStyle()) || 
IsPaintTransparent())
+if (ImplUseNativeBorder(rRenderContext, GetStyle()))
 {
 // Transparent background
 rRenderContext.SetBackground();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Crash test update

[Noel Grandin]

>
> There seems to be outstanding just two different distinct crashes,
> which looked sufficiently non-trivial I didn't have a stab at fixing it
> myself, one on reexport to ods of ooo118068-1.ods and one on import of
> e.g. ooo6593-5.sxc
>
>
>
Fixed now with 3df2e918408535acd2c4d028bfae70901ad24e62
and ac9aa53d51a4f359342274d107aed6df85658c55
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source

[Noel Grandin (via logerrit)]

 sc/inc/document.hxx|2 ++
 sc/source/core/data/dociter.cxx|4 ++--
 sc/source/core/data/documen3.cxx   |5 +
 sc/source/core/data/document10.cxx |9 +
 sc/source/filter/xml/XMLStylesExportHelper.cxx |1 +
 5 files changed, 19 insertions(+), 2 deletions(-)

New commits:
commit ac9aa53d51a4f359342274d107aed6df85658c55
Author: Noel Grandin 
AuthorDate: Wed Apr 17 21:40:28 2019 +0200
Commit: Noel Grandin 
CommitDate: Thu Apr 18 08:49:41 2019 +0200

crashtesting: failure on import of ooo6593-5.stc

since
commit 7282014e362a1529a36c88eb308df8ed359c2cfa
Date:   Fri Feb 1 15:15:16 2019 +0100
tdf#50916 Makes numbers of columns dynamic

Change-Id: I858e61b3a1158bf47b5855e56d63c77cc87aa09b
Reviewed-on: https://gerrit.libreoffice.org/70902
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 48dbe6c04e69..cdeab88fdfcb 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -787,6 +787,7 @@ public:
 ScRangePairListRef& GetRowNameRangesRef() { return xRowNameRanges; }
 
 SC_DLLPUBLIC SCCOL ClampToAllocatedColumns(SCTAB nTab, SCCOL nCol) const;
+SC_DLLPUBLIC SCCOL GetAllocatedColumnsCount(SCTAB nTab) const;
 
 SC_DLLPUBLIC ScDBCollection* GetDBCollection() const { return 
pDBCollection.get();}
 void SetDBCollection( 
std::unique_ptr pNewDBCollection,
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 8458e2895684..ec81363846f2 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -829,7 +829,6 @@ ScCellIterator::ScCellIterator( ScDocument* pDoc, const 
ScRange& rRange, Subtota
 maEndPos(rRange.aEnd),
 mnSubTotalFlags(nSubTotalFlags)
 {
-maEndPos.SetCol( pDoc->ClampToAllocatedColumns(maStartPos.Tab(), 
maEndPos.Col()) );
 init();
 }
 
@@ -914,7 +913,8 @@ bool ScCellIterator::getCurrent()
 do
 {
 maCurPos.IncCol();
-if (maCurPos.Col() > maEndPos.Col())
+if (maCurPos.Col() >= 
mpDoc->GetAllocatedColumnsCount(maCurPos.Tab())
+|| maCurPos.Col() > maEndPos.Col())
 {
 maCurPos.SetCol(maStartPos.Col());
 maCurPos.IncTab();
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 75f1cdab071a..0bcf1aa37580 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -2103,4 +2103,9 @@ SCCOL ScDocument::ClampToAllocatedColumns(SCTAB nTab, 
SCCOL nCol) const
 return maTabs[nTab]->ClampToAllocatedColumns(nCol);
 }
 
+SCCOL ScDocument::GetAllocatedColumnsCount(SCTAB nTab) const
+{
+return maTabs[nTab]->GetAllocatedColumnsCount();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 3df2e918408535acd2c4d028bfae70901ad24e62
Author: Noel Grandin 
AuthorDate: Wed Apr 17 21:03:26 2019 +0200
Commit: Noel Grandin 
CommitDate: Thu Apr 18 08:49:32 2019 +0200

crashtesting: failure on export of ooo118068-1.ods  to ods

since
commit 7282014e362a1529a36c88eb308df8ed359c2cfa
Date:   Fri Feb 1 15:15:16 2019 +0100
tdf#50916 Makes numbers of columns dynamic

Change-Id: Ib8dc06b80beed81a2543f343483599c425e87369
Reviewed-on: https://gerrit.libreoffice.org/70901
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index bd6db82a7d00..48dbe6c04e69 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -2454,6 +2454,7 @@ public:
 voidDeleteBroadcasters( sc::ColumnBlockPosition& 
rBlockPos, const ScAddress& rTopPos, SCROW nLength );
 
 std::unique_ptr GetColumnIterator( SCTAB nTab, SCCOL 
nCol, SCROW nRow1, SCROW nRow2 ) const;
+void CreateColumnIfNotExists( SCTAB nTab, SCCOL nCol );
 
 SC_DLLPUBLIC void StoreTabToCache(SCTAB nTab, SvStream& rStrm) const;
 SC_DLLPUBLIC void RestoreTabFromCache(SCTAB nTab, SvStream& rStream);
diff --git a/sc/source/core/data/document10.cxx 
b/sc/source/core/data/document10.cxx
index c286ecba4c98..429fc33074fb 100644
--- a/sc/source/core/data/document10.cxx
+++ b/sc/source/core/data/document10.cxx
@@ -916,6 +916,15 @@ std::unique_ptr 
ScDocument::GetColumnIterator( SCTAB nTab, S
 return pTab->GetColumnIterator(nCol, nRow1, nRow2);
 }
 
+void ScDocument::CreateColumnIfNotExists( SCTAB nTab, SCCOL nCol )
+{
+const ScTable* pTab = FetchTable(nTab);
+if (!pTab)
+return;
+
+pTab->CreateColumnIfNotExists(nCol);
+}
+
 bool ScDocument::EnsureFormulaCellResults( const ScRange& rRange, bool 
bSkipRunning )
 {
 bool bAnyDirty = false;
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx 
b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index 6b2fb2e4a2a4..9cc648340a3c 100644
--- a/s

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

[Mike Kaganski (via logerrit)]

 sw/source/uibase/uiview/viewdraw.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dac004faa077a7794bb3f33aa8a5c8344e1b891e
Author: Mike Kaganski 
AuthorDate: Thu Apr 18 07:48:11 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Thu Apr 18 08:54:16 2019 +0200

Build fix after commit 916c5834d09a4f9742cbdd00ab5d53b140a97153

Change-Id: Ia5ca829877712b9814ce6eee392d8f1f23a7e97b
Reviewed-on: https://gerrit.libreoffice.org/70915
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/sw/source/uibase/uiview/viewdraw.cxx 
b/sw/source/uibase/uiview/viewdraw.cxx
index 09d49e3b52a5..86a671102228 100644
--- a/sw/source/uibase/uiview/viewdraw.cxx
+++ b/sw/source/uibase/uiview/viewdraw.cxx
@@ -353,9 +353,9 @@ void SwView::ExecDraw(SfxRequest& rReq)
 {
 m_pWrtShell->GotoObj(true);
 }
-else if (dynamic_cast(pTempFuncPtr))
+else if (dynamic_cast(pFuncPtr))
 {
-pTempFuncPtr->CreateDefaultObject();
+pFuncPtr->CreateDefaultObject();
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits