[Libreoffice-commits] core.git: config_host/config_global.h.in configure.ac drawinglayer/source

[Libreoffice Gerrit user]

 config_host/config_global.h.in|4 
 configure.ac  |   21 +
 drawinglayer/source/animation/animationtiming.cxx |   10 ++
 3 files changed, 35 insertions(+)

New commits:
commit dc06c8f4989fc28d0c31ebd333e53dfe0e0f5f66
Author: Stephan Bergmann 
AuthorDate: Tue Aug 28 22:24:19 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Aug 29 08:59:15 2018 +0200

-Werror=redundant-move (GCC 9), take two

...after 5b62a43349da6fda13fb33e0f1ec477c21daec8f "Revert
'-Werror=redundant-move'" to fix the build for GCC 8.1 again.  Turns out the
std::move can only be dropped if the compiler has a fix for CWG1579.  For 
GCC
that's the case starting with GCC 5.1, so the !HAVE_CXX_GWG1579_FIX case can
hopefully be removed again soon, see the mail thread starting at

"Compiler baselines (was: [Libreoffice-qa] minutes of ESC call ...)").

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

diff --git a/config_host/config_global.h.in b/config_host/config_global.h.in
index 2bb60ca656ac..375e610a1180 100644
--- a/config_host/config_global.h.in
+++ b/config_host/config_global.h.in
@@ -26,4 +26,8 @@ Any change in this header will cause a rebuild of almost 
everything.
 /* Guaranteed copy elision (C++17), __cpp_guaranteed_copy_elision (C++2a): */
 #define HAVE_CPP_GUARANTEED_COPY_ELISION 0
 
+/* Fix for  
"Return by converting
+   move constructor": */
+#define HAVE_CXX_CWG1579_FIX 0
+
 #endif
diff --git a/configure.ac b/configure.ac
index 4a2d71a04877..4ab159b4146a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6438,6 +6438,27 @@ CXXFLAGS=$save_CXXFLAGS
 AC_LANG_POP([C++])
 AC_SUBST([HAVE_CPP_GUARANTEED_COPY_ELISION])
 
+HAVE_CXX_CWG1579_FIX=
+AC_MSG_CHECKING([whether $CXX has a fix for CWG1579])
+AC_LANG_PUSH([C++])
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11"
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+#include 
+struct S1 {};
+struct S2: S1 {};
+std::unique_ptr f() {
+std::unique_ptr s2(new S2);
+return s2;
+}
+])], [
+AC_DEFINE([HAVE_CXX_CWG1579_FIX],[1])
+AC_MSG_RESULT([yes])
+], [AC_MSG_RESULT([no])])
+CXXFLAGS=$save_CXXFLAGS
+AC_LANG_POP([C++])
+AC_SUBST([HAVE_CXX_CWG1579_FIX])
+
 dnl ===
 dnl system stl sanity tests
 dnl ===
diff --git a/drawinglayer/source/animation/animationtiming.cxx 
b/drawinglayer/source/animation/animationtiming.cxx
index db629aa8d31f..374def8aed6e 100644
--- a/drawinglayer/source/animation/animationtiming.cxx
+++ b/drawinglayer/source/animation/animationtiming.cxx
@@ -18,6 +18,8 @@
  */
 
 #include 
+
+#include 
 #include 
 #include 
 #include 
@@ -190,7 +192,11 @@ namespace drawinglayer
 pNew->append(*i);
 }
 
+#if HAVE_CXX_CWG1579_FIX
+return pNew;
+#else
 return std::move(pNew);
+#endif
 }
 
 bool AnimationEntryList::operator==(const AnimationEntry& rCandidate) 
const
@@ -283,7 +289,11 @@ namespace drawinglayer
 pNew->append(*i);
 }
 
+#if HAVE_CXX_CWG1579_FIX
+return pNew;
+#else
 return std::move(pNew);
+#endif
 }
 
 bool AnimationEntryLoop::operator==(const AnimationEntry& rCandidate) 
const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Implementing accessibility non-regression check tool

[Jan-Marek Glogowski]

Am August 28, 2018 4:04:37 PM UTC schrieb Samuel Thibault :
>Samuel Thibault, le lun. 12 févr. 2018 15:30:59 +0100, a ecrit:
>> - At some point we'll get confident that we won't introduce other
>> big classes of warnings over hundreds of .ui files. That's the point
>> where we can say "ok, let's start fixing the existing issues over
>> all .ui files once for good". We can then run through .ui files one
>> by one, fixing the issues and removing the corresponding suppression
>> lines. These could be used as "easy hacks" entries, they are usually
>> just a few lines to fix.

I'm not sure we want this handled as "easy hacks". The goal was to enable the 
checks always for the build. Is this implemented and can I enable it?

My preferred solution would be, that generating the error files in the current 
build wouldn't break it, but spill the errors to the console to annoy people, 
to get this fixed in time. Mind I have no ideas about the amount of output / 
the current state.

If everything is fixed, we can change it to actually break the build. This is a 
different category then translating German comments!

We can talk about this tomorrow on ESC, if the ML is not sufficient.

> I have completed documentation on fixing them on
>https://wiki.documentfoundation.org/Development/Accessibility
>
>Could people check this documentation before we advertise it more broadly as 
>an "easy hack"?
Nice.

>> The progression of all of this could be monitored with statistics reported 
>> e.g. in the minutes of ESC calls.
So who would be responsible to fix it? If we don't test it on patch submission 
and break on error, it would just pile up again.

ATB

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

[Libreoffice-commits] core.git: sal/osl sal/qa

[Libreoffice Gerrit user]

 sal/osl/w32/security.cxx |   58 +++
 sal/qa/osl/security/osl_Security.cxx |   52 +++
 2 files changed, 19 insertions(+), 91 deletions(-)

New commits:
commit d8d310dcac8ddfdb16756cc863552ef788cfc393
Author: Mike Kaganski 
AuthorDate: Tue Aug 28 23:22:29 2018 +0300
Commit: Mike Kaganski 
CommitDate: Wed Aug 29 08:40:01 2018 +0200

Use ConvertSidToStringSidW instead of composing SID string manually

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

diff --git a/sal/osl/w32/security.cxx b/sal/osl/w32/security.cxx
index 8192dbbb6ded..c70ad92f2931 100644
--- a/sal/osl/w32/security.cxx
+++ b/sal/osl/w32/security.cxx
@@ -24,7 +24,9 @@
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
 #include 
 #include "secimpl.hxx"
 
@@ -305,60 +307,26 @@ sal_Bool SAL_CALL osl_getUserIdent(oslSecurity Security, 
rtl_uString **strIdent)
 if (pInfoBuffer)
 {
 PSID pSid = 
reinterpret_cast(pInfoBuffer)->User.Sid;
-PSID_IDENTIFIER_AUTHORITY psia;
-DWORD dwSubAuthorities;
-DWORD dwCounter;
-DWORD dwSidSize;
-PUCHAR pSSACount;
 
-/* obtain SidIdentifierAuthority */
-psia=GetSidIdentifierAuthority(pSid);
-
-/* obtain sidsubauthority count */
-pSSACount = GetSidSubAuthorityCount(pSid);
-dwSubAuthorities = (*pSSACount < 5) ? *pSSACount : 5;
-
-/* buffer length: S-SID_REVISION- + identifierauthority- + 
subauthorities- + NULL */
-sal_Unicode *Ident=static_cast(malloc(88*sizeof(sal_Unicode)));
-
-/* prepare S-SID_REVISION- */
-dwSidSize=wsprintfW(o3tl::toW(Ident), L"S-%lu-", SID_REVISION);
-
-/* prepare SidIdentifierAuthority */
-if ((psia->Value[0] != 0) || (psia->Value[1] != 0))
+LPWSTR pSidStr = nullptr;
+BOOL bResult = ConvertSidToStringSidW(pSid, &pSidStr);
+if (bResult)
 {
-dwSidSize+=wsprintfW(o3tl::toW(Ident) + 
wcslen(o3tl::toW(Ident)),
-L"0x%02hx%02hx%02hx%02hx%02hx%02hx",
-static_cast(psia->Value[0]),
-static_cast(psia->Value[1]),
-static_cast(psia->Value[2]),
-static_cast(psia->Value[3]),
-static_cast(psia->Value[4]),
-static_cast(psia->Value[5]));
+rtl_uString_newFromStr(strIdent, o3tl::toU(pSidStr));
+LocalFree(pSidStr);
 }
 else
 {
-dwSidSize+=wsprintfW(o3tl::toW(Ident) + 
wcslen(o3tl::toW(Ident)),
-L"%lu",
-static_cast(psia->Value[5]  )   +
-static_cast(psia->Value[4] <<  8)   +
-static_cast(psia->Value[3] << 16)   +
-static_cast(psia->Value[2] << 24)   );
+const DWORD dwError = GetLastError();
+char sBuf[100];
+sprintf(sBuf, "ConvertSidToStringSidW failed. GetLastError 
returned: %d",
+dwError);
+SAL_WARN("sal.osl", sBuf);
 }
 
-/* loop through SidSubAuthorities */
-for (dwCounter=0; dwCounter < dwSubAuthorities; dwCounter++)
-{
-dwSidSize+=wsprintfW(o3tl::toW(Ident) + dwSidSize, L"-%lu",
-*GetSidSubAuthority(pSid, dwCounter) );
-}
-
-rtl_uString_newFromStr( strIdent, Ident );
-
 free(pInfoBuffer);
-free(Ident);
 
-return true;
+return bResult;
 }
 }
 else
diff --git a/sal/qa/osl/security/osl_Security.cxx 
b/sal/qa/osl/security/osl_Security.cxx
index 5c24b8260c4c..a1dff025ce70 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -23,6 +23,7 @@
 # define WIN32_LEAN_AND_MEAN
 #endif
 #include 
+#include 
 #undef min
 #endif
 #include "osl_Security_Const.h"
@@ -477,58 +478,17 @@ void MyTestPlugInImpl::initialize( 
CPPUNIT_NS::TestFactoryRegistry *,
 }
 }
 
-// now got SID successfully, only need to compare SID, so I copied the 
rest lines from source to convert SID to OUString.
-PSID_IDENTIFIER_AUTHORITY psia;
-DWORD dwSubAuthorities;
-DWORD dwSidRev=SID_REVISION;
-DWORD dwCounter;
-DWORD dwSidSize;
-wchar_t *Ident;
-
-/

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

[Libreoffice Gerrit user]

 svtools/qa/unit/testHtmlReader.cxx |   22 ++
 svtools/source/svhtml/parhtml.cxx  |3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)

New commits:
commit 60362accc78fdff4213fa6c28bb4fbf00e06972f
Author: Miklos Vajna 
AuthorDate: Tue Aug 28 18:10:03 2018 +0200
Commit: Miklos Vajna 
CommitDate: Wed Aug 29 08:37:10 2018 +0200

XHTML import:  is one line break

But only for XHTML, HTML stays unchanged to be in sync with web
browsers.

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

diff --git a/svtools/qa/unit/testHtmlReader.cxx 
b/svtools/qa/unit/testHtmlReader.cxx
index b09abaaabdd5..6df6b5541c2d 100644
--- a/svtools/qa/unit/testHtmlReader.cxx
+++ b/svtools/qa/unit/testHtmlReader.cxx
@@ -22,8 +22,11 @@ class TestHTMLParser : public HTMLParser
 public:
 TestHTMLParser(SvStream& rStream);
 virtual void NextToken(HtmlTokenId nToken) override;
+/// Make this public for test purposes.
+using HTMLParser::SetNamespace;
 
 OUString m_aDocument;
+int m_nLineBreakCount = 0;
 };
 
 TestHTMLParser::TestHTMLParser(SvStream& rStream)
@@ -35,6 +38,8 @@ void TestHTMLParser::NextToken(HtmlTokenId nToken)
 {
 if (nToken == HtmlTokenId::TEXTTOKEN)
 m_aDocument += aToken;
+else if (nToken == HtmlTokenId::LINEBREAK)
+++m_nLineBreakCount;
 }
 
 /// Tests HTMLParser.
@@ -42,9 +47,11 @@ class Test : public CppUnit::TestFixture
 {
 public:
 void testTdf114428();
+void testLineBreak();
 
 CPPUNIT_TEST_SUITE(Test);
 CPPUNIT_TEST(testTdf114428);
+CPPUNIT_TEST(testLineBreak);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -63,6 +70,21 @@ void Test::testTdf114428()
 CPPUNIT_ASSERT_EQUAL(OUString("hello"), xParser->m_aDocument.trim());
 }
 
+void Test::testLineBreak()
+{
+SvMemoryStream aStream;
+OString aDocument("aaabbb");
+aStream.WriteBytes(aDocument.getStr(), aDocument.getLength());
+aStream.Seek(0);
+
+tools::SvRef xParser = new TestHTMLParser(aStream);
+xParser->SetNamespace("reqif-xhtml");
+xParser->CallParser();
+
+// This was 2,  was interpreted as 2 line breaks in XHTML mode.
+CPPUNIT_ASSERT_EQUAL(1, xParser->m_nLineBreakCount);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 }
 
diff --git a/svtools/source/svhtml/parhtml.cxx 
b/svtools/source/svhtml/parhtml.cxx
index 14ed546ca9fe..c80fd00d77ed 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -1120,10 +1120,11 @@ HtmlTokenId HTMLParser::GetNextToken_()
 // and there is an off token, return off token 
instead
 nRet = 
static_cast(static_cast(nRet) + 1);
  }
- else if( HtmlTokenId::LINEBREAK!=nRet )
+ else if( HtmlTokenId::LINEBREAK!=nRet || 
!maNamespace.isEmpty())
  {
 // and there is no off token, return unknown token.
 // (except for , that is treated like )
+// No exception for XHTML, though.
 nRet = HtmlTokenId::UNKNOWNCONTROL_OFF;
  }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 external/pdfium/0001-Add-FPDFText_GetFontName-API.patch.1   |   87 
++
 external/pdfium/0002-svx-more-accurate-PDF-text-importing.patch.2   |   10 
+
 external/pdfium/0012-svx-import-processed-PDF-text.patch.2  |4 
 external/pdfium/0015-svx-set-the-font-name-of-imported-PDF-text.patch.2 |   77 

 external/pdfium/UnpackedTarball_pdfium.mk   |3 
 svx/source/svdraw/svdpdf.cxx|7 
 6 files changed, 104 insertions(+), 84 deletions(-)

New commits:
commit b4c003397eb29beff055044091c1d088acda2bae
Author: Miklos Vajna 
AuthorDate: Tue Aug 28 21:07:05 2018 +0200
Commit: Miklos Vajna 
CommitDate: Wed Aug 29 08:37:24 2018 +0200

pdfium: replace FPDFTextObj_GetFontName() patch with backport

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

diff --git a/external/pdfium/0001-Add-FPDFText_GetFontName-API.patch.1 
b/external/pdfium/0001-Add-FPDFText_GetFontName-API.patch.1
new file mode 100644
index ..3ddd8e6b8127
--- /dev/null
+++ b/external/pdfium/0001-Add-FPDFText_GetFontName-API.patch.1
@@ -0,0 +1,87 @@
+From 53d4f0a4526ef996caf5005ae84406a9467423f2 Mon Sep 17 00:00:00 2001
+Date: Wed, 1 Aug 2018 01:28:49 +
+Subject: [PATCH] Add FPDFText_GetFontName() API
+
+This follows the same pattern as DefaultGetFaceName(), so the client has
+to call this function twice, but allocation of the string buffer happens
+outside pdfium.
+
+Change-Id: I06b7dcd00aca9b9b94799dad3f139617d7f5451e
+Reviewed-on: https://pdfium-review.googlesource.com/38870
+Commit-Queue: Lei Zhang 
+Reviewed-by: Lei Zhang 
+Reviewed-by: Henrique Nakashima 
+---
+ fpdfsdk/fpdf_edit_embeddertest.cpp |  28 
+ fpdfsdk/fpdf_edittext.cpp  |  22 ++
+ fpdfsdk/fpdf_view_c_api_test.c |   1 +
+ public/fpdf_edit.h |  18 ++
+ testing/resources/text_font.pdf| Bin 0 -> 10576 bytes
+ 5 files changed, 69 insertions(+)
+ create mode 100644 testing/resources/text_font.pdf
+
+diff --git a/fpdfsdk/fpdf_edittext.cpp b/fpdfsdk/fpdf_edittext.cpp
+index c552d615e..6aa44b3b2 100644
+--- a/fpdfsdk/fpdf_edittext.cpp
 b/fpdfsdk/fpdf_edittext.cpp
+@@ -548,6 +548,28 @@ FPDF_EXPORT double FPDF_CALLCONV 
FPDFTextObj_GetFontSize(FPDF_PAGEOBJECT text) {
+   return pTextObj->GetFontSize();
+ }
+ 
++FPDF_EXPORT unsigned long FPDF_CALLCONV
++FPDFTextObj_GetFontName(FPDF_PAGEOBJECT text,
++void* buffer,
++unsigned long length) {
++  CPDF_TextObject* pTextObj = CPDFTextObjectFromFPDFPageObject(text);
++  if (!pTextObj)
++return 0;
++
++  CPDF_Font* pPdfFont = pTextObj->GetFont();
++  if (!pPdfFont)
++return 0;
++
++  CFX_Font* pFont = pPdfFont->GetFont();
++  ASSERT(pFont);
++
++  ByteString name = pFont->GetFamilyName();
++  unsigned long dwStringLen = name.GetLength() + 1;
++  if (buffer && length >= dwStringLen)
++memcpy(buffer, name.c_str(), dwStringLen);
++  return dwStringLen;
++}
++
+ FPDF_EXPORT void FPDF_CALLCONV FPDFFont_Close(FPDF_FONT font) {
+   CPDF_Font* pFont = CPDFFontFromFPDFFont(font);
+   if (!pFont)
+diff --git a/public/fpdf_edit.h b/public/fpdf_edit.h
+index b97a7adbd..4d5aa9c48 100644
+--- a/public/fpdf_edit.h
 b/public/fpdf_edit.h
+@@ -1256,6 +1256,24 @@ FPDFPageObj_CreateTextObj(FPDF_DOCUMENT document,
+ // Returns one of the FPDF_TEXTRENDERMODE_* flags on success, -1 on error.
+ FPDF_EXPORT int FPDF_CALLCONV FPDFText_GetTextRenderMode(FPDF_PAGEOBJECT 
text);
+ 
++// Experimental API.
++// Get the font name of a text object.
++//
++// text - the handle to the text object.
++// buffer   - the address of a buffer that receives the font name.
++// length   - the size, in bytes, of |buffer|.
++//
++// Returns the number of bytes in the font name (including the trailing NUL
++// character) on success, 0 on error.
++//
++// Regardless of the platform, the |buffer| is always in UTF-8 encoding.
++// If |length| is less than the returned length, or |buffer| is NULL, |buffer|
++// will not be modified.
++FPDF_EXPORT unsigned long FPDF_CALLCONV
++FPDFTextObj_GetFontName(FPDF_PAGEOBJECT text,
++void* buffer,
++unsigned long length);
++
+ // Experimental API.
+ // Get number of page objects inside |form_object|.
+ //
+-- 
+2.16.4
+
diff --git a/external/pdfium/0002-svx-more-accurate-PDF-text-importing.patch.2 
b/external/pdfium/0002-svx-more-accurate-PDF-text-importing.patch.2
index 473fe55fd2e8..6288dccba6b4 100644
--- a/external/pdfium/0002-svx-more-accurate-PDF-text-importing.patch.2
+++ b/external/pdfium/0002-svx-more-accurate-PDF-text-importing.patch.2
@@ -20,7 +20,15 @@ index 912df63..3244943 100644
  #include "core/fpdfapi/page/cpdf_form.h"
  #include "core/fpdfapi/page/cp

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

[Libreoffice Gerrit user]

 0 files changed

New commits:
commit b5fcdfd30c0a75b3365e42082f7af860381b2bc5
Author: Tor Lillqvist 
AuthorDate: Wed Aug 29 08:44:24 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Aug 29 08:44:24 2018 +0300

chmod -x

Change-Id: I6ba581f3665bc2934b8e3af5985ae853d60be39f

diff --git a/sw/source/core/unocore/unoportenum.cxx 
b/sw/source/core/unocore/unoportenum.cxx
old mode 100755
new mode 100644
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Implementing accessibility non-regression check tool

[Samuel Thibault]

Hello,

Samuel Thibault, le lun. 12 févr. 2018 15:30:59 +0100, a ecrit:
> - At some point we'll get confident that we won't introduce other
> big classes of warnings over hundreds of .ui files. That's the point
> where we can say "ok, let's start fixing the existing issues over
> all .ui files once for good". We can then run through .ui files one
> by one, fixing the issues and removing the corresponding suppression
> lines. These could be used as "easy hacks" entries, they are usually
> just a few lines to fix.

I believe we have gotten to this point, and it can now be time to start
fixing warnings.  I have completed documentation on fixing them on

https://wiki.documentfoundation.org/Development/Accessibility

and notably

https://wiki.documentfoundation.org/Development/Accessibility#Fixing_existing_issues

provides this kind of procedure to fix warnings: just remove suppression
rules for a .ui file, fix warnings in the .ui file or mark them as false
positives, submit the result, and move on to another .ui file.

Could people check this documentation before we advertise it more
broadly as an "easy hack"?

> The progression of all of this could be monitored with statistics
> reported e.g. in the minutes of ESC calls.

They could be gathered from e.g. the nightly build logs by grepping for

"\([0-9]+\) suppressed by .*\.suppr"

and adding the figures. I however don't know where such scripts live or
even their language :)

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

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

[Libreoffice Gerrit user]

 vcl/inc/printdlg.hxx   |1 +
 vcl/source/window/printdlg.cxx |9 +
 vcl/uiconfig/ui/printdialog.ui |4 ++--
 3 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 89c4a0a60a711c67fa1e63c0fedf950265b84b3d
Author: Michael Weghorn 
AuthorDate: Tue Aug 28 07:53:43 2018 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Aug 28 22:32:27 2018 +0200

tdf#119556 Sync "Use only paper size from printer preferences"

Since commit ee6dad51150fd53d19f882edfefa879e18f9897d,
the "Use only paper size from printer settings" is shown
at two places in the print dialog

1) in the "Options" tab
2) in the "Properties" -> "Paper" tab

This makes the setting being correctly updated in the UI in
1) as well if changed in 2).

The other way around was already working previously.

Change-Id: I41d29a11b4e1695a4b2f676b8d7a9c01e4abde3e
Reviewed-on: https://gerrit.libreoffice.org/59581
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 
(cherry picked from commit 571df3ede6f09c945c4cdfd37f34ef760b6b1af2)
Reviewed-on: https://gerrit.libreoffice.org/59729
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index b16d91cad1f6..750254700293 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -233,6 +233,7 @@ namespace vcl
 DECL_LINK( ToggleHdl, CheckBox&, void );
 DECL_LINK( ToggleRadioHdl, RadioButton&, void );
 DECL_LINK( ModifyHdl, Edit&, void );
+DECL_LINK( ActivatePageHdl, TabControl *, void);
 
 DECL_LINK( UIOption_CheckHdl, CheckBox&, void );
 DECL_LINK( UIOption_RadioHdl, RadioButton&, void );
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 084763fa934b..b59bfc17dfe3 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -723,6 +723,7 @@ PrintDialog::PrintDialog( vcl::Window* i_pParent, const 
std::shared_ptrSetSelectHdl( LINK( this, PrintDialog, SelectHdl ) );
+mpTabCtrl->SetActivatePageHdl( LINK( this, PrintDialog, ActivatePageHdl ) 
);
 
 // setup sizes for N-Up
 Size aNupSize( maPController->getPrinter()->PixelToLogic(
@@ -1751,6 +1752,14 @@ IMPL_LINK( PrintDialog, ModifyHdl, Edit&, rEdit, void )
 }
 }
 
+IMPL_LINK( PrintDialog, ActivatePageHdl, TabControl *, pTabCtrl, void )
+{
+const sal_uInt16 id = pTabCtrl->GetCurPageId();
+if (pTabCtrl->GetPageName(id) == "optionstab" ) {
+maOptionsPage.mpPapersizeFromSetup->Check( 
maPController->getPapersizeFromSetup() );
+}
+}
+
 PropertyValue* PrintDialog::getValueForWindow( vcl::Window* i_pWindow ) const
 {
 PropertyValue* pVal = nullptr;
diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index b2308cf2f5b9..2a6641250130 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -1517,10 +1517,10 @@
   
 
 
-  
+  
 True
 False
-Options
+Options
   
   
 3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg

[Libreoffice Gerrit user]

 dev/null   |binary
 icon-themes/colibre_svg/cmd/lc_convertmenu.svg |1 -
 icon-themes/colibre_svg/cmd/sc_convertmenu.svg |1 -
 3 files changed, 2 deletions(-)

New commits:
commit 22f2d8c41aa0a0a4cfa215c07ec06ae38cde7da8
Author: andreas kainz 
AuthorDate: Tue Aug 28 07:56:22 2018 +0200
Commit: andreas_kainz 
CommitDate: Tue Aug 28 21:29:00 2018 +0200

Colibre icons: remove convertmenu icon

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

diff --git a/icon-themes/colibre/cmd/lc_convertmenu.png 
b/icon-themes/colibre/cmd/lc_convertmenu.png
deleted file mode 100644
index de2e98711c34..
Binary files a/icon-themes/colibre/cmd/lc_convertmenu.png and /dev/null differ
diff --git a/icon-themes/colibre/cmd/sc_convertmenu.png 
b/icon-themes/colibre/cmd/sc_convertmenu.png
deleted file mode 100644
index cbe7badb6817..
Binary files a/icon-themes/colibre/cmd/sc_convertmenu.png and /dev/null differ
diff --git a/icon-themes/colibre_svg/cmd/lc_convertmenu.svg 
b/icon-themes/colibre_svg/cmd/lc_convertmenu.svg
deleted file mode 100644
index 1efa64275473..
--- a/icon-themes/colibre_svg/cmd/lc_convertmenu.svg
+++ /dev/null
@@ -1 +0,0 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/sc_convertmenu.svg 
b/icon-themes/colibre_svg/cmd/sc_convertmenu.svg
deleted file mode 100644
index 0a922341d78d..
--- a/icon-themes/colibre_svg/cmd/sc_convertmenu.svg
+++ /dev/null
@@ -1 +0,0 @@
-http://www.w3.org/2000/svg";>
\ 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: Branch 'distro/collabora/cp-6.0' - 8 commits - config_host.mk.in configure.ac connectivity/Library_mysqlc.mk connectivity/source distro-configs/Jenkins download.lst ext

[Libreoffice Gerrit user]

 Makefile.fetch |1 
 RepositoryExternal.mk  |   37 
 config_host.mk.in  |1 
 configure.ac   |   46 -
 connectivity/Library_mysqlc.mk |4 
 connectivity/source/drivers/mysqlc/mysqlc_connection.cxx   |1 
 connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx |1 
 distro-configs/Jenkins/Linux_ubsan_master.conf |1 
 download.lst   |2 
 external/mysql-connector-cpp/Library_mysqlcppconn.mk   |   87 
--
 solenv/clang-format/blacklist  |3 
 11 files changed, 2 insertions(+), 182 deletions(-)

New commits:
commit 940ba554a4b7861bab20ab6e8db6bcf88a93e5a9
Author: Stephan Bergmann 
AuthorDate: Mon Aug 27 13:36:06 2018 +0200
Commit: Andras Timar 
CommitDate: Tue Aug 28 20:53:01 2018 +0200

No space before period

...left there by 26b40fcfc67480e75bd9959b0c5cb9db10fdf6a1 "Moving mysqlc 
into
connectivity as a library".  (And remove latter half of sentence that 
doesn't
make much sense anymore.)

Change-Id: Ic87bd243cfde61080e4afae14de5c3fe7c53824b
Reviewed-on: https://gerrit.libreoffice.org/59656
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 760111784eb014091a445b3c5c2d1ad7b1b1ded7)

diff --git a/configure.ac b/configure.ac
index 87cc6f16b52b..9ed771bf868a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1638,8 +1638,7 @@ AC_ARG_WITH(system-apache-commons,
 
 AC_ARG_WITH(system-mariadb,
 AS_HELP_STRING([--with-system-mariadb],
-[Use MariaDB/MySQL libraries already on system, for building the 
MariaDB Connector/LibreOffice
- .]),,
+[Use MariaDB/MySQL libraries already on system.]),,
 [with_system_mariadb="$with_system_libs"])
 
 AC_ARG_ENABLE(bundle-mariadb,
commit 2803de7f376f25bd98ca6b064bc683ad420cf4d8
Author: Caolán McNamara 
AuthorDate: Mon Aug 27 11:51:37 2018 +0100
Commit: Andras Timar 
CommitDate: Tue Aug 28 20:41:33 2018 +0200

coverity#1438784 Uninitialized pointer field

Change-Id: Ic8bc7423765f8610d92ca3ced4c52d4838b7699a
Reviewed-on: https://gerrit.libreoffice.org/59653
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 15f6a37f97acaa8ea8c5af208d2f16992f349df0)

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
index 74c68b2dbe11..e6149975be9c 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
@@ -64,6 +64,7 @@ void lcl_executeUpdate(MYSQL* pMySql, const rtl::OString& sql)
 
 OConnection::OConnection(MysqlCDriver& _rDriver)
 : OMetaConnection_BASE(m_aMutex)
+, m_mysql()
 , m_xMetaData(nullptr)
 , m_xDriver(&_rDriver)
 {
commit da67d877f83eaa3d3238471aa13204c3a2fcfd53
Author: Stephan Bergmann 
AuthorDate: Mon Aug 27 09:23:31 2018 +0200
Commit: Andras Timar 
CommitDate: Tue Aug 28 20:40:41 2018 +0200

--enable-ext-mariadb-connector was removed

...in 26b40fcfc67480e75bd9959b0c5cb9db10fdf6a1 "Moving mysqlc into 
connectivity
as a library", apparently without replacement

Change-Id: Ia1d32f98bd90efe2fcd4441dd84cd1862a4daa70
(cherry picked from commit b1d1edff4e81a8299e2a17c7e562d144329549ab)

diff --git a/distro-configs/Jenkins/Linux_ubsan_master.conf 
b/distro-configs/Jenkins/Linux_ubsan_master.conf
index 46338003d792..b459a8248db6 100644
--- a/distro-configs/Jenkins/Linux_ubsan_master.conf
+++ b/distro-configs/Jenkins/Linux_ubsan_master.conf
@@ -7,7 +7,6 @@
 --enable-evolution2
 --enable-ext-ct2n
 --enable-ext-languagetool
---enable-ext-mariadb-connector
 --with-system-mariadb
 --enable-ext-nlpsolver
 --enable-ext-numbertext
commit 0ccafc71d5f5194b79c36ccb9e8e10f54b25a31b
Author: Stephan Bergmann 
AuthorDate: Mon Aug 27 08:53:09 2018 +0200
Commit: Andras Timar 
CommitDate: Tue Aug 28 20:40:12 2018 +0200

-Werror,-Wunused-private-field

Change-Id: I8c71fe9a5ae0d228313b6b66752ee93aae72f539
(cherry picked from commit 63f8c506637c910ed1efa572f23ff1af7715e7e3)

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx 
b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx
index 2ed4eca4179b..02e72f98c664 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx
@@ -39,7 +39,6 @@ class ODatabaseMetaData final : public ODatabaseMetaData_BASE
 {
 OConnection& m_rConnection;
 MYSQL* m_pMySql;
-rtl::OUString identifier_quote_string;
 
 public:
 const OConnection& getOwnConnection() co

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

[Libreoffice Gerrit user]

 svx/source/dialog/dlgctrl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b50e03fd9b56bcedf1dcc7ccfd16b223e39271bc
Author: Caolán McNamara 
AuthorDate: Tue Aug 28 17:20:21 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Aug 28 20:47:36 2018 +0200

tdf#119122 first (5%) pattern initially drawn with too many black cells

pattern of area tab, pattern subtab of e.g. format page

and in the pattern editor the 5% style is shown wrong,
clicking ona different pattern and then back may make it draw correct

a problem since...

commit 6fbb6d80fe6203ff6f84ee85ca625b6e60bf5bae
Date:   Fri Feb 16 16:13:38 2018 +0200

use std::array in createHistorical8x8FromArray

to make the assumption about the size of the array obvious in the code.

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

diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index f5ec3b570d93..2aa91452c139 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -1282,7 +1282,7 @@ void SvxPixelCtl::Paint( vcl::RenderContext& 
rRenderContext, const tools::Rectan
 
 //Draw Rectangles (squares)
 rRenderContext.SetLineColor();
-sal_uInt16 nLastPixel = maPixelData[0];
+sal_uInt16 nLastPixel = maPixelData[0] ? 0 : 1;
 
 for (i = 0; i < nLines; i++)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 svx/source/dialog/dlgctrl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2c91705505c6f1e22a0bb5b794b39267c6b11136
Author: Caolán McNamara 
AuthorDate: Tue Aug 28 17:20:21 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Aug 28 20:46:32 2018 +0200

tdf#119122 first (5%) pattern initially drawn with too many black cells

pattern of area tab, pattern subtab of e.g. format page

and in the pattern editor the 5% style is shown wrong,
clicking ona different pattern and then back may make it draw correct

a problem since...

commit 6fbb6d80fe6203ff6f84ee85ca625b6e60bf5bae
Date:   Fri Feb 16 16:13:38 2018 +0200

use std::array in createHistorical8x8FromArray

to make the assumption about the size of the array obvious in the code.

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

diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 659a572ba369..b7a3e6c5f92e 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -1279,7 +1279,7 @@ void SvxPixelCtl::Paint( vcl::RenderContext& 
rRenderContext, const tools::Rectan
 
 //Draw Rectangles (squares)
 rRenderContext.SetLineColor();
-sal_uInt16 nLastPixel = maPixelData[0];
+sal_uInt16 nLastPixel = maPixelData[0] ? 0 : 1;
 
 for (i = 0; i < nLines; i++)
 {
___
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' - configure.ac scp2/source setup_native/source

[Libreoffice Gerrit user]

 configure.ac |3 ---
 scp2/source/extensions/module_extensions.scp |   14 --
 scp2/source/extensions/module_extensions.ulf |6 --
 setup_native/source/packinfo/packinfo_extensions.txt |   15 ---
 4 files changed, 38 deletions(-)

New commits:
commit 6e10a1e7d53ce3a90bd50ea074765ba700127e37
Author: Stephan Bergmann 
AuthorDate: Mon Aug 27 19:07:04 2018 +0200
Commit: Andras Timar 
CommitDate: Tue Aug 28 20:35:03 2018 +0200

Remove Extensions_MySQLConnector junk

...left over from 26b40fcfc67480e75bd9959b0c5cb9db10fdf6a1 "Moving mysqlc 
into
connectivity as a library".  (Apparently, for one, a module's Files that 
don't
exist are ignored, so 8ecf5e1815b5459bc0bbcdfb398d3bd53b0c2861 "Build fix, 
make
install: mysql-connector-ooo extension is gone" removing
gid_File_Oxt_MySQLConnector but not
gid_Module_Optional_Extensions_MySQLConnector referencing it didn't cause
trouble; and for another, an empty module is ignored, so there were no
extension-mysql-connector packages generated any more---but better clean up 
the
junk anyway.)

Reviewed-on: https://gerrit.libreoffice.org/59669
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 5988d888099d018ca1000bb17341c9529c538649)

Change-Id: If598a968dfbbe9b5f16d735e8011e192cbd4178b

diff --git a/configure.ac b/configure.ac
index 70c0c11a1baf..e865649034c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8131,9 +8131,6 @@ AC_SUBST(MARIADBC_MINOR)
 AC_SUBST(MARIADBC_MICRO)
 
 if test "$ENABLE_MARIADBC" = "TRUE"; then
-
-SCPDEFS="$SCPDEFS -DWITH_EXTENSION_MARIADBC"
-
 dnl ===
 dnl Check for system MariaDB
 dnl ===
diff --git a/scp2/source/extensions/module_extensions.scp 
b/scp2/source/extensions/module_extensions.scp
index 6db143fce8bc..7c14cfeda594 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -105,20 +105,6 @@ Module gid_Module_Optional_Extensions_LanguageTool
 End
 #endif
 
-/* ** MySQL Connector ** */
-
-#ifdef WITH_EXTENSION_MARIADBC
-Module gid_Module_Optional_Extensions_MySQLConnector
- PackageInfo = "packinfo_extensions.txt";
- MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_MARIADBC);
- ParentID = gid_Module_Optional_Extensions;
- Files = (
- gid_File_Oxt_MySQLConnector );
- Default = YES;
- Styles = ( );
-End
-#endif
-
 /* ** Script provider for BeanShell ** */
 
 #if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL
diff --git a/scp2/source/extensions/module_extensions.ulf 
b/scp2/source/extensions/module_extensions.ulf
index 02de867b4ac8..a5fb2238fabb 100644
--- a/scp2/source/extensions/module_extensions.ulf
+++ b/scp2/source/extensions/module_extensions.ulf
@@ -52,12 +52,6 @@ en-US = "LanguageTool Open Source language checker"
 [STR_DESC_MODULE_OPTIONAL_EXTENSIONS_LANGUAGETOOL]
 en-US = "LanguageTool Open Source language checker"
 
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_MARIADBC]
-en-US = "MySQL Connector"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MARIADBC]
-en-US = "MySQL Connector"
-
 [STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL]
 en-US = "Script provider for BeanShell"
 
diff --git a/setup_native/source/packinfo/packinfo_extensions.txt 
b/setup_native/source/packinfo/packinfo_extensions.txt
index f08fdfc197d6..6b2cf0612e52 100644
--- a/setup_native/source/packinfo/packinfo_extensions.txt
+++ b/setup_native/source/packinfo/packinfo_extensions.txt
@@ -110,21 +110,6 @@ packageversion = "%PACKAGEVERSION"
 End
 
 Start
-module = "gid_Module_Optional_Extensions_MySQLConnector"
-solarispackagename = 
"%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-mysql-connector"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core 
(Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-mysql-connector"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION"
-linuxpatchrequires = ""
-copyright = "2017 The Document Foundation"
-solariscopyright = "solariscopyrightfile"
-vendor = "The Document Foundation"
-description = "MySQL Connector extension for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt"
-packageversion = "%PACKAGEVERSION"
-End
-
-Start
 module = "gid_Module_Optional_Extensions_Script_Provider_For_BS"
 solarispackagename = 
"%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-beanshell-script-provider"
 solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core 
(Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
___
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' - connectivity/registry

[Libreoffice Gerrit user]

 connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu |
4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 751ffd896662c8f12940e42bcd331ebece11643c
Author: Tamas Bunth 
AuthorDate: Tue Aug 28 11:28:12 2018 +0200
Commit: Andras Timar 
CommitDate: Tue Aug 28 20:30:35 2018 +0200

mysqlc: registry xml: install driver

Change-Id: I864302cc7ba8f27300e4bf0dd3d8a6cc1896da4b
Reviewed-on: https://gerrit.libreoffice.org/59698
Tested-by: Jenkins
Reviewed-by: Tamás Bunth 
Reviewed-on: https://gerrit.libreoffice.org/59718
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git 
a/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu 
b/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu
index 7ade9eebbc60..65bfdba90858 100644
--- a/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-http://openoffice.org/2001/registry"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
-  
+http://openoffice.org/2004/installation"; 
xmlns:oor="http://openoffice.org/2001/registry"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
+  
 
   
 com.sun.star.comp.sdbc.mysqlc.MysqlCDriver
___
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' - connectivity/source

[Libreoffice Gerrit user]

 connectivity/source/drivers/mysqlc/mysqlc_driver.hxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 756cf8411b6ca233cfed708024be05c8f800a986
Author: Stephan Bergmann 
AuthorDate: Mon Aug 27 16:59:04 2018 +0200
Commit: Andras Timar 
CommitDate: Tue Aug 28 20:30:16 2018 +0200

SYSTEM_MYSQL_CPPCONN is never defined

...since 5061663ce052087c6d5d0910d6f99358e26dbbd1 "drop unnecessary
SYSTEM_MYSQL_CONNECTOR_CPP"

Change-Id: I2023baf04dfb050833a0032367fc2dc2cfdb9d92
Reviewed-on: https://gerrit.libreoffice.org/59670
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
Reviewed-on: https://gerrit.libreoffice.org/59717
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx 
b/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx
index 89c57630823e..d0f7febf8d13 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx
@@ -54,12 +54,10 @@ protected:
 OWeakRefArray m_xConnections; // vector containing a list
 // of all the Connection objects
 // for this Driver
-#ifndef SYSTEM_MYSQL_CPPCONN
 #ifdef BUNDLE_MARIADB
 oslModule m_hCConnModule;
 bool m_bAttemptedLoadCConn;
 #endif
-#endif
 public:
 explicit MysqlCDriver(const Reference& 
_rxFactory);
 
___
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' - connectivity/source

[Libreoffice Gerrit user]

 connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit fbd76fbd23b52f5e98021a93c4e73a7844312ff3
Author: Caolán McNamara 
AuthorDate: Mon Aug 27 11:55:05 2018 +0100
Commit: Andras Timar 
CommitDate: Tue Aug 28 20:29:58 2018 +0200

coverity#1438783 Unchecked return value

Change-Id: Ice56d317087dd24d2eef27f2ace5fdf9f4da946d
Reviewed-on: https://gerrit.libreoffice.org/59654
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
Reviewed-on: https://gerrit.libreoffice.org/59716
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx
index eeadf2bd03a9..11e1d6996c70 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx
@@ -63,7 +63,9 @@ sal_Bool SAL_CALL 
OResultSetMetaData::isCaseSensitive(sal_Int32 column)
 Reference rs = stmt->executeQuery(sql.makeStringAndClear());
 Reference xRow(rs, UNO_QUERY_THROW);
 
-rs->next(); // fetch first and only row
+if (!rs->next()) // fetch first and only row
+return false;
+
 rtl::OUString sColName = xRow->getString(1); // first column is Collation 
name
 
 return !sColName.isEmpty() && !sColName.endsWith("_ci");
___
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' - connectivity/Configuration_mysql.mk postprocess/CustomTarget_registry.mk

[Libreoffice Gerrit user]

 connectivity/Configuration_mysql.mk  |9 +
 postprocess/CustomTarget_registry.mk |9 +++--
 2 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit 9b8a038343bb0f567b2dd46382d57e68bb9ff150
Author: Tamas Bunth 
AuthorDate: Mon Aug 27 10:21:32 2018 +0200
Commit: Andras Timar 
CommitDate: Tue Aug 28 20:29:40 2018 +0200

mysqlc: fix registry configuration

Change-Id: Iefe1446e5f28471c6cafd256b29612c2457e42fc
Reviewed-on: https://gerrit.libreoffice.org/59640
Tested-by: Jenkins
Reviewed-by: Tamás Bunth 
Reviewed-on: https://gerrit.libreoffice.org/59715
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/connectivity/Configuration_mysql.mk 
b/connectivity/Configuration_mysql.mk
index 3e3f0b908ecb..5ef54c70a80c 100644
--- a/connectivity/Configuration_mysql.mk
+++ b/connectivity/Configuration_mysql.mk
@@ -7,13 +7,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Configuration_Configuration,mysqlc))
+$(eval $(call gb_Configuration_Configuration,driver_mysqlc))
 
-$(eval $(call 
gb_Configuration_add_spool_modules,mysqlc,connectivity/registry/mysqlc,\
-   org/openoffice/Office/DataAccess/Drivers-mysql.xcu \
+$(eval $(call 
gb_Configuration_add_spool_modules,driver_mysqlc,connectivity/registry/mysqlc,\
+   org/openoffice/Office/DataAccess/Drivers-mysqlc.xcu \
 ))
 
-$(eval $(call 
gb_Configuration_add_localized_datas,mysqlc,connectivity/registry/mysqlc,\
+$(eval $(call 
gb_Configuration_add_localized_datas,driver_mysqlc,connectivity/registry/mysqlc,\
org/openoffice/Office/DataAccess/Drivers.xcu \
 ))
 
+# vim: set noet sw=4 ts=4:
diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index dc58f0657dce..360b9eedcb9f 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -280,9 +280,8 @@ ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
 postprocess_FILES_main += \
$(call 
gb_XcuModuleTarget_get_target,connectivity/registry/dbase)/org/openoffice/Office/DataAccess/Drivers-dbase.xcu
 \
$(call 
gb_XcuModuleTarget_get_target,connectivity/registry/flat)/org/openoffice/Office/DataAccess/Drivers-flat.xcu
 \
-   $(call 
gb_XcuModuleTarget_get_target,connectivity/registry/mysqlc)/org/openoffice/Office/DataAccess/Drivers-mysql.xcu
 \
$(call 
gb_XcuModuleTarget_get_target,connectivity/registry/odbc)/org/openoffice/Office/DataAccess/Drivers-odbc.xcu
-postprocess_DRIVERS += dbase flat mysqlc odbc
+postprocess_DRIVERS += dbase flat odbc
 ifeq (WNT,$(OS))
 else ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
@@ -344,6 +343,12 @@ postprocess_FILES_main += \
 postprocess_DRIVERS += firebird_sdbc
 endif
 
+ifeq ($(ENABLE_MARIADBC),TRUE)
+postprocess_FILES_main += \
+   $(call 
gb_XcuModuleTarget_get_target,connectivity/registry/mysqlc)/org/openoffice/Office/DataAccess/Drivers-mysqlc.xcu
+postprocess_DRIVERS += mysqlc
+endif
+
 ifneq (,$(SYSTEM_LIBEXTTEXTCAT_DATA))
 postprocess_FILES_main += 
$(postprocess_MOD)/org/openoffice/Office/Paths-externallibexttextcatdata.xcu
 else
___
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' - 2 commits - configure.ac connectivity/Configuration_mysql.mk connectivity/Library_mysqlc.mk connectivity/Library_mysql.mk connectivit

[Libreoffice Gerrit user]

 Repository.mk|
4 
 RepositoryExternal.mk|
5 
 RepositoryModule_host.mk |
1 
 configure.ac |   
30 
 connectivity/Configuration_mysql.mk  |
7 
 connectivity/Library_mysql.mk|   
48 
 connectivity/Library_mysqlc.mk   |   
38 
 connectivity/Module_connectivity.mk  |
9 
 connectivity/registry/mysql/org/openoffice/Office/DataAccess/Drivers.xcu |  
264 --
 connectivity/source/drivers/mysql/YUser.cxx  |  
320 ---
 connectivity/source/drivers/mysql/mysql.component|   
26 
 connectivity/source/drivers/mysqlc/mysqlc_connection.cxx |  
499 +
 connectivity/source/drivers/mysqlc/mysqlc_connection.hxx |  
183 +
 connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx   |  
989 ++
 connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx   |  
245 ++
 connectivity/source/drivers/mysqlc/mysqlc_driver.cxx |  
169 +
 connectivity/source/drivers/mysqlc/mysqlc_driver.hxx |  
101 +
 connectivity/source/drivers/mysqlc/mysqlc_general.cxx|  
354 +++
 connectivity/source/drivers/mysqlc/mysqlc_general.hxx|  
125 +
 connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx |
7 
 connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx |
2 
 connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx  |  
240 +-
 connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx  |  
161 +
 connectivity/source/drivers/mysqlc/mysqlc_propertyids.hxx|
5 
 connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx  |  
361 +--
 connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx  |  
246 ++
 connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx  |   
35 
 connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx  |  
109 +
 connectivity/source/drivers/mysqlc/mysqlc_services.cxx   |  
107 +
 connectivity/source/drivers/mysqlc/mysqlc_statement.cxx  |  
177 -
 connectivity/source/drivers/mysqlc/mysqlc_statement.hxx  |  
185 +
 connectivity/source/drivers/mysqlc/mysqlc_subcomponent.hxx   |  
164 +
 connectivity/source/drivers/mysqlc/mysqlc_types.cxx  |  
680 ++
 connectivity/source/drivers/mysqlc/mysqlc_types.hxx  |   
13 
 external/Module_external.mk  |
1 
 external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk|
2 
 external/mysql-connector-cpp/Makefile|
7 
 external/mysql-connector-cpp/Module_mysql-connector-cpp.mk   |   
17 
 external/mysql-connector-cpp/README  |
1 
 external/mysql-connector-cpp/UnpackedTarball_mysql-connector-cpp.mk  |   
26 
 external/mysql-connector-cpp/binding_config.h|
5 
 external/mysql-connector-cpp/config.h|   
39 
 external/mysql-connector-cpp/patches/dynexcspec.patch.0  |   
15 
 external/mysql-connector-cpp/patches/enable-libmysql-proxy.patch |   
27 
 external/mysql-connector-cpp/patches/mysql-connector-c++-1.1.0.patch |  
115 -
 external/mysql-connector-cpp/patches/warnings.patch.0|   
11 
 external/mysql-connector-cpp/version_info.h  |   
42 
 mysqlc/Configuration_mysql.mk|   
15 
 mysqlc/Makefile  |
7 
 mysqlc/Module_mysqlc.mk  |   
23 
 mysqlc/README|   
79 
 mysqlc/Rdb_mysqlc.mk |   
16 
 mysqlc/source/mysqlc_connection.cxx  |  
544 -
 mysqlc/source/mysqlc_databasemetadata.hxx|  
219 --
 mysqlc/source/mysqlc_general.hxx |  
128 -
 mysqlc/source/mysqlc_preparedstatement.hxx   |  
163 -
 mysqlc/source/mysqlc_resultset.hxx   |  
247 --
 mysqlc/source/mysqlc_resultsetmetadata.hxx   |  
110 -
 mysqlc/source/mysqlc_services.cxx|  
115 -
 mysqlc/source/mysqlc_types.cxx 

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

[Libreoffice Gerrit user]

 mysqlc/source/mysqlc_prepared_resultset.cxx |3 +++
 mysqlc/source/mysqlc_preparedstatement.cxx  |   21 +++--
 2 files changed, 14 insertions(+), 10 deletions(-)

New commits:
commit 4e8a7a6cbca2ba4119647dfeb59da68bedb3e157
Author: Tamas Bunth 
AuthorDate: Wed Aug 8 17:08:22 2018 +0200
Commit: Andras Timar 
CommitDate: Tue Aug 28 20:27:04 2018 +0200

mysqlc: Fix float, double and numeric types

Change-Id: I9d0b989735e736c9c35d8acf4ea1b072eddf7437
Reviewed-on: https://gerrit.libreoffice.org/58744
Tested-by: Jenkins
Reviewed-by: Tamás Bunth 
Reviewed-on: https://gerrit.libreoffice.org/59712
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/mysqlc/source/mysqlc_prepared_resultset.cxx 
b/mysqlc/source/mysqlc_prepared_resultset.cxx
index 3bc6b9424752..6ef50bea7116 100644
--- a/mysqlc/source/mysqlc_prepared_resultset.cxx
+++ b/mysqlc/source/mysqlc_prepared_resultset.cxx
@@ -239,6 +239,9 @@ double SAL_CALL OPreparedResultSet::getDouble(sal_Int32 
column)
 }
 m_bWasNull = false;
 
+if (m_aFields[column - 1].type == MYSQL_TYPE_FLOAT)
+return *reinterpret_cast(m_aData[column - 1].buffer);
+
 return *reinterpret_cast(m_aData[column - 1].buffer);
 }
 
diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx 
b/mysqlc/source/mysqlc_preparedstatement.cxx
index 88b899a55814..9c6da76913e6 100644
--- a/mysqlc/source/mysqlc_preparedstatement.cxx
+++ b/mysqlc/source/mysqlc_preparedstatement.cxx
@@ -439,23 +439,24 @@ void SAL_CALL 
OPreparedStatement::setObjectWithInfo(sal_Int32 parameterIndex, co
 case DataType::DECIMAL:
 case DataType::NUMERIC:
 {
-double nValue(0);
+double nValue(0.0);
+rtl::OUString sValue;
 if ( value >>= nValue )
 {
 setDouble( parameterIndex, nValue );
 break;
 }
-else
+else if ( value >>= sValue )
 {
-rtl::OUString sValue;
-if( value >>= sValue )
-{
-m_binds[nIndex].buffer_type = MYSQL_TYPE_NEWDECIMAL;
-mysqlc_sdbc_driver::resetSqlVar(&m_binds[nIndex].buffer, 
sValue.getStr(), MYSQL_TYPE_LONGLONG, sValue.getLength());
-m_bindMetas[nIndex].is_null = 0;
-}
-
+rtl::OString sAscii = rtl::OUStringToOString(sValue, 
getOwnConnection()->getConnectionEncoding());
+std::stringstream sStream{sAscii.getStr()};
+sStream >> nValue;
+m_binds[nIndex].buffer_type = MYSQL_TYPE_DOUBLE;
+mysqlc_sdbc_driver::resetSqlVar(&m_binds[nIndex].buffer, &nValue, 
MYSQL_TYPE_DOUBLE, sValue.getLength());
+m_bindMetas[nIndex].is_null = 0;
+break;
 }
+
 #if defined __GNUC__ && __GNUC__ >= 7
 [[fallthrough]];
 #else
___
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' - mysqlc/Library_mysqlc.mk mysqlc/Module_mysqlc.mk mysqlc/source Repository.mk RepositoryModule_host.mk

[Libreoffice Gerrit user]

 Repository.mk   |2 
 RepositoryModule_host.mk|2 
 mysqlc/Library_mysqlc.mk|9 
 mysqlc/Module_mysqlc.mk |4 
 mysqlc/source/dummy.cxx |   20 
 mysqlc/source/mysqlc_connection.cxx |  140 +--
 mysqlc/source/mysqlc_connection.hxx |   21 
 mysqlc/source/mysqlc_databasemetadata.cxx   | 1127 ++--
 mysqlc/source/mysqlc_databasemetadata.hxx   |4 
 mysqlc/source/mysqlc_driver.cxx |2 
 mysqlc/source/mysqlc_general.cxx|  266 +-
 mysqlc/source/mysqlc_general.hxx|   65 +
 mysqlc/source/mysqlc_prepared_resultset.cxx | 1097 +++
 mysqlc/source/mysqlc_prepared_resultset.hxx |  248 ++
 mysqlc/source/mysqlc_preparedstatement.cxx  |  512 
 mysqlc/source/mysqlc_preparedstatement.hxx  |   24 
 mysqlc/source/mysqlc_resultset.cxx  |  497 ++--
 mysqlc/source/mysqlc_resultset.hxx  |   20 
 mysqlc/source/mysqlc_resultsetmetadata.cxx  |  247 +-
 mysqlc/source/mysqlc_resultsetmetadata.hxx  |   17 
 mysqlc/source/mysqlc_statement.cxx  |  105 +-
 mysqlc/source/mysqlc_statement.hxx  |   12 
 22 files changed, 2727 insertions(+), 1714 deletions(-)

New commits:
commit 1db3337a82320aacbeed87963e2f6d0c84ba408c
Author: Tamas Bunth 
AuthorDate: Tue Aug 28 15:47:56 2018 +0200
Commit: Andras Timar 
CommitDate: Tue Aug 28 20:26:48 2018 +0200

Switch from mysql to MariaDB C API

In order to get rid of the MySQL C++ Connector, the sdbc driver should
be implemented using the MariaDB C connector instead. MariaDB
Connector/C is LGPL licensed, so later it can be used in the
connectivity module. This way mysqlc won't be an extension, so it could
be maintained easier.

Change-Id: I99c13ccf154b33b145d34b1e06eec85946dc82a0
Reviewed-on: https://gerrit.libreoffice.org/55960
Reviewed-by: Tamás Bunth 
Tested-by: Tamás Bunth 
Reviewed-on: https://gerrit.libreoffice.org/59711
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/Repository.mk b/Repository.mk
index 08b999ed5ac1..a35e837c21de 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -391,7 +391,6 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
mtfrenderer \
$(call gb_Helper_optional,DBCONNECTIVITY,mysql) \
odbc \
-   mysqlc \
odfflatxml \
offacc \
oox \
@@ -708,6 +707,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,UNOVERLIBS,ure, \
 
 $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \
active_native \
+   mysqlc \
passive_native \
 ))
 
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index e415cc992505..3b530286114e 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -81,7 +81,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
linguistic \
lotuswordpro \
$(call gb_Helper_optional,DESKTOP,l10ntools) \
-   mysqlc \
+   $(call gb_Helper_optional,MARIADBC,mysqlc) \
$(call gb_Helper_optional,NLPSOLVER,nlpsolver) \
o3tl \
$(call gb_Helper_optional,ODK,odk) \
diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk
index 6cb47081748e..f034eaeece76 100644
--- a/mysqlc/Library_mysqlc.mk
+++ b/mysqlc/Library_mysqlc.mk
@@ -9,16 +9,17 @@
 
 $(eval $(call gb_Library_Library,mysqlc))
 
-ifeq ($(ENABLE_MARIADBC),TRUE)
 $(eval $(call gb_Library_use_externals,mysqlc,\
boost_headers \
mysql-connector-cpp \
+   mariadb-connector-c \
 ))
 
 ifeq ($(SYSTEM_MYSQL_CONNECTOR_CPP),)
 $(eval $(call gb_Library_add_libs,mysqlc,\
$(if $(filter-out WNT,$(OS)),$(if $(filter MACOSX SOLARIS,$(OS)),-lz 
-lm,\
-rdynamic -lz -lcrypt -lnsl -lm)) \
+   $(if $(filter LINUX,$(OS)),-lpthread -ldl,) \
 ))
 endif
 
@@ -47,6 +48,7 @@ $(eval $(call gb_Library_add_exception_objects,mysqlc,\
mysqlc/source/mysqlc_services \
mysqlc/source/mysqlc_connection \
mysqlc/source/mysqlc_resultset \
+   mysqlc/source/mysqlc_prepared_resultset \
mysqlc/source/mysqlc_resultsetmetadata \
mysqlc/source/mysqlc_statement \
mysqlc/source/mysqlc_preparedstatement \
@@ -58,10 +60,5 @@ $(eval $(call gb_Library_add_exception_objects,mysqlc,\
 $(eval $(call gb_Library_set_componentfile,mysqlc,mysqlc/source/mysqlc))
 
 $(eval $(call gb_Library_set_external_code,mysqlc))
-else
-$(eval $(call gb_Library_add_exception_objects,mysqlc,\
-   mysqlc/source/dummy \
-))
-endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/mysqlc/Module_mysqlc.mk b/mysqlc/Module_mysqlc.mk
index 2577df5ffcdf..8274b0dc02e8 100644
--- a/mysqlc/Module_mysqlc.mk
+++ b/mysqlc/Module_mysqlc.mk
@@ -18,10 +18,6 @@ $(eval $(call gb_Module_add_targets,mysqlc,\
Extension_mysql-connector-ooo \
 ))
 
-else
-$(eval $(call gb

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - chart2/qa oox/source

[Libreoffice Gerrit user]

 chart2/qa/extras/chart2export.cxx |   40 +++
 chart2/qa/extras/data/docx/testBarChartDataPointPropDOCX.docx |binary
 chart2/qa/extras/data/xlsx/testBarChartDataPointPropXLSX.xlsx |binary
 oox/source/export/chartexport.cxx |   51 ++
 4 files changed, 91 insertions(+)

New commits:
commit 6fa95dca4d6b79698b55a2f2c956c99c3482
Author: Balazs Varga 
AuthorDate: Thu Aug 9 00:06:47 2018 +0200
Commit: Andras Timar 
CommitDate: Tue Aug 28 20:25:45 2018 +0200

tdf#96469 Export Data Point properties in Charts on DOCX/XLSX

If the color or other property of a datapoint in the chart
deviates from the dataseries property, this patch will write it
into a separate dPt tag and fixing the lost properies during
OOXML export.

Reviewed-on: https://gerrit.libreoffice.org/58806
Reviewed-by: Bartosz Kosiorek 
Tested-by: Jenkins
(cherry picked from commit 15035b98dc694bde4c4073fa75bdd2ce9d7e6670)

Change-Id: I3d975675ac3691fcafe76de16e46851561eb2807
Reviewed-on: https://gerrit.libreoffice.org/58807
Tested-by: Jenkins
Reviewed-by: Balazs Varga 
Reviewed-by: Andras Timar 

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 458a2e809631..2fba732e4357 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -83,6 +83,7 @@ public:
 void testChartTitlePropertiesColorFillDOCX();
 void testChartTitlePropertiesGradientFillDOCX();
 void testChartTitlePropertiesBitmapFillDOCX();
+void testBarChartDataPointPropDOCX();
 void testFdo83058dlblPos();
 void testAutoTitleDelXLSX();
 void testDispBlanksAsXLSX();
@@ -100,6 +101,7 @@ public:
 void testChartTitlePropertiesColorFillXLSX();
 void testChartTitlePropertiesGradientFillXLSX();
 void testChartTitlePropertiesBitmapFillXLSX();
+void testBarChartDataPointPropXLSX();
 void testAxisCharacterPropertiesXLSX();
 void testTitleCharacterPropertiesXLSX();
 void testPlotVisOnlyXLSX();
@@ -159,6 +161,7 @@ public:
 CPPUNIT_TEST(testChartTitlePropertiesColorFillDOCX);
 CPPUNIT_TEST(testChartTitlePropertiesGradientFillDOCX);
 CPPUNIT_TEST(testChartTitlePropertiesBitmapFillDOCX);
+CPPUNIT_TEST(testBarChartDataPointPropDOCX);
 CPPUNIT_TEST(testFdo83058dlblPos);
 CPPUNIT_TEST(testAutoTitleDelXLSX);
 CPPUNIT_TEST(testDispBlanksAsXLSX);
@@ -176,6 +179,7 @@ public:
 CPPUNIT_TEST(testChartTitlePropertiesColorFillXLSX);
 CPPUNIT_TEST(testChartTitlePropertiesGradientFillXLSX);
 CPPUNIT_TEST(testChartTitlePropertiesBitmapFillXLSX);
+CPPUNIT_TEST(testBarChartDataPointPropXLSX);
 CPPUNIT_TEST(testAxisCharacterPropertiesXLSX);
 CPPUNIT_TEST(testTitleCharacterPropertiesXLSX);
 CPPUNIT_TEST(testPlotVisOnlyXLSX);
@@ -1095,6 +1099,24 @@ void 
Chart2ExportTest::testChartTitlePropertiesBitmapFillDOCX()
 assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill", 
1);
 }
 
+void Chart2ExportTest::testBarChartDataPointPropDOCX()
+{
+load("/chart2/qa/extras/data/docx/", "testBarChartDataPointPropDOCX.docx");
+xmlDocPtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML 
Text");
+CPPUNIT_ASSERT(pXmlDoc);
+
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:varyColors", "val", "0");
+
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:idx", "val", "1");
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr",
 "val", "f6f8fc");
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr",
 "val", "c7d5ed");
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:ln/a:solidFill/a:srgbClr",
 "val", "70ad47");
+
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:idx", "val", "2");
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:spPr/a:solidFill/a:srgbClr",
 "val", "ff");
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:spPr/a:ln/a:solidFill/a:srgbClr",
 "val", "00");
+}
+
 void Chart2ExportTest::testBarChartRotation()
 {
 load ("/chart2/qa/extras/data/docx/", "barChartRotation.docx");
@@ -1560,6 +1582,24 @@ void 
Chart2ExportTest::testChartTitlePropertiesBitmapFillXLSX()
 assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill", 
1);
 }
 
+void Chart2ExportTest::testBarChartDataPointPropXLSX()
+{
+load("/chart2/qa/extras/data/xlsx/", "testBarChartDataPointPropXLSX.xlsx");
+xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
+CPPUNIT_ASSERT(pXmlDoc);
+
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:varyColors", "va

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sw/qa sw/source

[Libreoffice Gerrit user]

 sw/qa/extras/layout/data/tdf118058.fodt |   37 
 sw/qa/extras/layout/layout.cxx  |9 +++
 sw/source/core/layout/sectfrm.cxx   |   16 -
 3 files changed, 61 insertions(+), 1 deletion(-)

New commits:
commit 57d732c628b39834a97165404ae02a32577259f5
Author: Miklos Vajna 
AuthorDate: Mon Aug 13 21:03:08 2018 +0200
Commit: Andras Timar 
CommitDate: Tue Aug 28 20:26:07 2018 +0200

tdf#118058 sw, sections in tables: no split for multiple columns

The original use-case was "group a few paragraphs together" for the
split sections inside tables, i.e. it's safe to not split when the
section has multiple columns.

And the multiple columns case would mean that we don't find where to put
the follow section inside a table, resulting in a layout loop.

Reviewed-on: https://gerrit.libreoffice.org/58951
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit d2d996db4806e84ae0bf6aef1c285b498f2d2867)

Conflicts:
sw/qa/extras/layout/layout.cxx

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

diff --git a/sw/qa/extras/layout/data/tdf118058.fodt 
b/sw/qa/extras/layout/data/tdf118058.fodt
new file mode 100644
index ..dbdf26bf519f
--- /dev/null
+++ b/sw/qa/extras/layout/data/tdf118058.fodt
@@ -0,0 +1,37 @@
+
+
+  
+
+  
+
+  
+  
+
+  
+
+
+  
+
+
+  
+
+  
+
+
+  
+
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  Para 
1.No. However, you will not be able to 
see the colours produced on a black-and-white 
set.
+
+  
+
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 9a73e2025147..d7a25e95886c 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -19,11 +19,13 @@ public:
 void testTdf116830();
 void testTdf116925();
 void testTdf117028();
+void testTdf118058();
 
 CPPUNIT_TEST_SUITE(SwLayoutWriter);
 CPPUNIT_TEST(testTdf116830);
 CPPUNIT_TEST(testTdf116925);
 CPPUNIT_TEST(testTdf117028);
+CPPUNIT_TEST(testTdf118058);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -108,6 +110,13 @@ void SwLayoutWriter::testTdf117028()
 assertXPathContent(pXmlDoc, "//textarray/text", "Hello");
 }
 
+void SwLayoutWriter::testTdf118058()
+{
+SwDoc* pDoc = createDoc("tdf118058.fodt");
+// This resulted in a layout loop.
+pDoc->getIDocumentLayoutAccess().GetCurrentViewShell()->CalcLayout();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwLayoutWriter);
 CPPUNIT_PLUGIN_IMPLEMENT();
 
diff --git a/sw/source/core/layout/sectfrm.cxx 
b/sw/source/core/layout/sectfrm.cxx
index 1030d9ecb0e2..3790c92a199d 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -617,7 +617,21 @@ namespace
 return true;
 
 // The frame is in a table, see if the table is in a section.
-return !pFrame->FindTabFrame()->IsInSct();
+bool bRet = !pFrame->FindTabFrame()->IsInSct();
+
+if (bRet)
+{
+// Don't try to split if the frame itself is a section frame with
+// multiple columns.
+if (pFrame->IsSctFrame())
+{
+const SwFrame* pLower = pFrame->GetLower();
+if (pLower && pLower->IsColumnFrame())
+bRet = false;
+}
+}
+
+return bRet;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/core/data/dpgroup.cxx |   16 +++-
 sc/source/core/data/dputil.cxx  |   13 +++--
 tools/source/datetime/ttime.cxx |1 +
 3 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit e055b4a0fc23e1d0ad5d498f9195790dd41f6b3e
Author: Eike Rathke 
AuthorDate: Tue Aug 28 16:59:26 2018 +0200
Commit: Eike Rathke 
CommitDate: Tue Aug 28 19:50:15 2018 +0200

Use tools::Time::GetClock() to obtain hour,minute,second

... instead of rtl::math::approxFloor(fValue*DATE_TIME_FACTOR+0.5)
seconds that most times works but sometimes not.

Change-Id: Iaca69630461f2067622898fab35cda61d20172a9
Reviewed-on: https://gerrit.libreoffice.org/59719
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 70b326b8c5a7..92a6810d968d 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -169,31 +169,29 @@ bool ScDPGroupDateFilter::match( const ScDPItemData & 
rCellData ) const
 nGroupType == DataPilotFieldGroupBy::SECONDS)
 {
 // handle time
-// (as in the cell functions, ScInterpreter::ScGetHour etc.: 
seconds are rounded)
+// (do as in the cell functions, ScInterpreter::ScGetHour() etc.)
 
-double time = rCellData.GetValue() - 
approxFloor(rCellData.GetValue());
-long seconds = static_cast(approxFloor(time*DATE_TIME_FACTOR 
+ 0.5));
+sal_uInt16 nHour, nMinute, nSecond;
+double fFractionOfSecond;
+tools::Time::GetClock( rCellData.GetValue(), nHour, nMinute, 
nSecond, fFractionOfSecond, 0);
 
 switch (nGroupType)
 {
 case DataPilotFieldGroupBy::HOURS:
 {
-sal_Int32 hrs = seconds / 3600;
-if (hrs == nValue)
+if (nHour == nValue)
 return true;
 }
 break;
 case DataPilotFieldGroupBy::MINUTES:
 {
-sal_Int32 minutes = (seconds % 3600) / 60;
-if (minutes == nValue)
+if (nMinute == nValue)
 return true;
 }
 break;
 case DataPilotFieldGroupBy::SECONDS:
 {
-sal_Int32 sec = seconds % 60;
-if (sec == nValue)
+if (nSecond == nValue)
 return true;
 }
 break;
diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx
index 6afdc101a006..aefa1e143bcb 100644
--- a/sc/source/core/data/dputil.cxx
+++ b/sc/source/core/data/dputil.cxx
@@ -314,21 +314,22 @@ sal_Int32 ScDPUtil::getDatePartValue(
 nDatePart == sheet::DataPilotFieldGroupBy::SECONDS)
 {
 // handle time
-// (as in the cell functions, ScInterpreter::ScGetHour etc.: seconds 
are rounded)
+// (do as in the cell functions, ScInterpreter::ScGetHour() etc.)
 
-double fTime = fValue - rtl::math::approxFloor(fValue);
-long nSeconds = 
static_cast(rtl::math::approxFloor(fTime*DATE_TIME_FACTOR+0.5));
+sal_uInt16 nHour, nMinute, nSecond;
+double fFractionOfSecond;
+tools::Time::GetClock( fValue, nHour, nMinute, nSecond, 
fFractionOfSecond, 0);
 
 switch (nDatePart)
 {
 case sheet::DataPilotFieldGroupBy::HOURS:
-nResult = nSeconds / 3600;
+nResult = nHour;
 break;
 case sheet::DataPilotFieldGroupBy::MINUTES:
-nResult = ( nSeconds % 3600 ) / 60;
+nResult = nMinute;
 break;
 case sheet::DataPilotFieldGroupBy::SECONDS:
-nResult = nSeconds % 60;
+nResult = nSecond;
 break;
 }
 }
commit a19161a8b17a607f9d4a92c4ea57bafd55087841
Author: Eike Rathke 
AuthorDate: Tue Aug 28 17:13:05 2018 +0200
Commit: Eike Rathke 
CommitDate: Tue Aug 28 19:50:04 2018 +0200

Assign fFractionOfSecond in shortcut

Otherwise it may be uninitialized.

Change-Id: Iccb61d66c8410ac8ecdabbd96204d2393060bc1d
Reviewed-on: https://gerrit.libreoffice.org/59721
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/tools/source/datetime/ttime.cxx b/tools/source/datetime/ttime.cxx
index d9bfc40dfc02..f1dea02a6afb 100644
--- a/tools/source/datetime/ttime.cxx
+++ b/tools/source/datetime/ttime.cxx
@@ -287,6 +287,7 @@ void tools::Time::GetClock( double fTimeInDays,
 if (fTime <= 0.0 || fTime >= 1.0)
 {
 nHour = nMinute = nSecond = 0;
+fFractionOfSecond = 0.0;
 return;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freed

Re: Jenkins CI behaviour

[Eike Rathke]

Hi,

On Tuesday, 2018-08-28 17:57:23 +0200, Markus Mohrhard wrote:

> On Tue, Aug 28, 2018 at 5:52 PM Rahul Gurung  wrote:
> 
> > What if it hiccups again in rebase ?
> 
> Rebase again. Sadly some of the tests are not as stable as they should be.
> Some of the old java tests and some of the platform dependent tests (either
> font based, or other platform parts) fail from time to time.

This specific (JunitTest_framework_complex) test seemed to always fail on
(only?) tb75 building gerrit_linux_clang_dbgutil, for the last two days
or so; then for the last 14 hours looked stable; currently it seems
those builds get aborted by whoever/whatever. See
https://ci.libreoffice.org/computer/tb75-lilith/builds

So one is lucky if the gerrit_linux_clang_dbgutil build gets triggered
on a different machine.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
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

Re: Jenkins CI behaviour

[Markus Mohrhard]

Hey,

On Tue, Aug 28, 2018 at 6:36 PM Rahul Gurung  wrote:

> How to do that, because rebasing twice doesn't seems possible?
>


You need at least one new commit on master, otherwise rebasing is not
possible. So unless you try to rebase quickly after each other it should be
possible.

Regards,
Markus

>
> On 28 August 2018 at 21:27, Markus Mohrhard <
> markus.mohrh...@googlemail.com> wrote:
>
>> Hey,
>>
>> On Tue, Aug 28, 2018 at 5:52 PM Rahul Gurung 
>> wrote:
>>
>>> What if it hiccups again in rebase ?
>>>
>>
>>
>> Rebase again. Sadly some of the tests are not as stable as they should
>> be. Some of the old java tests and some of the platform dependent tests
>> (either font based, or other platform parts) fail from time to time.
>>
>> Just make sure that you are not causing the test failure before rebasing.
>>
>> Regards,
>> Markus
>>
>>
>>> On 27 August 2018 at 19:11, Muhammet Kara 
>>> wrote:
>>>
 Hi Rahul,

 On 08/27/2018 01:58 PM, Rahul Gurung wrote:

 hey,

 Why do we get that "junit test JunitTest_framework_complex failed"
 message when we upload a patch and weird thing is it gets fixed by a
 rebase? which rebase is recommended, normal or ticking that option we get ?
 sorry im a newbie.


 It is not something standard. Our Jenkins sometimes hiccups, which
 causes such failures; and a rebase usually solves the issue for you by
 triggering another build (with the latest commits).

 Thanks,
 RG


 ___
 LibreOffice mailing 
 listLibreOffice@lists.freedesktop.orghttps://lists.freedesktop.org/mailman/listinfo/libreoffice


 Best,
 Muhammet

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

Re: Jenkins CI behaviour

[Rahul Gurung]

How to do that, because rebasing twice doesn't seems possible?

On 28 August 2018 at 21:27, Markus Mohrhard 
wrote:

> Hey,
>
> On Tue, Aug 28, 2018 at 5:52 PM Rahul Gurung 
> wrote:
>
>> What if it hiccups again in rebase ?
>>
>
>
> Rebase again. Sadly some of the tests are not as stable as they should be.
> Some of the old java tests and some of the platform dependent tests (either
> font based, or other platform parts) fail from time to time.
>
> Just make sure that you are not causing the test failure before rebasing.
>
> Regards,
> Markus
>
>
>> On 27 August 2018 at 19:11, Muhammet Kara 
>> wrote:
>>
>>> Hi Rahul,
>>>
>>> On 08/27/2018 01:58 PM, Rahul Gurung wrote:
>>>
>>> hey,
>>>
>>> Why do we get that "junit test JunitTest_framework_complex failed"
>>> message when we upload a patch and weird thing is it gets fixed by a
>>> rebase? which rebase is recommended, normal or ticking that option we get ?
>>> sorry im a newbie.
>>>
>>>
>>> It is not something standard. Our Jenkins sometimes hiccups, which
>>> causes such failures; and a rebase usually solves the issue for you by
>>> triggering another build (with the latest commits).
>>>
>>> Thanks,
>>> RG
>>>
>>>
>>> ___
>>> LibreOffice mailing 
>>> listLibreOffice@lists.freedesktop.orghttps://lists.freedesktop.org/mailman/listinfo/libreoffice
>>>
>>>
>>> Best,
>>> Muhammet
>>>
>>
>> ___
>> LibreOffice mailing list
>> LibreOffice@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 sc/IwyuFilter_sc.yaml   |4 
 sc/source/core/data/bcaslot.cxx |1 +
 sc/source/core/data/document.cxx|1 +
 sc/source/core/data/grouptokenconverter.cxx |3 +++
 sc/source/core/data/simpleformulacalc.cxx   |1 +
 sc/source/core/data/table2.cxx  |1 +
 sc/source/core/inc/addinlis.hxx |6 +++---
 sc/source/core/inc/adiasync.hxx |1 +
 sc/source/core/inc/bcaslot.hxx  |   10 +-
 sc/source/core/inc/cellkeytranslator.hxx|3 +--
 sc/source/core/inc/ddelink.hxx  |3 ++-
 sc/source/core/inc/grouptokenconverter.hxx  |8 +---
 sc/source/core/inc/interpre.hxx |   11 +++
 sc/source/core/inc/jumpmatrix.hxx   |4 ++--
 sc/source/core/inc/parclass.hxx |1 -
 sc/source/core/inc/webservicelink.hxx   |   15 +--
 sc/source/core/tool/addincol.cxx|1 +
 sc/source/core/tool/addinlis.cxx|2 ++
 sc/source/core/tool/cellkeytranslator.cxx   |1 +
 sc/source/core/tool/interpr7.cxx|1 +
 20 files changed, 51 insertions(+), 27 deletions(-)

New commits:
commit dfb30a0b5c1f36f44e8806d9491cced343f4b8fd
Author: Gabor Kelemen 
AuthorDate: Thu Aug 23 00:19:02 2018 +0200
Commit: Miklos Vajna 
CommitDate: Tue Aug 28 18:31:27 2018 +0200

tdf#42949 Fix IWYU warnings in sc/source/core/inc/*

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

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

diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index b67bf7f9be83..0a369ba44f78 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -365,3 +365,7 @@ blacklist:
 sc/inc/unitconv.hxx:
 # base class has to be a complete type
 - map
+sc/source/core/inc/addinlis.hxx:
+# base class has to be a complete type
+- com/sun/star/lang/XServiceInfo.hpp
+- com/sun/star/sheet/XResultListener.hpp
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index da6f1b7a3232..b74fb95aaa46 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #if DEBUG_AREA_BROADCASTER
 #include 
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index e0ea4e04ed78..a1e44600eeac 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -101,6 +101,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
diff --git a/sc/source/core/data/grouptokenconverter.cxx 
b/sc/source/core/data/grouptokenconverter.cxx
index c5e99737afab..ec96c60827cf 100644
--- a/sc/source/core/data/grouptokenconverter.cxx
+++ b/sc/source/core/data/grouptokenconverter.cxx
@@ -9,6 +9,9 @@
 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
diff --git a/sc/source/core/data/simpleformulacalc.cxx 
b/sc/source/core/data/simpleformulacalc.cxx
index 9882fd7a352f..75bc35a322cb 100644
--- a/sc/source/core/data/simpleformulacalc.cxx
+++ b/sc/source/core/data/simpleformulacalc.cxx
@@ -13,6 +13,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define DISPLAY_LEN 15
 
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 749aa4fe28e6..8362c319d2ce 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -57,6 +57,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
diff --git a/sc/source/core/inc/addinlis.hxx b/sc/source/core/inc/addinlis.hxx
index 7da698456046..09bc0b85c07d 100644
--- a/sc/source/core/inc/addinlis.hxx
+++ b/sc/source/core/inc/addinlis.hxx
@@ -23,11 +23,11 @@
 #include 
 #include "adiasync.hxx"
 #include 
-#include 
 #include 
 #include 
-#include 
-#include 
+
+namespace com { namespace sun { namespace star { namespace sheet { class 
XVolatileResult; } } } }
+namespace rtl { template  class Reference; }
 
 class ScDocument;
 
diff --git a/sc/source/core/inc/adiasync.hxx b/sc/source/core/inc/adiasync.hxx
index 91b65311b71e..50e3924479a1 100644
--- a/sc/source/core/inc/adiasync.hxx
+++ b/sc/source/core/inc/adiasync.hxx
@@ -22,6 +22,7 @@
 
 #include 
 #include 
+#include 
 
 #include 
 
diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx
index 2ac91fcb4438..3a2ef4d6568d 100644
--- a/sc/source/core/inc/bcaslot.hxx
+++ b/sc/source/core/inc/bcaslot.hxx
@@ -20,19 +20,19 @@
 #ifndef INCLUDED_SC_SOURCE_CORE_INC_BCASLOT_HXX
 #define INCLUDED_SC_SOURCE_CORE_INC_BCASLOT_HXX
 
-#include 
 #include 
 #include 
-#include 
 #include 
 
 #include 
+#include 
+#include 
 
+#include 
 #include 
-#include 
-#include 
 
-class ScBroadcastArea;
+namespace sc { class ColumnSpanSet; }
+class ScHint;
 
 namespace sc {
 
diff --git a/sc/source/core/i

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

[Libreoffice Gerrit user]

 sw/qa/extras/ooxmlexport/data/tdf116436_rowFill.odt |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx  |9 ++
 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx   |7 +
 sw/source/filter/ww8/docxattributeoutput.cxx|   27 +++-
 4 files changed, 42 insertions(+), 1 deletion(-)

New commits:
commit e7d3e0b101ff25bb7edd49df61e330ccb4b75a24
Author: Justin Luth 
AuthorDate: Fri Aug 17 14:35:51 2018 +0300
Commit: Miklos Vajna 
CommitDate: Tue Aug 28 18:29:22 2018 +0200

tdf#116436 docx export: add missing table background fill

MS formats only have support for Table and Cell fill.

Interestingly, MS Word doesn't let the cells inherit from
the Table fill setting (even though LO docx import currently does),
so that value also needs to be written out into every cell.

Change-Id: Ib49fddf52758ff641428de747ea290d1fcb894f3
Reviewed-on: https://gerrit.libreoffice.org/59260
Reviewed-by: Justin Luth 
Tested-by: Justin Luth 
(cherry picked from commit 8cc753d54ad1834709c5802115580adf65def89e)
Reviewed-on: https://gerrit.libreoffice.org/59286
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf116436_rowFill.odt 
b/sw/qa/extras/ooxmlexport/data/tdf116436_rowFill.odt
new file mode 100644
index ..45f4a1c54b02
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf116436_rowFill.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index a34efcdd9e2f..df780afde73e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -50,6 +50,15 @@ DECLARE_OOXMLEXPORT_TEST(testTdf92524_autoColor, 
"tdf92524_autoColor.doc")
 CPPUNIT_ASSERT_EQUAL(COL_AUTO, 
Color(getProperty(getParagraph(1), "ParaBackColor")));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf116436_rowFill, "tdf116436_rowFill.odt")
+{
+uno::Reference xTextTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
+uno::Reference xTable(xTables->getByIndex(0), 
uno::UNO_QUERY);
+uno::Reference xCell = xTable->getCellByName("A1");
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0xF8DF7C), getProperty(xCell, 
"BackColor"));
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf46938_clearTabStop, 
"tdf46938_clearTabStop.docx")
 {
 // Number of tabstops should be zero, overriding the one in the style
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 762eae1bbc28..0f8e562a0f8a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -1014,6 +1014,13 @@ DECLARE_OOXMLEXPORT_TEST(testOO47778_2, "ooo47778-4.odt")
 {
 if (xmlDocPtr pXmlDoc = parseExport("word/document.xml"))
 assertXPathContent(pXmlDoc, "(//w:t)[4]", "c");
+
+// tdf116436: The problem was that the table background was undefined, not 
white.
+uno::Reference xTextTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
+uno::Reference xTable(xTables->getByIndex(0), 
uno::UNO_QUERY);
+uno::Reference xCell = xTable->getCellByName("A1");
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0xff), getProperty(xCell, 
"BackColor"));
 }
 
 DECLARE_OOXMLEXPORT_TEST(testOO67471, "ooo67471-2.odt")
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index c22ff5cdec4c..8529a06ad0bf 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3752,6 +3752,18 @@ void DocxAttributeOutput::TableDefinition( 
ww8::WW8TableNodeInfoInner::Pointer_t
 FSNS( XML_w, XML_val ), pJcVal,
 FSEND );
 
+// Output the table background color (although cell value still needs to 
be specified)
+const SvxBrushItem *pColorProp = 
pTableFormat->GetAttrSet().GetItem(RES_BACKGROUND);
+Color aColor = pColorProp ? pColorProp->GetColor() : COL_AUTO;
+if ( aColor != COL_AUTO )
+{
+OString sColor = msfilter::util::ConvertColor( aColor );
+m_pSerializer->singleElementNS( XML_w, XML_shd,
+FSNS( XML_w, XML_fill ), sColor.getStr( ),
+FSNS( XML_w, XML_val ), "clear",
+FSEND );
+}
+
 // Output the table borders
 TableDefaultBorders( pTableTextNodeInfoInner );
 
@@ -3814,12 +3826,25 @@ void DocxAttributeOutput::TableDefaultCellMargins( 
ww8::WW8TableNodeInfoInner::P
 
 void DocxAttributeOutput::TableBackgrounds( 
ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
 {
+const SwTable *pTable = pTableTextNodeInfoInner->getTable();
 const SwTableBox *pTableBox = pTableTextNodeInfoInner->getTableBox( );
+const SwTableLine *pTableRow = pTableBox->GetUpper();
 const SwFrameFormat *pFormat = pTableB

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

[Libreoffice Gerrit user]

 sw/qa/extras/ww8export/data/tdf116436_tableBackground.odt |binary
 sw/qa/extras/ww8export/ww8export2.cxx |   13 +
 sw/source/filter/ww8/wrtww8.cxx   |   36 +++---
 3 files changed, 31 insertions(+), 18 deletions(-)

New commits:
commit 029951e6d3636d99b370568313b8b5c2da8b452d
Author: Justin Luth 
AuthorDate: Fri Aug 17 18:38:57 2018 +0300
Commit: Miklos Vajna 
CommitDate: Tue Aug 28 18:28:23 2018 +0200

tdf#116436 doc export: add missing table background fill

MS formats only have support for Table and Cell fill.

Interestingly, MS Word doesn't let the cells inherit from
the Table fill setting,
so that value also needs to be written out into every cell.

Since Word apparently ignores the table color, I didn't
bother trying to search out how to export that in DOC
format.  (I did add it to DOCX since it was so easy to find.)

Change-Id: I8946f07b45f72fed5959369182882a7bf013b1d0
Reviewed-on: https://gerrit.libreoffice.org/59281
Tested-by: Jenkins
Reviewed-by: Justin Luth 
(cherry picked from commit b576ab5073a8cdf5ca2db04838d255e142f5a896)
Reviewed-on: https://gerrit.libreoffice.org/59287
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/ww8export/data/tdf116436_tableBackground.odt 
b/sw/qa/extras/ww8export/data/tdf116436_tableBackground.odt
new file mode 100644
index ..1ae65f788d4b
Binary files /dev/null and 
b/sw/qa/extras/ww8export/data/tdf116436_tableBackground.odt differ
diff --git a/sw/qa/extras/ww8export/ww8export2.cxx 
b/sw/qa/extras/ww8export/ww8export2.cxx
index 6cb358bf81ab..3ae7826db2cf 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -67,6 +67,19 @@ DECLARE_WW8EXPORT_TEST(testTdf55528_relativeTableWidth, 
"tdf55528_relativeTableW
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Table relative width percent", 
sal_Int16(98), getProperty(xTable, "RelativeWidth"));
  }
 
+DECLARE_WW8EXPORT_TEST(testTdf116436_tableBackground, 
"tdf116436_tableBackground.odt")
+{
+uno::Reference xTextTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
+uno::Reference xTable(xTables->getByIndex(0), 
uno::UNO_QUERY);
+uno::Reference xCell = xTable->getCellByName("A1");
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0xF8DF7C), getProperty(xCell, 
"BackColor"));
+xCell.set(xTable->getCellByName("A6"));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0x81D41A), getProperty(xCell, 
"BackColor"));
+xCell.set(xTable->getCellByName("B6"));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0xFFFBCC), getProperty(xCell, 
"BackColor"));
+}
+
 DECLARE_WW8EXPORT_TEST(testTdf37153, "tdf37153_considerWrapOnObjPos.doc")
 {
 CPPUNIT_ASSERT_EQUAL(text::WrapTextMode_THROUGH, 
getProperty(getShape(1), "Surround"));
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 745907044b52..833de9c7b452 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2582,6 +2582,7 @@ void WW8AttributeOutput::TableCellBorders(
 
 void WW8AttributeOutput::TableBackgrounds( 
ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
 {
+const SwTable * pTab = pTableTextNodeInfoInner->getTable();
 const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox();
 const SwTableLine * pTabLine = pTabBox->GetUpper();
 const SwTableBoxes & rTabBoxes = pTabLine->GetTabBoxes();
@@ -2590,19 +2591,24 @@ void WW8AttributeOutput::TableBackgrounds( 
ww8::WW8TableNodeInfoInner::Pointer_t
 m_rWW8Export.InsUInt16( NS_sprm::sprmTDefTableShd80 );
 m_rWW8Export.pO->push_back( static_cast(nBoxes * 2) );  // Len
 
+Color aRowColor = COL_AUTO;
+const SvxBrushItem *pTableColorProp = 
pTab->GetFrameFormat()->GetAttrSet().GetItem(RES_BACKGROUND);
+if ( pTableColorProp )
+aRowColor = pTableColorProp->GetColor();
+
+const SvxBrushItem *pRowColorProp = 
pTabLine->GetFrameFormat()->GetAttrSet().GetItem(RES_BACKGROUND);
+if ( pRowColorProp && pRowColorProp->GetColor() != COL_AUTO )
+aRowColor = pRowColorProp->GetColor();
+
 for ( sal_uInt8 n = 0; n < nBoxes; n++ )
 {
 const SwTableBox * pBox1 = rTabBoxes[n];
 const SwFrameFormat * pFrameFormat = pBox1->GetFrameFormat();
-const SfxPoolItem * pI = nullptr;
-Color aColor;
+Color aColor = aRowColor;
 
-if ( SfxItemState::SET == pFrameFormat->GetAttrSet().GetItemState( 
RES_BACKGROUND, false, &pI ) )
-{
-aColor = dynamic_cast(pI)->GetColor();
-}
-else
-aColor = COL_AUTO;
+const SvxBrushItem *pCellColorProp = 
pFrameFormat->GetAttrSet().GetItem(RES_BACKGROUND);
+if ( pCellColorProp && pCellColorProp->GetColor() != COL_AUTO )
+aColor = pCellColorProp->GetColor();
 
 WW8_SHD aShd;
 WW8Export::TransBrush( aColor, aShd );

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

[Libreoffice Gerrit user]

 cui/source/inc/page.hxx  |2 +-
 cui/source/tabpages/page.cxx |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c21e8bde3a2cf31e02d5eaf7a8773f6af6c67b3b
Author: Caolán McNamara 
AuthorDate: Tue Aug 21 12:06:51 2018 +0100
Commit: Miklos Vajna 
CommitDate: Tue Aug 28 18:27:19 2018 +0200

Resolves: tdf#119350 page with 0 margins shown as 1cm in page dialog

since...

commit 7958091b06954a7b253fdebb9ea0313db9217959
Date:   Fri Jun 15 14:03:31 2018 +0100

weld SvxPageDescPage

because the toggle handler fires when the value of landscape is set,
change to a click handler which fires only when the user explicitly
clicks on it, which restore the original quirky behaviour

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

diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index ab9f1cad1869..da7ee7047391 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -137,7 +137,7 @@ private:
 voidInit_Impl();
 DECL_LINK(LayoutHdl_Impl, weld::ComboBoxText&, void);
 DECL_LINK(PaperBinHdl_Impl, weld::ComboBoxText&, void);
-DECL_LINK(SwapOrientation_Impl, weld::ToggleButton&, void);
+DECL_LINK(SwapOrientation_Impl, weld::Button&, void);
 void SwapFirstValues_Impl( bool bSet );
 DECL_LINK(BorderModify_Impl, weld::MetricSpinButton&, void);
 void InitHeadFoot_Impl( const SfxItemSet& rSet );
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 265b2d1ef72b..df36ebf3a12d 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -316,8 +316,8 @@ void SvxPageDescPage::Init_Impl()
 m_xPaperSizeBox->connect_changed(LINK(this, SvxPageDescPage, 
PaperSizeSelect_Impl));
 m_xPaperWidthEdit->connect_value_changed( LINK(this, SvxPageDescPage, 
PaperSizeModify_Impl));
 m_xPaperHeightEdit->connect_value_changed(LINK(this, SvxPageDescPage, 
PaperSizeModify_Impl));
-m_xLandscapeBtn->connect_toggled(LINK(this, SvxPageDescPage, 
SwapOrientation_Impl));
-m_xPortraitBtn->connect_toggled(LINK(this, SvxPageDescPage, 
SwapOrientation_Impl));
+m_xLandscapeBtn->connect_clicked(LINK(this, SvxPageDescPage, 
SwapOrientation_Impl));
+m_xPortraitBtn->connect_clicked(LINK(this, SvxPageDescPage, 
SwapOrientation_Impl));
 
 Link aLink = LINK(this, SvxPageDescPage, 
BorderModify_Impl);
 m_xLeftMarginEdit->connect_value_changed(aLink);
@@ -905,7 +905,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeModify_Impl, 
weld::MetricSpinButton&,
 RangeHdl_Impl();
 }
 
-IMPL_LINK(SvxPageDescPage, SwapOrientation_Impl, weld::ToggleButton&, rBtn, 
void)
+IMPL_LINK(SvxPageDescPage, SwapOrientation_Impl, weld::Button&, rBtn, void)
 {
 if (
 (!bLandscape && &rBtn == m_xLandscapeBtn.get()) ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Jenkins CI behaviour

[Markus Mohrhard]

Hey,

On Tue, Aug 28, 2018 at 5:52 PM Rahul Gurung  wrote:

> What if it hiccups again in rebase ?
>


Rebase again. Sadly some of the tests are not as stable as they should be.
Some of the old java tests and some of the platform dependent tests (either
font based, or other platform parts) fail from time to time.

Just make sure that you are not causing the test failure before rebasing.

Regards,
Markus


> On 27 August 2018 at 19:11, Muhammet Kara 
> wrote:
>
>> Hi Rahul,
>>
>> On 08/27/2018 01:58 PM, Rahul Gurung wrote:
>>
>> hey,
>>
>> Why do we get that "junit test JunitTest_framework_complex failed"
>> message when we upload a patch and weird thing is it gets fixed by a
>> rebase? which rebase is recommended, normal or ticking that option we get ?
>> sorry im a newbie.
>>
>>
>> It is not something standard. Our Jenkins sometimes hiccups, which causes
>> such failures; and a rebase usually solves the issue for you by triggering
>> another build (with the latest commits).
>>
>> Thanks,
>> RG
>>
>>
>> ___
>> LibreOffice mailing 
>> listLibreOffice@lists.freedesktop.orghttps://lists.freedesktop.org/mailman/listinfo/libreoffice
>>
>>
>> Best,
>> Muhammet
>>
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Jenkins CI behaviour

[Rahul Gurung]

What if it hiccups again in rebase ?

On 27 August 2018 at 19:11, Muhammet Kara 
wrote:

> Hi Rahul,
>
> On 08/27/2018 01:58 PM, Rahul Gurung wrote:
>
> hey,
>
> Why do we get that "junit test JunitTest_framework_complex failed"
> message when we upload a patch and weird thing is it gets fixed by a
> rebase? which rebase is recommended, normal or ticking that option we get ?
> sorry im a newbie.
>
>
> It is not something standard. Our Jenkins sometimes hiccups, which causes
> such failures; and a rebase usually solves the issue for you by triggering
> another build (with the latest commits).
>
> Thanks,
> RG
>
>
> ___
> LibreOffice mailing 
> listLibreOffice@lists.freedesktop.orghttps://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>
> Best,
> Muhammet
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 drawinglayer/source/animation/animationtiming.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5b62a43349da6fda13fb33e0f1ec477c21daec8f
Author: Stephan Bergmann 
AuthorDate: Tue Aug 28 17:35:05 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 28 17:35:05 2018 +0200

Revert "-Werror=redundant-move"

This reverts commit 3ba67ff4b110635bae9552d1d895443a9df5e3e2.  Turns out
GCC 4.8 fights GCC 9 here, so needs a more elaborate fix.  Sorry for the 
noise.

diff --git a/drawinglayer/source/animation/animationtiming.cxx 
b/drawinglayer/source/animation/animationtiming.cxx
index 4bcc3ffa5f5b..db629aa8d31f 100644
--- a/drawinglayer/source/animation/animationtiming.cxx
+++ b/drawinglayer/source/animation/animationtiming.cxx
@@ -190,7 +190,7 @@ namespace drawinglayer
 pNew->append(*i);
 }
 
-return pNew;
+return std::move(pNew);
 }
 
 bool AnimationEntryList::operator==(const AnimationEntry& rCandidate) 
const
@@ -283,7 +283,7 @@ namespace drawinglayer
 pNew->append(*i);
 }
 
-return pNew;
+return std::move(pNew);
 }
 
 bool AnimationEntryLoop::operator==(const AnimationEntry& rCandidate) 
const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Mysql/Mariadb connector extension flag not recognized on MacoS when building LibreOffice

[Miklos Vajna]

Hi,

On Tue, Aug 28, 2018 at 04:40:55PM +0200, Alexander Thurgood 
 wrote:
> > MySQL connector is built-in code now, not an extension.
> 
> Does that mean that the flag --enable-bundle-mariadb is also no longer
> necessary ?

Correct, it's enabled by default.

Regards,

Miklos


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

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

[Libreoffice Gerrit user]

 sfx2/qa/cppunit/test_misc.cxx |8 
 sfx2/source/doc/docfile.cxx   |4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit ff0b1f3c8063f4d7c171a9ea2db4efbff16eda39
Author: Miklos Vajna 
AuthorDate: Tue Aug 28 09:05:06 2018 +0200
Commit: Caolán McNamara 
CommitDate: Tue Aug 28 17:10:14 2018 +0200

tdf#119050 sfx2 store: don't inherit temp file permissions when overwriting

The too aggressive error handling in commit
fb04780cf8523ad4e900ae8b9cecbe7a2697a12a (tdf#116117 sfx2 store: don't
inherit temp file permissions when renaming, 2018-03-12) means that if
the file is already there, then we don't try to stat() it; even if there
is no problem with that.

(cherry picked from commit 38afe2976eea427999c39ee3a73e7938ec8d5f7b)

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

diff --git a/sfx2/qa/cppunit/test_misc.cxx b/sfx2/qa/cppunit/test_misc.cxx
index d74687b25431..817e246b6bf6 100644
--- a/sfx2/qa/cppunit/test_misc.cxx
+++ b/sfx2/qa/cppunit/test_misc.cxx
@@ -146,6 +146,14 @@ void MiscTest::testNoThumbnail()
 // requested so.
 CPPUNIT_ASSERT(aStatus.getAttributes() & osl_File_Attribute_GrpRead);
 CPPUNIT_ASSERT(aStatus.getAttributes() & osl_File_Attribute_OthRead);
+
+// Now "save as" again to trigger the "overwrite" case.
+xStorable->storeToURL(aTempFile.GetURL(), {});
+CPPUNIT_ASSERT_EQUAL(osl::DirectoryItem::E_None, 
aItem.getFileStatus(aStatus));
+// The following check used to fail in the past, result had temp file
+// permissions.
+CPPUNIT_ASSERT(aStatus.getAttributes() & osl_File_Attribute_GrpRead);
+
 umask(nMask);
 #endif
 
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 72a6c131fc41..2e8b874deedb 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -179,8 +179,10 @@ sal_uInt64 GetDefaultFileAttributes(const OUString& rURL)
 if (!comphelper::isFileUrl(rURL))
 return nRet;
 
+// Make sure the file exists (and create it if not).
 osl::File aFile(rURL);
-if (aFile.open(osl_File_OpenFlag_Create) != osl::File::E_None)
+osl::File::RC nRes = aFile.open(osl_File_OpenFlag_Create);
+if (nRes != osl::File::E_None && nRes != osl::File::E_EXIST)
 return nRet;
 
 aFile.close();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 editeng/qa/unit/core-test.cxx   |9 -
 editeng/source/editeng/impedit2.cxx |1 +
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 4efa7cdc891b92b03e3335f7d410321db8109491
Author: Paul Trojahn 
AuthorDate: Sun Aug 19 09:18:28 2018 +0200
Commit: Caolán McNamara 
CommitDate: Tue Aug 28 17:08:51 2018 +0200

tdf#106260 Fix invisible pasted urls

UpdateFields() was never called after pasting a field.

Change-Id: I91f3eb183a0545d8735c0844f1e864a287101d22
Reviewed-on: https://gerrit.libreoffice.org/59339
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 7b52990a234bfd6d4efcbc9fe51e240e065faeea)
Reviewed-on: https://gerrit.libreoffice.org/59641
Reviewed-by: Paul Trojahn 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 7cd582a6a91e..1e0673677653 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -606,8 +606,8 @@ void Test::testHyperlinkCopyPaste()
 
 // Assert URL Fields and text before copy
 // Check text
-CPPUNIT_ASSERT_EQUAL( sal_uLong(aTextLen), rDoc.GetTextLen() );
-CPPUNIT_ASSERT_EQUAL( OUString("sampletextfortestingfeaturefields"), 
rDoc.GetParaAsString(sal_Int32(0)) );
+CPPUNIT_ASSERT_EQUAL( sal_uLong(aTextLen + aRepres1.getLength() + 
aRepres2.getLength()), rDoc.GetTextLen() );
+CPPUNIT_ASSERT_EQUAL( 
OUString("sampletextforuser@example.comtestingexample@domain.comfeaturefields"),
 rDoc.GetParaAsString(sal_Int32(0)) );
 
 // Check Field 1
 EFieldInfo aURLFieldInfo1 = aEditEngine.GetFieldInfo( sal_Int32(0), 
sal_uInt16(0) );
@@ -637,10 +637,10 @@ void Test::testHyperlinkCopyPaste()
 CPPUNIT_ASSERT_EQUAL( sal_uInt16(3), aEditEngine.GetFieldCount(0) );
 
 // Check the updated text length
-CPPUNIT_ASSERT_EQUAL( sal_uLong(aTextLen + 10 ), rDoc.GetTextLen() );
+CPPUNIT_ASSERT_EQUAL( sal_uLong(aTextLen + 10 + aRepres1.getLength()*2 + 
aRepres2.getLength()), rDoc.GetTextLen() );
 
 // Check the updated text contents
-CPPUNIT_ASSERT_EQUAL( 
OUString("sampletextfortestingfeaturefieldsfortesting"), 
rDoc.GetParaAsString(sal_Int32(0)) );
+CPPUNIT_ASSERT_EQUAL( 
OUString("sampletextforuser@example.comtestingexample@domain.comfeaturefieldsforuser@example.comtesting"),
 rDoc.GetParaAsString(sal_Int32(0)) );
 
 // Check the Fields and their values
 
@@ -830,7 +830,6 @@ void Test::testHyperlinkSearch()
 SvxFieldItem aField(aURLField, EE_FEATURE_FIELD);
 
 aEngine.InsertField(aSel, aField);
-aEngine.UpdateFields();
 
 OUString aContent = pNode->GetExpandedText();
 CPPUNIT_ASSERT_EQUAL_MESSAGE("get text", OUString("Please write email to 
j...@bob.com. if you find a fish(not a dog)."),
diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index 7e8fb846136a..39192121fcf0 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2803,6 +2803,7 @@ EditPaM ImpEditEngine::ImpInsertFeature(const 
EditSelection& rCurSel, const SfxP
 if ( IsUndoEnabled() && !IsInUndo() )
 InsertUndo(new EditUndoInsertFeature(pEditEngine, CreateEPaM(aPaM), 
rItem));
 aPaM = aEditDoc.InsertFeature( aPaM, rItem );
+UpdateFields();
 
 ParaPortion* pPortion = FindParaPortion( aPaM.GetNode() );
 OSL_ENSURE( pPortion, "Blind Portion in InsertFeature" );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 package/source/zipapi/ZipFile.cxx |   75 +-
 1 file changed, 34 insertions(+), 41 deletions(-)

New commits:
commit 2b5ff36afabcdbc879ae2f34903ede190c04
Author: Stephan Bergmann 
AuthorDate: Thu Aug 23 16:55:40 2018 +0200
Commit: Caolán McNamara 
CommitDate: Tue Aug 28 17:08:16 2018 +0200

Related rhbz#1618703: Properly handle failure encoding zip file

...when e.g. FIPS mode makes ZipFile::StaticGetCipher fail by throwing an
exception which would be caught by ZipPackageStream::saveChild (in
package/source/zippackage/ZipPackageStream.cxx) alright (and translated into
bSuccess = false), if ZipFile::StaticGetCipher didn't unhelpfully swallow 
and
ignore all exceptions in an outer try-catch.

Change-Id: I14376128515df1dd4bdac921edd8ab94cc9b7617
Reviewed-on: https://gerrit.libreoffice.org/59514
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 3cc6d3611ac8cbbfb9803f3a084d02edde470ad3)
Reviewed-on: https://gerrit.libreoffice.org/59569
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/package/source/zipapi/ZipFile.cxx 
b/package/source/zipapi/ZipFile.cxx
index 1ef81bf582a5..8126ebba305b 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -162,54 +162,47 @@ uno::Reference< xml::crypto::XCipherContext > 
ZipFile::StaticGetCipher( const un
 {
 uno::Reference< xml::crypto::XCipherContext > xResult;
 
-try
+if (xEncryptionData->m_nDerivedKeySize < 0)
 {
-if (xEncryptionData->m_nDerivedKeySize < 0)
-{
-throw ZipIOException("Invalid derived key length!" );
-}
+throw ZipIOException("Invalid derived key length!" );
+}
 
-uno::Sequence< sal_Int8 > aDerivedKey( 
xEncryptionData->m_nDerivedKeySize );
-if ( !xEncryptionData->m_nIterationCount &&
- xEncryptionData->m_nDerivedKeySize == 
xEncryptionData->m_aKey.getLength() )
-{
-// gpg4libre: no need to derive key, m_aKey is already
-// usable as symmetric session key
-aDerivedKey = xEncryptionData->m_aKey;
-}
-else if ( rtl_Digest_E_None != rtl_digest_PBKDF2( reinterpret_cast< 
sal_uInt8* >( aDerivedKey.getArray() ),
-aDerivedKey.getLength(),
-reinterpret_cast< const sal_uInt8 * > 
(xEncryptionData->m_aKey.getConstArray() ),
-xEncryptionData->m_aKey.getLength(),
-reinterpret_cast< const sal_uInt8 * > ( 
xEncryptionData->m_aSalt.getConstArray() ),
-xEncryptionData->m_aSalt.getLength(),
-xEncryptionData->m_nIterationCount ) )
-{
-throw ZipIOException("Can not create derived key!" );
-}
+uno::Sequence< sal_Int8 > aDerivedKey( xEncryptionData->m_nDerivedKeySize 
);
+if ( !xEncryptionData->m_nIterationCount &&
+ xEncryptionData->m_nDerivedKeySize == 
xEncryptionData->m_aKey.getLength() )
+{
+// gpg4libre: no need to derive key, m_aKey is already
+// usable as symmetric session key
+aDerivedKey = xEncryptionData->m_aKey;
+}
+else if ( rtl_Digest_E_None != rtl_digest_PBKDF2( reinterpret_cast< 
sal_uInt8* >( aDerivedKey.getArray() ),
+aDerivedKey.getLength(),
+reinterpret_cast< const sal_uInt8 * > 
(xEncryptionData->m_aKey.getConstArray() ),
+xEncryptionData->m_aKey.getLength(),
+reinterpret_cast< const sal_uInt8 * > ( 
xEncryptionData->m_aSalt.getConstArray() ),
+xEncryptionData->m_aSalt.getLength(),
+xEncryptionData->m_nIterationCount ) )
+{
+throw ZipIOException("Can not create derived key!" );
+}
 
-if ( xEncryptionData->m_nEncAlg == 
xml::crypto::CipherID::AES_CBC_W3C_PADDING )
-{
-uno::Reference< uno::XComponentContext > xContext = xArgContext;
-if ( !xContext.is() )
-xContext = comphelper::getProcessComponentContext();
+if ( xEncryptionData->m_nEncAlg == 
xml::crypto::CipherID::AES_CBC_W3C_PADDING )
+{
+uno::Reference< uno::XComponentContext > xContext = xArgContext;
+if ( !xContext.is() )
+xContext = comphelper::getProcessComponentContext();
 
-uno::Reference< xml::crypto::XNSSInitializer > 
xCipherContextSupplier = xml::crypto::NSSInitializer::create( xContext );
+uno::Reference< xml::crypto::XNSSInitializer > xCipherContextSupplier 
= xml::crypto::NSSInitializer::create( xContext );
 
-xResult = xCipherContextSupplier->getCipherContext( 
xEncryptionData->m_nEncAlg, aDerivedKey, xEncryptionData->m_aInitVector, 
bEncrypt, uno::Sequence< beans::NamedValue >() );
-}
-else if ( xEncryptionData->m

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - config_host.mk.in configure.ac sal/CppunitTest_sal_rtl.mk sal/Library_sal.mk sal/qa sal/rtl

[Libreoffice Gerrit user]

 config_host.mk.in|1 
 configure.ac |   23 +
 sal/CppunitTest_sal_rtl.mk   |4 
 sal/Library_sal.mk   |8 +
 sal/qa/rtl/cipher/rtl_cipher.cxx |   61 ++
 sal/rtl/cipher.cxx   |  164 ++-
 6 files changed, 258 insertions(+), 3 deletions(-)

New commits:
commit 062ac27d7052bcdf0bdd5db978e041d4c614fd6b
Author: Stephan Bergmann 
AuthorDate: Wed Aug 22 09:49:25 2018 +0200
Commit: Caolán McNamara 
CommitDate: Tue Aug 28 17:07:58 2018 +0200

rhbz#1618703: Allow to use OpenSSL as backend for rtl/cipher.h

...with new configuration option --enable-cipher-openssl-backend

rtl/cipher.h (which is part of the stable URE interface) offers 
functionality to
en-/decrypt data with Blowfish in ECB, CBC, and streaming CFB mode, and 
with RC4
(aka ARCFOUR; which is a stream cipher).  LO itself only uses Blowfish CFB 
and
RC4, so only those are wired to OpenSSL for now, for simplicity.  Using 
Blowfish
ECB and CBC, or Blowfish CFB in DirectionBoth mode would cause failures for 
now
(cf. sal/qa/rtl/cipher/rtl_cipher.cxx); the assumption is that no external 
code
actually makes use of this functionality.

Using NSS instead of OpenSSL could be an alternative, but there appears to 
be no
support in NSS for Blowfish in streaming CFB mode, only CKM_BLOWFISH_CBC for
CBC mode.

Change-Id: I0bc042961539ed46844c96cb1c808209578528a0
Reviewed-on: https://gerrit.libreoffice.org/59428
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 4bc16aeb73c1201f187742e0fefe35521fae77ac)
Reviewed-on: https://gerrit.libreoffice.org/59575
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/config_host.mk.in b/config_host.mk.in
index 4a864c745424..5d08d21e9b8a 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -112,6 +112,7 @@ export ENABLE_AVAHI=@ENABLE_AVAHI@
 export ENABLE_BREAKPAD=@ENABLE_BREAKPAD@
 export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@
 export ENABLE_CHART_TESTS=@ENABLE_CHART_TESTS@
+export ENABLE_CIPHER_OPENSSL_BACKEND=@ENABLE_CIPHER_OPENSSL_BACKEND@
 export ENABLE_LIBCMIS=@ENABLE_LIBCMIS@
 export ENABLE_COINMP=@ENABLE_COINMP@
 export SYSTEM_COINMP=@SYSTEM_COINMP@
diff --git a/configure.ac b/configure.ac
index 8de3b8bf4365..735ebf2e360a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1455,6 +1455,11 @@ AC_ARG_ENABLE(openssl,
  use only if you are hacking on it.]),
 ,enable_openssl=yes)
 
+libo_FUZZ_ARG_ENABLE(cipher-openssl-backend,
+AS_HELP_STRING([--enable-cipher-openssl-backend],
+[Enable using OpenSSL as the actual implementation of the rtl/cipher.h 
functionality.
+ Requires --enable-openssl.]))
+
 AC_ARG_ENABLE(library-bin-tar,
 AS_HELP_STRING([--enable-library-bin-tar],
 [Enable the building and reused of tarball of binary build for some 
'external' libraries.
@@ -9451,6 +9456,24 @@ fi
 
 AC_SUBST([DISABLE_OPENSSL])
 
+if test "$enable_cipher_openssl_backend" = yes && test "$DISABLE_OPENSSL" = 
TRUE; then
+if test "$libo_fuzzed_enable_cipher_openssl_backend" = yes; then
+AC_MSG_NOTICE([Resetting --enable-cipher-openssl-backend=no])
+enable_cipher_openssl_backend=no
+else
+AC_MSG_ERROR([--enable-cipher-openssl-backend needs OpenSSL, but 
--disable-openssl was given.])
+fi
+fi
+AC_MSG_CHECKING([whether to enable the OpenSSL backend for rtl/cipher.h])
+ENABLE_CIPHER_OPENSSL_BACKEND=
+if test "$enable_cipher_openssl_backend" = yes; then
+AC_MSG_RESULT([yes])
+ENABLE_CIPHER_OPENSSL_BACKEND=TRUE
+else
+AC_MSG_RESULT([no])
+fi
+AC_SUBST([ENABLE_CIPHER_OPENSSL_BACKEND])
+
 dnl ===
 dnl Check for building gnutls
 dnl ===
diff --git a/sal/CppunitTest_sal_rtl.mk b/sal/CppunitTest_sal_rtl.mk
index 43533fc5ab1c..c2eaa72daa26 100644
--- a/sal/CppunitTest_sal_rtl.mk
+++ b/sal/CppunitTest_sal_rtl.mk
@@ -63,4 +63,8 @@ $(call gb_CppunitTest_get_target,sal_rtl) : \
 
 $(eval $(call gb_CppunitTest_use_external,sal_rtl,boost_headers))
 
+ifeq ($(ENABLE_CIPHER_OPENSSL_BACKEND),TRUE)
+$(eval $(call gb_CppunitTest_add_defs,sal_rtl,-DLIBO_CIPHER_OPENSSL_BACKEND))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 0227d6ffe32c..42e9287f30ac 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -257,4 +257,12 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
 
 endif # ifneq ($(OS),WNT)
 
+ifeq ($(ENABLE_CIPHER_OPENSSL_BACKEND),TRUE)
+$(eval $(call gb_Library_add_defs,sal,-DLIBO_CIPHER_OPENSSL_BACKEND))
+$(eval $(call gb_Library_use_externals,sal, \
+openssl \
+openssl_headers \
+))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/sal/qa/rtl/cipher/rtl_cipher.cxx b/sal/qa/rtl/cipher/rtl_cipher.cxx
index e

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sysui/desktop

[Libreoffice Gerrit user]

 sysui/desktop/apparmor/program.soffice.bin |4 
 1 file changed, 4 insertions(+)

New commits:
commit 03fe0c36fccc7f2a9d0962dd8ed3d731c9f0d408
Author: Vincas Dargis 
AuthorDate: Tue Aug 14 21:34:59 2018 +0300
Commit: Caolán McNamara 
CommitDate: Tue Aug 28 17:07:33 2018 +0200

apparmor: fix printing to file

AppArmor denies writing to .ps files and dealing with temporaries needed
for "Print to file" functionality. Add .ps to the allowed extensions
list, also giving access to rm executable together with writing
printing-related temporary file.

Change-Id: I415e1401878bff6459f42162d4e8b517261b9cec
Reviewed-on: https://gerrit.libreoffice.org/59114
Tested-by: Jenkins
Reviewed-by: Rene Engelhard 
(cherry picked from commit 136077b40cdabab83aec6833bf3895d4305d30a3)
Reviewed-on: https://gerrit.libreoffice.org/59662
Reviewed-by: Vincas Dargis 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sysui/desktop/apparmor/program.soffice.bin 
b/sysui/desktop/apparmor/program.soffice.bin
index 82525d6cde7d..6e328c8f4c5c 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -37,6 +37,8 @@
 @{libreoffice_ext} += {,x,X}[hH][tT][mM]{,l,L}
 #.epub
 @{libreoffice_ext} += [eE][pP][uU][bB]
+#.ps (printing to file)
+@{libreoffice_ext} += [pP][sS]
 
 #Images
 @{libreoffice_ext} += [jJ][pP][gG]
@@ -113,6 +115,7 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
   owner @{HOME}/.cache/fontconfig/**rw,
   owner @{HOME}/.config/gtk-???/bookmarks r,  #Make bookmarks work
   owner @{HOME}/.recently-used  rwk,
+  owner /tmp/psp[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]* rw, 
#/tmp/psp1534203998 (printing to file)
 
   owner /{,var/}run/user/*/dconf/user   rw,
   owner @{HOME}/.config/dconf/user  r,
@@ -127,6 +130,7 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
   /{usr/,}bin/shrmix,
   /{usr/,}bin/bash  rmix,
   /{usr/,}bin/dash  rmix,
+  /{usr/,}bin/rmrmix, #deleting /tmp/psp1534203998 
(printing to file)
   /usr/bin/bluetooth-sendto rmPUx,
   /usr/bin/lpr  rmPUx,
   /usr/bin/paperconfrmix,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 drawinglayer/source/animation/animationtiming.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3ba67ff4b110635bae9552d1d895443a9df5e3e2
Author: Stephan Bergmann 
AuthorDate: Tue Aug 28 16:45:32 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 28 16:45:32 2018 +0200

-Werror=redundant-move

Change-Id: I8e239d95e288cba4fd798ce04cfe56cb62fff6a9

diff --git a/drawinglayer/source/animation/animationtiming.cxx 
b/drawinglayer/source/animation/animationtiming.cxx
index db629aa8d31f..4bcc3ffa5f5b 100644
--- a/drawinglayer/source/animation/animationtiming.cxx
+++ b/drawinglayer/source/animation/animationtiming.cxx
@@ -190,7 +190,7 @@ namespace drawinglayer
 pNew->append(*i);
 }
 
-return std::move(pNew);
+return pNew;
 }
 
 bool AnimationEntryList::operator==(const AnimationEntry& rCandidate) 
const
@@ -283,7 +283,7 @@ namespace drawinglayer
 pNew->append(*i);
 }
 
-return std::move(pNew);
+return pNew;
 }
 
 bool AnimationEntryLoop::operator==(const AnimationEntry& rCandidate) 
const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Mysql/Mariadb connector extension flag not recognized on MacoS when building LibreOffice

[Alexander Thurgood]

Le 28/08/2018 à 16:29, Andras Timar a écrit :

Hi Andras,

Thanks for the info.

> MySQL connector is built-in code now, not an extension.

Does that mean that the flag --enable-bundle-mariadb is also no longer
necessary ?


Alex


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

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-4' - kit/Kit.cpp

[Libreoffice Gerrit user]

 kit/Kit.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3988c9f8f0683cb62f656ada261e2630a6ff2f32
Author: Ashod Nakashian 
AuthorDate: Tue Aug 21 08:23:03 2018 -0400
Commit: Andras Timar 
CommitDate: Tue Aug 28 16:40:21 2018 +0200

wsd: log the raw message in kit as trace

To protect PII from getting exposed.

Change-Id: I838ccbdde5f497a98e022322a3f623ae677d4c13
Reviewed-on: https://gerrit.libreoffice.org/59397
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 
(cherry picked from commit 428938fbd4d9a8411269e07fa329ec6c5f84cbb2)
Reviewed-on: https://gerrit.libreoffice.org/59707
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 362f7bf2a..6d8bae5f8 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -1998,7 +1998,7 @@ protected:
 }
 #endif
 
-LOG_DBG(_socketName << ": recv [" << 
LOOLProtocol::getAbbreviatedMessage(message) << "].");
+LOG_TRC(_socketName << ": recv [" << 
LOOLProtocol::getAbbreviatedMessage(message) << "].");
 std::vector tokens = LOOLProtocol::tokenize(message);
 
 // Note: Syntax or parsing errors here are unexpected and fatal.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst external/epoxy

[Libreoffice Gerrit user]

 download.lst   |4 +--
 external/epoxy/UnpackedTarball_epoxy.mk|2 -
 external/epoxy/epoxy.noegl.by.default.patch|   30 -
 external/epoxy/epoxy.noglx_means_noglx.patch.1 |   28 ---
 external/epoxy/epoxy.visibility.patch  |5 
 5 files changed, 32 insertions(+), 37 deletions(-)

New commits:
commit 7d0d1b198e8f87b9a59a584abf71800874f6a431
Author: Caolán McNamara 
AuthorDate: Mon Aug 27 17:01:15 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Aug 28 16:32:57 2018 +0200

upgrade epoxy to 1.5.2

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

diff --git a/download.lst b/download.lst
index 9ecd5896b95c..1ed75b36f3b3 100644
--- a/download.lst
+++ b/download.lst
@@ -33,8 +33,8 @@ export CURL_SHA256SUM := 
e9c37986337743f37fd14fe8737f246e97aec94b39d1b71e8a5973f
 export CURL_TARBALL := curl-7.60.0.tar.gz
 export EBOOK_SHA256SUM := 
7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9
 export EBOOK_TARBALL := libe-book-0.1.3.tar.xz
-export EPOXY_SHA256SUM := 
1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64
-export EPOXY_TARBALL := libepoxy-1.3.1.tar.bz2
+export EPOXY_SHA256SUM := 
a9562386519eb3fd7f03209f279f697a8cba520d3c155d6e253c3e138beca7d8
+export EPOXY_TARBALL := libepoxy-1.5.2.tar.xz
 export EPM_SHA256SUM := 
b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7713ddb91
 export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
 export EPUBGEN_SHA256SUM := 
03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad
diff --git a/external/epoxy/UnpackedTarball_epoxy.mk 
b/external/epoxy/UnpackedTarball_epoxy.mk
index d72a9b9feab6..55d4012ef642 100644
--- a/external/epoxy/UnpackedTarball_epoxy.mk
+++ b/external/epoxy/UnpackedTarball_epoxy.mk
@@ -14,10 +14,10 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,epoxy,$(EPOXY_TARBALL)))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,epoxy,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,epoxy, \
+external/epoxy/epoxy.visibility.patch \
 external/epoxy/epoxy.windows.api.patch \
 external/epoxy/epoxy.noegl.by.default.patch \
 external/epoxy/clang-cl.patch \
-external/epoxy/epoxy.noglx_means_noglx.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/epoxy/epoxy.noegl.by.default.patch 
b/external/epoxy/epoxy.noegl.by.default.patch
index d80a3b99f15c..b562af433198 100644
--- a/external/epoxy/epoxy.noegl.by.default.patch
+++ b/external/epoxy/epoxy.noegl.by.default.patch
@@ -1,11 +1,29 @@
 --- src/dispatch_common.h
 +++ src/dispatch_common.h
-@@ -39,7 +39,7 @@
+@@ -24,20 +24,19 @@
+ #include "config.h"
+ 
+ #ifdef _WIN32
+-#define PLATFORM_HAS_EGL ENABLE_EGL
+-#define PLATFORM_HAS_GLX ENABLE_GLX
++#define PLATFORM_HAS_EGL 0
++#define PLATFORM_HAS_GLX 0
+ #define PLATFORM_HAS_WGL 1
+ #elif defined(__APPLE__)
+-#define PLATFORM_HAS_EGL ENABLE_EGL
+-#define PLATFORM_HAS_GLX ENABLE_GLX
++#define PLATFORM_HAS_EGL 0
++#define PLATFORM_HAS_GLX 0
+ #define PLATFORM_HAS_WGL 0
+ #elif defined(ANDROID)
+-#define PLATFORM_HAS_EGL ENABLE_EGL
++#define PLATFORM_HAS_EGL 1
+ #define PLATFORM_HAS_GLX 0
  #define PLATFORM_HAS_WGL 0
- #define EPOXY_IMPORTEXPORT
  #else
--#define PLATFORM_HAS_EGL 1
-+
- #define PLATFORM_HAS_GLX 1
+-#define PLATFORM_HAS_EGL ENABLE_EGL
+-#define PLATFORM_HAS_GLX ENABLE_GLX
++#define PLATFORM_HAS_GLX 1
  #define PLATFORM_HAS_WGL 0
- #define EPOXY_IMPORTEXPORT
+ #endif
+ 
diff --git a/external/epoxy/epoxy.noglx_means_noglx.patch.1 
b/external/epoxy/epoxy.noglx_means_noglx.patch.1
deleted file mode 100644
index 6a5c7eb3f472..
--- a/external/epoxy/epoxy.noglx_means_noglx.patch.1
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur epoxy.org/src/dispatch_common.c epoxy/src/dispatch_common.c
 epoxy.org/src/dispatch_common.c2017-09-15 14:59:07.458635939 +0200
-+++ epoxy/src/dispatch_common.c2017-09-15 15:03:16.978088807 +0200
-@@ -660,10 +660,13 @@
- #elif defined(__APPLE__)
- return epoxy_gl_dlsym(name);
- #else
-+#if PLATFORM_HAS_GLX
- if (epoxy_current_context_is_glx()) {
- return glXGetProcAddressARB((const GLubyte *)name);
--} else {
-+} else
-+#endif
- #if PLATFORM_HAS_EGL
-+{
- GLenum egl_api = epoxy_egl_get_current_gl_context_api();
- 
- switch (egl_api) {
-@@ -673,8 +676,8 @@
- case EGL_NONE:
- break;
- }
--#endif
- }
-+#endif
- errx(1, "Couldn't find current GLX or EGL context.\n");
- #endif
- }
diff --git a/external/epoxy/epoxy.visibility.patch 
b/external/epoxy/epoxy.visibility.patch
new file mode 100644
index ..12297b5e291c
--- /dev/null
+++ b/external/epoxy/epoxy.visibility.patch
@@ -0,0 +1,5 @@
+--- src/config.h   2018-08-28 13:19:40.699141662 +0100
 src/config.h   2018-08-

Re: Mysql/Mariadb connector extension flag not recognized on MacoS when building LibreOffice

[Andras Timar]

Hi Alex,

On Tue, Aug 28, 2018 at 4:25 PM Alexander Thurgood 
wrote:

> Hi all,
>
> Has someone removed the configure flag --enable-ext-mariadb-connector flag
> ?
>
> If so, what is the flag that should be used now if one wants to build
> the mysql/mariadb connector extension ?
>
>
See
https://cgit.freedesktop.org/libreoffice/core/commit/?id=26b40fcfc67480e75bd9959b0c5cb9db10fdf6a1
MySQL connector is built-in code now, not an extension.

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

Mysql/Mariadb connector extension flag not recognized on MacoS when building LibreOffice

[Alexander Thurgood]

Hi all,

Has someone removed the configure flag --enable-ext-mariadb-connector flag ?

If so, what is the flag that should be used now if one wants to build
the mysql/mariadb connector extension ?

TIA,

Alex

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

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

[Libreoffice Gerrit user]

 include/tools/time.hxx   |   19 +
 sc/source/core/tool/interpr2.cxx |   56 ++-
 tools/source/datetime/ttime.cxx  |   51 +++
 3 files changed, 79 insertions(+), 47 deletions(-)

New commits:
commit 7f3c6efd859050c8f376b6820710e91fa9077ac4
Author: Eike Rathke 
AuthorDate: Tue Aug 28 13:46:37 2018 +0200
Commit: Eike Rathke 
CommitDate: Tue Aug 28 16:23:46 2018 +0200

Move lcl_getHourMinuteSecond() to tools::Time::GetClock()

Also add fFractionOfSecond and nFractionDecimals to obtain the
remaining fraction of second.

In preparation to use this in the number formatter and other
places that obtain the wall clock time particles, which likely so
far use bad rounding as well.

Change-Id: I4fbea4165c560646438b06c340756c97dafa7c78
Reviewed-on: https://gerrit.libreoffice.org/59700
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/include/tools/time.hxx b/include/tools/time.hxx
index c6ada22a526d..9c137e5b9196 100644
--- a/include/tools/time.hxx
+++ b/include/tools/time.hxx
@@ -104,6 +104,25 @@ public:
 /// 12 hours == 0.5 days
 double  GetTimeInDays() const;
 
+/** Get the wall clock time particles for a (date+)time value.
+
+Does the necessary rounding and truncating to obtain hour, minute,
+second and fraction of second from a double time value (time in days,
+0.5 == 12h) such that individual values are not rounded up, i.e.
+x:59:59.999 does not yield x+1:0:0.00
+
+A potential date component (fTimeInDays >= 1.0) is discarded.
+
+@param  nFractionDecimals
+If > 0 fFractionOfSecond is truncated to that amount of
+decimals.
+Else fFractionOfSecond returns the full remainder of the
+fractional second.
+ */
+static void GetClock( double fTimeInDays,
+  sal_uInt16& nHour, sal_uInt16& nMinute, 
sal_uInt16& nSecond,
+  double& fFractionOfSecond, int nFractionDecimals 
);
+
 boolIsEqualIgnoreNanoSec( const tools::Time& rTime ) const;
 
 booloperator ==( const tools::Time& rTime ) const
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 92bd4ebd1aae..6adc434a3864 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -142,65 +142,27 @@ void ScInterpreter::ScGetDay()
 PushDouble(static_cast(aDate.GetDay()));
 }
 
-/* TODO: move this to tools::Time so also SvNumberFormatter and everything else
- * can use it and all display the same values. */
-static void lcl_getHourMinuteSecond( double fTimeInDays, sal_Int32& nHour, 
sal_Int32& nMinute, sal_Int32& nSecond )
-{
-const double fTime = fTimeInDays - rtl::math::approxFloor(fTimeInDays); // 
date part absent
-
-// If 0 then full day (or no day), shortcut.
-// If < 0 then approxFloor() effectively returned the ceiling (note this
-// also holds for negative fTimeInDays values) because of a near identical
-// value, shortcut this to a full day as well.
-// If >= 1.0 (actually == 1.0) then fTimeInDays is a negative small value
-// not significant for a representable time and approxFloor() returned -1,
-// shortcut to 0:0:0, otherwise it would become 24:0:0.
-if (fTime <= 0.0 || fTime >= 1.0)
-{
-nHour = nMinute = nSecond = 0;
-return;
-}
-
-// In seconds, including milli and nano.
-const double fRawSeconds = fTime * DATE_TIME_FACTOR;
-
-// Round to nanoseconds, which is the highest resolution this could be
-// influenced by.
-double fSeconds = rtl::math::round( fRawSeconds, 9);
-
-// If this ended up as a full day the original value was very very close
-// but not quite. Take that.
-if (fSeconds >= tools::Time::secondPerDay)
-fSeconds = fRawSeconds;
-
-// Now do not round values (specifically not up), but truncate to the next
-// magnitude, so 23:59:59.99 is still 23:59:59 and not 24:00:00 (or even
-// 00:00:00 which Excel does).
-nHour = fSeconds / tools::Time::secondPerHour;
-fSeconds -= nHour * tools::Time::secondPerHour;
-nMinute = fSeconds / tools::Time::secondPerMinute;
-fSeconds -= nMinute * tools::Time::secondPerMinute;
-nSecond = fSeconds;
-}
-
 void ScInterpreter::ScGetMin()
 {
-sal_Int32 nHour, nMinute, nSecond;
-lcl_getHourMinuteSecond( GetDouble(), nHour, nMinute, nSecond);
+sal_uInt16 nHour, nMinute, nSecond;
+double fFractionOfSecond;
+tools::Time::GetClock( GetDouble(), nHour, nMinute, nSecond, 
fFractionOfSecond, 0);
 PushDouble( nMinute);
 }
 
 void ScInterpreter::ScGetSec()
 {
-sal_Int32 nHour, nMinute, nSecond;
-lcl_getHourMinuteSecond( GetDouble(), nHour, nMinute, nSecond);
+sal_uInt16 nHour, nMinute, nSecond;
+double fFracti

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

[Libreoffice Gerrit user]

 sw/qa/extras/ooxmlexport/data/tdf119143.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx|   20 +++
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |   18 +
 writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |5 +++
 writerfilter/source/ooxml/model.xml   |   24 ++
 5 files changed, 67 insertions(+)

New commits:
commit c18e2c314a8f694abd3d31a168f670078d183011
Author: Mike Kaganski 
AuthorDate: Mon Aug 27 12:34:12 2018 +0300
Commit: Andras Timar 
CommitDate: Tue Aug 28 16:21:20 2018 +0200

tdf#119143: introduce tentative directional embedding import support

ECMA-376-1:2016 states that w:dir is functionally equivalent to LRE/RLE+PDF
pair around the enclosed runs. So this patch does just that.

Change-Id: Ibf9775338cc38a3bbc38a42a33fc64ae787b478f
Reviewed-on: https://gerrit.libreoffice.org/59643
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/59671
Tested-by: Mike Kaganski 
Reviewed-by: Andras Timar 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf119143.docx 
b/sw/qa/extras/ooxmlexport/data/tdf119143.docx
new file mode 100644
index ..be0bc03f71c1
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf119143.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index a00d8f4f546d..131953eb9723 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -315,6 +315,26 @@ DECLARE_OOXMLEXPORT_TEST(testTdf112118_DOCX, 
"tdf112118.docx")
 }
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf119143, "tdf119143.docx")
+{
+// The runs inside  were ignored
+const OUString sParaText = getParagraph(1)->getString();
+CPPUNIT_ASSERT_EQUAL(
+OUString::fromUtf8(
+u8"عندما يريد العالم أن يتكلّم ‬ ، فهو يتحدّث "
+u8"بلغة "
+u8"يونيكود. تسجّل الآن لحضور المؤتمر الدولي العاشر "
+u8"ليونيكود (Unicode Conference)، الذي سيعقد في 10-12 "
+u8"آذار 1997 بمدينة مَايِنْتْس، ألمانيا. و سيجمع المؤتمر "
+u8"بين خبراء من كافة قطاعات الصناعة على الشبكة "
+u8"العالمية انترنيت ويونيكود، حيث ستتم، على الصعيدين "
+u8"الدولي والمحلي على حد سواء مناقشة سبل استخدام "
+u8"يونكود في النظم القائمة وفيما يخص التطبيقات "
+u8"الحاسوبية، الخطوط، تصميم النصوص والحوسبة متعددة "
+u8"اللغات."),
+sParaText);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 138954023f89..8647b4525727 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -357,6 +357,10 @@ void OOXMLFastContextHandler::endCharacterGroup()
 }
 }
 
+void OOXMLFastContextHandler::pushBiDiEmbedLevel() {}
+
+void OOXMLFastContextHandler::popBiDiEmbedLevel() {}
+
 void OOXMLFastContextHandler::startParagraphGroup()
 {
 if (isForwardEvents())
@@ -1230,6 +1234,20 @@ void 
OOXMLFastContextHandlerValue::setDefaultStringValue()
 setValue(pValue);
 }
 }
+
+// ECMA-376-1:2016 17.3.2.8; 
https://www.unicode.org/reports/tr9/#Explicit_Directional_Embeddings
+void OOXMLFastContextHandlerValue::pushBiDiEmbedLevel()
+{
+const bool bRtl
+= mpValue.get() && mpValue.get()->getInt() == 
NS_ooxml::LN_Value_ST_Direction_rtl;
+OOXMLFactory::characters(this, bRtl ? u"\u202B" : u"\u202A"); // RLE / LRE
+}
+
+void OOXMLFastContextHandlerValue::popBiDiEmbedLevel()
+{
+OOXMLFactory::characters(this, u"\u202C"); // PDF (POP DIRECTIONAL 
FORMATTING)
+}
+
 /*
   class OOXMLFastContextHandlerTable
 */
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index a89644dc6e2d..8876ff76ad2d 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -137,6 +137,8 @@ public:
 void endParagraphGroup();
 void startCharacterGroup();
 void endCharacterGroup();
+virtual void pushBiDiEmbedLevel();
+virtual void popBiDiEmbedLevel();
 void startSdt();
 void endSdt();
 
@@ -333,6 +335,9 @@ public:
 virtual void setDefaultHexValue() override;
 virtual void setDefaultStringValue() override;
 
+virtual void pushBiDiEmbedLevel() override;
+virtual void popBiDiEmbedLevel() override;
+
 private:
 OOXMLValue::Pointer_t mpValue;
 };
diff --git a/writerfilter/source/ooxml/model.xml 
b/writerfilter/source/ooxml/model.xml
index 25f8a267bb8a..36328c035d75 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -13943,12 +13943,27 @@
   
 
   
+  
+   

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

[Libreoffice Gerrit user]

 cppuhelper/source/paths.cxx |2 +-
 desktop/inc/strings.hrc |4 ++--
 desktop/source/app/app.cxx  |4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit b57ed76361da672697eccd219b09bd358a967e0d
Author: Andrea Gelmini 
AuthorDate: Mon Aug 27 14:38:16 2018 +0200
Commit: Julien Nabet 
CommitDate: Tue Aug 28 16:19:10 2018 +0200

Fix typo in code

To complete commit:
e9fa088735bfbd34bc81f1925438691f746db070

It passed "make check" on Linux

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

diff --git a/cppuhelper/source/paths.cxx b/cppuhelper/source/paths.cxx
index 429df7edf8d3..38584b38ee4d 100644
--- a/cppuhelper/source/paths.cxx
+++ b/cppuhelper/source/paths.cxx
@@ -64,7 +64,7 @@ rtl::OUString cppu::getUnoIniUri() {
 // Wouldn't it be lovely to avoid this ugly hard-coding.
 // The problem is that the 'create_bootstrap_macro_expander_factory()'
 // required for bootstrapping services, calls cppu::get_unorc directly
-// instead of re-using the BoostrapHandle from:
+// instead of re-using the BootstrapHandle from:
 // defaultBootstrap_InitialComponentContext
 // and since rtlBootstrapHandle is not ref-counted doing anything
 // clean here is hardish.
diff --git a/desktop/inc/strings.hrc b/desktop/inc/strings.hrc
index 40504ce36815..912f76626b0e 100644
--- a/desktop/inc/strings.hrc
+++ b/desktop/inc/strings.hrc
@@ -174,8 +174,8 @@
 #define STR_TITLE_USERDATALOCKED
NC_("STR_TITLE_USERDATALOCKED", "%PRODUCTNAME %PRODUCTVERSION")
 #define STR_ERR_PRINTDISABLED   
NC_("STR_ERR_PRINTDISABLED", "Printing is disabled. No documents can be 
printed.")
 #define STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE
NC_("STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE", "The path manager is not 
available.\n")
-#define STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE 
NC_("STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE", "%PRODUCTNAME user installation 
could not be completed due to insufficient free disk space. Please free more 
disc space at the following location and restart %PRODUCTNAME:\n\n")
-#define STR_BOOSTRAP_ERR_NOACCESSRIGHTS 
NC_("STR_BOOSTRAP_ERR_NOACCESSRIGHTS", "%PRODUCTNAME user installation could 
not be processed due to missing access rights. Please make sure that you have 
sufficient access rights for the following location and restart 
%PRODUCTNAME:\n\n")
+#define STR_BOOTSTRAP_ERR_NOTENOUGHDISKSPACE 
NC_("STR_BOOTSTRAP_ERR_NOTENOUGHDISKSPACE", "%PRODUCTNAME user installation 
could not be completed due to insufficient free disk space. Please free more 
disc space at the following location and restart %PRODUCTNAME:\n\n")
+#define STR_BOOTSTRAP_ERR_NOACCESSRIGHTS 
NC_("STR_BOOTSTRAP_ERR_NOACCESSRIGHTS", "%PRODUCTNAME user installation could 
not be processed due to missing access rights. Please make sure that you have 
sufficient access rights for the following location and restart 
%PRODUCTNAME:\n\n")
 
 #define RID_STR_UNOPKG_ACCEPT_LIC_1 
NC_("RID_STR_UNOPKG_ACCEPT_LIC_1", "Extension Software License Agreement of 
$NAME:")
 #define RID_STR_UNOPKG_ACCEPT_LIC_2 
NC_("RID_STR_UNOPKG_ACCEPT_LIC_2", "Read the complete License Agreement 
displayed above. " \
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 71b83d64f3c3..de11310bc7ca 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -878,9 +878,9 @@ void Desktop::HandleBootstrapErrors(
 
 OUString aDiagnosticMessage;
 if ( aBootstrapError == BE_USERINSTALL_NOTENOUGHDISKSPACE )
-aDiagnosticMessage = DpResId(STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE);
+aDiagnosticMessage = DpResId(STR_BOOTSTRAP_ERR_NOTENOUGHDISKSPACE);
 else
-aDiagnosticMessage = DpResId(STR_BOOSTRAP_ERR_NOACCESSRIGHTS);
+aDiagnosticMessage = DpResId(STR_BOOTSTRAP_ERR_NOACCESSRIGHTS);
 aDiagnosticMessage += aUserInstallationPath;
 
 FatalError(MakeStartupErrorMessage(aDiagnosticMessage));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/source/window/builder.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 6a71408b00b99b3dc841b0a0812b5388f3e0ebed
Author: Caolán McNamara 
AuthorDate: Tue Aug 28 13:17:10 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Aug 28 16:11:08 2018 +0200

create toggles with WB_TOGGLE set

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

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 0394261e0248..458b836e77b3 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1003,9 +1003,11 @@ namespace
 pButton->SetCommandHandler(aCommand);
 }
 
-VclPtr extractStockAndBuildPushButton(vcl::Window *pParent, 
VclBuilder::stringmap &rMap, bool bLegacy)
+VclPtr extractStockAndBuildPushButton(vcl::Window *pParent, 
VclBuilder::stringmap &rMap, bool bToggle, bool bLegacy)
 {
 WinBits nBits = WB_CLIPCHILDREN|WB_CENTER|WB_VCENTER;
+if (bToggle)
+nBits |= WB_TOGGLE;
 
 nBits |= extractRelief(rMap);
 
@@ -1511,7 +1513,7 @@ VclPtr VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
 VclPtr xButton;
 OUString sMenu = BuilderUtils::extractCustomProperty(rMap);
 if (sMenu.isEmpty())
-xButton = extractStockAndBuildPushButton(pParent, rMap, m_bLegacy);
+xButton = extractStockAndBuildPushButton(pParent, rMap, name == 
"GtkToggleButton", m_bLegacy);
 else
 {
 assert(m_bLegacy && "use GtkMenuButton");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/inc/printdlg.hxx   |1 +
 vcl/source/window/printdlg.cxx |9 +
 vcl/uiconfig/ui/printdialog.ui |4 ++--
 3 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 571df3ede6f09c945c4cdfd37f34ef760b6b1af2
Author: Michael Weghorn 
AuthorDate: Tue Aug 28 07:53:43 2018 +0200
Commit: Katarina Behrens 
CommitDate: Tue Aug 28 15:59:54 2018 +0200

tdf119556 Sync "Use only paper size from printer preferences"

Since commit ee6dad51150fd53d19f882edfefa879e18f9897d,
the "Use only paper size from printer settings" is shown
at two places in the print dialog

1) in the "Options" tab
2) in the "Properties" -> "Paper" tab

This makes the setting being correctly updated in the UI in
1) as well if changed in 2).

The other way around was already working previously.

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

diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index e855c123e5d3..3aae7dd89103 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -233,6 +233,7 @@ namespace vcl
 DECL_LINK( ToggleHdl, CheckBox&, void );
 DECL_LINK( ToggleRadioHdl, RadioButton&, void );
 DECL_LINK( ModifyHdl, Edit&, void );
+DECL_LINK( ActivatePageHdl, TabControl *, void);
 
 DECL_LINK( UIOption_CheckHdl, CheckBox&, void );
 DECL_LINK( UIOption_RadioHdl, RadioButton&, void );
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 9c0666f8dc34..f8f566e96f39 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -724,6 +724,7 @@ PrintDialog::PrintDialog( vcl::Window* i_pParent, const 
std::shared_ptrSetSelectHdl( LINK( this, PrintDialog, SelectHdl ) );
+mpTabCtrl->SetActivatePageHdl( LINK( this, PrintDialog, ActivatePageHdl ) 
);
 
 // setup sizes for N-Up
 Size aNupSize( maPController->getPrinter()->PixelToLogic(
@@ -1752,6 +1753,14 @@ IMPL_LINK( PrintDialog, ModifyHdl, Edit&, rEdit, void )
 }
 }
 
+IMPL_LINK( PrintDialog, ActivatePageHdl, TabControl *, pTabCtrl, void )
+{
+const sal_uInt16 id = pTabCtrl->GetCurPageId();
+if (pTabCtrl->GetPageName(id) == "optionstab" ) {
+maOptionsPage.mpPapersizeFromSetup->Check( 
maPController->getPapersizeFromSetup() );
+}
+}
+
 PropertyValue* PrintDialog::getValueForWindow( vcl::Window* i_pWindow ) const
 {
 PropertyValue* pVal = nullptr;
diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index b2308cf2f5b9..2a6641250130 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -1517,10 +1517,10 @@
   
 
 
-  
+  
 True
 False
-Options
+Options
   
   
 3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 slideshow/source/engine/opengl/TransitionImpl.cxx |2 --
 slideshow/source/engine/opengl/TransitionImpl.hxx |2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 55b3854b663dfd8ef47f103fd3849804243d
Author: Caolán McNamara 
AuthorDate: Sat Aug 18 19:41:51 2018 +0100
Commit: Miklos Vajna 
CommitDate: Tue Aug 28 15:52:43 2018 +0200

Related: tdf#112166 require opengl >= 3.0 for slide transitions

glGenVertexArrays requires opengl >= 3.0

and since...

commit c831e4851f35ddef5ef45062ba291d07dda4b1b4
Date:   Wed Dec 9 21:39:27 2015 +

slideshow: Fix what was remaining to be able to use a core context

we always use that in all slide transitions, so slideshow opengl transitions
presumably thus all have a min opengl version of 3.0

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

diff --git a/slideshow/source/engine/opengl/TransitionImpl.cxx 
b/slideshow/source/engine/opengl/TransitionImpl.cxx
index 927e0d72130d..d6573f835dd4 100644
--- a/slideshow/source/engine/opengl/TransitionImpl.cxx
+++ b/slideshow/source/engine/opengl/TransitionImpl.cxx
@@ -729,7 +729,6 @@ std::shared_ptr makeTurnAround()
 {
 Primitive Slide;
 TransitionSettings aSettings;
-aSettings.mnRequiredGLVersion = 3.0;
 
 Slide.pushTriangle(glm::vec2(0,0),glm::vec2(1,0),glm::vec2(0,1));
 Slide.pushTriangle(glm::vec2(1,0),glm::vec2(0,1),glm::vec2(1,1));
@@ -892,7 +891,6 @@ std::shared_ptr makeRochade()
 {
 Primitive Slide;
 TransitionSettings aSettings;
-aSettings.mnRequiredGLVersion = 3.0;
 
 double w, h;
 
diff --git a/slideshow/source/engine/opengl/TransitionImpl.hxx 
b/slideshow/source/engine/opengl/TransitionImpl.hxx
index bfd38fa89d71..d2f78c6eb3d9 100644
--- a/slideshow/source/engine/opengl/TransitionImpl.hxx
+++ b/slideshow/source/engine/opengl/TransitionImpl.hxx
@@ -46,7 +46,7 @@ struct TransitionSettings
 TransitionSettings() :
 mbUseMipMapLeaving( true ),
 mbUseMipMapEntering( true ),
-mnRequiredGLVersion( 2.1f )
+mnRequiredGLVersion( 3.0f )
 {
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - vcl/opengl

[Libreoffice Gerrit user]

 vcl/opengl/x11/gdiimpl.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 43b5ac85b6e2e31d6505223ab6e29babb06ceafd
Author: Caolán McNamara 
AuthorDate: Sat Aug 18 20:00:42 2018 +0100
Commit: Miklos Vajna 
CommitDate: Tue Aug 28 15:51:59 2018 +0200

tdf#112166 need to check if glXCreateContextAttribsARB really exists

checking the glXCreateContextAttribsARB function pointer will just return 
the
epoxy_glXCreateContextAttribsARB stub which always exists.

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

diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/opengl/x11/gdiimpl.cxx
index 2e8fffe7c0f6..a8391999ec1e 100644
--- a/vcl/opengl/x11/gdiimpl.cxx
+++ b/vcl/opengl/x11/gdiimpl.cxx
@@ -296,7 +296,9 @@ bool X11OpenGLContext::ImplInit()
 if (!g_vShareList.empty())
 pSharedCtx = g_vShareList.front();
 
-if (glXCreateContextAttribsARB && !mbRequestLegacyContext)
+//tdf#112166 for, e.g. VirtualBox GL, claiming OpenGL 2.1
+static bool hasCreateContextAttribsARB = 
glXGetProcAddress(reinterpret_cast("glXCreateContextAttribsARB")) != nullptr;
+if (hasCreateContextAttribsARB && !mbRequestLegacyContext)
 {
 int best_fbc = -1;
 GLXFBConfig* pFBC = getFBConfig(m_aGLWin.dpy, m_aGLWin.win, best_fbc, 
mbUseDoubleBufferedRendering);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 include/svx/svdobj.hxx  |3 +
 sd/source/ui/view/sdview.cxx|   20 +++--
 svx/source/svdraw/svdotextdecomposition.cxx |   59 +++-
 3 files changed, 42 insertions(+), 40 deletions(-)

New commits:
commit 0655121bebd976a0c651b3c4f6f85e3bf76c89d6
Author: Caolán McNamara 
AuthorDate: Thu Aug 16 11:47:20 2018 +0100
Commit: Miklos Vajna 
CommitDate: Tue Aug 28 15:50:48 2018 +0200

tdf#119284 bg for automatic not set while editing

refactor and reuse fdo#35779 solution for this case

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

diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 0972849dd74a..00b1152816e4 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -43,6 +43,7 @@ class SfxBroadcaster;
 class Pointer;
 class AutoTimer;
 class OutlinerParaObject;
+class Outliner;
 class SdrOutliner;
 class SdrDragStat;
 class SdrHdl;
@@ -905,6 +906,8 @@ public:
 
 const css::uno::WeakReference< css::uno::XInterface >& getWeakUnoShape() 
const { return maWeakUnoShape; }
 
+void setSuitableOutlinerBg(Outliner& rOutliner) const;
+
 protected:
 tools::Rectangle   aOutRect; // surrounding rectangle 
for Paint (incl. LineWdt, ...)
 Point   aAnchor;  // anchor position (Writer)
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 3409123b788b..835474e79a0f 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -712,30 +712,24 @@ bool View::SdrBeginTextEdit(
 }
 }
 
-if (bReturn)
+if (::Outliner* pOL = bReturn ? GetTextEditOutliner() : nullptr)
 {
-::Outliner* pOL = GetTextEditOutliner();
-
-if( pObj && pObj->GetPage() )
+if (pObj)
 {
-Color aBackground;
 if( pObj->GetObjInventor() == SdrInventor::Default && 
pObj->GetObjIdentifier() == OBJ_TABLE )
 {
+Color aBackground;
 aBackground = GetTextEditBackgroundColor(*this);
+pOL->SetBackgroundColor( aBackground  );
 }
 else
 {
-aBackground = pObj->GetPage()->GetPageBackgroundColor(pPV);
+pObj->setSuitableOutlinerBg(*pOL);
 }
-if (pOL != nullptr)
-pOL->SetBackgroundColor( aBackground  );
 }
 
-if (pOL != nullptr)
-{
-pOL->SetParaInsertedHdl(LINK(this, View, OnParagraphInsertedHdl));
-pOL->SetParaRemovingHdl(LINK(this, View, OnParagraphRemovingHdl));
-}
+pOL->SetParaInsertedHdl(LINK(this, View, OnParagraphInsertedHdl));
+pOL->SetParaRemovingHdl(LINK(this, View, OnParagraphRemovingHdl));
 }
 
 if (bMasterPage && bReturn && pOutl)
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index 75830c864536..ede3f675e39e 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -851,6 +851,37 @@ void SdrTextObj::impDecomposeAutoFitTextPrimitive(
 rTarget = aConverter.getPrimitive2DSequence();
 }
 
+// Resolves: fdo#35779 set background color of this shape as the editeng 
background if there
+// is one. Check the shape itself, then the host page, then that page's master 
page.
+void SdrObject::setSuitableOutlinerBg(::Outliner& rOutliner) const
+{
+const SfxItemSet* pBackgroundFillSet = &GetObjectItemSet();
+
+if (drawing::FillStyle_NONE == 
pBackgroundFillSet->Get(XATTR_FILLSTYLE).GetValue())
+{
+SdrPage *pOwnerPage = GetPage();
+if (pOwnerPage)
+{
+pBackgroundFillSet = 
&pOwnerPage->getSdrPageProperties().GetItemSet();
+
+if (drawing::FillStyle_NONE == 
pBackgroundFillSet->Get(XATTR_FILLSTYLE).GetValue())
+{
+if (!pOwnerPage->IsMasterPage() && 
pOwnerPage->TRG_HasMasterPage())
+{
+pBackgroundFillSet = 
&pOwnerPage->TRG_GetMasterPage().getSdrPageProperties().GetItemSet();
+}
+}
+}
+}
+
+if (drawing::FillStyle_NONE != 
pBackgroundFillSet->Get(XATTR_FILLSTYLE).GetValue())
+{
+Color aColor(rOutliner.GetBackgroundColor());
+GetDraftFillColor(*pBackgroundFillSet, aColor);
+rOutliner.SetBackgroundColor(aColor);
+}
+}
+
 void SdrTextObj::impDecomposeBlockTextPrimitive(
 drawinglayer::primitive2d::Primitive2DContainer& rTarget,
 const drawinglayer::primitive2d::SdrBlockTextPrimitive2D& 
rSdrBlockTextPrimitive,
@@ -881,35 +912,9 @@ void SdrTextObj::impDecomposeBlockTextPrimitive(
 rOutliner.SetMinAutoPaperSize(aNullSize);
 rOutliner.SetMaxAutoPaperSize(Size(100,100));
 
-// Resolves: fdo#35779 set background

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

[Libreoffice Gerrit user]

 connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu |
4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a67acf8e6127e33dc9ba5f75e097aa27ad5fe952
Author: Tamas Bunth 
AuthorDate: Tue Aug 28 11:28:12 2018 +0200
Commit: Tamás Bunth 
CommitDate: Tue Aug 28 15:46:17 2018 +0200

mysqlc: registry xml: install driver

Change-Id: I864302cc7ba8f27300e4bf0dd3d8a6cc1896da4b
Reviewed-on: https://gerrit.libreoffice.org/59698
Tested-by: Jenkins
Reviewed-by: Tamás Bunth 

diff --git 
a/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu 
b/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu
index 7ade9eebbc60..65bfdba90858 100644
--- a/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-http://openoffice.org/2001/registry"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
-  
+http://openoffice.org/2004/installation"; 
xmlns:oor="http://openoffice.org/2001/registry"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
+  
 
   
 com.sun.star.comp.sdbc.mysqlc.MysqlCDriver
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/vector/vector-5.4' - 3 commits - include/vcl svx/source sw/qa vcl/headless vcl/inc vcl/source vcl/unx

[Libreoffice Gerrit user]

 include/vcl/settings.hxx  |3 +++
 svx/source/unodraw/UnoGraphicExporter.cxx |   14 ++
 sw/qa/extras/htmlexport/htmlexport.cxx|   11 +++
 vcl/headless/svptext.cxx  |2 +-
 vcl/inc/textrender.hxx|2 +-
 vcl/inc/unx/cairotextrender.hxx   |2 +-
 vcl/source/app/settings.cxx   |   19 +++
 vcl/unx/generic/gdi/cairotextrender.cxx   |   17 +++--
 vcl/unx/generic/gdi/font.cxx  |2 +-
 9 files changed, 66 insertions(+), 6 deletions(-)

New commits:
commit f114a573a782a265539ac75137aa80bba33560c2
Author: Miklos Vajna 
AuthorDate: Fri Jul 27 17:40:31 2018 +0200
Commit: Miklos Vajna 
CommitDate: Tue Aug 28 14:56:29 2018 +0200

tdf#118966 vcl: add a flag to determine if AA of fonts is used from the 
system

This is on by default (as there are loads of vcl users who expect font
AA working even if the default is off and they don't enable it), but the
svx UnoGraphicExporter disables it to make everyone happy.

The reason in practice AA was on by default is that the gtk backend uses
the system settings in GtkInstance::GetCairoFontOptions() (and not the
AA setting from the UI), and lclGetSystemTextAntiAliasMode() does the
same on Windows (at least in the direct write case). So now these
defaults again have higher priority than leaving the vcl-level default
unchanged.

Reviewed-on: https://gerrit.libreoffice.org/58199
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins
(cherry picked from commit e6538f5bdd876911ea30f84a6512c03908e620fd)

Conflicts:
svx/source/unodraw/UnoGraphicExporter.cxx
vcl/source/app/settings.cxx

Change-Id: I81267c0b036211525ac02d3282fa89d75510f4a8

diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 097605e7c251..67ba3cf5185b 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -409,6 +409,9 @@ public:
 voidSetUseSystemUIFonts( bool 
bUseSystemUIFonts );
 boolGetUseSystemUIFonts() const;
 
+void SetUseFontAAFromSystem(bool bUseFontAAFromSystem);
+bool GetUseFontAAFromSystem() const;
+
 voidSetUseFlatBorders( bool bUseFlatBorders );
 boolGetUseFlatBorders() const;
 
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx 
b/svx/source/unodraw/UnoGraphicExporter.cxx
index 2d9bd17bfb67..d28bc91f5841 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -1023,12 +1023,26 @@ sal_Bool SAL_CALL GraphicExporter::filter( const 
Sequence< PropertyValue >& aDes
 
 SvtOptionsDrawinglayer aOptions;
 bool bAntiAliasing = aOptions.IsAntiAliasing();
+AllSettings aAllSettings = Application::GetSettings();
+StyleSettings aStyleSettings = aAllSettings.GetStyleSettings();
+bool bUseFontAAFromSystem = aStyleSettings.GetUseFontAAFromSystem();
 if (aSettings.meAntiAliasing != TRISTATE_INDET)
+{
 // This is safe to do globally as we own the solar mutex.
 aOptions.SetAntiAliasing(aSettings.meAntiAliasing == TRISTATE_TRUE);
+// Opt in to have AA affect font rendering as well.
+aStyleSettings.SetUseFontAAFromSystem(false);
+aAllSettings.SetStyleSettings(aStyleSettings);
+Application::SetSettings(aAllSettings);
+}
 sal_uInt16 nStatus = GetGraphic( aSettings, aGraphic, bVectorType ) ? 
GRFILTER_OK : GRFILTER_FILTERERROR;
 if (aSettings.meAntiAliasing != TRISTATE_INDET)
+{
 aOptions.SetAntiAliasing(bAntiAliasing);
+aStyleSettings.SetUseFontAAFromSystem(bUseFontAAFromSystem);
+aAllSettings.SetStyleSettings(aStyleSettings);
+Application::SetSettings(aAllSettings);
+}
 
 if( nStatus == GRFILTER_OK )
 {
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 4887a283977b..83139fe648a7 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -171,6 +171,11 @@ struct ImplStyleData
 StyleSettingsOptionsmnOptions;
 boolmbHighContrast;
 boolmbUseSystemUIFonts;
+/**
+ * Disabling AA doesn't actually disable AA of fonts, instead it is taken
+ * from system settings.
+ */
+bool mbUseFontAAFromSystem;
 boolmbAutoMnemonic;
 TriStatemeUseImagesInMenus;
 boolmnUseFlatBorders;
@@ -647,6 +652,7 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
 mnOptions   = rData.mnOptions;
 mbHighContrast  = rData.mbHighContrast;
 mbUseSystemUIFonts  = rData.mbUseSystemUIFonts;
+mbUseFontAAFromSystem   = rData.mbUseFontAAFromSystem;
 mnUseFlatBorders 

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

[Libreoffice Gerrit user]

 sfx2/qa/cppunit/test_misc.cxx |8 
 sfx2/source/doc/docfile.cxx   |4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 38afe2976eea427999c39ee3a73e7938ec8d5f7b
Author: Miklos Vajna 
AuthorDate: Tue Aug 28 09:05:06 2018 +0200
Commit: Miklos Vajna 
CommitDate: Tue Aug 28 15:28:09 2018 +0200

tdf#119050 sfx2 store: don't inherit temp file permissions when overwriting

The too aggressive error handling in commit
fb04780cf8523ad4e900ae8b9cecbe7a2697a12a (tdf#116117 sfx2 store: don't
inherit temp file permissions when renaming, 2018-03-12) means that if
the file is already there, then we don't try to stat() it; even if there
is no problem with that.

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

diff --git a/sfx2/qa/cppunit/test_misc.cxx b/sfx2/qa/cppunit/test_misc.cxx
index 9c21ae95d704..fa3a2c1bca6d 100644
--- a/sfx2/qa/cppunit/test_misc.cxx
+++ b/sfx2/qa/cppunit/test_misc.cxx
@@ -146,6 +146,14 @@ void MiscTest::testNoThumbnail()
 // umask requested so:
 CPPUNIT_ASSERT(aStatus.getAttributes() & osl_File_Attribute_GrpRead);
 CPPUNIT_ASSERT(aStatus.getAttributes() & osl_File_Attribute_OthRead);
+
+// Now "save as" again to trigger the "overwrite" case.
+xStorable->storeToURL(aTempFile.GetURL(), {});
+CPPUNIT_ASSERT_EQUAL(osl::DirectoryItem::E_None, 
aItem.getFileStatus(aStatus));
+// The following check used to fail in the past, result had temp file
+// permissions.
+CPPUNIT_ASSERT(aStatus.getAttributes() & osl_File_Attribute_GrpRead);
+
 umask(nMask);
 #endif
 
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 638ecb5fc2f0..f8f5c85f757b 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -180,8 +180,10 @@ sal_uInt64 GetDefaultFileAttributes(const OUString& rURL)
 if (!comphelper::isFileUrl(rURL))
 return nRet;
 
+// Make sure the file exists (and create it if not).
 osl::File aFile(rURL);
-if (aFile.open(osl_File_OpenFlag_Create) != osl::File::E_None)
+osl::File::RC nRes = aFile.open(osl_File_OpenFlag_Create);
+if (nRes != osl::File::E_None && nRes != osl::File::E_EXIST)
 return nRet;
 
 aFile.close();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

Hi guys,

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

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

Lets use the new TDF jitsi goodness this week at:

http://jitsi.documentfoundation.org/esc

ATB,

Michael.

* Completed Action Items:

* Pending Action Items:
+ check out the CentOS builds tools for 32bit & update baseline (Christian)
+ default bitergia filter for master + libreoffice-* (Christian)
[ should be possible to add raw data to filter command (Christian) ]
+ add 6.2 release plan to the overview in the wiki (Christian)
[ pending, along with 6.1 update ]
  
* Release Engineering update (Christian)
+ 6.0.7 – due in October
+ 6.1.1 RC1 / RC2 status
+ Remotes
+ Android viewer
+ Online

* Documentation (Olivier)

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
246(246) (topicUI) bugs open, 294(294) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week   1 month   3 months   12 months  
 added 11(5) 20(3) 34(4)   97(3)  
 commented 66(35)   151(-2)   357(47)1683(17) 
   removed  0(0)  0(0)  1(0)9(0)  
  resolved  3(2) 13(-2)30(3)  145(-2) 
+ top 10 contributors:
  Kainz, Andreas made 100 changes in 1 month, and 135 changes in 1 year
  Tietze, Heiko made 44 changes in 1 month, and 608 changes in 1 year
  Foote, V Stuart made 30 changes in 1 month, and 260 changes in 1 year
  Xisco Faulí made 30 changes in 1 month, and 324 changes in 1 year
  Telesto made 19 changes in 1 month, and 84 changes in 1 year
  Thomas Lendo made 16 changes in 1 month, and 225 changes in 1 year
  Monastirsky, Maxim made 12 changes in 1 month, and 50 changes in 1 
year
  Kaganski, Mike made 12 changes in 1 month, and 73 changes in 1 year
  Cor Nouws made 12 changes in 1 month, and 102 changes in 1 year
  Dieter Praas made 11 changes in 1 month, and 140 changes in 1 year
* Crash Reporting (missing Caolan)
+ 1(+2) import failure, 2(+2) export failures
+ ??? 0 coverity issues
+ Google / ossfuzz: down for a while, build fixed again
  - ?? 15 issues, 5 series
  - build fixed now again
+ ForcePoint, round 9
  - ?? 38 issues, 5 unfixed, all writer layout
  - complicated, slow progress
  
* Crash Reporting (Xisco)
+ http://crashreport.libreoffice.org/stats/version/5.4.7.2
 + 434 (last 7 days) (+22)
+ http://crashreport.libreoffice.org/stats/version/6.0.4.2
 + 731 (last 7 days) (+94)
+ http://crashreport.libreoffice.org/stats/version/6.0.5.2
 + 1042 (last 7 days) (+73)
+ http://crashreport.libreoffice.org/stats/version/6.0.6.2
 + 434 (last 7 days) (+100)
+ http://crashreport.libreoffice.org/stats/version/6.1.0.3
 + 1626 (last 7 days) (+481)
 + top new crash in 6.1.0.3 in GL – looks like locking

* GSoC schedule (Heiko)
   + Mentors Submit Final Evaluations: August 14 – 21
   + final evaluations are done.
   + 3 students didn’t pass this eval.
   + big thanks to all mentors and students.
   + Mentor summit: 2 people going there 
   + Results Announced: August 22
   + https://wiki.documentfoundation.org/Development/GSoC/2018

* Akademy Vienna update ?
   + pending Bubli,Thorsten,? … no ideas.

* Hackfests & Events
   + FrOScon in Bonn: Aug 25
  + Bubli, Thorsten, perhaps Cloph.
   + maybe Munich (Thorsten)
   + Conference – September
   + DINAcon - Bern / Switzerland – Hackfest ~October 19th (Michael)
   + working on a Munich event October 26-28th (Thorsten)
  + an Open Gov’t meeting from the City of Munich
  + good to have a hack-fest back-to-back there.
  + moving slowly here …

* mentoring/easyhack update
  committer...   1 week   1 month  3 months 12 months   
  open   80(-9)  141(-13)  142(-12) 153(-12)
   reviews 1234(-226)   4740(-249)   12969(623)   26324(545)
merged  292(-143)   1262(-70) 3922(2) 14605(121)
 abandoned8(-3)   38(-7)   165(-9)  953(-6) 
   own commits  276(-3) 1044(-38) 3492(39)15506(48) 
review commits   81(15)  325(9)980(33) 3716(11) 
contributor...   1 week   1 month3 months 12 months
  open 20(3) 71(3)   72(3) 75(3)   
   reviews 66(8)262(25)1640(-490)   26199(-485)
merged 14(-9)   119(-17)403(-2)  1675(-39) 
 abandoned  6(3) 18(3)   79(4)328(-4)  
   own commits 32(9)166(-4) 469(13)  1504(-6)  
review commits  0(0)  0(0)0(0)  0(0)  

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

[Libreoffice Gerrit user]

 source/text/shared/02/12100200.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 222f1120f957b927650e2317f03cbc92aa80480b
Author: Andrea Gelmini 
AuthorDate: Tue Aug 28 11:02:37 2018 +0200
Commit: Olivier Hallot 
CommitDate: Tue Aug 28 14:42:26 2018 +0200

Preface->Precede

Just a suggestion.
I'm not english-native but it sounds wrong to me with "preface".

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

diff --git a/source/text/shared/02/12100200.xhp 
b/source/text/shared/02/12100200.xhp
index 0fae8f1d2..02396cf05 100644
--- a/source/text/shared/02/12100200.xhp
+++ b/source/text/shared/02/12100200.xhp
@@ -245,7 +245,7 @@
 
   
 
-If you want to 
search for the actual characters ? or *, preface them 
with a backslash: "\?" or "\*". However, this is only 
necessary when Wildcard expression is enabled. When the option is 
not enabled, the wildcard characters are processed like normal 
characters.
+If you want to 
search for the actual characters ? or *, precede them 
with a backslash: "\?" or "\*". However, this is only 
necessary when Wildcard expression is enabled. When the option is 
not enabled, the wildcard characters are processed like normal 
characters.
 
 Regular 
expression
 Searches with regular 
expressions. The same regular expressions that are supported here are 
also supported in the %PRODUCTNAME Find 
& Replace dialog.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit 29591a97d2832c1313d728db51b575de3fe5b672
Author: Andrea Gelmini 
AuthorDate: Tue Aug 28 11:02:37 2018 +0200
Commit: Gerrit Code Review 
CommitDate: Tue Aug 28 14:42:26 2018 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - Preface->Precede

Just a suggestion.
I'm not english-native but it sounds wrong to me with "preface".

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

diff --git a/helpcontent2 b/helpcontent2
index d2330a41e530..222f1120f957 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d2330a41e530b22a89fb32e4963d874f6a1d69ea
+Subproject commit 222f1120f957b927650e2317f03cbc92aa80480b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - ios/Module_ios.mk vcl/headless

[Libreoffice Gerrit user]

 ios/Module_ios.mk|2 +-
 vcl/headless/svpinst.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 31703196388b455edda1c40fd2b3b536b315848f
Author: Tor Lillqvist 
AuthorDate: Tue Aug 28 15:08:45 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Aug 28 15:20:01 2018 +0300

We do want to initialise m_MainThread on iOS, too

This doesn't make the LibreOfficeLight app work much better, though.
But at least it doesn't hang its event loop completely, some 10 s
timer keeps firing. (But nothing sane shows up in the app UI, even if
some welcome.odt document apparently does get loaded. Clearly
something is waiting for something else that never happens...)

Change-Id: Ieba22a5e1418d48a7dd6cacda526aca69cced4c3

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 5cfd6247d897..c5d0c89b4778 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -70,8 +70,8 @@ SvpSalInstance::SvpSalInstance( 
std::unique_ptr pMutex )
 m_aTimeout.tv_usec  = 0;
 m_nTimeoutMS= 0;
 
-#ifndef IOS
 m_MainThread = osl::Thread::getCurrentIdentifier();
+#ifndef IOS
 CreateWakeupPipe(true);
 #endif
 if( s_pDefaultInstance == nullptr )
commit 037737fe5acbe874892ff886577530e344273a6c
Author: Tor Lillqvist 
AuthorDate: Tue Aug 28 13:17:22 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Aug 28 15:20:00 2018 +0300

Fix typo

Change-Id: I78571f8494a13f6f8c07f9aee2bf6f8144a48ed2

diff --git a/ios/Module_ios.mk b/ios/Module_ios.mk
index d5b215e2cb82..b70f48264a80 100644
--- a/ios/Module_ios.mk
+++ b/ios/Module_ios.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_targets,ios,\
CustomTarget_iOS_setup \
 ))
 
-ifneq ($(ENABLE_IOS_LIBREOFFICELIGHT),)
+ifneq ($(ENABLE_IOS_LIBREOFFICELIGHT_APP),)
 $(eval $(call gb_Module_add_targets,ios,\
CustomTarget_iOS_link \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/source/core/doc/DocumentTimerManager.cxx |   21 +
 sw/source/core/inc/DocumentTimerManager.hxx |1 +
 2 files changed, 18 insertions(+), 4 deletions(-)

New commits:
commit 771544544ee13ec98961f93b5313a7d2e29429cd
Author: Jan-Marek Glogowski 
AuthorDate: Tue Aug 28 10:13:28 2018 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Tue Aug 28 13:13:12 2018 +0200

tdf#119458 fix sw background Idle unblocking

We can't handle the correct state when blocking via a tasks
mbActive bool, as this also schedules the task and starts the
scheduler timer. So reintroduce a bool for the unblock state.

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

diff --git a/sw/source/core/doc/DocumentTimerManager.cxx 
b/sw/source/core/doc/DocumentTimerManager.cxx
index 6195b8fdf961..81c46b125840 100644
--- a/sw/source/core/doc/DocumentTimerManager.cxx
+++ b/sw/source/core/doc/DocumentTimerManager.cxx
@@ -39,6 +39,7 @@ namespace sw
 
 DocumentTimerManager::DocumentTimerManager( SwDoc& i_rSwdoc ) : m_rDoc( 
i_rSwdoc ),
 
m_nIdleBlockCount( 0 ),
+
m_bStartOnUnblock( false ),
 m_aDocIdle( 
i_rSwdoc )
 {
 m_aDocIdle.SetPriority(TaskPriority::LOWEST);
@@ -48,18 +49,26 @@ DocumentTimerManager::DocumentTimerManager( SwDoc& i_rSwdoc 
) : m_rDoc( i_rSwdoc
 
 void DocumentTimerManager::StartIdling()
 {
-if (!m_aDocIdle.IsActive())
+if (m_nIdleBlockCount > 0)
+m_bStartOnUnblock = true;
+else if (!m_aDocIdle.IsActive())
 m_aDocIdle.Start();
 }
 
 void DocumentTimerManager::StopIdling()
 {
+m_bStartOnUnblock = false;
 m_aDocIdle.Stop();
 }
 
 void DocumentTimerManager::BlockIdling()
 {
 assert(SAL_MAX_UINT32 != m_nIdleBlockCount);
+if (0 == m_nIdleBlockCount)
+{
+assert(!m_bStartOnUnblock);
+m_bStartOnUnblock = false;
+}
 ++m_nIdleBlockCount;
 }
 
@@ -68,9 +77,13 @@ void DocumentTimerManager::UnblockIdling()
 assert(0 != m_nIdleBlockCount);
 --m_nIdleBlockCount;
 
-// kick the active idle, if it's not anymore blocked by IsDocIdle()
-if (m_aDocIdle.IsActive() && IsDocIdle())
-m_aDocIdle.Start();
+if ((0 == m_nIdleBlockCount) && m_bStartOnUnblock)
+{
+m_bStartOnUnblock = false;
+// kick the active idle, if it's not anymore blocked by IsDocIdle()
+if (IsDocIdle())
+m_aDocIdle.Start();
+}
 }
 
 DocumentTimerManager::IdleJob DocumentTimerManager::GetNextIdleJob() const
diff --git a/sw/source/core/inc/DocumentTimerManager.hxx 
b/sw/source/core/inc/DocumentTimerManager.hxx
index e04e0602cc4f..2caaf608c40d 100644
--- a/sw/source/core/inc/DocumentTimerManager.hxx
+++ b/sw/source/core/inc/DocumentTimerManager.hxx
@@ -67,6 +67,7 @@ private:
 SwDoc& m_rDoc;
 
 sal_uInt32 m_nIdleBlockCount; ///< Don't run the Idle, if > 0
+bool m_bStartOnUnblock; ///< true, if the last unblock should start the 
timer
 SwDocIdle m_aDocIdle;
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/CppunitTest_sd_uimpress.mk

[Libreoffice Gerrit user]

 sd/CppunitTest_sd_uimpress.mk |9 +
 1 file changed, 9 insertions(+)

New commits:
commit e82785887a13bdb8d8cd4d4c74df0c6c71ae52d4
Author: Luboš Luňák 
AuthorDate: Mon Aug 27 13:21:37 2018 +0200
Commit: Luboš Luňák 
CommitDate: Tue Aug 28 13:04:34 2018 +0200

fix glib/bluetooth linking errors

Since nobody else seems to have this problems, this may be possibly
only specific to KDE builds or to using gold linker.

Change-Id: I29359e298178b934a6232b78da684e55db590863
Reviewed-on: https://gerrit.libreoffice.org/59655
Tested-by: Jenkins
Reviewed-by: Arkadiy Illarionov 
Reviewed-by: Luboš Luňák 

diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
index 627876f21822..e483fb59a59c 100644
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -79,6 +79,15 @@ $(eval $(call gb_CppunitTest_use_externals,sd_uimpress,\
libxml2 \
 ))
 
+ifneq ($(DBUS_HAVE_GLIB),)
+$(eval $(call gb_CppunitTest_add_defs,sd_uimpress,\
+   $(DBUS_GLIB_CFLAGS) \
+))
+$(eval $(call gb_CppunitTest_add_libs,sd_uimpress,\
+   $(DBUS_GLIB_LIBS) \
+))
+endif
+
 $(eval $(call gb_CppunitTest_add_exception_objects,sd_uimpress,\
 sd/qa/unit/uimpress \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/core/tool/interpr2.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 98cb91686901dc0133c5c23dc5658d9623dbd436
Author: Eike Rathke 
AuthorDate: Tue Aug 28 11:41:37 2018 +0200
Commit: Eike Rathke 
CommitDate: Tue Aug 28 12:49:39 2018 +0200

Shortcut small negative values to 0:0:0, tdf#119533 tdf#118800 follow-up

... instead of letting them end up as 24:0:0

Change-Id: I0212a2b422a931a24fd2748aa2826a5b60d2a397
Reviewed-on: https://gerrit.libreoffice.org/59699
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index a50f4ea9aa9c..92bd4ebd1aae 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -152,7 +152,10 @@ static void lcl_getHourMinuteSecond( double fTimeInDays, 
sal_Int32& nHour, sal_I
 // If < 0 then approxFloor() effectively returned the ceiling (note this
 // also holds for negative fTimeInDays values) because of a near identical
 // value, shortcut this to a full day as well.
-if (fTime <= 0.0)
+// If >= 1.0 (actually == 1.0) then fTimeInDays is a negative small value
+// not significant for a representable time and approxFloor() returned -1,
+// shortcut to 0:0:0, otherwise it would become 24:0:0.
+if (fTime <= 0.0 || fTime >= 1.0)
 {
 nHour = nMinute = nSecond = 0;
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx|3 +++
 writerfilter/source/dmapper/DomainMapper.cxx  |2 +-
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |7 +++
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit b88da9b4302fa324f061a4a26ab4b2d647fdc765
Author: Justin Luth 
AuthorDate: Mon Aug 27 11:19:22 2018 +0300
Commit: László Németh 
CommitDate: Tue Aug 28 11:47:53 2018 +0200

writerfilter: not FirstParaInSection if IsInShape

Since anchored objects can contain paragraphs, considering all
of them to be "firstParagraphs" would generally be considered
an incorrect result. Browsing through the existing uses of
IsFirstPara.*InSection I didn't see any that looked like
it should be considered true if IsInShape.

Since this is the kind of gotcha that that the programmer
should be aware of, add it directly into the function instead
of requiring each use to have an additional qualification.

The following ooxml unit tests match these conditions, but
only one was fixed - the rest were unaffected since they just
avoided adding/removing dummy paragraphs.
fdo79540.docx - 5
tblppr-shape.docx - 5
ooo47778-3.odt- 5
ooo47778-4.odt- 5
textbox-rounded-corners.docx - 7
n780563.docx - 8
missing-path.docx - 10
floating-tables-anchor.docx - 10
tdf117805.odt - 11  (fixed - prevented extra section paragraphs)

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

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 263959520851..e02d829b734f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -271,6 +271,9 @@ DECLARE_OOXMLEXPORT_TEST(testTdf117805, "tdf117805.odt")
 // This failed, the header was lost. It's still referenced at an incorrect
 // location in document.xml, though.
 CPPUNIT_ASSERT(xNameAccess->hasByName("word/header1.xml"));
+
+uno::Reference textbox(getShape(1), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(8, getParagraphs(textbox));
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTdf113183, "tdf113183.docx")
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index cfd44ab53dd9..4b07d253eb21 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -656,7 +656,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 else
 {
 // tdf#104354 first paragraphs of table cells and shapes 
get zero top margin
-if ((m_pImpl->GetIsFirstParagraphInSection() && 
!m_pImpl->IsInShape() && m_pImpl->m_nTableDepth > 0) ||
+if ((m_pImpl->GetIsFirstParagraphInSection() && 
m_pImpl->m_nTableDepth > 0) ||
  m_pImpl->GetIsFirstParagraphInShape())
 default_spacing = 0;
 else
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 0091f40aff28..508e74e017ae 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -478,6 +478,13 @@ void DomainMapper_Impl::SetIsFirstParagraphInSection( bool 
bIsFirst )
 m_bIsFirstParaInSection = bIsFirst;
 }
 
+bool DomainMapper_Impl::GetIsFirstParagraphInSection()
+{
+// Anchored objects may include multiple paragraphs,
+// and none of them should be considered the first para in section.
+return m_bIsFirstParaInSection && !IsInShape();
+}
+
 void DomainMapper_Impl::SetIsFirstParagraphInShape(bool bIsFirst)
 {
 m_bIsFirstParaInShape = bIsFirst;
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 72a9b56da66e..342fa4d0f006 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -594,7 +594,7 @@ public:
 void SetIsLastSectionGroup( bool bIsLast );
 bool GetIsLastSectionGroup() { return m_bIsLastSectionGroup;}
 void SetIsFirstParagraphInSection( bool bIsFirst );
-bool GetIsFirstParagraphInSection() { return m_bIsFirstParaInSection;}
+bool GetIsFirstParagraphInSection();
 void SetIsFirstParagraphInShape(bool bIsFirst);
 bool GetIsFirstParagraphInShape() { return m_bIsFirstParaInShape; }
 void SetIsDummyParaAddedForTableInSection( bool bIsAdded );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'refs/tags/3.4-rc2'

[Libreoffice Gerrit user]

Tag '3.4-rc2' created by Andras Timar  at 
2018-08-28 08:59 +

3.4-rc2

Changes since 3.4-rc1-10:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 debian/changelog |6 ++
 loolwsd.spec.in  |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 65d15707baf7d9af51459805dd08c2aa340023c5
Author: Andras Timar 
AuthorDate: Tue Aug 28 10:58:05 2018 +0200
Commit: Andras Timar 
CommitDate: Tue Aug 28 10:58:05 2018 +0200

Bump package version to 3.4.0-2

Change-Id: Ifbe9fb476ebc131f8f7f819939c206527ee1e5e3

diff --git a/debian/changelog b/debian/changelog
index 38969b61c..2953d0976 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (3.4.0-2) unstable; urgency=medium
+
+  * see the git log: http://col.la/cool3
+
+ -- Andras Timar   Thu, 28 Aug 2018 10:50:00 +0200
+
 loolwsd (3.4.0-1) unstable; urgency=medium
 
   * see the git log: http://col.la/cool3
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index deafcde4d..0ab7cf170 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:   loolwsd%{name_suffix}
 Name:   loolwsd
 %endif
 Version:@PACKAGE_VERSION@
-Release:1%{?dist}
+Release:2%{?dist}
 %if 0%{?suse_version} == 1110
 Group:  Productivity/Office/Suite
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - 2 commits - wsd/ClientSession.cpp wsd/ClientSession.hpp wsd/DocumentBroker.cpp

[Libreoffice Gerrit user]

 wsd/ClientSession.cpp  |   37 ++---
 wsd/ClientSession.hpp  |5 -
 wsd/DocumentBroker.cpp |2 ++
 3 files changed, 40 insertions(+), 4 deletions(-)

New commits:
commit c819651600a337627543a6855202468a8b6eae6e
Author: Tamás Zolnai 
AuthorDate: Fri Aug 24 14:01:44 2018 +0200
Commit: Andras Timar 
CommitDate: Tue Aug 28 10:43:28 2018 +0200

First forward invalidation to client and request tiles after

(cherry picked from commit 1b01af36059623627fd8895353f028efc20ef26f)

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

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index ef3380199..00fd8373d 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -947,7 +947,12 @@ bool ClientSession::handleKitToClientMessage(const char* 
buffer, const int lengt
 else if (tokens[0] == "invalidatetiles:")
 {
 assert(firstLine.size() == 
static_cast(length));
+
+// First forward invalidation
+bool ret = forwardToClient(payload);
+
 handleTileInvalidation(firstLine, docBroker);
+return ret;
 }
 else if (tokens[0] == "invalidatecursor:")
 {
commit dce9d960fe8e059e8d60f0a93b88dba54f53a7ee
Author: Tamás Zolnai 
AuthorDate: Thu Aug 23 12:46:49 2018 +0200
Commit: Andras Timar 
CommitDate: Tue Aug 28 10:43:15 2018 +0200

Drop too old tileID's from tiles-on-fly list

So we can avoid that tile sending stop working because server is
waiting for tileprocessed messages which will not arrive.

Change-Id: I545346c50d49340999608aadac32b5190ede43c5
(cherry picked from commit 759d1fe72294b22669f19dabf28a4fcf4922af8c)

Fix previous commit

Change-Id: I7d3bce0132d124e52f7885c8cb3c26acc6f7b41d
(cherry picked from commit 3bd7c6b5084bb2505cf0f2629450974e68b8c050)

Go back using list for tilesOnFly

It can handle duplicates which we need to have.

Change-Id: Ia4cd813dd173bc538dd27953c4886d460b5b1c49
(cherry picked from commit 185b933353c670ef4639ada323ed2f803f209e70)
Reviewed-on: https://gerrit.libreoffice.org/59648
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 9ed10cf30..ef3380199 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -51,7 +51,6 @@ ClientSession::ClientSession(const std::string& id,
 _tileWidthTwips(0),
 _tileHeightTwips(0),
 _isTextDocument(false),
-_tilesOnFly(0),
 _tilesBeingRendered(0)
 {
 const size_t curConnections = ++LOOLWSD::NumConnections;
@@ -342,7 +341,13 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
 sendTextFrame("error: cmd=tileprocessed kind=syntax");
 return false;
 }
-auto iter = std::find(_tilesOnFly.begin(), _tilesOnFly.end(), tileID);
+
+auto iter = std::find_if(_tilesOnFly.begin(), _tilesOnFly.end(),
+[&tileID](const std::pair& curTile)
+{
+return curTile.first == tileID;
+});
+
 if(iter != _tilesOnFly.end())
 _tilesOnFly.erase(iter);
 else
@@ -1040,7 +1045,7 @@ Authorization ClientSession::getAuthorization() const
 
 void ClientSession::addTileOnFly(const TileDesc& tile)
 {
-_tilesOnFly.push_back(generateTileID(tile));
+_tilesOnFly.push_back({generateTileID(tile), 
std::chrono::steady_clock::now()});
 }
 
 void ClientSession::clearTilesOnFly()
@@ -1048,6 +1053,24 @@ void ClientSession::clearTilesOnFly()
 _tilesOnFly.clear();
 }
 
+void ClientSession::removeOutdatedTilesOnFly()
+{
+// Check only the beginning of the list, tiles are ordered by timestamp
+bool continueLoop = true;
+while(!_tilesOnFly.empty() && continueLoop)
+{
+auto tileIter = _tilesOnFly.begin();
+double elapsedTimeMs = 
std::chrono::duration_cast(std::chrono::steady_clock::now()
 - tileIter->second).count();
+if(elapsedTimeMs > 3000)
+{
+LOG_WRN("Tracker tileID was dropped because of time out. 
Tileprocessed message did not arrive");
+_tilesOnFly.erase(tileIter);
+}
+else
+continueLoop = false;
+}
+}
+
 void ClientSession::onDisconnect()
 {
 LOG_INF(getName() << " Disconnected, current number of connections: " << 
LOOLWSD::NumConnections);
@@ -1242,7 +1265,10 @@ void ClientSession::removeOutdatedTileSubscriptions()
 {
 double elapsedTime = 
docBroker->tileCache().getTileBeingRenderedElapsedTimeMs(*iterator);
 if(elapsedTime < 0.0 && elapsedTime > 5000.0)
+{
+LOG_WRN("Tracked TileBeingRendered was dropped because of time 
out.");
 _tilesBeingRendered.erase(iterator);
+}
 else
 ++iterator;
 }
diff --git a/ws

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/src/layer/tile/GridLayer.js |   49 ++
 1 file changed, 26 insertions(+), 23 deletions(-)

New commits:
commit d331ddee38ff27cfad95ab821786c55fde85e29a
Author: Tamás Zolnai 
AuthorDate: Sun Aug 26 06:11:08 2018 +0200
Commit: Andras Timar 
CommitDate: Tue Aug 28 10:43:43 2018 +0200

loleaflet: Request invalid tiles too by view change

Change-Id: I43c65ce025d3b18bd664d2ad16107cf828bab300
(cherry picked from commit 9473908d45a884827356b504c5f768e2f29cc46b)
Reviewed-on: https://gerrit.libreoffice.org/59650
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loleaflet/src/layer/tile/GridLayer.js 
b/loleaflet/src/layer/tile/GridLayer.js
index a337e3835..3bd563639 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -532,7 +532,8 @@ L.GridLayer = L.Layer.extend({
 
key = this._tileCoordsToKey(coords);
var tile = this._tiles[key];
-   if (tile) {
+   var invalid = tile && tile._invalidCount && 
tile._invalidCount > 0;
+   if (tile && tile.loaded && !invalid) {
tile.current = true;
newView = false;
} else {
@@ -866,34 +867,36 @@ L.GridLayer = L.Layer.extend({
key = this._tileCoordsToKey(coords);
 
if (coords.part === this._selectedPart) {
-   var tile = 
this.createTile(this._wrapCoords(coords), L.bind(this._tileReady, this, 
coords));
+   if (!this._tiles[key]) {
+   var tile = 
this.createTile(this._wrapCoords(coords), L.bind(this._tileReady, this, 
coords));
 
-   this._initTile(tile);
+   this._initTile(tile);
 
-   // if createTile is defined with a second 
argument ("done" callback),
-   // we know that tile is async and will be ready 
later; otherwise
-   if (this.createTile.length < 2) {
-   // mark tile as ready, but delay one 
frame for opacity animation to happen
-   setTimeout(L.bind(this._tileReady, 
this, coords, null, tile), 0);
-   }
+   // if createTile is defined with a 
second argument ("done" callback),
+   // we know that tile is async and will 
be ready later; otherwise
+   if (this.createTile.length < 2) {
+   // mark tile as ready, but 
delay one frame for opacity animation to happen
+   
setTimeout(L.bind(this._tileReady, this, coords, null, tile), 0);
+   }
 
-   // we prefer top/left over translate3d so that 
we don't create a HW-accelerated layer from each tile
-   // which is slow, and it also fixes gaps 
between tiles in Safari
-   L.DomUtil.setPosition(tile, tilePos, true);
+   // we prefer top/left over translate3d 
so that we don't create a HW-accelerated layer from each tile
+   // which is slow, and it also fixes 
gaps between tiles in Safari
+   L.DomUtil.setPosition(tile, tilePos, 
true);
 
-   // save tile in cache
-   this._tiles[key] = {
-   el: tile,
-   coords: coords,
-   current: true
-   };
+   // save tile in cache
+   this._tiles[key] = {
+   el: tile,
+   coords: coords,
+   current: true
+   };
 
-   fragment.appendChild(tile);
+   fragment.appendChild(tile);
 
-   this.fire('tileloadstart', {
-   tile: tile,
-   coords: coords
-   });
+   this.fire('tileloadstart', {
+   tile: tile,
+   coords: coords
+   });
+ 

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - 2 commits - common/Rectangle.hpp wsd/ClientSession.cpp wsd/ClientSession.hpp wsd/DocumentBroker.cpp wsd/TileCache.cpp

[Libreoffice Gerrit user]

 common/Rectangle.hpp   |   10 ++
 wsd/ClientSession.cpp  |   25 +++--
 wsd/ClientSession.hpp  |   13 -
 wsd/DocumentBroker.cpp |1 -
 wsd/TileCache.cpp  |2 --
 5 files changed, 37 insertions(+), 14 deletions(-)

New commits:
commit e7649f5b4535c60ced12da9ba1b9982b58cc3bdc
Author: Tamás Zolnai 
AuthorDate: Tue Aug 21 17:15:02 2018 +0200
Commit: Andras Timar 
CommitDate: Tue Aug 28 10:42:38 2018 +0200

Handle tiles hanging out the visible area

A problem comes up when only a part of the tile is visible
on the client side and invalidation affects the invisible
part of this tile. To get back the old / right behavior we
need to request this kind of tiles too.

(cherry picked from commit 25e1a01a3c3df8bf412db7819536ed0a36196320)

Handle negativ position value of clientvisiblearea

Change-Id: I1bf1217e038d034167e1a5412d81a311ebbd83ed
(cherry picked from commit d0fb39cd76cf9097f8f5398a1f7202d4df6390f4)
Reviewed-on: https://gerrit.libreoffice.org/59645
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/common/Rectangle.hpp b/common/Rectangle.hpp
index 1300aa71a..6089f863d 100644
--- a/common/Rectangle.hpp
+++ b/common/Rectangle.hpp
@@ -78,6 +78,16 @@ struct Rectangle
 {
 return _x1 < _x2 && _y1 < _y2;
 }
+
+bool intersects(const Rectangle& rOther)
+{
+Util::Rectangle intersection;
+intersection._x1 = std::max(_x1, rOther._x1);
+intersection._y1 = std::max(_y1, rOther._y1);
+intersection._x2 = std::min(_x2, rOther._x2);
+intersection._y2 = std::min(_y2, rOther._y2);
+return intersection.isValid();
+}
 };
 
 }
diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index f5573c06c..35732eb94 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -1141,6 +1141,13 @@ void ClientSession::handleTileInvalidation(const 
std::string& message,
 return;
 }
 
+// Visible area can have negativ value as position, but we have tiles only 
in the positiv range 
+Util::Rectangle normalizedVisArea;
+normalizedVisArea._x1 = std::max(_clientVisibleArea._x1, 0);
+normalizedVisArea._y1 = std::max(_clientVisibleArea._y1, 0);
+normalizedVisArea._x2 = _clientVisibleArea._x2;
+normalizedVisArea._y2 = _clientVisibleArea._y2;
+
 std::pair result = 
TileCache::parseInvalidateMsg(message);
 int part = result.first;
 Util::Rectangle& invalidateRect = result.second;
@@ -1151,18 +1158,16 @@ void ClientSession::handleTileInvalidation(const 
std::string& message,
 std::vector invalidTiles;
 if(part == _clientSelectedPart || _isTextDocument)
 {
-Util::Rectangle intersection;
-intersection._x1 = std::max(invalidateRect._x1, 
_clientVisibleArea._x1);
-intersection._y1 = std::max(invalidateRect._y1, 
_clientVisibleArea._y1);
-intersection._x2 = std::min(invalidateRect._x2, 
_clientVisibleArea._x2);
-intersection._y2 = std::min(invalidateRect._y2, 
_clientVisibleArea._y2);
-if(intersection.isValid()) // Client visible area and invalidated 
rectangle has intersection
+// Iterate through visible tiles
+for(int i = std::ceil(normalizedVisArea._y1 / _tileHeightTwips);
+i <= std::ceil(normalizedVisArea._y2 / _tileHeightTwips); 
++i)
 {
-for(int i = std::ceil(intersection._y1 / _tileHeightTwips);
-i <= std::ceil(intersection._y2 / _tileHeightTwips); ++i)
+for(int j = std::ceil(normalizedVisArea._x1 / _tileWidthTwips);
+j <= std::ceil(normalizedVisArea._x2 / _tileWidthTwips); ++j)
 {
-for(int j = std::ceil(intersection._x1 / _tileWidthTwips);
-j <= std::ceil(intersection._x2 / _tileWidthTwips); ++j)
+// Find tiles affected by invalidation
+Util::Rectangle tileRect (j * _tileWidthTwips, i * 
_tileHeightTwips, _tileWidthTwips, _tileHeightTwips);
+if(invalidateRect.intersects(tileRect))
 {
 invalidTiles.emplace_back(TileDesc(part, _tileWidthPixel, 
_tileHeightPixel, j * _tileWidthTwips, i * _tileHeightTwips, _tileWidthTwips, 
_tileHeightTwips, -1, 0, -1, false));
 
commit 4de17fe29436bbf2cc70db4be91d06f5dc451e43
Author: Tamás Zolnai 
AuthorDate: Mon Jul 23 16:11:47 2018 +0200
Commit: Andras Timar 
CommitDate: Tue Aug 28 10:42:25 2018 +0200

Trace sent tiles when they are actually sent

SenderQueue might drop some tiles, so we were waiting for
tileprocessed message for a tile which was not sent at all.

Change-Id: I7c502966f656e46df7c22002dee19aeabbf97774
(cherry picked from commit b014804ce2229030a8816eb3c35a08f9af9e4676)
Reviewed-on: https://gerrit.libreoffice.org/59644
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/wsd/ClientSession.hp

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - 2 commits - wsd/ClientSession.cpp wsd/ClientSession.hpp wsd/DocumentBroker.cpp wsd/TestStubs.cpp

[Libreoffice Gerrit user]

 wsd/ClientSession.cpp  |5 +++--
 wsd/ClientSession.hpp  |   22 ++
 wsd/DocumentBroker.cpp |4 
 wsd/TestStubs.cpp  |2 +-
 4 files changed, 18 insertions(+), 15 deletions(-)

New commits:
commit 05d8d8667fa0c70d670048702172b7a860c9ee01
Author: Tamás Zolnai 
AuthorDate: Wed Aug 22 23:20:27 2018 +0200
Commit: Andras Timar 
CommitDate: Tue Aug 28 10:43:04 2018 +0200

Updated deduplicated tiles wireID

Change-Id: Ia901d8831792de1bee6b21017be02fa1e744e2ee
(cherry picked from commit 3ca4421eb73d17d8dc84fb46284d1746db078988)
Reviewed-on: https://gerrit.libreoffice.org/59647
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 35732eb94..9ed10cf30 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -1195,7 +1195,7 @@ void ClientSession::resetWireIdMap()
 _oldWireIds.clear();
 }
 
-void ClientSession::traceTileBySend(const TileDesc& tile)
+void ClientSession::traceTileBySend(const TileDesc& tile, bool deduplicated)
 {
 const std::string tileID = generateTileID(tile);
 
@@ -1217,7 +1217,8 @@ void ClientSession::traceTileBySend(const TileDesc& tile)
 }
 
 // Record that the tile is sent
-addTileOnFly(tile);
+if (!deduplicated)
+addTileOnFly(tile);
 }
 
 void ClientSession::traceSubscribeToTile(const std::string& cacheName)
diff --git a/wsd/ClientSession.hpp b/wsd/ClientSession.hpp
index 04241d91b..13f0b141c 100644
--- a/wsd/ClientSession.hpp
+++ b/wsd/ClientSession.hpp
@@ -86,15 +86,13 @@ public:
 LOG_TRC(getName() << " enqueueing client message " << data->id());
 size_t sizeBefore = _senderQueue.size();
 size_t newSize = _senderQueue.enqueue(data);
-if(sizeBefore != newSize)
+
+// Track sent tile
+const std::string command = data->firstToken();
+if (command == "tile:")
 {
-// Track sent tile
-const std::string command = data->firstToken();
-if (command == "tile:")
-{
-const TileDesc tile = TileDesc::parse(data->firstLine());
-traceTileBySend(tile);
-}
+const TileDesc tile = TileDesc::parse(data->firstLine());
+traceTileBySend(tile, sizeBefore == newSize);
 }
 }
 
@@ -134,7 +132,7 @@ public:
 
 /// This method updates internal data related to sent tiles (wireID and 
tiles-on-fly)
 /// Call this method anytime when a new tile is sent to the client
-void traceTileBySend(const TileDesc& tile);
+void traceTileBySend(const TileDesc& tile, bool deduplicated = false);
 
 /// Trask tiles what we a subscription to
 void traceSubscribeToTile(const std::string& tileCacheName);
diff --git a/wsd/TestStubs.cpp b/wsd/TestStubs.cpp
index d5407c11b..9a56e0a67 100644
--- a/wsd/TestStubs.cpp
+++ b/wsd/TestStubs.cpp
@@ -20,7 +20,7 @@
 void DocumentBroker::assertCorrectThread() const {}
 
 
-void ClientSession::traceTileBySend(const TileDesc& /*tile*/) {}
+void ClientSession::traceTileBySend(const TileDesc& /*tile*/, bool 
/*deduplicated = false*/) {}
 
 void ClientSession::traceSubscribeToTile(const std::string& /*tileCacheName*/) 
{};
 
commit 12a7d0df0dbcf29307f2ed92ef217c4024be5b66
Author: Tamás Zolnai 
AuthorDate: Wed Aug 22 16:19:04 2018 +0200
Commit: Andras Timar 
CommitDate: Tue Aug 28 10:42:51 2018 +0200

Reset also the wireId map by canceltiles

(cherry picked from commit 54596dbcf9db8d3aa415734988e15390e4133830)

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

diff --git a/wsd/ClientSession.hpp b/wsd/ClientSession.hpp
index ff5975f1e..04241d91b 100644
--- a/wsd/ClientSession.hpp
+++ b/wsd/ClientSession.hpp
@@ -143,6 +143,9 @@ public:
 void clearTileSubscription();
 
 size_t getTilesBeingRenderedCount() const {return 
_tilesBeingRendered.size();}
+
+/// Clear wireId map anytime when client visible area changes (visible 
area, zoom, part number)
+void resetWireIdMap();
 private:
 
 /// SocketHandler: disconnection event.
@@ -184,9 +187,6 @@ private:
 void handleTileInvalidation(const std::string& message,
 const std::shared_ptr& 
docBroker);
 
-/// Clear wireId map anytime when client visible area changes (visible 
area, zoom, part number)
-void resetWireIdMap();
-
 /// Generate a unique id for a tile
 std::string generateTileID(const TileDesc& tile);
 
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 874d1c587..913510064 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -1473,6 +1473,10 @@ void DocumentBroker::cancelTileRequests(const 
std::shared_ptr& se
 
 session->getRequestedTiles().clear();
 
+session->clearTileSubscription();
+
+session->resetWireIdMap();
+
 co

[Libreoffice-commits] core.git: config_host.mk.in configure.ac ios/Module_ios.mk

[Libreoffice Gerrit user]

 config_host.mk.in |1 +
 configure.ac  |   23 ++-
 ios/Module_ios.mk |8 +---
 3 files changed, 24 insertions(+), 8 deletions(-)

New commits:
commit a922f56cbf25f78534cd2d36bf13a86a4f15d970
Author: Tor Lillqvist 
AuthorDate: Tue Aug 28 11:36:13 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Aug 28 11:38:51 2018 +0300

Add --enable-ios-libreofficelight-app option to build stuff for janI's app

Change-Id: I1310cb8f5f543f49f9667ee10cb26c9809df259e

diff --git a/config_host.mk.in b/config_host.mk.in
index 0d87b7dfb535..691ec809bbab 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -143,6 +143,7 @@ export ENABLE_GTK=@ENABLE_GTK@
 export ENABLE_GTK_PRINT=@ENABLE_GTK_PRINT@
 export DISABLE_GUI=@DISABLE_GUI@
 export ENABLE_HTMLHELP=@ENABLE_HTMLHELP@
+export ENABLE_IOS_LIBREOFFICELIGHT_APP=@ENABLE_IOS_LIBREOFFICELIGHT_APP@
 export ENABLE_JAVA=@ENABLE_JAVA@
 export ENABLE_KDE4=@ENABLE_KDE4@
 export ENABLE_LPSOLVE=@ENABLE_LPSOLVE@
diff --git a/configure.ac b/configure.ac
index a31b26c62ab9..4a2d71a04877 100644
--- a/configure.ac
+++ b/configure.ac
@@ -949,6 +949,24 @@ if test $_os != "WINNT"; then
 fi
 AC_SUBST(DLOPEN_LIBS)
 
+AC_ARG_ENABLE(ios-simulator,
+AS_HELP_STRING([--enable-ios-simulator],
+[build i386 or x86_64 for ios simulator])
+)
+
+AC_ARG_ENABLE(ios-libreofficelight-app,
+AS_HELP_STRING([--enable-ios-libreofficelight-app],
+[When building for iOS, build stuff relevant only for the 
'LibreOfficeLight' app
+ (in ios/LibreOfficeLight). Note that this app is not known to work in 
any useful manner,
+ and also that its actual build (in Xcode) requires some obvious 
modifications to the project.])
+)
+
+ENABLE_IOS_LIBREOFFICELIGHT_APP=
+if test "$enable_ios_libreofficelight_app" = yes; then
+ENABLE_IOS_LIBREOFFICELIGHT_APP=TRUE
+fi
+AC_SUBST(ENABLE_IOS_LIBREOFFICELIGHT_APP)
+
 ###
 # Extensions switches --enable/--disable
 ###
@@ -962,11 +980,6 @@ AC_SUBST(DLOPEN_LIBS)
 # if you use --disable-extension-integration. Is that really the
 # case?
 
-AC_ARG_ENABLE(ios-simulator,
-AS_HELP_STRING([--enable-ios-simulator],
-[build i386 or x86_64 for ios simulator])
-)
-
 libo_FUZZ_ARG_ENABLE(extension-integration,
 AS_HELP_STRING([--disable-extension-integration],
 [Disable integration of the built extensions in the installer of the
diff --git a/ios/Module_ios.mk b/ios/Module_ios.mk
index 111391b31bee..d5b215e2cb82 100644
--- a/ios/Module_ios.mk
+++ b/ios/Module_ios.mk
@@ -12,12 +12,14 @@ ifeq ($(OS),IOS)
 
 $(eval $(call gb_Module_add_targets,ios,\
CustomTarget_iOS_setup \
-   CustomTarget_iOS_link \
 ))
 
+ifneq ($(ENABLE_IOS_LIBREOFFICELIGHT),)
+$(eval $(call gb_Module_add_targets,ios,\
+   CustomTarget_iOS_link \
+))
 
-
-
+endif
 endif
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 cppcanvas/source/mtfrenderer/implrenderer.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c16d64ad4f26382f5763bfb9f8f9216e76f289e0
Author: Tor Lillqvist 
AuthorDate: Tue Aug 28 11:24:02 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Aug 28 11:24:50 2018 +0300

Bin superfluous whitespace on empty line

Change-Id: Ida0ab3cd78514b2c10f8e6655becefe794217f8c

diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx 
b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index b67e1e9def05..8108ffbb4564 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -1568,7 +1568,7 @@ namespace cppcanvas
 // #i44110# correct null-sized output - there
 // are metafiles which have zero size in at
 // least one dimension
-  
+
 // Remark the 1L cannot be replaced, that would cause 
max to compare long/int
 const Size aMtfSizePix( std::max( 
aMtfSizePixPre.Width(), 1L ),
 std::max( 
aMtfSizePixPre.Height(), 1L ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - avmedia/source ios/LibreOfficeLight

[Libreoffice Gerrit user]

 avmedia/source/avmediadummy.cxx |5 +
 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj |8 
 2 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 15b7cdb35d080a8cbeb844dc4102ef0b7b172d3d
Author: Tor Lillqvist 
AuthorDate: Tue Aug 28 11:17:24 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Aug 28 11:18:27 2018 +0300

Add getMaskSet() to the dummy AVMediaSetMask

As such I am not convinced that this "dummy" replacement class
approach is the right thing; we don't do it like that elsewhere
either?

Change-Id: Ife912d9ed91bd26610ea40cf4b446beb2ed481ec

diff --git a/avmedia/source/avmediadummy.cxx b/avmedia/source/avmediadummy.cxx
index 3cd4a9e70f4f..74ac0ecf3a1d 100644
--- a/avmedia/source/avmediadummy.cxx
+++ b/avmedia/source/avmediadummy.cxx
@@ -71,6 +71,11 @@ bool MediaItem::PutValue( const css::uno::Any&, sal_uInt8 )
   return false;
 }
 
+AVMediaSetMask MediaItem::getMaskSet() const
+{
+return AVMediaSetMask::NONE;
+}
+
 SfxPoolItem* MediaItem::CreateDefault()
 {
 return new MediaItem;
commit 6a37bb093a2891723d2fff720b0adaf114d7953a
Author: Tor Lillqvist 
AuthorDate: Tue Aug 28 11:07:24 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Aug 28 11:18:27 2018 +0300

Bump version number in ICU data file name

Change-Id: I222792dd34cd016196dfec9870161896c7c43b0d

diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 67e33800b54a..66337e63b55e 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -20,7 +20,7 @@
3941EF1D204B4C8A00082486 /* filter in Resources */ = {isa = 
PBXBuildFile; fileRef = 3941EF0E204B4C8900082486 /* filter */; };
3941EF1E204B4C8A00082486 /* rc in Resources */ = {isa = 
PBXBuildFile; fileRef = 3941EF0F204B4C8900082486 /* rc */; };
3941EF1F204B4C8A00082486 /* udkapi.rdb in Resources */ = {isa = 
PBXBuildFile; fileRef = 3941EF10204B4C8900082486 /* udkapi.rdb */; };
-   3941EF20204B4C8A00082486 /* icudt60l.dat in Resources */ = {isa 
= PBXBuildFile; fileRef = 3941EF11204B4C8900082486 /* icudt60l.dat */; };
+   3941EF20204B4C8A00082486 /* icudt62l.dat in Resources */ = {isa 
= PBXBuildFile; fileRef = 3941EF11204B4C8900082486 /* icudt62l.dat */; };
3941EF21204B4C8A00082486 /* welcome.odt in Resources */ = {isa 
= PBXBuildFile; fileRef = 3941EF12204B4C8900082486 /* welcome.odt */; };
3941EF22204B4C8A00082486 /* config in Resources */ = {isa = 
PBXBuildFile; fileRef = 3941EF13204B4C8900082486 /* config */; };
3941EF23204B4C8A00082486 /* share in Resources */ = {isa = 
PBXBuildFile; fileRef = 3941EF14204B4C8900082486 /* share */; };
@@ -77,7 +77,7 @@
3941EF0E204B4C8900082486 /* filter */ = {isa = 
PBXFileReference; lastKnownFileType = folder; name = filter; path = 
../generated/resources/filter; sourceTree = ""; };
3941EF0F204B4C8900082486 /* rc */ = {isa = PBXFileReference; 
fileEncoding = 4; lastKnownFileType = text; name = rc; path = 
../generated/resources/rc; sourceTree = ""; };
3941EF10204B4C8900082486 /* udkapi.rdb */ = {isa = 
PBXFileReference; lastKnownFileType = file; name = udkapi.rdb; path = 
../generated/resources/udkapi.rdb; sourceTree = ""; };
-   3941EF11204B4C8900082486 /* icudt60l.dat */ = {isa = 
PBXFileReference; lastKnownFileType = file; name = icudt60l.dat; path = 
../generated/resources/icudt60l.dat; sourceTree = ""; };
+   3941EF11204B4C8900082486 /* icudt62l.dat */ = {isa = 
PBXFileReference; lastKnownFileType = file; name = icudt62l.dat; path = 
../generated/resources/icudt62l.dat; sourceTree = ""; };
3941EF12204B4C8900082486 /* welcome.odt */ = {isa = 
PBXFileReference; lastKnownFileType = file; name = welcome.odt; path = 
../generated/resources/welcome.odt; sourceTree = ""; };
3941EF13204B4C8900082486 /* config */ = {isa = 
PBXFileReference; lastKnownFileType = folder; name = config; path = 
../generated/resources/config; sourceTree = ""; };
3941EF14204B4C8900082486 /* share */ = {isa = PBXFileReference; 
lastKnownFileType = folder; name = share; path = ../generated/resources/share; 
sourceTree = ""; };
@@ -211,7 +211,7 @@
3941EF13204B4C8900082486 /* config */,
3941EF0E204B4C8900082486 /* filter */,
3941EF07204B4C8900082486 /* fundamentalrc */,
-   3941EF11204B4C8900082486 /* icudt60l.dat */,
+   3941EF11204B4C8900082486 /* icudt62l.dat */,
3941EF0D204B4C8900082486 /* offapi.rdb */,
3941E

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

[Libreoffice Gerrit user]

 sc/inc/cellsuno.hxx|2 -
 sc/inc/chartarr.hxx|6 ++--
 sc/qa/unit/ucalc.cxx   |   34 
 sc/qa/unit/ucalc.hxx   |2 -
 sc/qa/unit/ucalc_sharedformula.cxx |2 -
 sc/source/core/tool/chartarr.cxx   |   10 +++
 sc/source/ui/docshell/dbdocfun.cxx |   26 +-
 sc/source/ui/docshell/dbdocimp.cxx |   15 --
 sc/source/ui/docshell/docfunc.cxx  |   52 ++---
 sc/source/ui/docshell/docsh5.cxx   |4 +-
 sc/source/ui/docshell/impex.cxx|4 +-
 sc/source/ui/docshell/olinefun.cxx |   30 ++---
 sc/source/ui/inc/undoblk.hxx   |   28 +--
 sc/source/ui/inc/undodat.hxx   |   20 +++---
 sc/source/ui/undo/undoblk.cxx  |   48 +-
 sc/source/ui/undo/undoblk2.cxx |4 +-
 sc/source/ui/undo/undodat.cxx  |   44 +++
 sc/source/ui/unoobj/cellsuno.cxx   |   14 -
 sc/source/ui/view/dbfunc3.cxx  |   12 
 sc/source/ui/view/viewfun3.cxx |   22 +++
 sc/source/ui/view/viewfun4.cxx |8 ++---
 sc/source/ui/view/viewfunc.cxx |   14 -
 22 files changed, 200 insertions(+), 201 deletions(-)

New commits:
commit 6100ef45d8c90f141d68011bba9d9745dd319174
Author: Noel Grandin 
AuthorDate: Mon Aug 27 15:58:54 2018 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 28 10:13:06 2018 +0200

return ScMemChart by std::unique_ptr

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

diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 625818ce5cfb..3bdb5e357fc4 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -202,7 +202,7 @@ private:
 voidPaintGridRanges_Impl();
 ScRangeListRef  GetLimitedChartRanges_Impl( long nDataColumns, long 
nDataRows ) const;
 voidForceChartListener_Impl();
-ScMemChart* CreateMemChart_Impl() const;
+std::unique_ptr CreateMemChart_Impl() const;
 
 const ScPatternAttr*GetCurrentAttrsFlat();
 const ScPatternAttr*GetCurrentAttrsDeep();
diff --git a/sc/inc/chartarr.hxx b/sc/inc/chartarr.hxx
index b24745bc7388..b342be84f7ac 100644
--- a/sc/inc/chartarr.hxx
+++ b/sc/inc/chartarr.hxx
@@ -61,8 +61,8 @@ class SC_DLLPUBLIC ScChartArray // only 
parameter-struct
 ScChartPositioner aPositioner;
 
 private:
-ScMemChart* CreateMemChartSingle();
-ScMemChart* CreateMemChartMulti();
+std::unique_ptr CreateMemChartSingle();
+std::unique_ptr CreateMemChartMulti();
 public:
 ScChartArray( ScDocument* pDoc, const ScRangeListRef& rRangeList );
 
@@ -73,7 +73,7 @@ public:
 boolHasColHeaders() const { return aPositioner.HasColHeaders(); }
 boolHasRowHeaders() const { return aPositioner.HasRowHeaders(); }
 
-ScMemChart* CreateMemChart();
+std::unique_ptr CreateMemChart();
 };
 
 #endif
diff --git a/sc/source/core/tool/chartarr.cxx b/sc/source/core/tool/chartarr.cxx
index ba632ba1a386..76fcc2645839 100644
--- a/sc/source/core/tool/chartarr.cxx
+++ b/sc/source/core/tool/chartarr.cxx
@@ -60,7 +60,7 @@ ScChartArray::ScChartArray(
 pDocument( pDoc ),
 aPositioner(pDoc, rRangeList) {}
 
-ScMemChart* ScChartArray::CreateMemChart()
+std::unique_ptr ScChartArray::CreateMemChart()
 {
 ScRangeListRef aRangeListRef(GetRangeList());
 size_t nCount = aRangeListRef->size();
@@ -112,7 +112,7 @@ double getCellValue( ScDocument& rDoc, const ScAddress& 
rPos, double fDefault, b
 
 }
 
-ScMemChart* ScChartArray::CreateMemChartSingle()
+std::unique_ptr ScChartArray::CreateMemChartSingle()
 {
 SCSIZE nCol;
 SCSIZE nRow;
@@ -207,7 +207,7 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
 }
 
 //  Data
-ScMemChart* pMemChart = new ScMemChart( nColCount, nRowCount );
+std::unique_ptr pMemChart(new ScMemChart( nColCount, nRowCount 
));
 
 if ( bValidData )
 {
@@ -275,7 +275,7 @@ ScMemChart* ScChartArray::CreateMemChartSingle()
 return pMemChart;
 }
 
-ScMemChart* ScChartArray::CreateMemChartMulti()
+std::unique_ptr ScChartArray::CreateMemChartMulti()
 {
 SCSIZE nColCount = GetPositionMap()->GetColCount();
 SCSIZE nRowCount = GetPositionMap()->GetRowCount();
@@ -300,7 +300,7 @@ ScMemChart* ScChartArray::CreateMemChartMulti()
 }
 
 //  Data
-ScMemChart* pMemChart = new ScMemChart( nColCount, nRowCount );
+std::unique_ptr pMemChart(new ScMemChart( nColCount, nRowCount 
));
 
 SCSIZE nCol = 0;
 SCSIZE nRow = 0;
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index e957cb22faef..4d31248c34e9 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -2995,7 +2995,7 @@ void SAL_CALL ScCellRangesBase::incrementIndent()
 
 // XChartData
 
-ScMemChart* ScC

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

[Libreoffice Gerrit user]

 sc/inc/table.hxx   |4 ++--
 sc/source/core/data/table3.cxx |   12 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 8bcc4a98d78869d6839821b9747602777f00ebaf
Author: Noel Grandin 
AuthorDate: Mon Aug 27 15:50:56 2018 +0200
Commit: Noel Grandin 
CommitDate: Tue Aug 28 09:54:02 2018 +0200

return by std::unique_ptr from CreateSortInfoArray

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

diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 54d11db8599c..e9aee6b689a5 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -1153,8 +1153,8 @@ private:
 ScRefCellValue& rCell2, SCCOL nCell2Col, SCROW nCell2Row ) const;
 short   Compare(SCCOLROW nIndex1, SCCOLROW nIndex2) const;
 short   Compare( ScSortInfoArray*, SCCOLROW nIndex1, SCCOLROW nIndex2) 
const;
-ScSortInfoArray* CreateSortInfoArray( const sc::ReorderParam& rParam );
-ScSortInfoArray* CreateSortInfoArray(
+std::unique_ptr CreateSortInfoArray( const 
sc::ReorderParam& rParam );
+std::unique_ptr CreateSortInfoArray(
 const ScSortParam& rSortParam, SCCOLROW nInd1, SCCOLROW nInd2,
 bool bKeepQuery, bool bUpdateRefs );
 voidQuickSort( ScSortInfoArray*, SCCOLROW nLo, SCCOLROW nHi);
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 816851e8c9a0..94c86f5eb8c2 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -446,9 +446,9 @@ void initDataRows(
 
 }
 
-ScSortInfoArray* ScTable::CreateSortInfoArray( const sc::ReorderParam& rParam )
+std::unique_ptr ScTable::CreateSortInfoArray( const 
sc::ReorderParam& rParam )
 {
-ScSortInfoArray* pArray = nullptr;
+std::unique_ptr pArray;
 
 if (rParam.mbByRow)
 {
@@ -458,7 +458,7 @@ ScSortInfoArray* ScTable::CreateSortInfoArray( const 
sc::ReorderParam& rParam )
 SCCOL nCol1 = rParam.maSortRange.aStart.Col();
 SCCOL nCol2 = rParam.maSortRange.aEnd.Col();
 
-pArray = new ScSortInfoArray(0, nRow1, nRow2);
+pArray.reset(new ScSortInfoArray(0, nRow1, nRow2));
 pArray->SetKeepQuery(rParam.mbHiddenFiltered);
 pArray->SetUpdateRefs(rParam.mbUpdateRefs);
 
@@ -471,7 +471,7 @@ ScSortInfoArray* ScTable::CreateSortInfoArray( const 
sc::ReorderParam& rParam )
 SCCOLROW nCol1 = rParam.maSortRange.aStart.Col();
 SCCOLROW nCol2 = rParam.maSortRange.aEnd.Col();
 
-pArray = new ScSortInfoArray(0, nCol1, nCol2);
+pArray.reset(new ScSortInfoArray(0, nCol1, nCol2));
 pArray->SetKeepQuery(rParam.mbHiddenFiltered);
 pArray->SetUpdateRefs(rParam.mbUpdateRefs);
 }
@@ -479,14 +479,14 @@ ScSortInfoArray* ScTable::CreateSortInfoArray( const 
sc::ReorderParam& rParam )
 return pArray;
 }
 
-ScSortInfoArray* ScTable::CreateSortInfoArray(
+std::unique_ptr ScTable::CreateSortInfoArray(
 const ScSortParam& rSortParam, SCCOLROW nInd1, SCCOLROW nInd2,
 bool bKeepQuery, bool bUpdateRefs )
 {
 sal_uInt16 nUsedSorts = 1;
 while ( nUsedSorts < rSortParam.GetSortKeyCount() && 
rSortParam.maKeyState[nUsedSorts].bDoSort )
 nUsedSorts++;
-ScSortInfoArray* pArray = new ScSortInfoArray( nUsedSorts, nInd1, nInd2 );
+std::unique_ptr pArray(new ScSortInfoArray( nUsedSorts, 
nInd1, nInd2 ));
 pArray->SetKeepQuery(bKeepQuery);
 pArray->SetUpdateRefs(bUpdateRefs);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 chart2/IwyuFilter_chart2.yaml  
|   53 ++
 chart2/source/controller/accessibility/AccessibleBase.cxx  
|1 
 chart2/source/controller/accessibility/AccessibleChartElement.cxx  
|1 
 chart2/source/controller/accessibility/AccessibleChartShape.cxx
|1 
 chart2/source/controller/accessibility/AccessibleChartView.cxx 
|1 
 chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
|1 
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
|1 
 chart2/source/controller/chartapiwrapper/TitleWrapper.cxx  
|1 
 chart2/source/controller/chartapiwrapper/TitleWrapper.hxx  
|1 
 
chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx 
   |2 
 
chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx 
   |1 
 
chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
 |1 
 chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
|2 
 chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
|1 
 chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
|1 
 chart2/source/controller/dialogs/ObjectNameProvider.cxx
|1 
 chart2/source/controller/inc/AccessibleBase.hxx
|3 
 chart2/source/controller/inc/ChartController.hxx   
|8 -
 chart2/source/controller/inc/PositionAndSizeHelper.hxx 
|1 
 chart2/source/controller/inc/TitleDialogData.hxx   
|2 
 chart2/source/controller/inc/dlg_ObjectProperties.hxx  
|1 
 chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx 
|1 
 chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx   
|1 
 chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
|2 
 chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
|1 
 chart2/source/controller/main/ChartController.cxx  
|1 
 chart2/source/controller/main/ChartController_Insert.cxx   
|3 
 chart2/source/controller/main/ChartController_Position.cxx 
|1 
 chart2/source/controller/main/ChartController_Properties.cxx   
|1 
 chart2/source/controller/main/ChartController_TextEdit.cxx 
|1 
 chart2/source/controller/main/ChartController_Tools.cxx
|3 
 chart2/source/controller/main/ChartController_Window.cxx   
|3 
 chart2/source/controller/main/ControllerCommandDispatch.cxx
|2 
 chart2/source/controller/main/ElementSelector.cxx  
|1 
 chart2/source/controller/main/ObjectHierarchy.cxx  
|1 
 chart2/source/controller/main/StatusBarCommandDispatch.cxx 
|2 
 chart2/source/controller/sidebar/ChartAreaPanel.cxx
|2 
 chart2/source/controller/sidebar/ChartAxisPanel.cxx
|2 
 chart2/source/controller/sidebar/ChartColorWrapper.cxx 
|1 
 chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
|1 
 chart2/source/controller/sidebar/ChartLinePanel.cxx
|2 
 chart2/source/controller/sidebar/ChartSeriesPanel.cxx  
|2 
 chart2/source/controller/uitest/uiobject.cxx   
|1 
 chart2/source/inc/LabeledDataSequence.hxx  
|7 -
 chart2/source/inc/LegendHelper.hxx 
|   10 -
 chart2/source/inc/LinearRegressionCurveCalculator.hxx  
|1 
 chart2/source/inc/MediaDescriptorHelper.hxx
|   12 +-
 chart2/source/inc/ModifyListenerHelper.hxx 
|5 
 chart2/source/inc/NumberFormatterWrapper.hxx   
|6 -
 chart2/source/inc/ObjectIdentifier.hxx 
|   22 ++--
 chart2/source/inc/PotentialRegressionCurveCalculator.hxx   
|1 
 chart2/source/inc/PropertyHelper.hxx   
|3 
 chart2/source/inc/RangeHighlighter.hxx 
|6 -
 chart2/source/inc/ReferenceSizeProvider.hxx  

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

[Libreoffice Gerrit user]

 vcl/source/outdev/text.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 24534b101c713a04c9ab12570d9124037643e644
Author: Miklos Vajna 
AuthorDate: Mon Aug 27 17:40:22 2018 +0200
Commit: Miklos Vajna 
CommitDate: Tue Aug 28 09:04:36 2018 +0200

tdf#119451 vcl layout cache: fix glyph fallback handling

Type ":dog:" into Writer with e.g. the Liberation Serif font, glyph
layout doesn't execute, a literal 0 glyph id is rendered.

Fix the problem by returning the glyph items (to be inserted into a
cache) after handling glyph fallback.

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

diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 9568b3b50eb2..5112814a35ec 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -1332,14 +1332,16 @@ std::unique_ptr 
OutputDevice::ImplLayout(const OUString& rOrigStr,
 if( !pSalLayout )
 return nullptr;
 
-if (flags & SalLayoutFlags::GlyphItemsOnly)
-return pSalLayout;
-
 // do glyph fallback if needed
 // #105768# avoid fallback for very small font sizes
 if (aLayoutArgs.NeedFallback() && 
mpFontInstance->GetFontSelectPattern().mnHeight >= 3)
 pSalLayout = ImplGlyphFallbackLayout(std::move(pSalLayout), 
aLayoutArgs);
 
+if (flags & SalLayoutFlags::GlyphItemsOnly)
+// Return glyph items only after fallback handling. Otherwise they may
+// contain invalid glyph IDs.
+return pSalLayout;
+
 // position, justify, etc. the layout
 pSalLayout->AdjustLayout( aLayoutArgs );
 pSalLayout->DrawBase() = ImplLogicToDevicePixel( rLogicalPos );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 oox/source/drawingml/shape.cxx |7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit eada4adee8a32be021ee3031d07e0ccda7217e0d
Author: Arkadiy Illarionov 
AuthorDate: Sat Aug 25 10:09:41 2018 +0300
Commit: Noel Grandin 
CommitDate: Tue Aug 28 09:01:09 2018 +0200

tdf#39593 deduplicate code using existing function

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

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index e58d54bf863c..2f7cd0722938 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -413,12 +413,7 @@ static inline void lcl_setPropertyValue( 
std::vector& rPro
const OUString& rName,
const beans::PropertyValue& rPropertyValue )
 {
-auto aIterator = std::find_if(
-rPropVec.begin(), rPropVec.end(),
-[rName]( const beans::PropertyValue& rValue ) { return rValue.Name == 
rName; } );
-
-if (aIterator != rPropVec.end())
-rPropVec.erase( aIterator );
+lcl_resetPropertyValue( rPropVec, rName );
 
 rPropVec.push_back( rPropertyValue );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits