[Libreoffice-commits] core.git: download.lst external/libpagemaker solenv/flatpak-manifest.in

[David Tardon]

 download.lst  |4 ++--
 external/libpagemaker/ExternalProject_libpagemaker.mk |3 +--
 solenv/flatpak-manifest.in|6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 3164e193c2bd1b224231caab3b9306d5f10d9f85
Author: David Tardon 
Date:   Mon Jan 8 20:30:43 2018 +0100

upload libpagemaker 0.0.4

Change-Id: Idc4b7eaa3331ee3831f7d27ca3e23c30b8c9
Reviewed-on: https://gerrit.libreoffice.org/47615
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/download.lst b/download.lst
index d2b8140c4e0e..988c601ece06 100644
--- a/download.lst
+++ b/download.lst
@@ -194,8 +194,8 @@ export ORCUS_SHA256SUM := 
d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceacc
 export ORCUS_TARBALL := liborcus-0.13.1.tar.gz
 export OWNCLOUD_ANDROID_LIB_SHA256SUM := 
b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb
 export OWNCLOUD_ANDROID_LIB_TARBALL := 
owncloud-android-library-0.9.4-no-binary-deps.tar.gz
-export PAGEMAKER_SHA256SUM := 
3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33
-export PAGEMAKER_TARBALL := libpagemaker-0.0.3.tar.bz2
+export PAGEMAKER_SHA256SUM := 
66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d
+export PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz
 export PDFIUM_SHA256SUM := 
7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f
 export PDFIUM_TARBALL := pdfium-3235.tar.bz2
 export PIXMAN_SHA256SUM := 
21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e
diff --git a/external/libpagemaker/ExternalProject_libpagemaker.mk 
b/external/libpagemaker/ExternalProject_libpagemaker.mk
index 852b6e846dd9..91e494402cc1 100644
--- a/external/libpagemaker/ExternalProject_libpagemaker.mk
+++ b/external/libpagemaker/ExternalProject_libpagemaker.mk
@@ -34,8 +34,7 @@ $(call 
gb_ExternalProject_get_state_target,libpagemaker,build) :
--disable-weffc \
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS="$(gb_CXXFLAGS) $(if 
$(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
-   CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS) \
-   -DBOOST_ERROR_CODE_HEADER_ONLY 
-DBOOST_SYSTEM_NO_DEPRECATED" \
+   CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
&& $(MAKE) \
)
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 70d08916ae8c..d9966383b484 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -254,10 +254,10 @@
 "dest-filename": 
"external/tarballs/libodfgen-0.1.6.tar.bz2"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/libpagemaker-0.0.3.tar.bz2";,
-"sha256": 
"3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33",
+"url": 
"https://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz";,
+"sha256": 
"66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d",
 "type": "file",
-"dest-filename": 
"external/tarballs/libpagemaker-0.0.3.tar.bz2"
+"dest-filename": 
"external/tarballs/libpagemaker-0.0.4.tar.xz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2";,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/rtl sot/source store/source svl/source ucb/source

[Noel Grandin]

 sal/rtl/strimp.cxx   |2 +-
 sot/source/sdstor/stg.cxx|8 
 sot/source/sdstor/stgcache.cxx   |8 
 sot/source/sdstor/stgdir.cxx |4 ++--
 store/source/stordir.cxx |6 +++---
 svl/source/items/slstitm.cxx |4 ++--
 ucb/source/cacher/cachedcontentresultset.cxx |   14 +++---
 ucb/source/sorter/sortdynres.cxx |4 ++--
 ucb/source/sorter/sortresult.cxx |4 ++--
 9 files changed, 27 insertions(+), 27 deletions(-)

New commits:
commit 75c604a4ecd61322285f4139621e14166a8db1f2
Author: Noel Grandin 
Date:   Mon Jan 8 13:49:54 2018 +0200

loplugin:convertlong in ucb,sot

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

diff --git a/sal/rtl/strimp.cxx b/sal/rtl/strimp.cxx
index d520d2412b6e..e760de186417 100644
--- a/sal/rtl/strimp.cxx
+++ b/sal/rtl/strimp.cxx
@@ -81,7 +81,7 @@ static void *pre_allocateStringFn(sal_Size n)
 static void pre_freeStringFn(void *data)
 {
 char*addr = static_cast(data) - 4;
-sal_Size size = reinterpret_cast(addr)[0] + 12;
+sal_uInt32 size = reinterpret_cast(addr)[0] + 12;
 
 rtl_arena_free(pre_arena, addr, size);
 }
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx
index 313d2c893840..64583644d7cc 100644
--- a/sot/source/sdstor/stg.cxx
+++ b/sot/source/sdstor/stg.cxx
@@ -316,7 +316,7 @@ bool Storage::IsStorageFile( SvStream* pStream )
 if ( pStream )
 {
 StgHeader aHdr;
-sal_uLong nPos = pStream->Tell();
+sal_uInt64 nPos = pStream->Tell();
 bRet = ( aHdr.Load( *pStream ) && aHdr.Check() );
 
 // It's not a stream error if it is too small for a OLE storage header
@@ -374,7 +374,7 @@ Storage::Storage( SvStream& r, bool bDirect )
 if( r.GetError() == ERRCODE_NONE )
 {
 pIo->SetStrm( &r, false );
-sal_uLong nSize = r.Seek( STREAM_SEEK_TO_END );
+sal_uInt64 nSize = r.Seek( STREAM_SEEK_TO_END );
 r.Seek( 0 );
 // Initializing is OK if the stream is empty
 Init( nSize == 0 );
@@ -419,7 +419,7 @@ Storage::Storage( UCBStorageStream& rStrm, bool bDirect )
 
 pIo->SetStrm( &rStrm );
 
-sal_uLong nSize = pStream->Seek( STREAM_SEEK_TO_END );
+sal_uInt64 nSize = pStream->Seek( STREAM_SEEK_TO_END );
 pStream->Seek( 0 );
 // Initializing is OK if the stream is empty
 Init( nSize == 0 );
@@ -444,7 +444,7 @@ void Storage::Init( bool bCreate )
 OSL_ENSURE( pIo, "The pointer may not be empty at this point!" );
 if( pIo->Good() && pIo->GetStrm() )
 {
-sal_uLong nSize = pIo->GetStrm()->Seek( STREAM_SEEK_TO_END );
+sal_uInt64 nSize = pIo->GetStrm()->Seek( STREAM_SEEK_TO_END );
 pIo->GetStrm()->Seek( 0 );
 if( nSize )
 {
diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx
index 8f77abdbc345..3665aac7b856 100644
--- a/sot/source/sdstor/stgcache.cxx
+++ b/sot/source/sdstor/stgcache.cxx
@@ -111,8 +111,8 @@ void StgCache::SetPhysPageSize( short n )
 if ( n >= 512 )
 {
 m_nPageSize = n;
-sal_uLong nPos = m_pStrm->Tell();
-sal_uLong nFileSize = m_pStrm->Seek( STREAM_SEEK_TO_END );
+sal_uInt64 nPos = m_pStrm->Tell();
+sal_uInt64 nFileSize = m_pStrm->Seek( STREAM_SEEK_TO_END );
 m_nPages = lcl_GetPageCount( nFileSize, m_nPageSize );
 m_pStrm->Seek( nPos );
 }
@@ -295,7 +295,7 @@ bool StgCache::Open( const OUString& rName, StreamMode 
nMode )
 SetStrm( pFileStrm, true );
 if( pFileStrm->IsOpen() )
 {
-sal_uLong nFileSize = m_pStrm->Seek( STREAM_SEEK_TO_END );
+sal_uInt64 nFileSize = m_pStrm->Seek( STREAM_SEEK_TO_END );
 m_nPages = lcl_GetPageCount( nFileSize, m_nPageSize );
 m_pStrm->Seek( 0 );
 }
@@ -384,7 +384,7 @@ bool StgCache::Write( sal_Int32 nPage, void const * pBuf )
 {
 m_pStrm->Seek(nPos);
 }
-sal_uLong nRes = m_pStrm->WriteBytes( pBuf, nBytes );
+size_t nRes = m_pStrm->WriteBytes( pBuf, nBytes );
 if( nRes != nBytes )
 SetError( SVSTREAM_WRITE_ERROR );
 else
diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index 309c5f896112..3cad0ee08962 100644
--- a/sot/source/sdstor/stgdir.cxx
+++ b/sot/source/sdstor/stgdir.cxx
@@ -625,7 +625,7 @@ bool StgDirEntry::Tmp2Strm()
 OSL_ENSURE( m_pStgStrm, "The pointer may not be NULL!" );
 if ( !m_pStgStrm )
 return false;
-sal_uLong n = m_pTmpStrm->GetSize();
+sal_uInt64 n = m_pTmpStrm->GetSize();
 StgStrm* pNewStrm;
 StgIo& rIo = m_pStgStrm->GetIo();
 sal_uLong nThreshold = (sal_uLong) rIo.m_aHdr.GetThreshold();
@@ -639,7 +639,7 @@ bool StgDirEntry::Tmp2Strm()

[Libreoffice-commits] core.git: 2 commits - include/editeng include/svx include/tools include/vcl sw/inc sw/source vcl/source xmloff/source

[Noel Grandin]

 include/editeng/editids.hrc   |2 +-
 include/svx/svxitems.hrc  |1 -
 include/tools/color.hxx   |6 +++---
 include/tools/colordata.hxx   |6 --
 include/vcl/salbtype.hxx  |6 +++---
 sw/inc/hintids.hxx|4 ++--
 sw/source/core/bastyp/init.cxx|8 
 sw/source/core/doc/dbgoutsw.cxx   |2 --
 sw/source/core/layout/wsfrm.cxx   |1 -
 sw/source/core/text/atrstck.cxx   |4 ++--
 sw/source/filter/html/css1atr.cxx |4 ++--
 sw/source/filter/html/htmlatr.cxx |4 ++--
 vcl/source/outdev/bitmap.cxx  |6 +++---
 vcl/source/outdev/transparent.cxx |6 +++---
 xmloff/source/text/txtprmap.cxx   |   12 
 15 files changed, 33 insertions(+), 39 deletions(-)

New commits:
commit c0847dc7b7a311d19b73d4943d1b0466b10cde4f
Author: Noel Grandin 
Date:   Mon Jan 8 14:34:59 2018 +0200

convert COLOR_CHANNEL_MERGE to constexpr function

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

diff --git a/include/tools/color.hxx b/include/tools/color.hxx
index 0173840d80ff..1d0d239d5af5 100644
--- a/include/tools/color.hxx
+++ b/include/tools/color.hxx
@@ -192,9 +192,9 @@ inline sal_uInt8 Color::GetLuminance() const
 
 inline void Color::Merge( const Color& rMergeColor, sal_uInt8 cTransparency )
 {
-SetRed(COLOR_CHANNEL_MERGE(COLORDATA_RED(mnColor), 
COLORDATA_RED(rMergeColor.mnColor), cTransparency));
-SetGreen(COLOR_CHANNEL_MERGE(COLORDATA_GREEN(mnColor), 
COLORDATA_GREEN(rMergeColor.mnColor), cTransparency));
-SetBlue(COLOR_CHANNEL_MERGE(COLORDATA_BLUE(mnColor), 
COLORDATA_BLUE(rMergeColor.mnColor), cTransparency));
+SetRed(ColorChannelMerge(COLORDATA_RED(mnColor), 
COLORDATA_RED(rMergeColor.mnColor), cTransparency));
+SetGreen(ColorChannelMerge(COLORDATA_GREEN(mnColor), 
COLORDATA_GREEN(rMergeColor.mnColor), cTransparency));
+SetBlue(ColorChannelMerge(COLORDATA_BLUE(mnColor), 
COLORDATA_BLUE(rMergeColor.mnColor), cTransparency));
 }
 
 #endif
diff --git a/include/tools/colordata.hxx b/include/tools/colordata.hxx
index ffe5a2d14b44..6008d0c0fc24 100644
--- a/include/tools/colordata.hxx
+++ b/include/tools/colordata.hxx
@@ -92,8 +92,10 @@ constexpr ColorData RGB_COLORDATA(sal_uInt8 r, sal_uInt8 g, 
sal_uInt8 b) {
 #define COL_AUTHOR9_NORMAL  RGB_COLORDATA(255, 226, 185)
 #define COL_AUTHOR9_LIGHT   RGB_COLORDATA(255, 231, 199)
 
-#define COLOR_CHANNEL_MERGE( _def_cDst, _def_cSrc, _def_cSrcTrans ) \
-
((sal_uInt8)long)(_def_cDst)-(_def_cSrc))*(_def_cSrcTrans)+(((_def_cSrc)<<8)|(_def_cDst)))>>8))
+constexpr sal_uInt8 ColorChannelMerge(sal_uInt8 nDst, sal_uInt8 nSrc, 
sal_uInt8 nSrcTrans)
+{
+return (sal_uInt8) 
sal_Int32)nDst-nSrc)*nSrcTrans+((nSrc<<8)|nDst))>>8);
+};
 
 #endif
 
diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index ed38c9a41b8a..e9a3bdf599b7 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -480,9 +480,9 @@ inline BitmapColor& BitmapColor::Merge( const BitmapColor& 
rBitmapColor, sal_uIn
 {
 assert( !mbIndex && "Pixel represents index into colortable" );
 assert( !rBitmapColor.mbIndex && "Pixel represents index into colortable" 
);
-mcBlueOrIndex = COLOR_CHANNEL_MERGE( mcBlueOrIndex, 
rBitmapColor.mcBlueOrIndex, cTransparency );
-mcGreen = COLOR_CHANNEL_MERGE( mcGreen, rBitmapColor.mcGreen, 
cTransparency );
-mcRed = COLOR_CHANNEL_MERGE( mcRed, rBitmapColor.mcRed, cTransparency );
+mcBlueOrIndex = ColorChannelMerge( mcBlueOrIndex, 
rBitmapColor.mcBlueOrIndex, cTransparency );
+mcGreen = ColorChannelMerge( mcGreen, rBitmapColor.mcGreen, cTransparency 
);
+mcRed = ColorChannelMerge( mcRed, rBitmapColor.mcRed, cTransparency );
 
 return *this;
 }
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index e33cfa60bd70..24b1c5403057 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -867,11 +867,11 @@ public:
 
 nAlpha  = (nAlphaLine1  + nMapFY * ((nAlphaLine2  >> 7) - 
(nAlphaLine1 >> 7))) >> 7;
 
-*pDestScanline = COLOR_CHANNEL_MERGE(*pDestScanline, nColor1, 
nAlpha);
+*pDestScanline = ColorChannelMerge(*pDestScanline, nColor1, 
nAlpha);
 pDestScanline++;
-*pDestScanline = COLOR_CHANNEL_MERGE(*pDestScanline, nColor2, 
nAlpha);
+*pDestScanline = ColorChannelMerge(*pDestScanline, nColor2, 
nAlpha);
 pDestScanline++;
-*pDestScanline = COLOR_CHANNEL_MERGE(*pDestScanline, nColor3, 
nAlpha);
+*pDestScanline = ColorChannelMerge(*pDestScanline, nColor3, 
nAlpha);
 pDestScanline++;
 pDestScanline++;
 }
diff --git a/vcl/source/outdev/transparent.cxx 
b/vcl/source/outdev/transparent.cxx
index 31d4c946bb36..764389dcbe78 100644
--- a/

[Libreoffice-commits] core.git: include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa test/Library_subsequenttest.mk test/source

[Jens Carl]

 include/test/sheet/spreadsheetviewsettings.hxx   |   34 +
 qadevOOo/Jar_OOoRunner.mk|1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv |   20 
 qadevOOo/tests/java/ifc/sheet/_SpreadsheetViewSettings.java  |   66 --
 sc/qa/extras/sctabviewobj.cxx|   14 
 test/Library_subsequenttest.mk   |1 
 test/source/sheet/spreadsheetviewsettings.cxx|  243 +++
 7 files changed, 288 insertions(+), 91 deletions(-)

New commits:
commit 95307f2ca73480176634e5cc46d96a19b735e87b
Author: Jens Carl 
Date:   Tue Jan 9 03:57:02 2018 +

tdf#45904 Move _SpreadsheetViewSettings Java tests to C++

Change-Id: I68dcabd15b4b318a833a893b4de96c64ffd2a164
Reviewed-on: https://gerrit.libreoffice.org/47625
Tested-by: Jenkins 
Reviewed-by: Jens Carl 

diff --git a/include/test/sheet/spreadsheetviewsettings.hxx 
b/include/test/sheet/spreadsheetviewsettings.hxx
new file mode 100644
index ..135c95e5d078
--- /dev/null
+++ b/include/test/sheet/spreadsheetviewsettings.hxx
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_SHEET_SPREADSHEETVIEWSETTINGS_HXX
+#define INCLUDED_TEST_SHEET_SPREADSHEETVIEWSETTINGS_HXX
+
+#include 
+#include 
+
+#include 
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST SpreadsheetViewSettings
+{
+public:
+virtual css::uno::Reference init() = 0;
+
+void testSpreadsheetViewSettingsProperties();
+
+protected:
+~SpreadsheetViewSettings() {}
+};
+}
+
+#endif // INCLUDED_TEST_SHEET_SPREADSHEETVIEWSETTINGS_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 2e855eca6e1e..227ede99d893 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -575,7 +575,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/ifc/sheet/_Spreadsheet \
 qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocument \
 qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings \
-qadevOOo/tests/java/ifc/sheet/_SpreadsheetViewSettings \
 qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField \
 qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster \
 qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv
index bd00af8e020d..e13c05bfda4e 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv
@@ -15,26 +15,6 @@
 "ScTabViewObj";"com::sun::star::sheet::XCellRangeReferrer";"getReferredCells()"
 "ScTabViewObj";"com::sun::star::container::XElementAccess";"getElementType()"
 "ScTabViewObj";"com::sun::star::container::XElementAccess";"hasElements()"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"ShowFormulas"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"ShowZeroValues"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"IsValueHighlightingEnabled"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"ShowNotes"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"HasVerticalScrollBar"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"HasHorizontalScrollBar"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"HasSheetTabs"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"IsOutlineSymbolsSet"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"HasColumnRowHeaders"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"ShowGrid"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"GridColor"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"ShowHelpLines"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"ShowAnchor"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"ShowPageBreaks"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"ShowObjects"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"ShowCharts"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"ShowDrawing"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"HideSpellMarks"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"ZoomType"
-"ScTabViewObj";"com::sun::star::sheet::SpreadsheetViewSettings";"ZoomValue"
 
"ScTabViewObj";"com::sun::star::sheet::XActivationBroadcaster#optional";"ad

[Libreoffice-commits] online.git: wsd/Admin.cpp

[Ashod Nakashian]

 wsd/Admin.cpp |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit b0fa4c33cd79f240064aa282eb88c5fd359905ea
Author: Ashod Nakashian 
Date:   Mon Jan 8 22:09:33 2018 -0500

wsd: pass lambda args by value

These callbacks are executed on a different thread
and passing by ref is clearly invalid (and unintentional).

Change-Id: I02e5359594f912baf67028202e6262d74b5769eb
Reviewed-on: https://gerrit.libreoffice.org/47624
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
index f6ade65f..29032057 100644
--- a/wsd/Admin.cpp
+++ b/wsd/Admin.cpp
@@ -430,24 +430,24 @@ void Admin::pollingThread()
 }
 
 void Admin::modificationAlert(const std::string& dockey, Poco::Process::PID 
pid, bool value){
-addCallback([&] { _model.modificationAlert(dockey, pid, value); });
+addCallback([=] { _model.modificationAlert(dockey, pid, value); });
 }
 
 void Admin::addDoc(const std::string& docKey, Poco::Process::PID pid, const 
std::string& filename,
 const std::string& sessionId, const std::string& userName, const 
std::string& userId)
 {
-addCallback([&] { _model.addDocument(docKey, pid, filename, sessionId, 
userName, userId); });
+addCallback([=] { _model.addDocument(docKey, pid, filename, sessionId, 
userName, userId); });
 }
 
 void Admin::rmDoc(const std::string& docKey, const std::string& sessionId)
 {
-addCallback([&] { _model.removeDocument(docKey, sessionId); });
+addCallback([=] { _model.removeDocument(docKey, sessionId); });
 }
 
 void Admin::rmDoc(const std::string& docKey)
 {
 LOG_INF("Removing complete doc [" << docKey << "] from Admin.");
-addCallback([&]{ _model.removeDocument(docKey); });
+addCallback([=]{ _model.removeDocument(docKey); });
 }
 
 void Admin::rescheduleMemTimer(unsigned interval)
@@ -518,17 +518,17 @@ AdminModel& Admin::getModel()
 
 void Admin::updateLastActivityTime(const std::string& docKey)
 {
-addCallback([&]{ _model.updateLastActivityTime(docKey); });
+addCallback([=]{ _model.updateLastActivityTime(docKey); });
 }
 
 void Admin::updateMemoryDirty(const std::string& docKey, int dirty)
 {
-addCallback([&] { _model.updateMemoryDirty(docKey, dirty); });
+addCallback([=] { _model.updateMemoryDirty(docKey, dirty); });
 }
 
 void Admin::addBytes(const std::string& docKey, uint64_t sent, uint64_t recv)
 {
-addCallback([&] { _model.addBytes(docKey, sent, recv); });
+addCallback([=] { _model.addBytes(docKey, sent, recv); });
 }
 
 void Admin::notifyForkit()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa test/Library_subsequenttest.mk test/source

[Jens Carl]

 include/test/sheet/subtotaldescriptor.hxx|   
34 ++
 qadevOOo/Jar_OOoRunner.mk|
1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv |
8 
 qadevOOo/tests/java/ifc/sheet/_SubTotalDescriptor.java   |   
40 ---
 sc/qa/extras/scsubtotaldescriptorbaseobj.cxx |   
10 
 test/Library_subsequenttest.mk   |
1 
 test/source/sheet/subtotaldescriptor.cxx |  
116 ++
 7 files changed, 159 insertions(+), 51 deletions(-)

New commits:
commit c29828daa32f3dee503e4db2b5b55d3d12f1fd39
Author: Jens Carl 
Date:   Tue Jan 9 01:00:49 2018 +

tdf#45904 Move _SubTotalDescriptor Java tests to C++

Change-Id: Id4265dd6a8123624bccdfe343655525948cadee7
Reviewed-on: https://gerrit.libreoffice.org/47623
Tested-by: Jenkins 
Reviewed-by: Jens Carl 

diff --git a/include/test/sheet/subtotaldescriptor.hxx 
b/include/test/sheet/subtotaldescriptor.hxx
new file mode 100644
index ..9b2c21f21c98
--- /dev/null
+++ b/include/test/sheet/subtotaldescriptor.hxx
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_SHEET_SUBTOTALDESCRIPTOR_HXX
+#define INCLUDED_TEST_SHEET_SUBTOTALDESCRIPTOR_HXX
+
+#include 
+#include 
+
+#include 
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST SubTotalDescriptor
+{
+public:
+virtual css::uno::Reference init() = 0;
+
+void testSubTotalDescriptorProperties();
+
+protected:
+~SubTotalDescriptor() {}
+};
+}
+
+#endif // INCLUDED_TEST_SHEET_SUBTOTALDESCRIPTOR_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index ec406f859a2f..2e855eca6e1e 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -576,7 +576,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocument \
 qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings \
 qadevOOo/tests/java/ifc/sheet/_SpreadsheetViewSettings \
-qadevOOo/tests/java/ifc/sheet/_SubTotalDescriptor \
 qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField \
 qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster \
 qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange \
diff --git 
a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv
index 32ad24f94880..9aa6d5addfeb 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSubTotalDescriptorBase.csv
@@ -2,14 +2,6 @@
 
"ScSubTotalDescriptorBase";"com::sun::star::container::XIndexAccess";"getByIndex()"
 
"ScSubTotalDescriptorBase";"com::sun::star::container::XElementAccess";"getElementType()"
 
"ScSubTotalDescriptorBase";"com::sun::star::container::XElementAccess";"hasElements()"
-"ScSubTotalDescriptorBase";"com::sun::star::sheet::SubTotalDescriptor";"InsertPageBreaks"
-"ScSubTotalDescriptorBase";"com::sun::star::sheet::SubTotalDescriptor";"IsCaseSensitive"
-"ScSubTotalDescriptorBase";"com::sun::star::sheet::SubTotalDescriptor";"EnableUserSortList"
-"ScSubTotalDescriptorBase";"com::sun::star::sheet::SubTotalDescriptor";"UserSortListIndex"
-"ScSubTotalDescriptorBase";"com::sun::star::sheet::SubTotalDescriptor";"BindFormatsToContent"
-"ScSubTotalDescriptorBase";"com::sun::star::sheet::SubTotalDescriptor";"EnableSort"
-"ScSubTotalDescriptorBase";"com::sun::star::sheet::SubTotalDescriptor";"SortAscending"
-"ScSubTotalDescriptorBase";"com::sun::star::sheet::SubTotalDescriptor";"MaxFieldCount"
 
"ScSubTotalDescriptorBase";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
 
"ScSubTotalDescriptorBase";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
 
"ScSubTotalDescriptorBase";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
diff --git a/qadevOOo/tests/java/ifc/sheet/_SubTotalDescriptor.java 
b/qadevOOo/tests/java/ifc/sheet/_SubTotalDescriptor.java
deleted file mode 100644
index 0f63ac5f41f1..
--- a/qadevOOo/tests/java/ifc/sheet/_SubTotalDescriptor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the fo

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

[Ashod Nakashian]

 vcl/headless/svpgdi.cxx |   21 +
 1 file changed, 17 insertions(+), 4 deletions(-)

New commits:
commit acb43c0b8efbfb841e7b40603d75a8432eb21f21
Author: Ashod Nakashian 
Date:   Sun Jan 7 21:11:31 2018 -0500

vcl: mask must alwasy be argb32 even when we can use rgb24

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

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 396618f354a1..3e3e7babcd44 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -221,12 +221,16 @@ namespace
 class SourceHelper
 {
 public:
-explicit SourceHelper(const SalBitmap& rSourceBitmap)
+explicit SourceHelper(const SalBitmap& rSourceBitmap, const bool 
bForceARGB32 = false)
+#ifdef HAVE_CAIRO_FORMAT_RGB24_888
+: m_bForceARGB32(bForceARGB32)
+#endif
 {
 const SvpSalBitmap& rSrcBmp = static_cast(rSourceBitmap);
 #ifdef HAVE_CAIRO_FORMAT_RGB24_888
-if (rSrcBmp.GetBitCount() != 32 && rSrcBmp.GetBitCount() != 24)
+if ((rSrcBmp.GetBitCount() != 32 && rSrcBmp.GetBitCount() != 24) 
|| bForceARGB32)
 #else
+(void)bForceARGB32;
 if (rSrcBmp.GetBitCount() != 32)
 #endif
 {
@@ -267,13 +271,22 @@ namespace
 
 unsigned char *mask_data = cairo_image_surface_get_data(source);
 
-cairo_format_t nFormat = cairo_image_surface_get_format(source);
+const cairo_format_t nFormat = 
cairo_image_surface_get_format(source);
+#ifdef HAVE_CAIRO_FORMAT_RGB24_888
+if (!m_bForceARGB32)
+assert(nFormat == CAIRO_FORMAT_RGB24_888 && "Expected 
RGB24_888 image");
+else
+#endif
 assert(nFormat == CAIRO_FORMAT_ARGB32 && "need to implement 
CAIRO_FORMAT_A1 after all here");
+
 rStride = cairo_format_stride_for_width(nFormat, 
cairo_image_surface_get_width(source));
 
 return mask_data;
 }
 private:
+#ifdef HAVE_CAIRO_FORMAT_RGB24_888
+const bool m_bForceARGB32;
+#endif
 SvpSalBitmap aTmpBmp;
 cairo_surface_t* source;
 
@@ -1225,7 +1238,7 @@ void SvpSalGraphics::drawMask( const SalTwoRect& rTR,
 {
 /** creates an image from the given rectangle, replacing all black pixels
  *  with nMaskColor and make all other full transparent */
-SourceHelper aSurface(rSalBitmap);
+SourceHelper aSurface(rSalBitmap, true); // The mask is argb32
 sal_Int32 nStride;
 unsigned char *mask_data = aSurface.getBits(nStride);
 for (sal_Int32 y = rTR.mnSrcY ; y < rTR.mnSrcY + rTR.mnSrcHeight; ++y)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: wizards/com

[Stephan Bergmann]

 wizards/com/sun/star/wizards/common/Configuration.py |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 2f9aea0c1aa77a88a3dbfcc668dc410f983f3460
Author: Stephan Bergmann 
Date:   Mon Jan 8 14:31:58 2018 +0100

tdf#114881: Re-introduce ConfigurationUpdateAccess

...which had accidentally been removed completely from this part of
cb2550750386f51ef7a46a8a664a4ab9de614f8d "Drop lazywrite property, which is
silently ignored by configmgr anyway"

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

diff --git a/wizards/com/sun/star/wizards/common/Configuration.py 
b/wizards/com/sun/star/wizards/common/Configuration.py
index 95816ca6c071..e63d20827542 100644
--- a/wizards/com/sun/star/wizards/common/Configuration.py
+++ b/wizards/com/sun/star/wizards/common/Configuration.py
@@ -34,7 +34,10 @@ class Configuration(object):
 
 args.append(aPathArgument)
 
-sView = "com.sun.star.configuration.ConfigurationAccess"
+if updateable:
+sView = "com.sun.star.configuration.ConfigurationUpdateAccess"
+else:
+sView = "com.sun.star.configuration.ConfigurationAccess"
 
 return oConfigProvider.createInstanceWithArguments(sView, tuple(args))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: test/data

[Andras Timar]

 test/data/empty.ods |binary
 1 file changed

New commits:
commit 0806dbdd39ed4010a6fc2cf83841013bf4493019
Author: Andras Timar 
Date:   Mon Jan 8 23:07:25 2018 +0100

revert accidental modification of empty.ods

Change-Id: I5b5e34aa792e5fc3336a946e050bee3f9682c05f

diff --git a/test/data/empty.ods b/test/data/empty.ods
index 78fc7b11..86414ec0 100755
Binary files a/test/data/empty.ods and b/test/data/empty.ods differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 loleaflet/src/control/Control.Menubar.js |   19 +--
 loleaflet/unocommands.js |8 +++-
 test/data/empty.ods  |binary
 3 files changed, 20 insertions(+), 7 deletions(-)

New commits:
commit b18c87f7c9d68a1ecada51ee7bc75d280deebb2b
Author: Andras Timar 
Date:   Mon Jan 8 22:55:29 2018 +0100

Insert rows/columns belong to Sheet menu

Change-Id: I4eb8f8e6fc73e8c0f2985172ef303c9895ac1afd

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 8ef8ad31..f9fe3daa 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -315,9 +315,6 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:InsertGraphic', 
'spreadsheet'), id: 'insertgraphic', type: 'action'},
{name: _UNO('.uno:InsertAnnotation', 
'spreadsheet'), id: 'insertcomment', type: 'action'},
{type: 'separator'},
-   {uno: '.uno:InsertRows'},
-   {uno: '.uno:InsertColumns'},
-   {type: 'separator'},
{uno: '.uno:InsertSymbol'}
]},
{name: _UNO('.uno:FormatMenu', 'spreadsheet'), type: 
'menu', menu: [
@@ -325,11 +322,21 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:FormatCellDialog'}
]},
{name: _UNO('.uno:SheetMenu', 'spreadsheet'), type: 
'menu', menu: [
-   {uno: '.uno:InsertRows'},
-   {uno: '.uno:InsertColumns'},
+   {name: _UNO('.uno:InsertRowsMenu', 
'spreadsheet'), type: 'menu', menu: [
+   {uno: '.uno:InsertRowsBefore'},
+   {uno: '.uno:InsertRowsAfter'}]},
+   {name: _UNO('.uno:InsertColumnsMenu', 
'spreadsheet'), type: 'menu', menu: [
+   {uno: '.uno:InsertColumnsBefore'},
+   {uno: '.uno:InsertColumnsAfter'}]},
+   {name: _UNO('.uno:InsertBreakMenu', 
'spreadsheet'), type: 'menu', menu: [
+   {uno: '.uno:InsertRowBreak'},
+   {uno: '.uno:InsertColumnBreak'}]},
{type: 'separator'},
{uno: '.uno:DeleteRows'},
-   {uno: '.uno:DeleteColumns'}
+   {uno: '.uno:DeleteColumns'},
+   {name: _UNO('.uno:DelBreakMenu', 
'spreadsheet'), type: 'menu', menu: [
+   {uno: '.uno:DeleteRowbreak'},
+   {uno: '.uno:DeleteColumnbreak'}]}
]},
{name: _UNO('.uno:DataMenu', 'spreadsheet'), type: 
'menu', menu: [
{uno: '.uno:DataSort'},
diff --git a/loleaflet/unocommands.js b/loleaflet/unocommands.js
index beaafaf5..9d8175cb 100644
--- a/loleaflet/unocommands.js
+++ b/loleaflet/unocommands.js
@@ -42,10 +42,13 @@ var unoCommandsArray = {
DecrementSubLevels:{text:{menu:_('Demote One Level With Subpoints'),},},
DefaultBullet:{global:{context:_('Toggle Bulleted 
List'),menu:_('~Bulleted List'),},},
DefaultNumbering:{global:{context:_('Toggle Numbered 
List'),menu:_('~Numbered List'),},},
+   DelBreakMenu:{spreadsheet:{menu:_('Delete Page ~Break'),},},
DeleteAllNotes:{global:{menu:_('Delete All 
Comments'),},spreadsheet:{menu:_('Delete All Comments'),},},
DeleteAuthor:{global:{menu:_('Delete All Comments by This Author'),},},
+   DeleteColumnbreak:{spreadsheet:{menu:_('~Column Break'),},},
DeleteColumns:{presentation:{context:_('Delete 
Column'),menu:_('~Columns'),},spreadsheet:{menu:_('Delete 
Columns'),},text:{menu:_('~Columns'),},},
DeleteComment:{global:{menu:_('Delete Comment'),},},
+   DeleteRowbreak:{spreadsheet:{menu:_('~Row Break'),},},
DeleteRows:{presentation:{context:_('Delete 
Row'),menu:_('~Rows'),},spreadsheet:{menu:_('Delete 
Rows'),},text:{menu:_('~Rows'),},},
DeleteSlide:{presentation:{menu:_('~Delete Slide'),},},
DeleteTable:{text:{menu:_('~Table'),},},
@@ -81,10 +84,11 @@ var unoCommandsArray = {
IncrementLevel:{text:{menu:_('Promote One Level'),},},
IncrementSubLevels:{text:{menu:_('Promote One Level With 
Subpoints'),},},
InsertAnnotation:{global:{context:_('Insert 
Comment'),menu:_('Comme~nt'),},presentation:{menu:_('Comme~nt'),},spreadsheet:{context:_('Insert
 Co~mment'),menu:_('Comm~ent'),},},
+   InsertBreakMenu:{spreadsheet:{menu:_('Insert Page ~Break'),},},
InsertColumnBreak:{

[Libreoffice-commits] core.git: distro-configs/LibreOfficeFlatpak.conf Makefile.in solenv/bin solenv/flatpak-manifest.in

[Stephan Bergmann]

 Makefile.in|   17 +
 distro-configs/LibreOfficeFlatpak.conf |1 +
 solenv/bin/assemble-flatpak.sh |2 +-
 solenv/flatpak-manifest.in |2 +-
 4 files changed, 8 insertions(+), 14 deletions(-)

New commits:
commit 0ba869fc5c13a29599fda7eb976b2e7959706e04
Author: Stephan Bergmann 
Date:   Mon Jan 8 10:40:32 2018 +0100

Let flatpak-builder build .Debug extension

Includes a revert of 58891d589bd8da700f135b098dd50833277c65dc "Add 
distro-pack-
install-strip target to be used by dev-tools' flatpak/build.sh".

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

diff --git a/Makefile.in b/Makefile.in
index 8c777a67f4ee..08476e14fd49 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,7 +9,7 @@
 
 gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck 
uicheck screenshot
 
-.PHONY : all check-if-root bootstrap gbuild build build-non-l10n-only 
build-l10n-only check clean clean-build clean-host test-install distclean 
distro-pack-install distro-pack-install-strip docs download etags fetch 
get-submodules id install install-gdb-printers install-strip tags debugrun help 
showmodules translations packageinfo internal.clean 
$(gb_Top_MODULE_CHECK_TARGETS)
+.PHONY : all check-if-root bootstrap gbuild build build-non-l10n-only 
build-l10n-only check clean clean-build clean-host test-install distclean 
distro-pack-install docs download etags fetch get-submodules id install 
install-gdb-printers install-strip tags debugrun help showmodules translations 
packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
 
 MAKECMDGOALS?=all
 build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\
@@ -390,18 +390,11 @@ else
@exit 1
 endif
 
-define gb_Top_DistroPackInstall
-$(SRCDIR)/bin/distro-install-clean-up
-$(SRCDIR)/bin/distro-install-desktop-integration
-$(SRCDIR)/bin/distro-install-sdk
-$(SRCDIR)/bin/distro-install-file-lists
-endef
-
 distro-pack-install: install
-   $(gb_Top_DistroPackInstall)
-
-distro-pack-install-strip: install-strip
-   $(gb_Top_DistroPackInstall)
+   $(SRCDIR)/bin/distro-install-clean-up
+   $(SRCDIR)/bin/distro-install-desktop-integration
+   $(SRCDIR)/bin/distro-install-sdk
+   $(SRCDIR)/bin/distro-install-file-lists
 
 install-package-%:
$(MAKE) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@
diff --git a/distro-configs/LibreOfficeFlatpak.conf 
b/distro-configs/LibreOfficeFlatpak.conf
index bb6b12b567c4..60312c31c8f5 100644
--- a/distro-configs/LibreOfficeFlatpak.conf
+++ b/distro-configs/LibreOfficeFlatpak.conf
@@ -1,5 +1,6 @@
 --disable-odk
 --enable-release-build
+--enable-symbols
 --with-ant-home=/run/build/libreoffice/ant
 --with-extra-buildid=Flatpak version
 --with-jdk-home=/usr/lib/sdk/openjdk9/jvm/openjdk-9
diff --git a/solenv/bin/assemble-flatpak.sh b/solenv/bin/assemble-flatpak.sh
index e678b9894b86..3eade815b11b 100755
--- a/solenv/bin/assemble-flatpak.sh
+++ b/solenv/bin/assemble-flatpak.sh
@@ -8,7 +8,7 @@
 #
 
 # Assemble Flatpak app files and metadata under /app/, copying from the
-# installation tree generated by 'make distro-pack-install-strip' (at
+# installation tree generated by 'make distro-pack-install' (at
 # $PREFIXDIR):
 
 set -e
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index b9eaa71beb67..70d08916ae8c 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -534,7 +534,7 @@
 "build-commands": [
 "./autogen.sh --prefix=/run/build/libreoffice/inst 
--with-distro=LibreOfficeFlatpak",
 "make",
-"make distro-pack-install-strip",
+"make distro-pack-install",
 "make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'"
 ]
 }
___
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-5.3' - sc/inc sc/qa sc/source

[Henry Castro]

 sc/inc/clipdata.hxx  |   24 --
 sc/inc/scmod.hxx |6 ---
 sc/qa/unit/tiledrendering/data/empty.ods |binary
 sc/qa/unit/tiledrendering/tiledrendering.cxx |   44 +++
 sc/source/ui/app/drwtrans.cxx|   30 +++---
 sc/source/ui/app/scmod.cxx   |   18 +++
 sc/source/ui/app/transobj.cxx|   37 --
 sc/source/ui/inc/drwtrans.hxx|2 -
 sc/source/ui/inc/transobj.hxx|1 
 sc/source/ui/vba/excelvbahelper.cxx  |4 +-
 sc/source/ui/vba/vbarange.cxx|6 +++
 sc/source/ui/view/cellsh.cxx |   33 +++-
 sc/source/ui/view/drawvie4.cxx   |1 
 sc/source/ui/view/viewfun3.cxx   |2 -
 sc/source/ui/view/viewfun7.cxx   |3 +
 15 files changed, 84 insertions(+), 127 deletions(-)

New commits:
commit dc916fdea9819fb7efbf3521efc5dc758f9fd3b3
Author: Henry Castro 
Date:   Sat Aug 12 19:46:27 2017 -0400

sc lok: 1 view has 1 clipboard to transfer data

In tiled rendering case, each view copy and paste
the contents of the clipboard associated with the view

Change-Id: Ic7b0d38ce4741af8c2053926ffd5172ab81aaaf5
Reviewed-on: https://gerrit.libreoffice.org/41113
Tested-by: Jenkins 
Reviewed-by: Henry Castro 
Reviewed-on: https://gerrit.libreoffice.org/46423
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 

diff --git a/sc/inc/clipdata.hxx b/sc/inc/clipdata.hxx
deleted file mode 100644
index 8c8d7dff93a2..
--- a/sc/inc/clipdata.hxx
+++ /dev/null
@@ -1,24 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef INCLUDED_SC_INC_CLIPDATA_HXX
-#define INCLUDED_SC_INC_CLIPDATA_HXX
-
-class ScTransferObj;
-class ScDrawTransferObj;
-
-struct ScClipData
-{
-ScTransferObj*  pCellClipboard;
-ScDrawTransferObj*  pDrawClipboard;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index 15ddc133fdf0..99b6b66565f7 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -71,14 +71,12 @@ class ScSelectionTransferObj;
 class ScFormEditData;
 class ScMarkData;
 struct ScDragData;
-struct ScClipData;
 
 class ScModule: public SfxModule, public SfxListener, public 
utl::ConfigurationListener
 {
 Timer   aIdleTimer;
 IdleaSpellIdle;
 ScDragData* mpDragData;
-ScClipData* mpClipData;
 ScSelectionTransferObj* pSelTransfer;
 ScMessagePool*  pMessagePool;
 // there is no global InputHandler anymore, each View has it's own
@@ -142,10 +140,6 @@ public:
 voidSetDragJump(
 ScDocument* pLocalDoc, const OUString& rTarget, const OUString& rText 
);
 
-//  clipboard:
-const ScClipData&   GetClipData() const { return *mpClipData;}
-voidSetClipObject( ScTransferObj* pCellObj, 
ScDrawTransferObj* pDrawObj );
-
 static ScDocument*  GetClipDoc();   // called from document - should 
be removed later
 
 //  X selection:
diff --git a/sc/qa/unit/tiledrendering/data/empty.ods 
b/sc/qa/unit/tiledrendering/data/empty.ods
new file mode 100644
index ..3cdfa65704e5
Binary files /dev/null and b/sc/qa/unit/tiledrendering/data/empty.ods differ
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx 
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 6e5fdbe646a9..53d96494ad75 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -78,6 +79,7 @@ public:
 void testDocumentSizeWithTwoViews();
 void testDisableUndoRepair();
 void testLanguageStatus();
+void testMultiViewCopyPaste();
 
 CPPUNIT_TEST_SUITE(ScTiledRenderingTest);
 CPPUNIT_TEST(testRowColumnSelections);
@@ -106,6 +108,7 @@ public:
 CPPUNIT_TEST(testDocumentSizeWithTwoViews);
 CPPUNIT_TEST(testDisableUndoRepair);
 CPPUNIT_TEST(testLanguageStatus);
+CPPUNIT_TEST(testMultiViewCopyPaste);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -1460,6 +1463,47 @@ void ScTiledRenderingTest::testLanguageStatus()
 CPPUNIT_ASSERT_EQUAL(aLangBolivia, dynamic_cast< const SfxStringItem* 
>(pItem1.get())->GetValue());
 CPPUNIT_ASSERT_EQUAL(aLangBolivia, dynamic_cast< const SfxStringItem* 
>(pItem1.get())->GetValue());
 }
+}
+
+void ScTiledRenderingTest::testMultiViewCopyPaste()
+{
+comphelper::LibreOfficeKit::setActive();
+
+Sc

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

[Caolán McNamara]

 tools/source/generic/bigint.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 8ac48304da003daf9187f0d9ba706be2b3a8d895
Author: Caolán McNamara 
Date:   Sun Jan 7 21:07:15 2018 +

UL->U

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

diff --git a/tools/source/generic/bigint.cxx b/tools/source/generic/bigint.cxx
index e4afdb6be55e..cda2be1843d7 100644
--- a/tools/source/generic/bigint.cxx
+++ b/tools/source/generic/bigint.cxx
@@ -302,7 +302,7 @@ void BigInt::MultLong( const BigInt& rB, BigInt& rErg ) 
const
 {
 nZ = (sal_uInt32)nNum[i] * (sal_uInt32)rB.nNum[j] +
  (sal_uInt32)rErg.nNum[i + j] + k;
-rErg.nNum[i + j] = (sal_uInt16)(nZ & 0xUL);
+rErg.nNum[i + j] = (sal_uInt16)(nZ & 0xU);
 k = nZ >> 16;
 }
 rErg.nNum[i + j] = (sal_uInt16)k;
@@ -349,7 +349,7 @@ void BigInt::DivLong( const BigInt& rB, BigInt& rErg ) const
 aTmpA.nNum[j - nLenB + i] = (sal_uInt16)nTmp;
 nK = (sal_uInt16) (nTmp >> 16);
 if ( nK )
-nK = (sal_uInt16)(0x1UL - nK);
+nK = (sal_uInt16)(0x1U - nK);
 }
 sal_uInt16& rNum( aTmpA.nNum[j - nLenB + i] );
 rNum -= nK;
@@ -416,7 +416,7 @@ void BigInt::ModLong( const BigInt& rB, BigInt& rErg ) const
 aTmpA.nNum[j - nLenB + i] = (sal_uInt16)nTmp;
 nK = (sal_uInt16) (nTmp >> 16);
 if ( nK )
-nK = (sal_uInt16)(0x1UL - nK);
+nK = (sal_uInt16)(0x1U - nK);
 }
 sal_uInt16& rNum( aTmpA.nNum[j - nLenB + i] );
 rNum = rNum - nK;
@@ -560,11 +560,11 @@ BigInt::BigInt( sal_uInt32 nValue )
 : nVal(0)
 {
 bIsSet  = true;
-if ( nValue & 0x8000UL )
+if ( nValue & 0x8000U )
 {
 bIsBig  = true;
 bIsNeg  = false;
-nNum[0] = (sal_uInt16)(nValue & 0xUL);
+nNum[0] = (sal_uInt16)(nValue & 0xU);
 nNum[1] = (sal_uInt16)(nValue >> 16);
 nLen= 2;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/ui/index/swuiidxmrk.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e799e98cbdde6eb1dfbe637b573918ebe0dfe96b
Author: Caolán McNamara 
Date:   Mon Jan 8 12:20:11 2018 +

Resolves: tdf#114728 wrong entries in bibliographic entry dialog

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

diff --git a/sw/source/ui/index/swuiidxmrk.cxx 
b/sw/source/ui/index/swuiidxmrk.cxx
index 61249f585796..6c2561065cff 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -1502,7 +1502,8 @@ 
SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(vcl::Window* pParent,
 {
 pTypeListBox = VclPtr::Create(bLeft ? pLeft : pRight, 
WB_DROPDOWN|WB_BORDER|WB_VCENTER);
 for (int j = 0; j < AUTH_TYPE_END; j++)
-pTypeListBox->InsertEntry(SwResId(STR_AUTH_FIELD_ARY[j]));
+
pTypeListBox->InsertEntry(SwAuthorityFieldType::GetAuthTypeName(static_cast(j)));
+pTypeListBox->EnableAutoSize(true);
 if(!pFields[aCurInfo.nToxField].isEmpty())
 {
 
pTypeListBox->SelectEntryPos(pFields[aCurInfo.nToxField].toInt32());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

MSVC code generation & BinScope

[Michael Stahl]

hi all,

i've been wondering if we build everything we ship on Windows with the
recommended compiler flags to mitigate security issues:

https://docs.microsoft.com/en-us/cpp/security/security-best-practices-for-cpp

there's a tool named BinScope which can check the DLLs and executables:

https://www.microsoft.com/en-us/download/details.aspx?id=44995

on current master, this mainly complained about missing PDB files, which
it requires to do anything, so i've tweaked some externals to generate
all needed PDBs, at least in an --enable-dbgutil build; presumably a lot
will be missing in a release build currently.

there were a handful of real issues where mitigations were not enabled,
patches for which are in gerrit for libreoffice-6-0.

the remaining complaints from BinScope seem minor and not worth fixing:

* jpeg-turbo (which is linked statically into 3 things)
  BinScope complains about missing symbols in the NASM objects,
  no idea what can be done about that, NASM can only generate "Borland"
  debuginfo for Windows .obj files...

* ICU data library
  this doesn't contain any code which makes BinScope generally unhappy

* unowinreg
  forgot what it complained about here

* MSVC runtime DLLs, funnily

* some even more ignorable stuff

the BinScope tool is a command line tool that could conceivably be
integrated into the build as a CustomTarget so that we don't regress in
this area by checking against a whitelist, if anybody wants to volunteer
for that.

the main thing that's still missing is that we don't use "Control Flow
Guard", which is apparently new in MSVC 2015 and which BinScope doesn't
check for.

https://docs.microsoft.com/en-us/cpp/build/reference/guard-enable-control-flow-guard

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

[Libreoffice-commits] core.git: solenv/gcc-wrappers

[Michael Stahl]

 solenv/gcc-wrappers/wrapper.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 471b844915cc3d7036cb0fd88b40eeb049f5b54d
Author: Michael Stahl 
Date:   Mon Jan 8 20:50:18 2018 +0100

gcc-wrappers: always pass -debug to linker

... like gbuild does; this causes a PDB file to be created, which
is required by BinScope.  Stops complaints about firebird's DLLs,
which are apparently the only DLLs linked with gcc-wrapper.

Change-Id: Ibe0e8053e0556748b1562b5f50f08480b2f2f89b

diff --git a/solenv/gcc-wrappers/wrapper.cxx b/solenv/gcc-wrappers/wrapper.cxx
index eb8954bc9764..b156c89dc220 100644
--- a/solenv/gcc-wrappers/wrapper.cxx
+++ b/solenv/gcc-wrappers/wrapper.cxx
@@ -97,7 +97,8 @@ string processccargs(vector rawargs) {
 
 // apparently these must be at the end
 // otherwise configure tests may fail
-string linkargs(" -link");
+// note: always use -debug so a PDB file is created
+string linkargs(" -link -debug");
 
 for(vector::iterator i = rawargs.begin(); i != rawargs.end(); ++i) 
{
 args.append(" ");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/gbuild

[Don Lewis]

 solenv/gbuild/Output.mk |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 064e99cea6e96decb0fd508e930580fccb4c33bc
Author: Don Lewis 
Date:   Mon Jan 8 17:12:58 2018 +

Revert the part of r1818099 that changed the hardwired awk command

in main/solenv/gbuild/Output.mk with $(gb_AWK).  Unfortunately
$(gb_AWK) is not defined at this point, so this change caused
errors each time a gbuild makefile was invoked.  The definition
of $(gb_AWK) is in the platform gbuild files, which are included
after Output.mk.  Changing the order of the includes breaks the
Windows build due to other chicken vs. egg problems.  Fortunately
using hardwired awk works everywhere except Solaris, which we no
longer support.

diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk
index 62acd486201c..0431914b03f3 100644
--- a/solenv/gbuild/Output.mk
+++ b/solenv/gbuild/Output.mk
@@ -57,8 +57,11 @@ endif
 
 # disable for OS/2
 ifneq ($(OS),OS2)
-gb_Output_ESCAPE := $(shell echo|$(gb_AWK) 'BEGIN { printf "%c", 27 }' -)
-gb_Output_BELL := $(shell echo|$(gb_AWK) 'BEGIN { printf "%c", 7 }' -)
+# We can't use $(gb_AWK) here since that is defined in the platform files,
+# which are not included yet.  Reordering the includes causes other
+# problems.  Fortunately hardcoding awk works everywhere except Solaris.
+gb_Output_ESCAPE := $(shell echo|awk 'BEGIN { printf "%c", 27 }' -)
+gb_Output_BELL := $(shell echo|awk 'BEGIN { printf "%c", 7 }' -)
 endif
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[jan Iversen]

 ios/source/LibreOfficeKit.c |   11 ---
 ios/source/LibreOfficeKit.h |2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit da745e2f1440592bbf22edc00b29aac93e5ff7d4
Author: jan Iversen 
Date:   Mon Jan 8 20:03:44 2018 +0100

iOS, add bridge function to expose kit pointer.

Change-Id: I534dc7e418c342d50762fbb69ae442a75610b278

diff --git a/ios/source/LibreOfficeKit.c b/ios/source/LibreOfficeKit.c
index 841c19ceff26..4ed3c919bafb 100644
--- a/ios/source/LibreOfficeKit.c
+++ b/ios/source/LibreOfficeKit.c
@@ -19,11 +19,11 @@
 
 
 // Force reference to libreofficekit_hook
-extern __attribute__((used)) void *libreofficekit_hook(const char *);
-static __attribute__((used)) void *(*foop)(const char *) = libreofficekit_hook;
+extern __attribute__((used)) void *libreofficekit_hook_2(const char *);
+static __attribute__((used)) void *(*foop)(const char *) = 
libreofficekit_hook_2;
 
 // pointers to our instance
-LibreOfficeKit* kit;
+static LibreOfficeKit* kit;
 static LibreOfficeKitDocument* document;
 
 
@@ -119,3 +119,8 @@ int BridgeLOkit_LeaveHipernate()
 return 0;
 }
 
+__attribute__((visibility("default")))
+LibreOfficeKit* BridgeLOkit_getLOK()
+{
+return kit;
+}
diff --git a/ios/source/LibreOfficeKit.h b/ios/source/LibreOfficeKit.h
index 0f5ca6edc95f..c4624371b347 100644
--- a/ios/source/LibreOfficeKit.h
+++ b/ios/source/LibreOfficeKit.h
@@ -29,6 +29,6 @@ int BridgeLOkit_LeaveHipernate(void);
 #include 
 #include 
 
-extern LibreOfficeKit* kit;
+LibreOfficeKit* BridgeLOkit_getLOK(void);
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 basctl/source/dlged/dlged.cxx |   14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit e7980e60ee60d9707780d0eee3841850351febf6
Author: Caolán McNamara 
Date:   Mon Jan 8 11:56:03 2018 +

Resolves: tdf#114766 gtk3 solar mutex assert

since

commit 33de587e95dddfc8e3c89b84f90b3d1bca823dae
Date:   Tue Mar 17 12:56:54 2015 +0530

tdf#88230: cleanup solar mutex yielding

Use SolarMutexReleaser, instead.

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

diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index f8ac1f4e6561..8b698c407230 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -822,7 +822,6 @@ void DlgEditor::Paste()
 if ( xClipboard.is() )
 {
 Reference< datatransfer::XTransferable > xTransf;
-
 {
 SolarMutexReleaser aReleaser;
 // get clipboard content
@@ -1051,11 +1050,14 @@ bool DlgEditor::IsPasteAllowed()
 Reference< datatransfer::clipboard::XClipboard > xClipboard = 
GetWindow().GetClipboard();
 if ( xClipboard.is() )
 {
-// get clipboard content
-SolarMutexReleaser aReleaser;
-Reference< datatransfer::XTransferable > xTransf = 
xClipboard->getContents();
-
-return xTransf.is() && xTransf->isDataFlavorSupported( 
m_ClipboardDataFlavors[0] );
+Reference< datatransfer::XTransferable > xTransf;
+{
+SolarMutexReleaser aReleaser;
+// get clipboard content
+xTransf = xClipboard->getContents();
+}
+if (xTransf.is())
+return xTransf->isDataFlavorSupported(m_ClipboardDataFlavors[0]);
 }
 return false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli]

 cui/source/options/personalization.cxx |4 
 vcl/source/window/msgbox.cxx   |2 ++
 2 files changed, 6 insertions(+)

New commits:
commit 8fb6d980868bc08b1eef4c95bd820131c2b03640
Author: Xisco Fauli 
Date:   Thu Jan 4 12:41:07 2018 +0100

tdf#114818 hold the mutex before executing the error dialog

Also add an assert to ErrorBox to ensure the mutex is acquired

Change-Id: I3e426024dad6ddfc5cffc7861b0cba9e8989c018
Reviewed-on: https://gerrit.libreoffice.org/47388
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 
(cherry picked from commit 0ddd15c1134dde249552ebe763c1cd005e8b4591)
Reviewed-on: https://gerrit.libreoffice.org/47570
Reviewed-by: Michael Stahl 

diff --git a/cui/source/options/personalization.cxx 
b/cui/source/options/personalization.cxx
index d18d56b06fb6..c75a78c8ef2e 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -702,6 +702,7 @@ void SearchAndParseThread::execute()
 {
 // in case of a returned CommandFailedException
 // SimpleFileAccess serves it, returning an empty stream
+SolarMutexGuard aGuard;
 sError = CuiResId(RID_SVXSTR_SEARCHERROR);
 sError = sError.replaceAll("%1", m_aURL);
 m_pPersonaDialog->SetProgress( OUString() );
@@ -714,6 +715,7 @@ void SearchAndParseThread::execute()
 {
 // a catch all clause, in case the exception is not
 // served elsewhere
+SolarMutexGuard aGuard;
 sError = CuiResId(RID_SVXSTR_SEARCHERROR);
 sError = sError.replaceAll("%1", m_aURL);
 m_pPersonaDialog->SetProgress( OUString() );
@@ -754,6 +756,7 @@ void SearchAndParseThread::execute()
 {
 if( m_bDirectURL )
 {
+SolarMutexGuard aGuard;
 sError = CuiResId(RID_SVXSTR_SEARCHERROR);
 sError = sError.replaceAll("%1", m_aURL);
 m_pPersonaDialog->SetProgress( OUString() );
@@ -837,6 +840,7 @@ void SearchAndParseThread::execute()
 }
 catch ( const uno::Exception & )
 {
+SolarMutexGuard aGuard;
 sError = CuiResId( RID_SVXSTR_SEARCHERROR );
 sError = sError.replaceAll("%1", m_aURL);
 m_pPersonaDialog->SetProgress( OUString() );
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 67b3edf1df37..e45dfd0dee4f 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -433,6 +433,7 @@ OUString WarningBox::GetStandardText()
 ErrorBox::ErrorBox( vcl::Window* pParent, const OUString& rMessage ) :
 MessBox( pParent, MessBoxStyle::Ok | MessBoxStyle::DefaultOk, 0, 
OUString(), rMessage )
 {
+DBG_TESTSOLARMUTEX();
 // Default Text is the display title from the application
 if ( GetText().isEmpty() )
 SetText( GetStandardText() );
@@ -450,6 +451,7 @@ ErrorBox::ErrorBox( vcl::Window* pParent, MessBoxStyle 
nStyle, WinBits nWinBits,
 const OUString& rMessage ) :
 MessBox( pParent, nStyle, nWinBits, OUString(), rMessage )
 {
+DBG_TESTSOLARMUTEX();
 // Default Text is the display title from the application
 if ( GetText().isEmpty() )
 SetText( GetStandardText() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 external/openssl/UnpackedTarball_openssl.mk |1 +
 external/openssl/opensslwnt.patch   |   15 ++-
 external/openssl/opensslwnt_safeseh.patch   |   23 +++
 3 files changed, 26 insertions(+), 13 deletions(-)

New commits:
commit cd44182c345adf3fe197e49575463ca34b10223d
Author: Michael Stahl 
Date:   Mon Jan 8 17:48:40 2018 +0100

openssl: fix MSVC 64-bit build

For whatever reason OpenSSL wants to use "masm" (ml.exe) on 32-bit
builds but "nasm" on 64-bit builds - this despite INSTALL.W32 claiming
that only nasm is "supported".

But /safeseh doesn't make sense on 64-bit anyway because there
is no "unsafe" SEH there, so just apply the patch only for 32-bit.

Change-Id: Ie32b17dfeeaf11c49ee29c3181021ffa5bd99091

diff --git a/external/openssl/UnpackedTarball_openssl.mk 
b/external/openssl/UnpackedTarball_openssl.mk
index 5845e31a436a..719b8b0e5842 100644
--- a/external/openssl/UnpackedTarball_openssl.mk
+++ b/external/openssl/UnpackedTarball_openssl.mk
@@ -14,6 +14,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,openssl,$(OPENSSL_TARBALL),,openssl
 $(eval $(call gb_UnpackedTarball_add_patches,openssl,\
external/openssl/openssllnx.patch \
external/openssl/opensslwnt.patch \
+   $(if $(filter 
INTEL,$(CPUNAME)),external/openssl/opensslwnt_safeseh.patch) \
external/openssl/openssl-1.0.1h-win64.patch.1 \
external/openssl/opensslsol.patch \
external/openssl/opensslios.patch \
diff --git a/external/openssl/opensslwnt.patch 
b/external/openssl/opensslwnt.patch
index c5c96dd25700..e22bea6f077b 100644
--- a/external/openssl/opensslwnt.patch
+++ b/external/openssl/opensslwnt.patch
@@ -79,26 +79,15 @@ diff -ru openssl.orig/util/mk1mf.pl openssl/util/mk1mf.pl
  APP_CFLAG=$app_cflag
  LIB_CFLAG=$lib_cflag
  SHLIB_CFLAG=$shl_cflag
-@@ -488,8 +493,8 @@
- SRC_D=$src_dir
+@@ -488,7 +493,7 @@
  
  LINK_CMD=$link
--LFLAGS=$lflags
-+LFLAGS=$lflags /SAFESEH
+ LFLAGS=$lflags
 -RSC=$rsc
 +RSC=$rsc \$(SOLARINC)
  
  # The output directory for everything interesting
  OUT_D=$out_dir
-@@ -511,7 +516,7 @@
- MKDIR=$mkdir
- MKLIB=$bin_dir$mklib
- MLFLAGS=$mlflags
--ASM=$bin_dir$asm
-+ASM=$bin_dir$asm /safeseh
- 
- # FIPS validated module and support file locations
- 
 @@ -669,7 +674,7 @@
  printf OUT 

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - config_host.mk.in configure.ac external/msc-externals instsetoo_native/inc_openoffice postprocess/CustomTarget_signing.mk RepositoryExternal.

[Mike Kaganski]

 Repository.mk  |1 
 RepositoryExternal.mk  |4 +
 config_host.mk.in  |4 -
 configure.ac   |   37 
--
 external/msc-externals/Module_msc-externals.mk |8 --
 external/msc-externals/Package_vcredist_exe.mk |6 -
 instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt |2 
 instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt |2 
 postprocess/CustomTarget_signing.mk|1 
 scp2/InstallModule_windows.mk  |8 +-
 scp2/source/ooo/vc_redist.scp  |   26 
+++
 solenv/bin/modules/installer/windows/idtglobal.pm  |2 
 12 files changed, 65 insertions(+), 36 deletions(-)

New commits:
commit ca893ce3e4da351576e0d57caada57da190773f2
Author: Mike Kaganski 
Date:   Wed Dec 13 00:04:03 2017 +0300

tdf#108580: integrate vc_redist.exe into MSI

... in InstallUISequense.

Use --with-vcredist-dir to point to a directory with vc_redist.x64.exe
and/or vc_redist.x86.exe. Use --without-vcredist-dir (or
--with-vcredist-dir=no) if you don't want to ship it as part of
installer and want to silence the configure warning.

VCRedist 2015 version 14.0.24215.1 is available at
https://www.microsoft.com/en-us/download/details.aspx?id=53840

Since VisualStudio 2015, VC redist merge module that we used before
started to work differently: it installs the UCRT only on WinXP,
but not on later OSes (Vista to 8.1) which may lack the UCRT (Win10
has it out of the box). The merge module only installs VCRuntime on
those systems, which still leaves us with "api-ms-*.dll is missing"
problem.


(https://blogs.msdn.microsoft.com/vcblog/2015/03/03/introducing-the-universal-crt/
gives more information on VCRedist refactoring background.)

Since commit 71d9a61302e65fe091cf70c13fa72b3df09b7e3a, we use a
workaround described at the page mentioned above as "App-local
deployment of the Universal CRT". We just copy all UCRT DLLs to
LibreOffice/program. This has a drawback though, that our UCRT
is not updated by Windows Update, so users would rely on LibreOffice
updates in case of some vulnerabilities in UCRT (and they could
even not realize they have that problem).

MS recommends to install UCRT using EXEs they provide from their
site. The EXEs install both VCRuntimes and UCRTs, along with
required patches, for all Windows versions (Windows XP through
Windows 10, where they only install VCRuntimes); the installed
libraries are managed by system's update mechanism. But those EXEs
cannot be used in MSI custom actions inside InstallExecuteSequence,
because they use MSI themselves.

So this patch integrates the vc_redist.xXX.exe into MSI binary
table, and uses custom action to run the EXE after ExecuteAction
in InstallUISequence. This will show the user a VCRedist install
window after the main LibreOffice installation finishes; no user
interaction is required (except for one additional UAC request),
and errors are ignored.

Since this installation takes care of both VCRuntime and UCRT,
we can ultimately drop both the app-local workaround, and
vcredist merge module (so VCRuntime would also be updated by
system). The former is done here: this reverts commit
71d9a61302e65fe091cf70c13fa72b3df09b7e3a.

This approach has its drawback: if one wants to use unattended
installation (without UI; one example is deployment using
ActiveDirectory GPO), then InstallUISequence is not run, and so
VCRedist isn't installed. In this case, one should install
VCRedist separately. Supposedly this should not be huge problem,
because this is the case for many existing applications that need
separate VCRedist deployment in these scenarios, and unattended
installation is advanced stuff that requires prepared user. A
notice would be required in release notes and FAQ, though.

Change-Id: Ia6a16be60af8a08f41ea7c3dbd457d8f89006006
Reviewed-on: https://gerrit.libreoffice.org/46356
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
(cherry picked from commit 61b1d631331551b43bc7d619be33bfbfeff7cad6)
Reviewed-on: https://gerrit.libreoffice.org/47603
Tested-by: Jenkins 

diff --git a/Repository.mk b/Repository.mk
index c3ccf4c16142..8f5347fac910 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -819,7 +819,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\
jvmfwk_jreproperties \
$(if $(filter MACOSX,$(OS)),bridges_jnilib_java_uno) \
) \
-   $(if $(UCRT_REDI

[Libreoffice-commits] core.git: 2 commits - desktop/source include/LibreOfficeKit libreofficekit/source

[Pranav Kant]

 desktop/source/lib/init.cxx|5 +
 include/LibreOfficeKit/LibreOfficeKitGtk.h |6 ++
 libreofficekit/source/gtk/lokdocview.cxx   |   22 ++
 3 files changed, 21 insertions(+), 12 deletions(-)

New commits:
commit 169b9264f4c8b6a64ea445766b3f7e18cfee1eb0
Author: Pranav Kant 
Date:   Mon Jan 8 22:39:23 2018 +0530

lokdialog: Enable input before posting mouse events

Change-Id: Ib878544cf902aa3c12c59e4c7be6fff20d3a91a9

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index f8aebcfc8606..ae0a99b8424f 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2447,6 +2447,11 @@ static void 
doc_postWindowMouseEvent(LibreOfficeKitDocument* /*pThis*/, unsigned
 Point aPos(nX, nY);
 MouseEvent aEvent(aPos, nCount, MouseEventModifiers::SIMPLECLICK, 
nButtons, nModifier);
 
+if (Dialog* pDialog = dynamic_cast(pWindow.get()))
+{
+pDialog->EnableInput();
+}
+
 switch (nType)
 {
 case LOK_MOUSEEVENT_MOUSEBUTTONDOWN:
commit 9b47049bfaa40ab5eea6f69ad0abc7b771ea8fe9
Author: Pranav Kant 
Date:   Fri Dec 22 14:50:52 2017 +0530

lokdocview: Make g-ir-compiler, scanner happy

Silence their warnings

Change-Id: Id397745bbf7fe6687b60eeca60d5a0b67da421b1

diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h 
b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index dd35505e2b86..fb18aae8aab6 100644
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -90,8 +90,6 @@ GtkWidget* lok_doc_view_new_from_widget   
 (LOKDocView*
  * @cancellable:
  * @callback:
  * @userdata:
- *
- * Returns: %TRUE if the document is loaded successfully, %FALSE otherwise
  */
 void   lok_doc_view_open_document  
(LOKDocView* pDocView,
 const 
gchar* pPath,
@@ -136,7 +134,7 @@ void   lok_doc_view_set_zoom
   (LOKDocView*
 /**
  * lok_doc_view_set_visible_area:
  * @pDocView: The #LOKDocView instance
- * @fZoom: The new visible area of pDocView in twips.
+ * @pVisibleArea: The new visible area of pDocView in twips.
  *
  * Sets the new visible area of the widget. This helps e.g. the page down key
  * to jump the correct length, which depends on the amount of visible height of
@@ -308,7 +306,7 @@ gbooleanlok_doc_view_paste  
   (LOKDocView*
 /**
  * lok_doc_view_set_document_password:
  * @pDocView: The #LOKDocView instance
- * @pUrl: the URL of the document to set password for, as sent with signal 
`password-required`
+ * @pURL: the URL of the document to set password for, as sent with signal 
`password-required`
  * @pPassword: (nullable) (allow-none): the password, NULL for no password
  *
  * Set the password for password protected documents
diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index ca4e2433c43a..a4bf0c64f3b5 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -3205,7 +3205,9 @@ static void lok_doc_view_class_init (LOKDocViewClass* 
pClass)
  G_TYPE_STRING);
 
 /**
- * The key ruler related properties on change are reported by this.
+ * LOKDocView::ruler:
+ * @pDocView: the #LOKDocView on which the signal is emitted
+ * @pPayload: the JSON string contaning the information about ruler 
properties
  *
  * The payload format is:
  *
@@ -3217,8 +3219,6 @@ static void lok_doc_view_class_init (LOKDocViewClass* 
pClass)
  *  "pageWidth": "...",
  *  "unit": "..."
  *  }
- *
- * Here all aproperties are same as described in svxruler.
  */
 doc_view_signals[RULER] =
 g_signal_new("ruler",
@@ -3231,10 +3231,13 @@ static void lok_doc_view_class_init (LOKDocViewClass* 
pClass)
  G_TYPE_STRING);
 
 /**
- * Window related callbacks are emitted under this category. It includes
- * external windows like dialogs, autopopups for now.
+ * LOKDocView::window::
+ * @pDocView: the #LOKDocView on which the signal is emitted
+ * @pPayload: the JSON string containing the information about the window
  *
- * The payload format is:
+ * This signal emits information about external windows like dialogs, 
autopopups for now.
+ *
+ * The payload format of pPayload is:
  *
  * {
  *"id": "unique integer id of the dialog",
@@ -3269,11 +3272,14 @@ static void lok_doc_view_class_init (LOKDocViewClass* 
pClass)
  G_TYPE_STRING);
 
 /**
+ * LOKDocView::invalidate-header::
+ * @pDocView: the #LOKDocView on which the signal is emitted
+ * @pPayload: can be either "row", "column", or "all".
+ *
  * The column/row header is no more valid because of a column/row ins

Weekly QA Report (W01-2018)

[Xisco Fauli]

Hello,

What have happened in QA in the last 7 days?

  * 113 bugs have been created, of which, 44 are still unconfirmed (
Total Unconfirmed bugs: 407 )
    Link: http://tinyurl.com/yb2lunwg

  * 1226 comments have been written.

== STATUSES CHANGED ==
  * 28 bugs have been changed to 'ASSIGNED'.
    Link: http://tinyurl.com/yasqj3po
    Done by: Tamás Zolnai ( 7 ), Gülşah Köse ( 6 ), Xisco Faulí ( 5 ),
Szymon Kłos ( 2 ), Bartosz ( 2 ), Miklos Vajna ( 1 ), Heiko Tietze ( 1
), David Tardon ( 1 ), Cor Nouws ( 1 ), architjugran ( 1 ), Ahmed GHANMI
( 1 )

  * 1 bug has been changed to 'CLOSED'.
    Link: http://tinyurl.com/yc7csjk5
    Done by: Regina Henschel ( 1 )

  * 16 bugs have been changed to 'NEEDINFO'.
    Link: http://tinyurl.com/y8xg7v72
    Done by: raal ( 6 ), Xisco Faulí ( 3 ), Buovjaga ( 1 ), Heiko Tietze
( 1 ), Julien Nabet ( 1 ), Regina Henschel ( 1 ), Jean-Baptiste Faure (
1 ), Timur ( 1 ), tommy27 ( 1 )

  * 46 bugs have been changed to 'NEW'.
    Link: http://tinyurl.com/yar2wnfq
    Done by: raal ( 9 ), Buovjaga ( 5 ), Xisco Faulí ( 4 ), Timur ( 3 ),
V Stuart Foote ( 2 ), Heiko Tietze ( 2 ), Thomas Lendo ( 2 ), Regina
Henschel ( 2 ), Mike Kaganski ( 2 ), Alex Thurgood ( 2 ), Aron Budea ( 2
), Telesto ( 1 ), robert ( 1 ), MM ( 1 ), Yousuf Philips (jay) ( 1 ),
Michael Stahl ( 1 ), Laurent BP ( 1 ), Jean-Pierre Ledure ( 1 ),
jorojmaqui ( 1 ), Jean-Baptiste Faure ( 1 ), Cor Nouws ( 1 ), tommy27 ( 1 )

  * 33 bugs have been changed to 'RESOLVED DUPLICATE'.
    Link: http://tinyurl.com/yd3hseo4
    Done by: Thomas Linard ( 6 ), V Stuart Foote ( 5 ), Xisco Faulí ( 4
), raal ( 4 ), Aron Budea ( 3 ), m.a.riosv ( 2 ), zyklon87 ( 1 ),
Telesto ( 1 ), Rebentisch ( 1 ), Regina Henschel ( 1 ), Maxim
Monastirsky ( 1 ), Mike Kaganski ( 1 ), Gabor Kelemen ( 1 ),
Jean-Baptiste Faure ( 1 ), Alex Thurgood ( 1 )

  * 27 bugs have been changed to 'RESOLVED FIXED'.
    Link: http://tinyurl.com/yamqh6nv
    Done by: Heiko Tietze ( 3 ), Julien Nabet ( 2 ), Adolfo Jayme ( 2 ),
Tamás Zolnai ( 1 ), Xavier Van Wijmeersch ( 1 ), Miklos Vajna ( 1 ),
Szymon Kłos ( 1 ), Kevin Suo ( 1 ), Yousuf Philips (jay) ( 1 ), Patrick
Jaap ( 1 ), Noel Grandin ( 1 ), Mike Kaganski ( 1 ), Michael Meeks ( 1
), Mark Hung ( 1 ), Terrence Enger ( 1 ), Zhenbo Li ( 1 ), Lionel Elie
Mamane ( 1 ), Justin L ( 1 ), Henry Castro ( 1 ), David Tardon ( 1 ),
Cor Nouws ( 1 ), Caolán McNamara ( 1 ), Ahmed GHANMI ( 1 )

  * 70 bugs have been changed to 'RESOLVED INSUFFICIENTDATA'.
    Link: http://tinyurl.com/y7ypbwl6
    Done by: qa-admin ( 70 )

  * 2 bugs have been changed to 'RESOLVED INVALID'.
    Link: http://tinyurl.com/y7mbdr8f
    Done by: V Stuart Foote ( 1 ), Tor Lillqvist ( 1 )

  * 1 bug has been changed to 'RESOLVED MOVED'.
    Link: http://tinyurl.com/y7dpfqop
    Done by: Xisco Faulí ( 1 )

  * 4 bugs have been changed to 'RESOLVED NOTABUG'.
    Link: http://tinyurl.com/ybc35el5
    Done by: Mike Kaganski ( 2 ), Michael H. ( 1 ), m.a.riosv ( 1 )

  * 6 bugs have been changed to 'RESOLVED WONTFIX'.
    Link: http://tinyurl.com/y73fvcv4
    Done by: Heiko Tietze ( 4 ), Buovjaga ( 2 )

  * 21 bugs have been changed to 'RESOLVED WORKSFORME'.
    Link: http://tinyurl.com/ybfhb88y
    Done by: Buovjaga ( 5 ), raal ( 3 ), Yan Pas ( 2 ), V Stuart Foote (
2 ), Xisco Faulí ( 1 ), Heiko Tietze ( 1 ), Regina Henschel ( 1 ),
Michael H. ( 1 ), Matthias Basler ( 1 ), Eyal Rozenberg ( 1 ), Emil
Tanev ( 1 ), Cor Nouws ( 1 ), Bryce ( 1 )

  * 6 bugs have been changed to 'UNCONFIRMED'.
    Link: http://tinyurl.com/yb9a6u5x
    Done by: Roy ( 2 ), Xisco Faulí ( 1 ), Buovjaga ( 1 ), Telesto ( 1
), Tim ( 1 )

  * 7 bugs have been changed to 'VERIFIED FIXED'.
    Link: http://tinyurl.com/yap5at4k
    Done by: Xisco Faulí ( 3 ), Terrence Enger ( 1 ), Justin L ( 1 ),
Jean-Baptiste Faure ( 1 ), Alex Thurgood ( 1 )

== KEYWORDS ADDED ==
  * 'bibisectRequest' has been added to 3 bugs.
    Link: http://tinyurl.com/ydyk6kcv
    Done by: Thomas Linard ( 1 ), Luke ( 1 ), Lionel Elie Mamane ( 1 )

  * 'bibisected' has been added to 15 bugs.
    Link: http://tinyurl.com/ybht4uln
    Done by: Xisco Faulí ( 10 ), Telesto ( 2 ), Kevin Suo ( 1 ), raal (
1 ), Mike Kaganski ( 1 )

  * 'bisected' has been added to 14 bugs.
    Link: http://tinyurl.com/ya2sml7d
    Done by: Xisco Faulí ( 9 ), Telesto ( 2 ), Kevin Suo ( 1 ), raal ( 1
), Mihkel Tõnnov ( 1 )

  * 'dataLoss' has been added to 1 bug.
    Link: http://tinyurl.com/yctfedg4
    Done by: raal ( 1 )

  * 'easyHack' has been added to 1 bug.
    Link: http://tinyurl.com/y74jbcrn
    Done by: Lionel Elie Mamane ( 1 )

  * 'filter:doc' has been added to 1 bug.
    Link: http://tinyurl.com/yafo35fv
    Done by: Telesto ( 1 )

  * 'filter:docx' has been added to 1 bug.
    Link: http://tinyurl.com/y944qmlh
    Done by: Justin L ( 1 )

  * 'filter:pptx' has been added to 2 bugs.
    Link: http://tinyurl.com/ya5ezoma
    Done by: Xisco Faulí ( 2 )

  * 'filter:rtf' has been added to 1 bug.
    Link: http://tinyurl.com/y92e79bj
   

[Libreoffice-commits] core.git: 2 commits - ios/CustomTarget_iOS_prelink.mk ios/LibreOfficeLight

[jan Iversen]

 ios/CustomTarget_iOS_prelink.mk |7 +
 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj |   14 
--
 2 files changed, 13 insertions(+), 8 deletions(-)

New commits:
commit cdfd99e27d4c72b43b8f36a6c62c86c68b463199
Author: jan Iversen 
Date:   Mon Jan 8 15:36:51 2018 +0100

iOS, codesigning .dylib

.dylib can only be loaded if signed, so added
codesign to make

In order not to expose the code identity, this is added through
use of an environment variable IOS_CODESIGN

Change-Id: I03ee7a6f2bfa8493a08b3e90163ab6c68d3c94a9

diff --git a/ios/CustomTarget_iOS_prelink.mk b/ios/CustomTarget_iOS_prelink.mk
index affd32e5bf59..fec4fd271511 100644
--- a/ios/CustomTarget_iOS_prelink.mk
+++ b/ios/CustomTarget_iOS_prelink.mk
@@ -64,6 +64,13 @@ $(IOSKIT): $(WORKDIR)/CObject/ios/source/LibreOfficeKit.o
$(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \
`$(SRCDIR)/bin/lo-all-static-libs` \
-o $(IOSKIT)
+ifeq ($(origin IOS_CODEID),undefined)
+   @echo "please define environment variable IOS_CODEID as\n" \
+ "export IOS_CODEID="
+   @exit -1
+else
+   codesign -s "$(IOS_CODEID)" $(IOSKIT) 
+endif
 
 
 
commit ee3edd994597e751baa279b9cafc14c3db6e39f1
Author: jan Iversen 
Date:   Mon Jan 8 13:41:29 2018 +0100

iOS, switched simulator to use .dylib

changed static lib to .dylib causing link times to be 1-2 seconds.

However .dylib have a "missing code signature".

Change-Id: I59e95444a0db5406075bc15360f0acb6ab08b65b

diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 08e146c58d8c..5134985d5b18 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -16,7 +16,7 @@
393975781F8BECB0002DC80B /* libiconv.tbd in Frameworks */ = 
{isa = PBXBuildFile; fileRef = 393975771F8BECB0002DC80B /* libiconv.tbd */; };
3939757A1F8BECC1002DC80B /* libz.tbd in Frameworks */ = {isa = 
PBXBuildFile; fileRef = 393975791F8BECC1002DC80B /* libz.tbd */; };
39503A751F94D44900F19C78 /* libc++.tbd in Frameworks */ = {isa 
= PBXBuildFile; fileRef = 39503A741F94D44900F19C78 /* libc++.tbd */; };
-   396C833F1FC9D89E008E662A /* libKit_X86_64_debug.a in Frameworks 
*/ = {isa = PBXBuildFile; fileRef = 396C833E1FC9D89D008E662A /* 
libKit_X86_64_debug.a */; };
+   396C833F1FC9D89E008E662A /* libKit_X86_64_debug.dylib in 
Frameworks */ = {isa = PBXBuildFile; fileRef = 396C833E1FC9D89D008E662A /* 
libKit_X86_64_debug.dylib */; };
396F92F71E7AE62400A28C82 /* Settings.bundle in Resources */ = 
{isa = PBXBuildFile; fileRef = 396F92F61E7AE62400A28C82 /* Settings.bundle */; 
};
397868D61E59A3EA007F9248 /* LaunchScreen.xib in Resources */ = 
{isa = PBXBuildFile; fileRef = 397868D81E59A3EA007F9248 /* LaunchScreen.xib */; 
};
397E08FE1E597BD8001374E0 /* AppDelegate.swift in Sources */ = 
{isa = PBXBuildFile; fileRef = 397E08FD1E597BD8001374E0 /* AppDelegate.swift 
*/; };
@@ -47,8 +47,7 @@
393975791F8BECC1002DC80B /* libz.tbd */ = {isa = 
PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; 
name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
39503A6F1F94C4AC00F19C78 /* lokit-Bridging-Header.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
"lokit-Bridging-Header.h"; sourceTree = ""; };
39503A741F94D44900F19C78 /* libc++.tbd */ = {isa = 
PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; 
name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
-   396C833C1FC9D62B008E662A /* libtest.a */ = {isa = 
PBXFileReference; lastKnownFileType = archive.ar; name = libtest.a; path = 
../generated/libtest.a; sourceTree = ""; };
-   396C833E1FC9D89D008E662A /* libKit_X86_64_debug.a */ = {isa = 
PBXFileReference; lastKnownFileType = archive.ar; name = libKit_X86_64_debug.a; 
path = ../generated/libKit_X86_64_debug.a; sourceTree = ""; };
+   396C833E1FC9D89D008E662A /* libKit_X86_64_debug.dylib */ = {isa 
= PBXFileReference; lastKnownFileType = archive.ar; name = 
libKit_X86_64_debug.dylib; path = ../generated/libKit_X86_64_debug.dylib; 
sourceTree = ""; };
396F92F61E7AE62400A28C82 /* Settings.bundle */ = {isa = 
PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = 
Settings.bundle; sourceTree = ""; };
397275391E77D9F1006ACDCC /* LibreOfficeLight.entitlements */ = 
{isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = 
LibreOfficeLight.entitlements; sourceTree = ""; };
3975A8C91FBD70EE00A87B3A /* LibreOfficeKi

[Libreoffice-commits] core.git: toolkit/Module_toolkit.mk

[Michael Stahl]

 toolkit/Module_toolkit.mk |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit c46ab19bcab9151744527978742eeb5e34d2effe
Author: Michael Stahl 
Date:   Mon Jan 8 16:14:37 2018 +0100

toolkit: disable the UnitConversion test only on WNT

The Mac problem cited in 43dd63898c145ebeb918f1d6ce094cf5c68548c8
is unrelated.

Change-Id: I2cba950d1b6df356fb5ecffdfe9d1f686f895ef4

diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk
index 74a9d5d78ffc..21fd5ae92cdc 100644
--- a/toolkit/Module_toolkit.mk
+++ b/toolkit/Module_toolkit.mk
@@ -23,9 +23,12 @@ $(eval $(call gb_Module_add_targets,toolkit,\
 Library_tk \
 ))
 
-#$(eval $(call gb_Module_add_check_targets,toolkit,\
-#CppunitTest_toolkit \
-#))
+# FIXME fails on some tinderboxes, needs investigation
+ifneq ($(OS),WNT)
+$(eval $(call gb_Module_add_check_targets,toolkit,\
+CppunitTest_toolkit \
+))
+endif
 
 ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Fwd: [Libreoffice-commits] core.git: toolkit/Module_toolkit.mk

[Michael Stahl]

On 07.01.2018 22:20, Markus Mohrhard wrote:
> New commits:
> commit 43dd63898c145ebeb918f1d6ce094cf5c68548c8
> Author: Markus Mohrhard  >
> Date:   Sun Jan 7 22:15:13 2018 +0100
> 
>     disable toolkit unit conversion test for now
> 
>     There seems to be a bunch of problems:
> 
>     On OSX the test crashes when no display can be found:
>    
> https://ci.libreoffice.org/job/lo_gerrit/25298/Config=macosx_clang_dbgutil/console
> 

that's a problem of that jenkins builder, i just had a libreoffice-6-0
branch build fail in the same way in CppunitTest_vcl_complextext:

https://ci.libreoffice.org/job/lo_gerrit_60/326/Config=macosx_clang_dbgutil/console

Thorsten is investigating...

>     On windows the position seems to be wrong on some boxes, e.g.:
>     D:/lode/dev/core/toolkit/qa/cppunit/UnitConversion.cxx(149) : error
> : Assertion
>     Test name: `anonymous namespace'::ToolkitTest::testXUnitConversion
>     equality assertion failed
>     - Expected: 100
>     - Actual  : 72
>     - Window pos wrong

well screw that, let's disable the test on windows, it Works-For-Me but
nobody else apparently... it's a pretty stupid test anyway... pushed
c46ab19bcab9151744527978742eeb5e34d2effe "toolkit: disable the
UnitConversion test only on WNT"

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

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

[Dominique Leuenberger]

 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 38368be8527ca655854ee1231d9f355b8c0591ec
Author: Dominique Leuenberger 
Date:   Fri Jan 5 12:16:03 2018 +0100

Allow building with poppler-0.62

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

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 85647b6a3c22..4f6ff1d49b33 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -32,10 +32,12 @@
 #pragma warning(push, 1)
 #endif
 
-// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1
+// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1, then 
renamed to UnicodeMapFuncs.h in 0.62.0
 // FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && 
!POPPLER_CHECK_VERSION(0, 21, 1)
 //because the internal poppler does not provide poppler-version.h and 
the macro always returns 0
-#if POPPLER_CHECK_VERSION(0, 21, 1)
+#if POPPLER_CHECK_VERSION(0, 62, 0)
+#include 
+#elif POPPLER_CHECK_VERSION(0, 21, 1)
 #include 
 #elif POPPLER_CHECK_VERSION(0, 21, 0)
 #include "UTF.h"
@@ -913,7 +915,11 @@ void PDFOutDev::drawChar(GfxState *state, double x, double 
y,
 );
 
 // silence spurious warning
+#if POPPLER_CHECK_VERSION(0, 62, 0)
+(void)&mapUTF16;
+#else
 (void)&mapUCS2;
+#endif
 
 char buf[9];
 for( int i=0; ihttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 basctl/source/dlged/dlged.cxx |   14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit ca9526f42a1eac5aa3ff801e017636ca0e618ebd
Author: Caolán McNamara 
Date:   Mon Jan 8 11:56:03 2018 +

Resolves: tdf#114766 gtk3 solar mutex assert

since

commit 33de587e95dddfc8e3c89b84f90b3d1bca823dae
Date:   Tue Mar 17 12:56:54 2015 +0530

tdf#88230: cleanup solar mutex yielding

Use SolarMutexReleaser, instead.

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

diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index d112a9636609..a6239a40a0a0 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -822,7 +822,6 @@ void DlgEditor::Paste()
 if ( xClipboard.is() )
 {
 Reference< datatransfer::XTransferable > xTransf;
-
 {
 SolarMutexReleaser aReleaser;
 // get clipboard content
@@ -1051,11 +1050,14 @@ bool DlgEditor::IsPasteAllowed()
 Reference< datatransfer::clipboard::XClipboard > xClipboard = 
GetWindow().GetClipboard();
 if ( xClipboard.is() )
 {
-// get clipboard content
-SolarMutexReleaser aReleaser;
-Reference< datatransfer::XTransferable > xTransf = 
xClipboard->getContents();
-
-return xTransf.is() && xTransf->isDataFlavorSupported( 
m_ClipboardDataFlavors[0] );
+Reference< datatransfer::XTransferable > xTransf;
+{
+SolarMutexReleaser aReleaser;
+// get clipboard content
+xTransf = xClipboard->getContents();
+}
+if (xTransf.is())
+return xTransf->isDataFlavorSupported(m_ClipboardDataFlavors[0]);
 }
 return false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - basctl/source

[Caolán McNamara]

 basctl/source/dlged/dlged.cxx |   14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit b5e9fc18cb51e52f2f3f5b35cba7fed5cd6cb122
Author: Caolán McNamara 
Date:   Mon Jan 8 11:56:03 2018 +

Resolves: tdf#114766 gtk3 solar mutex assert

since

commit 33de587e95dddfc8e3c89b84f90b3d1bca823dae
Date:   Tue Mar 17 12:56:54 2015 +0530

tdf#88230: cleanup solar mutex yielding

Use SolarMutexReleaser, instead.

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

diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index f5cc428272d2..c6987520bc8c 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -823,7 +823,6 @@ void DlgEditor::Paste()
 if ( xClipboard.is() )
 {
 Reference< datatransfer::XTransferable > xTransf;
-
 {
 SolarMutexReleaser aReleaser;
 // get clipboard content
@@ -1052,11 +1051,14 @@ bool DlgEditor::IsPasteAllowed()
 Reference< datatransfer::clipboard::XClipboard > xClipboard = 
GetWindow().GetClipboard();
 if ( xClipboard.is() )
 {
-// get clipboard content
-SolarMutexReleaser aReleaser;
-Reference< datatransfer::XTransferable > xTransf = 
xClipboard->getContents();
-
-return xTransf.is() && xTransf->isDataFlavorSupported( 
m_ClipboardDataFlavors[0] );
+Reference< datatransfer::XTransferable > xTransf;
+{
+SolarMutexReleaser aReleaser;
+// get clipboard content
+xTransf = xClipboard->getContents();
+}
+if (xTransf.is())
+return xTransf->isDataFlavorSupported(m_ClipboardDataFlavors[0]);
 }
 return false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwptoc.cxx |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit f39fd98e8cc9e3a7b6c0930cfdf06b8b01bd794d
Author: Caolán McNamara 
Date:   Mon Jan 8 10:08:07 2018 +

ofz#5028 Direct-leak

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

diff --git a/lotuswordpro/source/filter/lwptoc.cxx 
b/lotuswordpro/source/filter/lwptoc.cxx
index 38a41e580f9c..940ff20e7ba9 100644
--- a/lotuswordpro/source/filter/lwptoc.cxx
+++ b/lotuswordpro/source/filter/lwptoc.cxx
@@ -146,10 +146,10 @@ void LwpTocSuperLayout::RegisterStyle()
  */
 void  LwpTocSuperLayout::XFConvert(XFContentContainer* pCont)
 {
-XFIndex* pToc = new XFIndex();
+rtl::Reference xToc(new XFIndex);
 
-pToc->SetProtected(false);
-pToc->SetIndexType(enumXFIndexTOC);
+xToc->SetProtected(false);
+xToc->SetIndexType(enumXFIndexTOC);
 
 // add TOC template
 for (sal_uInt16 i = 1; i<= MAX_LEVELS; i++)
@@ -160,7 +160,7 @@ void  LwpTocSuperLayout::XFConvert(XFContentContainer* 
pCont)
 if(!pLevel)
 {
 // add an blank template so that SODC won't add default style to 
this level
-pToc->AddTemplate(OUString::number(i),  OUString(), pTemplate);
+xToc->AddTemplate(OUString::number(i),  OUString(), pTemplate);
 continue;
 }
 
@@ -226,13 +226,13 @@ void  LwpTocSuperLayout::XFConvert(XFContentContainer* 
pCont)
 pTemplate->AddEntry(enumXFIndexTemplatePage, "TOC Page 
Number Text Style");
 }
 
-pToc->AddTemplate(OUString::number((sal_Int32)i),  
m_pFoundry->FindActuralStyleName(pLevel->GetSearchStyle()), pTemplate);
+xToc->AddTemplate(OUString::number((sal_Int32)i),  
m_pFoundry->FindActuralStyleName(pLevel->GetSearchStyle()), pTemplate);
 bInserted = true;
 }
 
 // 1 style in WordPro may be mapped to several styles in SODC
 LwpDocument * pDocument = 
m_pFoundry->GetDocument()->GetRootDocument();
-AddSourceStyle(pToc, pLevel,  pDocument->GetFoundry());
+AddSourceStyle(xToc.get(), pLevel,  pDocument->GetFoundry());
 
 // one level may have several corresponding Styles
 pLevel = GetNextSearchLevelPtr(i, pLevel);  // find next 
LwpTocLevelData which is same index
@@ -241,7 +241,7 @@ void  LwpTocSuperLayout::XFConvert(XFContentContainer* 
pCont)
 
 m_pCont = pCont;
 // add TOC content
-LwpSuperTableLayout::XFConvert(pToc);
+LwpSuperTableLayout::XFConvert(xToc.get());
 
 rtl::Reference xContainer(GetContainerLayout());
 if (!xContainer.is())
@@ -250,7 +250,7 @@ void  LwpTocSuperLayout::XFConvert(XFContentContainer* 
pCont)
 // if current TOC is located in a cell, we must add a frame between upper 
level container and TOC
 if (!xContainer->IsCell())
 {
-pCont->Add(pToc);
+pCont->Add(xToc.get());
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - download.lst external/libabw solenv/flatpak-manifest.in

[David Tardon]

 download.lst  |4 +-
 external/libabw/ExternalProject_libabw.mk |3 -
 external/libabw/UnpackedTarball_libabw.mk |4 ++
 external/libabw/libabw-msvc.patch.1   |   46 ++
 solenv/flatpak-manifest.in|6 +--
 5 files changed, 56 insertions(+), 7 deletions(-)

New commits:
commit 65197e46df544dd0f2c28fa245b1810bab98b519
Author: David Tardon 
Date:   Tue Jan 2 09:54:19 2018 +0100

upload libabw 0.1.2

Change-Id: I972ff9e0dbb73f6a38c886e1acd03cc4d62da2ec
Reviewed-on: https://gerrit.libreoffice.org/47251
Tested-by: Jenkins 
Reviewed-by: David Tardon 
(cherry picked from commit f04ad5673a9de1eda94ed3ae5719d8b761da80bb)
Reviewed-on: https://gerrit.libreoffice.org/47487
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index 8dade701d629..2eb621658abe 100644
--- a/download.lst
+++ b/download.lst
@@ -1,5 +1,5 @@
-export ABW_SHA256SUM := 
7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199
-export ABW_TARBALL := libabw-0.1.1.tar.bz2
+export ABW_SHA256SUM := 
0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485
+export ABW_TARBALL := libabw-0.1.2.tar.xz
 export APACHE_COMMONS_LOGGING_SHA256SUM := 
49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81
 export APACHE_COMMONS_LOGGING_TARBALL := commons-logging-1.2-src.tar.gz
 export APR_SHA256SUM := 
1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb
diff --git a/external/libabw/ExternalProject_libabw.mk 
b/external/libabw/ExternalProject_libabw.mk
index d8e4d112ea35..c8c2bd2e9882 100644
--- a/external/libabw/ExternalProject_libabw.mk
+++ b/external/libabw/ExternalProject_libabw.mk
@@ -35,8 +35,7 @@ $(call gb_ExternalProject_get_state_target,libabw,build) :
--disable-werror \
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS="$(gb_CXXFLAGS) $(if 
$(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
-   CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS) \
-   -DBOOST_ERROR_CODE_HEADER_ONLY 
-DBOOST_SYSTEM_NO_DEPRECATED" \
+   CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
&& $(MAKE) \
)
diff --git a/external/libabw/UnpackedTarball_libabw.mk 
b/external/libabw/UnpackedTarball_libabw.mk
index 7b9ba49e7e69..27195d3a0ab3 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -15,6 +15,10 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libabw,0))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libabw))
 
+$(eval $(call gb_UnpackedTarball_add_patches,libabw, \
+external/libabw/libabw-msvc.patch.1 \
+))
+
 ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libabw, \
diff --git a/external/libabw/libabw-msvc.patch.1 
b/external/libabw/libabw-msvc.patch.1
new file mode 100644
index ..d14b122f9575
--- /dev/null
+++ b/external/libabw/libabw-msvc.patch.1
@@ -0,0 +1,46 @@
+From 49f6461d4751d3b16e32ab8f9c93a3856b33be49 Mon Sep 17 00:00:00 2001
+From: Miklos Vajna 
+Date: Wed, 2 Aug 2017 14:53:36 +0200
+Subject: [PATCH] m4: MSVC defines __cplusplus as 199711L still
+
+See e.g.
+,
+on MSVC we can't depend on the value of __cplusplus, since that one is a
+too low value, even if everything else works fine.
+---
+ m4/ax_cxx_compile_stdcxx.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff -Naur a/configure b/configure
+--- a/configure2017-08-02 14:50:09.0 +0200
 b/configure2017-08-02 14:50:57.0 +0200
+@@ -16001,7 +16001,7 @@
+ 
+ #error "This is not a C++ compiler"
+ 
+-#elif __cplusplus < 201103L
++#elif __cplusplus < 201103L && !(defined _MSC_VER)
+ 
+ #error "This is not a C++11 compiler"
+ 
+@@ -16314,7 +16314,7 @@
+ 
+ #error "This is not a C++ compiler"
+ 
+-#elif __cplusplus < 201103L
++#elif __cplusplus < 201103L && !(defined _MSC_VER)
+ 
+ #error "This is not a C++11 compiler"
+ 
+@@ -16636,7 +16636,7 @@
+ 
+ #error "This is not a C++ compiler"
+ 
+-#elif __cplusplus < 201103L
++#elif __cplusplus < 201103L && !(defined _MSC_VER)
+ 
+ #error "This is not a C++11 compiler"
+ 
+-- 
+2.12.3
+
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index ad1b7cd06efe..eed6a529b18d 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -182,10 +182,10 @@
 "dest-filename": 
"external/tarballs/libgpg-error-1.27.tar.bz2"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/libabw-0.1.1.ta

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

[Takeshi Abe]

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

New commits:
commit 08de4faa001307a758e182ea981c769357c976bf
Author: Takeshi Abe 
Date:   Sun Jan 7 18:42:35 2018 +0900

starmath: Replace confusing sal_uIntPtr with sal_Int32

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

diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 318410638772..170bfe84b796 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -490,11 +490,11 @@ void SmMathConfig::GetSymbols( std::vector< SmSym > 
&rSymbols ) const
 
 void SmMathConfig::SetSymbols( const std::vector< SmSym > &rNewSymbols )
 {
-sal_uIntPtr nCount = rNewSymbols.size();
+auto nCount = sal::static_int_cast(rNewSymbols.size());
 
 Sequence< OUString > aNames = lcl_GetSymbolPropertyNames();
 const OUString *pNames = aNames.getConstArray();
-sal_uIntPtr nSymbolProps = sal::static_int_cast< sal_uInt32 
>(aNames.getLength());
+sal_Int32 nSymbolProps = aNames.getLength();
 
 Sequence< PropertyValue > aValues( nCount * nSymbolProps );
 PropertyValue *pValues = aValues.getArray();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [cppunit] specific test selection

[Michael Stahl]

On 04.01.2018 17:10, th.la...@arcor.de wrote:
> how do I select a varying, but specific group of tests?
> Is it just possible as hard-coded definition of a certain test suite,
> which could be separated by a compiler directive?
> No way to specify an individual pattern refering to the test case tags on the 
> command line?

fwiw we have a CPPUNIT_TEST_NAME env variable in the LO test-runner, see:

https://opengrok.libreoffice.org/xref/core/sal/cppunittester/cppunittester.cxx#300

presumably this feature isn't built-in to CppUnit, since it's
implemented in the LO specific test runner.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [cppunit] aborting the test case for failing condition

[Michael Stahl]

On 04.01.2018 17:30, malervier...@arcor.de wrote:
> we are missing some fatal aborting assertions, i.e. the equivalents of all 
> current comparisons, but causing an (immediate) abort. Sometimes the 
> continuation of following tests makes no sense ...
> 
> I could imagine the use of CPPUNIT_FAIL(message) for these situations, but 
> hesitate to start a new development as long as the lack isn't confirmed.

just #include  and use assert(), no need for anything extra in
CppUnit if you want that.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - basic/Library_sb.mk basic/source ios/CustomTarget_iOS_prelink.mk

[jan Iversen]

 basic/Library_sb.mk  |4 ++--
 basic/source/runtime/basrdll.cxx |3 +++
 basic/source/sbx/sbxdate.cxx |7 +++
 basic/source/sbx/sbxscan.cxx |6 ++
 ios/CustomTarget_iOS_prelink.mk  |   26 --
 5 files changed, 34 insertions(+), 12 deletions(-)

New commits:
commit b9bfda051a4248a0e209fa9fa59a4bfe8a48b853
Author: jan Iversen 
Date:   Mon Jan 8 11:53:31 2018 +0100

iOS, forgot make dependency.

and also added -Objc to allow use of NS functions.

Change-Id: I236cefa53f54531d035881768d2f99749dd00cea

diff --git a/ios/CustomTarget_iOS_prelink.mk b/ios/CustomTarget_iOS_prelink.mk
index a50a1209630b..affd32e5bf59 100644
--- a/ios/CustomTarget_iOS_prelink.mk
+++ b/ios/CustomTarget_iOS_prelink.mk
@@ -7,6 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #- Env 
 IOSLD = 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
+IOSCLANG = 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
 IOSOBJ = $(WORKDIR)/CObject/ios/Kit.o
 
 ifeq ($(ENABLE_DEBUG),TRUE)
@@ -31,7 +32,7 @@ $(call gb_CustomTarget_get_target,ios/iOS_prelink): $(IOSKIT)
 FORCE:
 
 
-$(IOSKIT):
+$(IOSKIT): $(WORKDIR)/CObject/ios/source/LibreOfficeKit.o
$(IOSLD) -r -ios_version_min 11.2 \
-syslibroot $(MACOSX_SDK_PATH) \
-arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \
@@ -40,28 +41,33 @@ $(IOSKIT):
`$(SRCDIR)/bin/lo-all-static-libs`
$(AR) -r $(IOSKIT2) $(IOSOBJ)
 
-   $(IOSLD) -dylib -ios_version_min $(IOS_DEPLOYMENT_VERSION) \
-   -syslibroot $(MACOSX_SDK_PATH) \
+   $(IOSCLANG) -dynamiclib 
-mios-simulator-version-min=$(IOS_DEPLOYMENT_VERSION) \
-arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \
+   -isysroot $(MACOSX_SDK_PATH) \
+   -Xlinker -rpath -Xlinker @executable_path/Frameworks \
+   -Xlinker -rpath -Xlinker @loader_path/Frameworks \
+   -dead_strip \
+   -Xlinker -export_dynamic \
+   -Xlinker -no_deduplicate \
+   -Xlinker -objc_abi_version -Xlinker 2 \
+   -fobjc-link-runtime \
-framework CoreFoundation \
-framework CoreGraphics \
-framework CoreText \
+   -liconv \
-lc++ \
-   -lobjc \
-lz \
-   -liconv \
-lpthread \
-   -objc_abi_version 2 \
-   -rpath  @executable_path/Frameworks \
-   -rpath  @loader_path/Frameworks \
-   -export_dynamic \
-   -no_deduplicate \
+   -single_module \
+   -compatibility_version 1 \
+   -current_version 1 \
$(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \
`$(SRCDIR)/bin/lo-all-static-libs` \
-o $(IOSKIT)
 
 
 
+
 #- clean ios  -
 $(call gb_CustomTarget_get_clean_target,ios/iOS_prelink):
rm -f $(IOSKIT) $(IOSKIT2)
commit ee4b074ce26029092d0e5f27c22a358abe101312
Author: jan Iversen 
Date:   Mon Jan 8 11:52:17 2018 +0100

basic, solve link problems

When not using scripting, there were a number of
unresolved symbols. First aproach did not work, so this
commit is the more extensive.

Change-Id: Iaf78bde10d9a43862d58d1aa8f46b14aa075eddb

diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 88cae207b166..c1b47e27daa6 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -97,15 +97,15 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/runtime/props \
basic/source/runtime/stdobj \
basic/source/runtime/stdobj1 \
+   basic/source/runtime/runtime \
+   basic/source/classes/errobject \
 ))
 endif
 
 $(eval $(call gb_Library_add_exception_objects,sb,\
-   basic/source/classes/errobject \
basic/source/runtime/basrdll \
basic/source/runtime/methods \
basic/source/runtime/methods1 \
-   basic/source/runtime/runtime \
basic/source/classes/sbintern \
basic/source/sbx/sbxarray \
basic/source/sbx/sbxbool \
diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx
index d84e3953284e..e7a639a5a069 100644
--- a/basic/source/runtime/basrdll.cxx
+++ b/basic/source/runtime/basrdll.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 
 struct BasicDLL::Impl
 {
@@ -85,6 +86,7 @@ void BasicDLL::BasicBreak()
 {
 BasicDLL* pThis = BASIC_DLL;
 DBG_ASSERT( pThis, "BasicDLL::EnableBreak: No instance yet!" );
+#if HAVE_FEATURE_SCRIPTING
 if ( pThis )
 {
 // bJustStopping: if there's someone pressing STOP like crazy umpteen 
times,
@@ -99,6 +101,7 @@ void BasicDLL::BasicBreak()
 bJustStopping = false;
 }
 }
+#endif
 }
 
 SbxAppData& GetSbxData_Impl

[Libreoffice-commits] core.git: 6 commits - external/coinmp external/libxslt external/lpsolve external/openssl solenv/gbuild solenv/gcc-wrappers

[Michael Stahl]

 external/coinmp/windows.build.patch.1   |   16 
 external/libxslt/ExternalProject_libxslt.mk |1 +
 external/lpsolve/lp_solve_5.5-windows.patch |2 +-
 external/openssl/opensslwnt.patch   |   15 +--
 solenv/gbuild/platform/com_MSC_class.mk |2 +-
 solenv/gcc-wrappers/wrapper.cxx |2 +-
 6 files changed, 25 insertions(+), 13 deletions(-)

New commits:
commit 3dc21da3b01811e9e26890e3a30ea73589f36ea1
Author: Michael Stahl 
Date:   Mon Jan 8 12:37:15 2018 +0100

libxslt: enable debug if ENABLE_DBGUTIL

BinScope requires a PDB file to check the DLL.

Change-Id: Id4c584fb5b0e1a7368708267bb4650e4f1c61e79

diff --git a/external/libxslt/ExternalProject_libxslt.mk 
b/external/libxslt/ExternalProject_libxslt.mk
index 8d6a40f5e187..3e4ebb87ea0a 100644
--- a/external/libxslt/ExternalProject_libxslt.mk
+++ b/external/libxslt/ExternalProject_libxslt.mk
@@ -21,6 +21,7 @@ $(call gb_ExternalProject_get_state_target,libxslt,build):
$(call gb_ExternalProject_run,build,\
cscript /e:javascript configure.js \
$(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \
+   $(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \
vcmanifest=yes \
lib=$(call 
gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc \
&& nmake \
commit d6b91568d22b9019ddf098f3c3072de25eb1c268
Author: Michael Stahl 
Date:   Mon Jan 8 12:34:59 2018 +0100

gcc-wrappers: recognise -ggdb.* in addition to -g as debug flag

Firebird uses -ggdb.  This causes it to have 2 PDB files, however
this isn't sufficient to make BinScope happy, more investigation
needed.

Change-Id: I5286964586eaffea36790ab7a7ca2df75d85f068

diff --git a/solenv/gcc-wrappers/wrapper.cxx b/solenv/gcc-wrappers/wrapper.cxx
index 800687ad65a6..eb8954bc9764 100644
--- a/solenv/gcc-wrappers/wrapper.cxx
+++ b/solenv/gcc-wrappers/wrapper.cxx
@@ -127,7 +127,7 @@ string processccargs(vector rawargs) {
 exit(1);
 }
 }
-else if(*i == "-g") {
+else if(*i == "-g" || !(*i).compare(0,5,"-ggdb")) {
 args.append("-Zi");
 args.append(" -FS");
 }
commit e8f2ca76037eed4c10c9851682c7f6856c7fb0de
Author: Michael Stahl 
Date:   Mon Jan 8 12:33:55 2018 +0100

gbuild: MSVC: invoke MSASM with /safeseh

BinScope complains that the sblo.dll lacks SAFESEH flag.

Change-Id: If2b4b6592eac37542c3e2745d90a8e432b8da2e2

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 0916c2fd1fd9..27a0aec80c4b 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -95,7 +95,7 @@ define gb_AsmObject__command
 $(call gb_Output_announce,$(2),$(true),ASM,3)
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) $(dir $(4)) && \
-   "$(ML_EXE)" /c /Cp $(gb_AFLAGS) -D$(COM) /Fo$(1) $(3)) && \
+   "$(ML_EXE)" /safeseh /c /Cp $(gb_AFLAGS) -D$(COM) /Fo$(1) $(3)) && \
echo "$(1) : $(3)" > $(4)
 endef
 
commit 8f3ca0831993f7d687d7fc0feb1abe0c67a413bd
Author: Michael Stahl 
Date:   Mon Jan 8 12:31:39 2018 +0100

openssl: MSVC build: link and run MSASM with /SAFESEH

Actually the assembler requires lowercase /safeseh, oddly enough.

Change-Id: I1569409a2d6358282a7463ea996a6b1615e6ed8c

diff --git a/external/openssl/opensslwnt.patch 
b/external/openssl/opensslwnt.patch
index e22bea6f077b..c5c96dd25700 100644
--- a/external/openssl/opensslwnt.patch
+++ b/external/openssl/opensslwnt.patch
@@ -79,15 +79,26 @@ diff -ru openssl.orig/util/mk1mf.pl openssl/util/mk1mf.pl
  APP_CFLAG=$app_cflag
  LIB_CFLAG=$lib_cflag
  SHLIB_CFLAG=$shl_cflag
-@@ -488,7 +493,7 @@
+@@ -488,8 +493,8 @@
+ SRC_D=$src_dir
  
  LINK_CMD=$link
- LFLAGS=$lflags
+-LFLAGS=$lflags
++LFLAGS=$lflags /SAFESEH
 -RSC=$rsc
 +RSC=$rsc \$(SOLARINC)
  
  # The output directory for everything interesting
  OUT_D=$out_dir
+@@ -511,7 +516,7 @@
+ MKDIR=$mkdir
+ MKLIB=$bin_dir$mklib
+ MLFLAGS=$mlflags
+-ASM=$bin_dir$asm
++ASM=$bin_dir$asm /safeseh
+ 
+ # FIPS validated module and support file locations
+ 
 @@ -669,7 +674,7 @@
  printf OUT <
Date:   Mon Jan 8 12:21:31 2018 +0100

lpsolve: always generate symbols with MSVC

BinScope requires a PDB file to check the DLL; not worth the effort
to conditionalize this.

Change-Id: Ibb9800baa0932495504f0bebea2ffa765aa0cecf

diff --git a/external/lpsolve/lp_solve_5.5-windows.patch 
b/external/lpsolve/lp_solve_5.5-windows.patch
index 368c90d04270..1ea580dc8311 100644
--- a/external/lpsolve/lp_solve_5.5-windows.patch
+++ b/external/lpsolve/lp_solve_5.5-windows.patch
@@ -46,7 +46,7 @@
 -rc lpsolve.rc
 +rc %SOLARINC% lpsolve.rc
 -%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL 
-I../colamd /LD /MD /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL -DWIN32 
-D_CRT_S

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sd/uiconfig

[Laurent BP]

 sd/uiconfig/sdraw/ui/copydlg.ui |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 6e0cd872f5f922244a42ca2c445c80a5c5bb6c08
Author: Laurent BP 
Date:   Thu Jan 4 14:00:04 2018 +0100

UI Duplicate dlg: enable negative angle

Duplicate dlg (Shift+F3) should accept negative angle
and angle between 359° and 360°

Change-Id: I933816698143a9766a5127f3cefeaec317077289
Reviewed-on: https://gerrit.libreoffice.org/47393
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 
(cherry picked from commit 2453c5a62cd2c4364d0258f7488ab23b83b5478b)
Reviewed-on: https://gerrit.libreoffice.org/47566

diff --git a/sd/uiconfig/sdraw/ui/copydlg.ui b/sd/uiconfig/sdraw/ui/copydlg.ui
index 8ba01c9f8aa3..4bb5f4195a8b 100644
--- a/sd/uiconfig/sdraw/ui/copydlg.ui
+++ b/sd/uiconfig/sdraw/ui/copydlg.ui
@@ -11,14 +11,15 @@
 10
   
   
-359
+-360
+360
 1
 10
   
   
 -100
 100
-0.10001
+0.1
 1
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpcelllayout.cxx |   49 +--
 lotuswordpro/source/filter/lwplayout.cxx |6 +--
 2 files changed, 28 insertions(+), 27 deletions(-)

New commits:
commit 231f7c28267c56442ba65809a41aca7ecf09dd1e
Author: Caolán McNamara 
Date:   Mon Jan 8 09:10:16 2018 +

ofz#5025 Direct-leak

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

diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx 
b/lotuswordpro/source/filter/lwpcelllayout.cxx
index c6da43589aee..ca16bde31ffd 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -177,8 +177,8 @@ void LwpCellLayout::ApplyBorders(XFCellStyle *pCellStyle)
 LwpCellBorderType eType = GetCellBorderType(crowid, ccolid, 
GetTableLayout());
 
 // get left cell and judge if neighbour border is different
-XFBorders * pBorders = GetXFBorders();
-if(!pBorders)
+std::unique_ptr xBorders(GetXFBorders());
+if (!xBorders)
 {
 return;
 }
@@ -186,21 +186,21 @@ void LwpCellLayout::ApplyBorders(XFCellStyle *pCellStyle)
 switch (eType)
 {
 case enumNoBottomBorder:
-pBorders->SetWidth(enumXFBorderBottom, 0);
+xBorders->SetWidth(enumXFBorderBottom, 0);
 break;
 case enumNoLeftBorder:
-pBorders->SetWidth(enumXFBorderLeft, 0);
+xBorders->SetWidth(enumXFBorderLeft, 0);
 break;
 case enumNoLeftNoBottomBorder:
-pBorders->SetWidth(enumXFBorderBottom, 0);
-pBorders->SetWidth(enumXFBorderLeft, 0);
+xBorders->SetWidth(enumXFBorderBottom, 0);
+xBorders->SetWidth(enumXFBorderLeft, 0);
 break;
 case enumWholeBorder:
 break;
 default:
 assert(false);
 }
-pCellStyle->SetBorders(pBorders);
+pCellStyle->SetBorders(xBorders.release());
 }
 /**
  * @short   Apply watermark to cell style
@@ -424,13 +424,13 @@ LwpCellBorderType 
LwpCellLayout::GetCellBorderType(sal_uInt16 nRow, sal_uInt16 n
 return enumWholeBorder;
 
 // get left cell and judge if neighbour border is different
-XFBorders * pBorders = GetXFBorders();
-if(!pBorders)
+std::unique_ptr xBorders(GetXFBorders());
+if (!xBorders)
 {
 return enumWholeBorder;
 }
-XFBorder& rLeftBorder = pBorders->GetLeft();
-XFBorder& rBottomBorder = pBorders->GetBottom();
+XFBorder& rLeftBorder = xBorders->GetLeft();
+XFBorder& rBottomBorder = xBorders->GetBottom();
 bool bNoLeftBorder = false;
 bool bNoBottomBorder = false;
 
@@ -471,7 +471,7 @@ LwpCellBorderType 
LwpCellLayout::GetCellBorderType(sal_uInt16 nRow, sal_uInt16 n
 }
 }
 
-delete pBorders;
+xBorders.reset();
 
 if (bNoBottomBorder)
 {
@@ -517,8 +517,8 @@ void LwpCellLayout::RegisterDefaultCell()
 ApplyFmtStyle(xCellStyle.get());
 xCellStyle->SetAlignType(enumXFAlignNone, GetVerticalAlignmentType());
 
-XFBorders * pBorders = GetXFBorders();
-if (pBorders)
+std::unique_ptr xBorders(GetXFBorders());
+if (xBorders)
 {
 switch(eLoop)
 {
@@ -527,15 +527,15 @@ void LwpCellLayout::RegisterDefaultCell()
 //| |
 
 // remove bottom line
-pBorders->SetWidth(enumXFBorderBottom, 0);
+xBorders->SetWidth(enumXFBorderBottom, 0);
 break;
 case enumNoLeftNoBottomBorder:
 
 //  |
 
 // remove left and bottom
-pBorders->SetWidth(enumXFBorderLeft, 0);
-pBorders->SetWidth(enumXFBorderBottom, 0);
+xBorders->SetWidth(enumXFBorderLeft, 0);
+xBorders->SetWidth(enumXFBorderBottom, 0);
 break;
 case enumWholeBorder:
 
@@ -548,12 +548,12 @@ void LwpCellLayout::RegisterDefaultCell()
 //| |
 
 // remove left line
-pBorders->SetWidth(enumXFBorderLeft, 0);
+xBorders->SetWidth(enumXFBorderLeft, 0);
 break;
 default:
 assert(false);
 }
-xCellStyle->SetBorders(pBorders);
+xCellStyle->SetBorders(xBorders.release());
 }
 m_CellStyleNames[eLoop] = 
pXFStyleManager->AddStyle(xCellStyle.release()).m_pStyle->GetStyleName();
 }
@@ -721,13 +721,13 @@ LwpCellBorderType 
LwpConnectedCellLayout::GetCellBorderType(sal_uInt16 nRow, sal
 sal_uInt16 nRowSpan = m_nRealrowspan;
 
 // get left cell and judge if neighbour border is different
-XFBorders * pBorders = GetXFBorders();
-if(!pBorders)
+std::unique_ptr xBorders(GetXFBorders());
+if( !xBorders)
 {
 return enumWholeBorder;
 }
-XFBorder& rLeftBorder = pBorders->

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sw/qa writerfilter/source

[Caolán McNamara]

 sw/qa/core/data/ooxml/pass/ofz4825-1.docx |binary
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b01146c534b8a2edf0b73b528bf1428e45ee8bd1
Author: Caolán McNamara 
Date:   Fri Dec 29 14:40:13 2017 +

ofz#4825 Bad-cast

Change-Id: I57f180c9e28d5f2439efcc1f2726d8fabc108bc9
Reviewed-on: https://gerrit.libreoffice.org/47176
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 752684babf5ebc4ac6dfa4a7ea30f7f7cb4a9e4a)

diff --git a/sw/qa/core/data/ooxml/pass/ofz4825-1.docx 
b/sw/qa/core/data/ooxml/pass/ofz4825-1.docx
new file mode 100644
index ..ce8e6493af45
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/ofz4825-1.docx differ
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index d3a6a02d3ab6..49d54521fc39 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1847,7 +1847,7 @@ OOXMLFastContextHandlerWrapper::lcl_createFastChildContext
 bool bSkipImages = getDocument()->IsSkipImages() && 
oox::getNamespace(Element) == static_cast(NMSP_dml) &&
 !((oox::getBaseToken(Element) == XML_linkedTxbx) || 
(oox::getBaseToken(Element) == XML_txbx));
 
-if ( bInNamespaces && ((!bIsWrap && !bIsSignatureLine) || 
static_cast(mpParent)->isShapeSent()) )
+if ( bInNamespaces && ((!bIsWrap && !bIsSignatureLine) || 
dynamic_cast(*mpParent).isShapeSent()) )
 xResult.set(OOXMLFactory::createFastChildContextFromStart(this, 
Element));
 else if (mxContext.is()  && !bSkipImages)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/source/core/access/accnotexthyperlink.cxx |8 +++
 sw/source/core/access/accnotexthyperlink.hxx |2 -
 sw/source/core/access/accpage.cxx|   12 +-
 sw/source/core/access/accpage.hxx|2 -
 sw/source/core/access/acctable.cxx   |   30 +--
 5 files changed, 27 insertions(+), 27 deletions(-)

New commits:
commit b6b96f16c6269d2b42029b8e649c7965b936e09e
Author: Miklos Vajna 
Date:   Mon Jan 8 09:42:44 2018 +0100

sw: prefix members of SwAccessibleNoTextHyperlink, SwAccessiblePage and ...

... SwAccAllTableSelHander_Impl

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

diff --git a/sw/source/core/access/accnotexthyperlink.cxx 
b/sw/source/core/access/accnotexthyperlink.cxx
index a4555ee877bb..4682f701bbd2 100644
--- a/sw/source/core/access/accnotexthyperlink.cxx
+++ b/sw/source/core/access/accnotexthyperlink.cxx
@@ -38,7 +38,7 @@ using namespace css::uno;
 using namespace css::accessibility;
 
 SwAccessibleNoTextHyperlink::SwAccessibleNoTextHyperlink( 
SwAccessibleNoTextFrame *p, const SwFrame *aFrame ) :
-xFrame( p ),
+mxFrame( p ),
 mpFrame( aFrame )
 {
 }
@@ -77,7 +77,7 @@ sal_Bool SAL_CALL 
SwAccessibleNoTextHyperlink::doAccessibleAction( sal_Int32 nIn
 IMapObject* pMapObj = pMap->GetIMapObject(nIndex);
 if (!pMapObj->GetURL().isEmpty())
 {
-SwViewShell *pVSh = xFrame->GetShell();
+SwViewShell *pVSh = mxFrame->GetShell();
 if( pVSh )
 {
 LoadURL( *pVSh, pMapObj->GetURL(), LoadUrlFlags::NONE,
@@ -88,7 +88,7 @@ sal_Bool SAL_CALL 
SwAccessibleNoTextHyperlink::doAccessibleAction( sal_Int32 nIn
 }
 else if (!aURL.GetURL().isEmpty())
 {
-SwViewShell *pVSh = xFrame->GetShell();
+SwViewShell *pVSh = mxFrame->GetShell();
 if( pVSh )
 {
 LoadURL( *pVSh, aURL.GetURL(), LoadUrlFlags::NONE,
@@ -176,7 +176,7 @@ Any SAL_CALL 
SwAccessibleNoTextHyperlink::getAccessibleActionAnchor(
 
 Any aRet;
 //SwFrame* pAnchor = static_cast(mpFrame)->GetAnchor();
-Reference< XAccessible > xAnchor = 
xFrame->GetAccessibleMap()->GetContext(mpFrame);
+Reference< XAccessible > xAnchor = 
mxFrame->GetAccessibleMap()->GetContext(mpFrame);
 //SwAccessibleNoTextFrame* pFrame = xFrame.get();
 //Reference< XAccessible > xAnchor = (XAccessible*)pFrame;
 aRet <<= xAnchor;
diff --git a/sw/source/core/access/accnotexthyperlink.hxx 
b/sw/source/core/access/accnotexthyperlink.hxx
index d57cd29f2e86..d9b9a7a0dfb2 100644
--- a/sw/source/core/access/accnotexthyperlink.hxx
+++ b/sw/source/core/access/accnotexthyperlink.hxx
@@ -34,7 +34,7 @@ class SwAccessibleNoTextHyperlink :
 {
 friend class SwAccessibleNoTextFrame;
 
-::rtl::Reference< SwAccessibleNoTextFrame > xFrame;
+::rtl::Reference< SwAccessibleNoTextFrame > mxFrame;
 const SwFrame *mpFrame;
 
 SwFrameFormat *GetFormat()
diff --git a/sw/source/core/access/accpage.cxx 
b/sw/source/core/access/accpage.cxx
index cfec5a6be975..7a3ea6f80bf7 100644
--- a/sw/source/core/access/accpage.cxx
+++ b/sw/source/core/access/accpage.cxx
@@ -53,7 +53,7 @@ void SwAccessiblePage::GetStates(
 // FOCUSED
 if( IsSelected() )
 {
-OSL_ENSURE( bIsSelected, "bSelected out of sync" );
+OSL_ENSURE( m_bIsSelected, "bSelected out of sync" );
 ::rtl::Reference < SwAccessibleContext > xThis( this );
 GetMap()->SetCursorContext( xThis );
 
@@ -70,8 +70,8 @@ void SwAccessiblePage::InvalidateCursorPos_()
 
 {
 osl::MutexGuard aGuard( m_Mutex );
-bOldSelected = bIsSelected;
-bIsSelected = bNewSelected;
+bOldSelected = m_bIsSelected;
+m_bIsSelected = bNewSelected;
 }
 
 if( bNewSelected )
@@ -99,7 +99,7 @@ void SwAccessiblePage::InvalidateFocus_()
 
 {
 osl::MutexGuard aGuard( m_Mutex );
-bSelected = bIsSelected;
+bSelected = m_bIsSelected;
 }
 OSL_ENSURE( bSelected, "focus object should be selected" );
 
@@ -111,7 +111,7 @@ void SwAccessiblePage::InvalidateFocus_()
 SwAccessiblePage::SwAccessiblePage(std::shared_ptr const& 
pInitMap,
 const SwFrame* pFrame )
 : SwAccessibleContext( pInitMap, AccessibleRole::PANEL, pFrame )
-, bIsSelected( false )
+, m_bIsSelected( false )
 {
 assert(pFrame != nullptr);
 assert(pInitMap != nullptr);
@@ -129,7 +129,7 @@ SwAccessiblePage::~SwAccessiblePage()
 bool SwAccessiblePage::HasCursor()
 {
 osl::MutexGuard aGuard( m_Mutex );
-return bIsSelected;
+return m_bIsSelected;
 }
 
 OUString SwAccessiblePage::getImplementationName( )
diff --git a/sw/source/core/access/accpage.hxx 
b/sw/source/core/access/accpage.hxx
index 355015756df7..006eda746557 100644
--- a/sw/source/core/

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

[Jan Holesovsky]

 sfx2/source/appl/sfxhelp.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit bd00b979e2d7a1d63e65d1c49be90b9deacb1b56
Author: Jan Holesovsky 
Date:   Thu Dec 14 08:46:32 2017 +0100

LOK: Honor the user's language when issuing help.

Change-Id: I2cfe5e5ae0e10dffb7b5672fccdc71af6060491d
Reviewed-on: https://gerrit.libreoffice.org/46435
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 
(cherry picked from commit ca35b857cc99dcd909e5c2662043ea6a4ffdf244)
Reviewed-on: https://gerrit.libreoffice.org/46969
Tested-by: Jenkins 
Reviewed-by: Jan Holesovsky 

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index bce03be37adb..bdfba5d88435 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -103,6 +103,9 @@ static bool impl_hasHelpInstalled( const OUString &rLang );
 /// Return the locale we prefer for displaying help
 static OUString const & HelpLocaleString()
 {
+if (comphelper::LibreOfficeKit::isActive())
+return comphelper::LibreOfficeKit::getLanguageTag().getBcp47();
+
 static OUString aLocaleStr;
 if (aLocaleStr.isEmpty())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 unotools/source/misc/syslocale.cxx |8 
 vcl/source/app/svdata.cxx  |3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit a9e294ff5c8466bd1577ae43b0feaa002f9fd5ab
Author: Jan Holesovsky 
Date:   Fri Jan 5 15:37:29 2018 +0100

lokdialog: Few more places that need to take LOK's LanguageTag into account.

Change-Id: Ida41025c70d45f426304fabe702a3bccd6e2385d
Reviewed-on: https://gerrit.libreoffice.org/47474
Tested-by: Jenkins 
Reviewed-by: Jan Holesovsky 

diff --git a/unotools/source/misc/syslocale.cxx 
b/unotools/source/misc/syslocale.cxx
index 8dd7a5824982..951ac9e3b4aa 100644
--- a/unotools/source/misc/syslocale.cxx
+++ b/unotools/source/misc/syslocale.cxx
@@ -23,12 +23,14 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
+
 #include 
 
 using namespace osl;
@@ -169,11 +171,17 @@ SvtSysLocaleOptions& SvtSysLocale::GetOptions() const
 
 const LanguageTag& SvtSysLocale::GetLanguageTag() const
 {
+if (comphelper::LibreOfficeKit::isActive())
+return comphelper::LibreOfficeKit::getLanguageTag();
+
 return pImpl->aSysLocaleOptions.GetRealLanguageTag();
 }
 
 const LanguageTag& SvtSysLocale::GetUILanguageTag() const
 {
+if (comphelper::LibreOfficeKit::isActive())
+return comphelper::LibreOfficeKit::getLanguageTag();
+
 return pImpl->aSysLocaleOptions.GetRealUILanguageTag();
 }
 
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 69a9db6d008d..8d5d329a7478 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -19,6 +19,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -165,7 +166,7 @@ vcl::Window *ImplGetDefaultContextWindow()
 const std::locale& ImplGetResLocale()
 {
 ImplSVData* pSVData = ImplGetSVData();
-if (!pSVData->mbResLocaleSet)
+if (!pSVData->mbResLocaleSet || comphelper::LibreOfficeKit::isActive())
 {
 pSVData->maResLocale = Translate::Create("vcl");
 pSVData->mbResLocaleSet = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/com

[Stephan Bergmann]

 include/com/sun/star/uno/Any.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 29ce7afd3502684206da5f31396daaed11baf629
Author: Stephan Bergmann 
Date:   Mon Jan 8 11:17:49 2018 +0100

Typo in comment ("from" vs. "to")

...which had been like that ever since the code got introduced with
0fbe22a77289a624e1346ab457734c2f64f8e6fb "css::uno::Any move semantics (for
LIBO_INTERNAL_ONLY)"

Change-Id: Iacd93a4434a92f2ee8f83ba1d59b0ef0a6c38a42

diff --git a/include/com/sun/star/uno/Any.hxx b/include/com/sun/star/uno/Any.hxx
index ac1b43dd779e..3021fb2bade0 100644
--- a/include/com/sun/star/uno/Any.hxx
+++ b/include/com/sun/star/uno/Any.hxx
@@ -135,7 +135,7 @@ inline void moveAnyInternals(Any & from, Any & to) {
 if (to.pData == &from.pReserved) {
 to.pData = &to.pReserved;
 }
-// This leaves to.pData (where "to" is now VOID) dangling to somewhere (cf.
+// This leaves from.pData (where "from" is now VOID) dangling to somewhere 
(cf.
 // CONSTRUCT_EMPTY_ANY, cppu/source/uno/prim.hxx), but what's relevant is
 // only that it isn't a nullptr (as e.g. >>= -> uno_type_assignData ->
 // _assignData takes a null pSource to mean "construct a default value").
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: osx/soffice.xcodeproj

[Tor Lillqvist]

 osx/soffice.xcodeproj/project.pbxproj |   26 ++
 1 file changed, 26 insertions(+)

New commits:
commit 41f09aa5fc7b1fde5a95e57f51d085a8c79f9825
Author: Tor Lillqvist 
Date:   Fri Jan 5 14:59:47 2018 +0200

Add a few Mac-specific source files in avmedia for easier breakpointing

Change-Id: I36b42ca16932cab10342894840f57e89d08dac4f

diff --git a/osx/soffice.xcodeproj/project.pbxproj 
b/osx/soffice.xcodeproj/project.pbxproj
index f303a60d2ea7..770a980fcdc0 100644
--- a/osx/soffice.xcodeproj/project.pbxproj
+++ b/osx/soffice.xcodeproj/project.pbxproj
@@ -256,6 +256,11 @@
BE82C42418C86E010050EB79 /* spinfld.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = spinfld.cxx; 
path = ../vcl/source/control/spinfld.cxx; sourceTree = ""; };
BE82C42518C86E010050EB79 /* tabctrl.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tabctrl.cxx; 
path = ../vcl/source/control/tabctrl.cxx; sourceTree = ""; };
BE82C42618C86E010050EB79 /* throbber.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = throbber.cxx; 
path = ../vcl/source/control/throbber.cxx; sourceTree = ""; };
+   BEB6E30D1FFF988700B0BDB0 /* framegrabber.mm */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; 
name = framegrabber.mm; path = ../../../avmedia/source/macavf/framegrabber.mm; 
sourceTree = ""; };
+   BEB6E30E1FFF988700B0BDB0 /* manager.mm */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; 
name = manager.mm; path = ../../../avmedia/source/macavf/manager.mm; sourceTree 
= ""; };
+   BEB6E30F1FFF988700B0BDB0 /* window.mm */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; 
name = window.mm; path = ../../../avmedia/source/macavf/window.mm; sourceTree = 
""; };
+   BEB6E3101FFF988700B0BDB0 /* player.mm */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; 
name = player.mm; path = ../../../avmedia/source/macavf/player.mm; sourceTree = 
""; };
+   BEB6E3111FFF988800B0BDB0 /* macavfuno.mm */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; 
name = macavfuno.mm; path = ../../../avmedia/source/macavf/macavfuno.mm; 
sourceTree = ""; };
BEC676DE17461A720069E01D /* dbggui.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dbggui.cxx; 
path = ../vcl/source/app/dbggui.cxx; sourceTree = ""; };
BECB749D17189A3B001BEB85 /* crsrsh.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = crsrsh.cxx; 
path = ../sw/source/core/crsr/crsrsh.cxx; sourceTree = ""; };
 /* End PBXFileReference section */
@@ -595,9 +600,30 @@
name = control;
sourceTree = "";
};
+   BEB6E30B1FFF984200B0BDB0 /* avmedia */ = {
+   isa = PBXGroup;
+   children = (
+   BEB6E30C1FFF985300B0BDB0 /* macavf */,
+   );
+   path = avmedia;
+   sourceTree = "";
+   };
+   BEB6E30C1FFF985300B0BDB0 /* macavf */ = {
+   isa = PBXGroup;
+   children = (
+   BEB6E30D1FFF988700B0BDB0 /* framegrabber.mm */,
+   BEB6E3111FFF988800B0BDB0 /* macavfuno.mm */,
+   BEB6E30E1FFF988700B0BDB0 /* manager.mm */,
+   BEB6E3101FFF988700B0BDB0 /* player.mm */,
+   BEB6E30F1FFF988700B0BDB0 /* window.mm */,
+   );
+   path = macavf;
+   sourceTree = "";
+   };
BEC3D9171710B0390030AD56 = {
isa = PBXGroup;
children = (
+   BEB6E30B1FFF984200B0BDB0 /* avmedia */,
BE2DAD2B183148BE00A4D2F7 /* formula */,
BE2DAD28182FAB7900A4D2F7 /* sw */,
BE82BE5A18298E2E00A447B5 /* vcl */,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Bug 83260

[Miklos Vajna]

Hi,

On Sat, Jan 06, 2018 at 01:20:05AM +, Yemelyanenko Fyodor 
 wrote:
> Now I’m investigating CompresRedlines further. I think it can be
> changed so it merges only two neighbor redlines in the same node and
> not merge cross-node. Or maybe it should be completely removed, as it
> only merges redlines if they’ve been created in the same minute!
> (https://opengrok.libreoffice.org/xref/core/sw/source/core/doc/docredln.cxx#946)
> So chances that two redlines will be merged are very low.

Did you try typing "asdf" into a document without that merging enabled?
I think 4 redlines are created without this "merge changes from the same
minute" mechanism.

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-0' - sax/source

[Michael Stahl]

 sax/source/fastparser/fastparser.cxx |   33 ++---
 1 file changed, 30 insertions(+), 3 deletions(-)

New commits:
commit 25b0538b1af6fd2f9646ff875523a6ddd77c9ce4
Author: Michael Stahl 
Date:   Fri Jan 5 15:36:59 2018 +0100

ofz#4392 sax: guard access to Entity::maSavedException with mutex

The problem here is presumably that the parser thread reports a
low-level SAX exception and the main thread reports a high-level filter
exception at the same time, so both threads modify maSavedException
concurrently.

Change-Id: Ic8ce9a4992208a24a111c990a67be163858ddaf8
Reviewed-on: https://gerrit.libreoffice.org/47478
Reviewed-by: Michael Meeks 
Tested-by: Jenkins 
(cherry picked from commit 2a88f62ac01daa72b6287a8cedccfb78579a6067)
Reviewed-on: https://gerrit.libreoffice.org/47539

diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index 1aa8811366ea..4d4ec416e7a4 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -173,6 +173,7 @@ struct Entity : public ParserData
 // resource leaks), therefore any exception thrown by a UNO callback
 // must be saved somewhere until the C-XmlParser is stopped.
 css::uno::Any   maSavedException;
+osl::Mutex maSavedExceptionMutex;
 void saveException( const Any & e );
 void throwException( const ::rtl::Reference< FastLocatorImpl > 
&xDocumentLocator,
  bool mbDuringParse );
@@ -584,12 +585,20 @@ void Entity::throwException( const ::rtl::Reference< 
FastLocatorImpl > &xDocumen
  bool mbDuringParse )
 {
 // Error during parsing !
+Any savedException;
+{
+osl::MutexGuard g(maSavedExceptionMutex);
+if (maSavedException.hasValue())
+{
+savedException.setValue(&maSavedException, 
cppu::UnoType::get());
+}
+}
 SAXParseException aExcept(
 lclGetErrorMessage( mpParser,
 xDocumentLocator->getSystemId(),
 xDocumentLocator->getLineNumber() ),
 Reference< XInterface >(),
-Any( &maSavedException, 
cppu::UnoType::get() ),
+savedException,
 xDocumentLocator->getPublicId(),
 xDocumentLocator->getSystemId(),
 xDocumentLocator->getLineNumber(),
@@ -621,7 +630,15 @@ void Entity::saveException( const Any & e )
 // for XComponent; and yet expect to continue parsing.
 SAL_WARN("sax", "Unexpected exception from XML parser "
 << e.get());
-maSavedException = e;
+osl::MutexGuard g(maSavedExceptionMutex);
+if (maSavedException.hasValue())
+{
+SAL_INFO("sax.fastparser", "discarding exception, already have one");
+}
+else
+{
+maSavedException = e;
+}
 }
 
 } // namespace
@@ -838,6 +855,8 @@ void FastSaxParserImpl::parseStream(const InputSource& 
maStructSource)
 deleteUsedEvents();
 
 // callbacks used inside XML_Parse may have caught an exception
+// No need to lock maSavedExceptionMutex here because parser
+// thread is joined.
 if( rEntity.maSavedException.hasValue() )
 rEntity.throwException( mxDocumentLocator, true );
 }
@@ -1047,8 +1066,16 @@ void FastSaxParserImpl::parse()
 }
 
 // callbacks used inside XML_Parse may have caught an exception
-if( !bContinue || rEntity.maSavedException.hasValue() )
+if (!bContinue)
+{
 rEntity.throwException( mxDocumentLocator, true );
+}
+osl::ClearableMutexGuard g(rEntity.maSavedExceptionMutex);
+if (rEntity.maSavedException.hasValue())
+{
+g.clear();
+rEntity.throwException( mxDocumentLocator, true );
+}
 } while( nRead > 0 );
 rEntity.getEvent( DONE );
 if( rEntity.mbEnableThreads )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - set_soenv.in sysui/desktop

[Don Lewis]

 set_soenv.in |   12 
 sysui/desktop/debian/makefile.mk |2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit eee1fb3486915a9182b5f24f9dd9c0fe8a8b959e
Author: Don Lewis 
Date:   Mon Jan 8 08:56:31 2018 +

Don't put "." in $PATH because it is somewhat inefficient

as well as hazardous, especially if a user does a manual build
and then continues to use the same shell session.

Fix on instance of a script in the current directory being
executed without a leading "./".

Remember to run "./bootstrap" as configure recommends.  With
this change "bootstrap" without the leading "./" will no longer
work.

diff --git a/set_soenv.in b/set_soenv.in
index a68924f65467..16d37ae9de8f 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1118,8 +1118,7 @@ if ($platform =~ m/cygwin|os2/)
  
 # The general environment path.
 if ($platform =~ m/linux|netbsd|odf1|freebsd|aix|solaris/)
-{  $PATH  = $cur_dir.
-$ps.'$SOLARENV'.$ds.'$INPATH'.$BIN.
+{  $PATH  = '$SOLARENV'.$ds.'$INPATH'.$BIN.
 $ps.'$SOLARENV'.$BIN;
 
if ($platform =~ m/solaris/) {
@@ -1149,8 +1148,7 @@ elsif ($platform =~ m/cygwin/)
 
my ( $tmppath );
 
-   $PATH  = $cur_dir.
-$ps.CygFormat($SOLARENV).$ds."bin".
+   $PATH  = CygFormat($SOLARENV).$ds."bin".
 $ps.CygFormat($SOLARENV).$ds.$INPATH.$BIN;
 
if ( $JAVA_HOME ne "" )
@@ -1283,8 +1281,7 @@ elsif ($platform =~ m/os2/)
 {  # The PATH variable is completely created from scratch. Everything that is 
not
# needed is appended to the end.
 
-   $PATH  = $cur_dir.
-$ps.'$SOLARENV'.$ds."bin".
+   $PATH  = '$SOLARENV'.$ds."bin".
 $ps.'$SOLARENV'.$ds.'$INPATH'.$BIN;
 
if ( $JAVA_HOME ne "" )
@@ -1315,8 +1312,7 @@ elsif ($platform =~ m/os2/)
 }
 
 elsif ($platform =~ m/darwin/)
-{  $PATH  = $cur_dir.
-$ps.'$SOLARENV'.$ds.'$INPATH'.$BIN.
+{  $PATH  = '$SOLARENV'.$ds.'$INPATH'.$BIN.
 $ps.'$SOLARENV'.$BIN;
 
   # Append old PATH
diff --git a/sysui/desktop/debian/makefile.mk b/sysui/desktop/debian/makefile.mk
index 96c630a9585a..06d6d7a477c4 100644
--- a/sysui/desktop/debian/makefile.mk
+++ b/sysui/desktop/debian/makefile.mk
@@ -57,7 +57,7 @@ ALLTAR : $(DEBFILES)
 %/DEBIAN/control : $$(@:f)
 @$(MKDIRHIER) $(@:d) $*$/etc $*$/usr/share/applnk/Office $*$/usr/lib/menu
 ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.2//)) $*$/etc$/
-/bin/sh -c -x "cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/4.2//) && 
DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr 
GNOMEDIR=/usr create_tree.sh"
+/bin/sh -c -x "cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/4.2//) && 
DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr 
GNOMEDIR=/usr ./create_tree.sh"
 @cat openoffice.org-debian-menus | sed -e 
's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/4.2//)) 
$(PRODUCTVERSION.$(*:f:s/-/ /:1:s/4.2//))/' -e 
's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.2//))/' -e 
's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/4.2//))/' > 
$*$/usr/lib/menu/$(*:f:s/_/ /:1:s/4.2//)
 echo "Package: $(*:f:s/_/ /:1:s/4.2//)" > $@
 cat $(@:f) | tr -d "\015" | sed "s/%productname/$(PRODUCTNAME.$(*:f:s/-/ 
/:1:s/4.2//))/" >> $@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/sdi starmath/sdi svx/sdi sw/sdi

[Maxim Monastirsky]

 sc/sdi/cellsh.sdi  |6 +-
 sc/sdi/scalc.sdi   |4 ++--
 starmath/sdi/smath.sdi |6 +++---
 svx/sdi/svx.sdi|8 
 sw/sdi/_viewsh.sdi |1 +
 5 files changed, 15 insertions(+), 10 deletions(-)

New commits:
commit 8b9582855a529823191ed6a12b96ec10ac8e2dec
Author: Maxim Monastirsky 
Date:   Fri Dec 8 02:38:10 2017 +0200

tdf#113715 Fix .uno: names appearing in the customization dialog

Based on 591ed2391389120efdf366f207642a98eb9f054c

Changes from master:
- Revert officecfg string changes.
- Instead, hide .uno:AutoSum in Calc for 6-0.

Change-Id: Ia4a4231acf2f15ebf58f2acd02b7fc0ab5a88072
Reviewed-on: https://gerrit.libreoffice.org/46970
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 

diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index 22a66319cd53..decb76cfc659 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -193,7 +193,11 @@ interface CellSelection
 SID_CHARMAP_CONTROL [ ExecMethod = ExecuteEdit; StateMethod = 
GetCellState; ]
 
 SID_INSERT_POSTIT   [ ExecMethod = ExecuteEdit; StateMethod = 
GetCellState; ]
-SID_EDIT_POSTIT   [ ExecMethod = ExecuteEdit; StateMethod = GetCellState; ]
+SID_EDIT_POSTIT
+[
+ExecMethod = ExecuteEdit; StateMethod = GetCellState;
+ToolBoxConfig, MenuConfig , AccelConfig;
+]
 
 SID_TABOP   [ ExecMethod = ExecuteEdit; StateMethod = 
GetState; ]
 SID_CONSOLIDATE [ ExecMethod = ExecuteEdit; StateMethod = 
GetState; ]
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index db1a738fe8c8..d332d466253b 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -2228,7 +2228,7 @@ SfxVoidItem SearchResultsDialog SID_SEARCH_RESULTS_DIALOG
 RecordAbsolute = FALSE,
 RecordPerSet;
 
-AccelConfig = TRUE,
+AccelConfig = FALSE,
 MenuConfig = FALSE,
 ToolBoxConfig = FALSE,
 GroupId = SfxGroupId::Options;
@@ -6344,6 +6344,6 @@ SfxVoidItem AutoSum SID_AUTO_SUM
 
 AccelConfig = FALSE,
 MenuConfig = FALSE,
-ToolBoxConfig = TRUE,
+ToolBoxConfig = FALSE,
 GroupId = SfxGroupId::Intern;
 ]
diff --git a/starmath/sdi/smath.sdi b/starmath/sdi/smath.sdi
index bf564dcf88cc..0ee7306938ca 100644
--- a/starmath/sdi/smath.sdi
+++ b/starmath/sdi/smath.sdi
@@ -228,9 +228,9 @@ SfxVoidItem InsertCommandText SID_INSERTCOMMANDTEXT
 RecordPerSet;
 Asynchron;
 
-AccelConfig = TRUE,
-MenuConfig = TRUE,
-ToolBoxConfig = TRUE,
+AccelConfig = FALSE,
+MenuConfig = FALSE,
+ToolBoxConfig = FALSE,
 GroupId = SfxGroupId::Insert;
 ]
 
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 3d684944a963..eed15720caa9 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -4491,9 +4491,9 @@ SfxVoidItem EditAnnotation SID_EDIT_POSTIT
 RecordAbsolute = FALSE,
 RecordPerSet;
 
-AccelConfig = TRUE,
-MenuConfig = TRUE,
-ToolBoxConfig = TRUE,
+AccelConfig = FALSE,
+MenuConfig = FALSE,
+ToolBoxConfig = FALSE,
 GroupId = SfxGroupId::Edit;
 ]
 
@@ -6166,7 +6166,7 @@ SvxSizeItem AttributePageSize SID_ATTR_PAGE_SIZE
 
 AccelConfig = FALSE,
 MenuConfig = FALSE,
-ToolBoxConfig = TRUE,
+ToolBoxConfig = FALSE,
 GroupId = SfxGroupId::Format;
 ]
 
diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index b31c42112be6..099033a1a278 100644
--- a/sw/sdi/_viewsh.sdi
+++ b/sw/sdi/_viewsh.sdi
@@ -430,6 +430,7 @@ interface BaseTextEditView
 [
 ExecMethod = Execute ;
 StateMethod = GetState ;
+ToolBoxConfig;
 ]
 SID_ATTR_PAGE_MAXSIZE // status()
 [
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/filter/html/svxcss1.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0ef0740298b45379bbf8d00d50beffee7a2f812a
Author: Caolán McNamara 
Date:   Sun Jan 7 15:03:04 2018 +

ofz#5015 Integer-overflow

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

diff --git a/sw/source/filter/html/svxcss1.cxx 
b/sw/source/filter/html/svxcss1.cxx
index 392e02addbc0..37c0a88df992 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -2592,11 +2592,11 @@ static void ParseCSS1_border_xxx( const CSS1Expression 
*pExpr,
 bool bHori = nWhichLine == SvxBoxItemLine::TOP ||
  nWhichLine == SvxBoxItemLine::BOTTOM;
 // One Pixel becomes a hairline (is prettier)
-long nWidthL = (long)pExpr->GetNumber();
-if( nWidthL > 1 )
+double fWidth = pExpr->GetNumber();
+if (fWidth > 1.0 && fWidth < SAL_MAX_INT32/2.0)
 {
-long nPWidth = bHori ? 0 : nWidthL;
-long nPHeight = bHori ? nWidthL : 0;
+long nPWidth = bHori ? 0 : fWidth;
+long nPHeight = bHori ? fWidth : 0;
 SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight );
 nWidth = (sal_uInt16)(bHori ? nPHeight : nPWidth);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gulsah Kose]

 sc/inc/globstr.hrc|2 +-
 sc/source/ui/view/cellsh1.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2d771c81d1292ea20f954364a0b8f34875973a17
Author: Gulsah Kose 
Date:   Thu Jan 4 16:30:48 2018 +0300

tdf#61418 Show message on protected sheets for conditional formatting.

.uno:ConditionalFormatDialog, .uno:ColorScaleFormatDialog,
.uno:DataBarFormatDialog, .uno:IconSetFormatDialog and
.uno:CondDateFormatDialog show an error message on protected sheets
for conditional formatting. The patch was sent for the ULAKBIM/Pardus
project.

Change-Id: Id3c1d6f76d1245b0395082b24fa5175c14f5
Signed-off-by: Gulsah Kose 
Reviewed-on: https://gerrit.libreoffice.org/47395
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index ffa5101df16b..3612e159f972 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -465,7 +465,7 @@
 #define STR_COND_LASTYEAR   NC_("STR_COND_LASTYEAR", "last 
year")
 #define STR_COND_NEXTYEAR   NC_("STR_COND_NEXTYEAR", "next 
year")
 #define STR_COND_ANDNC_("STR_COND_AND", "and")
-#define STR_ERR_CONDFORMAT_PROTECTED
NC_("STR_ERR_CONDFORMAT_PROTECTED", "Conditional Formats can not be created, 
deleted or changed in protected sheets!")
+#define STR_ERR_CONDFORMAT_PROTECTED
NC_("STR_ERR_CONDFORMAT_PROTECTED", "Conditional Formats can not be created, 
deleted or changed in protected sheets.")
 #define STR_EDIT_EXISTING_COND_FORMATS  
NC_("STR_EDIT_EXISTING_COND_FORMATS", "The selected cell already contains 
conditional formatting. You can either edit the existing conditional format or 
you define a new overlapping conditional format.\n\n Do you want to edit the 
existing conditional format?")
 #define STR_QUERY_FORMULA_RECALC_ONLOAD_ODS 
NC_("STR_QUERY_FORMULA_RECALC_ONLOAD_ODS", "This document was last saved by an 
application other than %PRODUCTNAME.  Some formula cells may produce different 
results when recalculated.\n\nDo you want to recalculate all formula cells in 
this document now?")
 #define STR_QUERY_FORMULA_RECALC_ONLOAD_XLS 
NC_("STR_QUERY_FORMULA_RECALC_ONLOAD_XLS", "This document was last saved by 
Excel.  Some formula cells may produce different results when 
recalculated.\n\nDo you want to recalculate all formula cells now?")
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 7a7ecf3da833..f4599a40b35f 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1948,7 +1948,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 ScDocument* pDoc = GetViewData()->GetDocument();
 if(pDoc->IsTabProtected(pData->GetTabNo()))
 {
-//ErrorMessage( STR_ERR_CONDFORMAT_PROTECTED );
+pTabViewShell->ErrorMessage( STR_ERR_CONDFORMAT_PROTECTED 
);
 break;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits