date:20170913

[Libreoffice-commits] core.git: solenv/flatpak-manifest.in

2017-09-13 Thread Stephan Bergmann

 solenv/flatpak-manifest.in |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit be78f7b8e202105625ff750853851b93f5a61ddf
Author: Stephan Bergmann 
Date:   Thu Sep 14 08:48:20 2017 +0200

Adapt flatpak-manifest.in to updated poppler and libwpg

...1c983335116a6f09cabf0b3eae7f5195341e "upload poppler 0.59.0" and
1a2b33348e53a4c3262494cfc5bfa7cbd1bb4e36 "upload libwpg 0.3.2"

Change-Id: I8b6d5f6bb96a8bd668abebbdc6087cdb93226db6

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index c1e3960e3f8d..ee7e8f87dc56 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -292,10 +292,10 @@
 "dest-filename": "external/tarballs/libwpd-0.10.1.tar.bz2"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/libwpg-0.3.1.tar.bz2";,
-"sha256": 
"29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59",
+"url": 
"https://dev-www.libreoffice.org/src/libwpg-0.3.2.tar.xz";,
+"sha256": 
"57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33",
 "type": "file",
-"dest-filename": "external/tarballs/libwpg-0.3.1.tar.bz2"
+"dest-filename": "external/tarballs/libwpg-0.3.2.tar.xz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/libwps-0.4.7.tar.xz";,
@@ -346,10 +346,10 @@
 "dest-filename": "external/tarballs/liborcus-0.12.1.tar.gz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/poppler-0.57.0.tar.xz";,
-"sha256": 
"0ea37de71b7db78212ebc79df59f99b66409a29c2eac4d882dae9f2397fe44d8",
+"url": 
"https://dev-www.libreoffice.org/src/poppler-0.59.0.tar.xz";,
+"sha256": 
"a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641",
 "type": "file",
-"dest-filename": "external/tarballs/poppler-0.57.0.tar.xz"
+"dest-filename": "external/tarballs/poppler-0.59.0.tar.xz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2";,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-13 Thread Stephan Bergmann

 vcl/opengl/win/gdiimpl.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 1415b726714b3d4f606020eedf8e875c8325ce72
Author: Stephan Bergmann 
Date:   Thu Sep 14 08:42:02 2017 +0200

loplugin:externvar (clang-cl)

Change-Id: I83245eb7d616d87b74326f49911b1fa5fc58431e

diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index c91577130071..d81c37283983 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -76,10 +76,9 @@ void WinOpenGLContext::resetCurrent()
 g_bAnyCurrent = false;
 }
 
-thread_local bool bEpoxyDispatchMakeCurrentCalled = false;
-
 void ensureDispatchTable()
 {
+thread_local bool bEpoxyDispatchMakeCurrentCalled = false;
 if (!bEpoxyDispatchMakeCurrentCalled)
 {
 epoxy_handle_external_wglMakeCurrent();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-13 Thread Stephan Bergmann

 svl/source/crypto/cryptosign.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c3711e3ea676e0ee0bb1a6bc43a57e735ee586fe
Author: Stephan Bergmann 
Date:   Thu Sep 14 08:39:58 2017 +0200

loplugin:cstylecast (clang-cl)

Change-Id: I1d9b30cc06882b7662ef5d706be52755e02323ed

diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx
index 952cdf5e0b6b..a6758519b7cd 100644
--- a/svl/source/crypto/cryptosign.cxx
+++ b/svl/source/crypto/cryptosign.cxx
@@ -1925,7 +1925,8 @@ OUString GetSubjectName(PCCERT_CONTEXT pCertContext)
 }
 
 // Allocate memory for subject name.
-LPTSTR szName = (LPTSTR)LocalAlloc(LPTR, dwData * sizeof(TCHAR));
+LPTSTR szName = static_cast(
+LocalAlloc(LPTR, dwData * sizeof(TCHAR)));
 if (!szName)
 {
 SAL_WARN("svl.crypto", "ValidateSignature: Unable to allocate memory 
for subject name");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-13 Thread Stephan Bergmann

 sfx2/source/doc/graphhelp.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d8655c09a946e9eac3a8be75a23a1516863d60e7
Author: Stephan Bergmann 
Date:   Thu Sep 14 08:38:43 2017 +0200

loplugin:unnecessaryparen (clang-cl)

Change-Id: Iebcf75f406a2cb9914bf3cbc1019a53c08e9203e

diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx
index a1129c4a3431..eb8ad7ffe736 100644
--- a/sfx2/source/doc/graphhelp.cxx
+++ b/sfx2/source/doc/graphhelp.cxx
@@ -128,7 +128,7 @@ void* GraphicHelper::getWinMetaFileFromGDI_Impl( const 
GDIMetaFile* pGDIMeta, co
 if ( nLength > 22 )
 {
 HMETAFILE hMeta = SetMetaFileBitsEx( nLength - 22,
-( static_cast< const unsigned char*>( 
pStream.GetData() ) ) + 22 );
+static_cast< const unsigned char*>( 
pStream.GetData() ) + 22 );
 
 if ( hMeta )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-13 Thread Stephan Bergmann

 external/nss/clang-cl.patch.0 |   37 +
 1 file changed, 37 insertions(+)

New commits:
commit c2f081d17484d2efbc2b294f89f4cb59b1937a9c
Author: Stephan Bergmann 
Date:   Thu Sep 14 08:38:12 2017 +0200

Silence clang-cl -Wpragma-pack in external/nss

Change-Id: I08672659e7ff1e7ddf3f2185faba5aeab3fd2239

diff --git a/external/nss/clang-cl.patch.0 b/external/nss/clang-cl.patch.0
index 98786d49971c..684cf74d3ca6 100644
--- a/external/nss/clang-cl.patch.0
+++ b/external/nss/clang-cl.patch.0
@@ -72,3 +72,40 @@
  /* This magic gets the windows compiler to give us a deprecation
   * warning */
  #pragma deprecated(CKT_NSS_UNTRUSTED, CKT_NSS_MUST_VERIFY, CKT_NSS_VALID)
+
+# While MSVC uses
+#  #pragma warning(disable : 4103)
+# in the inner pkcs11p.h, clang-cl wants
+#  #pragma clang diagnostic ignored "-Wpragma-pack"
+# in the outer pkcs11t.h:
+--- nss/lib/util/pkcs11t.h
 nss/lib/util/pkcs11t.h
+@@ -72,7 +72,14 @@
+ #define CK_INVALID_HANDLE 0
+ 
+ /* pack */
++#if defined __clang__ && defined _MSC_VER
++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wpragma-pack"
++#endif
+ #include "pkcs11p.h"
++#if defined __clang__ && defined _MSC_VER
++#pragma clang diagnostic pop
++#endif
+ 
+ typedef struct CK_VERSION {
+ CK_BYTE major; /* integer portion of version number */
+@@ -1795,6 +1802,13 @@
+ #include "pkcs11n.h"
+ 
+ /* undo packing */
++#if defined __clang__ && defined _MSC_VER
++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wpragma-pack"
++#endif
+ #include "pkcs11u.h"
++#if defined __clang__ && defined _MSC_VER
++#pragma clang diagnostic pop
++#endif
+ 
+ #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-13 Thread Stephan Bergmann

 embedserv/source/embed/ed_ipersiststr.cxx|2 +-
 embedserv/source/inprocserv/inprocembobj.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d4bd86f52d5a7d8ac0125132451911d9b51a6c58
Author: Stephan Bergmann 
Date:   Thu Sep 14 08:37:19 2017 +0200

loplugin:redundantpointerops (clang-cl)

Change-Id: I5d4a1c3746b0eec02e022e5ffefd1a30a01948cd

diff --git a/embedserv/source/embed/ed_ipersiststr.cxx 
b/embedserv/source/embed/ed_ipersiststr.cxx
index 59099e572225..73263b5e3646 100644
--- a/embedserv/source/embed/ed_ipersiststr.cxx
+++ b/embedserv/source/embed/ed_ipersiststr.cxx
@@ -363,7 +363,7 @@ STDMETHODIMP_(ULONG) EmbedDocument_Impl::Release()
 
 STDMETHODIMP EmbedDocument_Impl::GetClassID( CLSID* pClassId )
 {
-*pClassId = *&m_guid;
+*pClassId = m_guid;
 return S_OK;
 }
 
diff --git a/embedserv/source/inprocserv/inprocembobj.cxx 
b/embedserv/source/inprocserv/inprocembobj.cxx
index d71e9960d4bf..51173c9c9c65 100644
--- a/embedserv/source/inprocserv/inprocembobj.cxx
+++ b/embedserv/source/inprocserv/inprocembobj.cxx
@@ -391,7 +391,7 @@ STDMETHODIMP_(ULONG) InprocEmbedDocument_Impl::Release()
 
 STDMETHODIMP InprocEmbedDocument_Impl::GetClassID( CLSID* pClassId )
 {
-*pClassId = *&m_guid;
+*pClassId = m_guid;
 return S_OK;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-13 Thread Stephan Bergmann

 dtrans/source/win32/dtobj/DOTransferable.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7901d47cbb6feb31b9d8fd8a3c877fe2c97f62a5
Author: Stephan Bergmann 
Date:   Thu Sep 14 08:36:20 2017 +0200

loplugin:unnecessaryparen (clang-cl)

Change-Id: Icd5e625f7c67c45ea3038455514e44c1c9449661

diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx 
b/dtrans/source/win32/dtobj/DOTransferable.cxx
index ceca4996a7db..4303c69b3fb7 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.cxx
@@ -364,7 +364,7 @@ LCID SAL_CALL CDOTransferable::getLocaleFromClipboard( )
 {
 CFormatEtc fetc = CDataFormatTranslator::getFormatEtcForClipformat( 
CF_LOCALE );
 ByteSequence_t aLCIDSeq = getClipboardData( fetc );
-lcid = *(reinterpret_cast( aLCIDSeq.getArray( ) ) );
+lcid = *reinterpret_cast( aLCIDSeq.getArray( ) );
 
 // because of a Win95/98 Bug; there the high word
 // of a locale has the same value as the
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-13 Thread Stephan Bergmann

 avmedia/source/win/player.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 303380beef4ab88433006d4aeeb65ea1ee7f3990
Author: Stephan Bergmann 
Date:   Thu Sep 14 08:35:54 2017 +0200

loplugin:unnecessaryparen (clang-cl)

Change-Id: I5335d639cddb07ad442d1e09f2d2ac694c38ccaf

diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx
index a7c3e6bd766d..c0579c225dde 100644
--- a/avmedia/source/win/player.cxx
+++ b/avmedia/source/win/player.cxx
@@ -403,7 +403,7 @@ sal_Int16 SAL_CALL Player::getVolumeDB(  )
 {
 ::osl::MutexGuard aGuard(m_aMutex);
 
-return( static_cast< sal_Int16 >( mnUnmutedVolume / 100 ) );
+return static_cast< sal_Int16 >( mnUnmutedVolume / 100 );
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/backendtest vcl/headless vcl/source vcl/unx vcl/workben

2017-09-13 Thread Noel Grandin

 vcl/backendtest/VisualBackendTest.cxx  |2 
 vcl/headless/svpinst.cxx   |2 
 vcl/source/app/session.cxx |2 
 vcl/source/app/svapp.cxx   |4 -
 vcl/source/control/button.cxx  |   64 -
 vcl/source/control/tabctrl.cxx |2 
 vcl/source/control/throbber.cxx|2 
 vcl/source/edit/texteng.cxx|6 +-
 vcl/source/filter/graphicfilter.cxx|2 
 vcl/source/fontsubset/sft.cxx  |2 
 vcl/source/gdi/CommonSalLayout.cxx |4 -
 vcl/source/gdi/gdimetafiletools.cxx|4 -
 vcl/source/gdi/oldprintadaptor.cxx |2 
 vcl/source/gdi/pdffontcache.cxx|2 
 vcl/source/gdi/pdfwriter_impl.cxx  |   58 +++---
 vcl/source/gdi/print.cxx   |2 
 vcl/source/gdi/print2.cxx  |   10 +--
 vcl/source/image/ImplImageTree.cxx |8 +--
 vcl/source/outdev/font.cxx |2 
 vcl/source/outdev/text.cxx |2 
 vcl/source/uitest/uiobject.cxx |8 +--
 vcl/source/window/builder.cxx  |   36 +++---
 vcl/source/window/debugevent.cxx   |2 
 vcl/source/window/msgbox.cxx   |8 +--
 vcl/source/window/printdlg.cxx |   12 ++--
 vcl/source/window/scrwnd.cxx   |   12 ++--
 vcl/source/window/stacking.cxx |2 
 vcl/source/window/window.cxx   |4 -
 vcl/source/window/window2.cxx  |2 
 vcl/unx/generic/app/gendisp.cxx|2 
 vcl/unx/generic/app/saldata.cxx|2 
 vcl/unx/generic/app/saldisp.cxx|2 
 vcl/unx/generic/fontmanager/fontconfig.cxx |4 -
 vcl/unx/generic/print/common_gfx.cxx   |   18 +++
 vcl/unx/generic/print/genprnpsp.cxx|2 
 vcl/unx/generic/print/text_gfx.cxx |2 
 vcl/unx/generic/printer/printerinfomanager.cxx |4 -
 vcl/unx/gtk/gtksalframe.cxx|2 
 vcl/unx/gtk/gtksys.cxx |2 
 vcl/unx/gtk/salprn-gtk.cxx |2 
 vcl/unx/gtk3/gtk3gtkframe.cxx  |2 
 vcl/workben/outdevgrind.cxx|2 
 vcl/workben/vcldemo.cxx|6 +-
 43 files changed, 159 insertions(+), 161 deletions(-)

New commits:
commit c856ae17aff5db258eb16713f56fce9f28400d47
Author: Noel Grandin 
Date:   Wed Sep 13 16:44:19 2017 +0200

clang-tidy modernize-use-emplace in vcl

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

diff --git a/vcl/backendtest/VisualBackendTest.cxx 
b/vcl/backendtest/VisualBackendTest.cxx
index a83d9be8417f..0c0584cad792 100644
--- a/vcl/backendtest/VisualBackendTest.cxx
+++ b/vcl/backendtest/VisualBackendTest.cxx
@@ -168,7 +168,7 @@ public:
 long x2 = (x+1) * (nWidth  / nPartitionsX);
 long y2 = (y+1) * (nHeight / nPartitionsY);
 
-aRegions.push_back(tools::Rectangle(x1 + 1, y1 + 1, x2 - 2, y2 
- 2));
+aRegions.emplace_back(x1 + 1, y1 + 1, x2 - 2, y2 - 2);
 }
 }
 return aRegions;
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 4ebeac8f4a3c..20d92e55c82e 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -169,7 +169,7 @@ void SvpSalInstance::PostEvent(const SalFrame* pFrame, 
ImplSVEvent* pData, SalEv
 {
 {
 osl::MutexGuard g(m_aEventGuard);
-m_aUserEvents.push_back( SalUserEvent( pFrame, pData, nEvent ) );
+m_aUserEvents.emplace_back( pFrame, pData, nEvent );
 }
 Wakeup();
 }
diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index d8f20efdfebb..23c60d7f8bb9 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.cxx
@@ -257,7 +257,7 @@ void SAL_CALL VCLSession::addSessionManagerListener( const 
css::uno::ReferencequeryGraphic( 
aMediaProperties.getPropertyValues() ), UNO_QUERY );
-aImages.push_back( Image( xGraphic ) );
+aImages.emplace_back( xGraphic );
 }
 
 return aImages;
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index f1f3a408afc1..cb4fa8798603 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -2096,7 +2096,7 @@ bool TextEngine::CreateLines( sal_uInt32 nPara )
 // initialization
 if ( pTEParaPortion->GetLines().empty() )
 {
-pTEParaPortion->GetLines().push_back( TextLine() );
+pTEParaPortion->GetLines().emplace_back( );
 }
 
 const sal_Int32 nInvalidDiff = pTEParaPortion->GetInvalidDiff();
@@ -2789,7 +2789,7 @@ void Tex

[Libreoffice-commits] core.git: test/source toolkit/source ucbhelper/source ucb/qa ucb/source unotools/source unoxml/source vbahelper/source

2017-09-13 Thread Noel Grandin

 test/source/mtfxmldump.cxx|   64 +-
 toolkit/source/awt/animatedimagespeer.cxx |2 
 toolkit/source/controls/controlmodelcontainerbase.cxx |4 -
 toolkit/source/controls/geometrycontrolmodel.cxx  |2 
 toolkit/source/controls/unocontrol.cxx|5 -
 ucb/qa/cppunit/webdav/webdav_propfindcache.cxx|2 
 ucb/source/ucp/file/filrset.cxx   |9 --
 ucb/source/ucp/gio/gio_content.cxx|2 
 ucb/source/ucp/hierarchy/hierarchycontent.cxx |5 -
 ucb/source/ucp/package/pkgcontent.cxx |5 -
 ucb/source/ucp/tdoc/tdoc_content.cxx  |5 -
 ucb/source/ucp/webdav-neon/ContentProperties.cxx  |9 --
 ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx  |8 --
 ucb/source/ucp/webdav-neon/webdavcontent.cxx  |   20 ++---
 ucbhelper/source/client/proxydecider.cxx  |7 -
 ucbhelper/source/provider/providerhelper.cxx  |5 -
 unotools/source/config/fontcfg.cxx|2 
 unotools/source/misc/eventlisteneradapter.cxx |2 
 unoxml/source/events/eventdispatcher.cxx  |2 
 vbahelper/source/vbahelper/vbaeventshelperbase.cxx|2 
 vbahelper/source/vbahelper/vbashapes.cxx  |2 
 21 files changed, 73 insertions(+), 91 deletions(-)

New commits:
commit 2d2259c848b43f9f04d5bb6073c00b8ae124534a
Author: Noel Grandin 
Date:   Wed Sep 13 16:43:57 2017 +0200

clang-tidy modernize-use-emplace in test..vbahelper

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

diff --git a/test/source/mtfxmldump.cxx b/test/source/mtfxmldump.cxx
index c49340f5c926..5cb4402ee4d8 100644
--- a/test/source/mtfxmldump.cxx
+++ b/test/source/mtfxmldump.cxx
@@ -33,33 +33,33 @@ OUString collectPushFlags(PushFlags nFlags)
 std::vector aStrings;
 
 if (nFlags & PushFlags::LINECOLOR)
-aStrings.push_back("PushLineColor");
+aStrings.emplace_back("PushLineColor");
 if (nFlags & PushFlags::FILLCOLOR)
-aStrings.push_back("PushFillColor");
+aStrings.emplace_back("PushFillColor");
 if (nFlags & PushFlags::FONT)
-aStrings.push_back("PushFont");
+aStrings.emplace_back("PushFont");
 if (nFlags & PushFlags::TEXTCOLOR)
-aStrings.push_back("PushTextColor");
+aStrings.emplace_back("PushTextColor");
 if (nFlags & PushFlags::MAPMODE)
-aStrings.push_back("PushMapMode");
+aStrings.emplace_back("PushMapMode");
 if (nFlags & PushFlags::CLIPREGION)
-aStrings.push_back("PushClipRegion");
+aStrings.emplace_back("PushClipRegion");
 if (nFlags & PushFlags::RASTEROP)
-aStrings.push_back("PushRasterOp");
+aStrings.emplace_back("PushRasterOp");
 if (nFlags & PushFlags::TEXTFILLCOLOR)
-aStrings.push_back("PushTextFillColor");
+aStrings.emplace_back("PushTextFillColor");
 if (nFlags & PushFlags::TEXTALIGN)
-aStrings.push_back("PushTextAlign");
+aStrings.emplace_back("PushTextAlign");
 if (nFlags & PushFlags::REFPOINT)
-aStrings.push_back("PushRefPoint");
+aStrings.emplace_back("PushRefPoint");
 if (nFlags & PushFlags::TEXTLINECOLOR)
-aStrings.push_back("PushTextLineColor");
+aStrings.emplace_back("PushTextLineColor");
 if (nFlags & PushFlags::TEXTLAYOUTMODE)
-aStrings.push_back("PushTextLayoutMode");
+aStrings.emplace_back("PushTextLayoutMode");
 if (nFlags & PushFlags::TEXTLANGUAGE)
-aStrings.push_back("PushTextLanguage");
+aStrings.emplace_back("PushTextLanguage");
 if (nFlags & PushFlags::OVERLINECOLOR)
-aStrings.push_back("PushOverlineColor");
+aStrings.emplace_back("PushOverlineColor");
 
 OUString aString;
 
@@ -78,41 +78,41 @@ OUString convertDrawTextFlagsToString(DrawTextFlags 
eDrawTextFlags)
 {
 std::vector aStrings;
 if (eDrawTextFlags & DrawTextFlags::Disable)
-aStrings.push_back("Disable");
+aStrings.emplace_back("Disable");
 if (eDrawTextFlags & DrawTextFlags::Mnemonic)
-aStrings.push_back("Mnemonic");
+aStrings.emplace_back("Mnemonic");
 if (eDrawTextFlags & DrawTextFlags::Mono)
-aStrings.push_back("Mono");
+aStrings.emplace_back("Mono");
 if (eDrawTextFlags & DrawTextFlags::Clip)
-aStrings.push_back("Clip");
+aStrings.emplace_back("Clip");
 if (eDrawTextFlags & DrawTextFlags::Left)
-aStrings.push_back("Left");
+aStrings.emplace_back("Left");
 if (eDrawTextFlags & DrawTextFlags::Center)
-aStrings.push_back("Center");
+aStrings.emplace_back("Center");
 if (eDrawTextFlags & DrawTextFlags::Right)
-aStrings.push_back("Right");
+aStrings.emplace_back("Right"

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

2017-09-13 Thread Noel Grandin

 sw/qa/extras/mailmerge/mailmerge.cxx|   26 
 sw/qa/extras/tiledrendering/tiledrendering.cxx  |2 -
 sw/qa/extras/uiwriter/uiwriter.cxx  |   10 +++---
 sw/source/core/access/accportions.cxx   |2 -
 sw/source/core/access/acctable.cxx  |4 +-
 sw/source/core/crsr/viscrs.cxx  |8 ++--
 sw/source/core/doc/DocumentContentOperationsManager.cxx |8 ++--
 sw/source/core/doc/SwStyleNameMapper.cxx|   26 
 sw/source/core/doc/acmplwrd.cxx |2 -
 sw/source/core/doc/doc.cxx  |2 -
 sw/source/core/doc/docbm.cxx|2 -
 sw/source/core/doc/doccomp.cxx  |   10 +++---
 sw/source/core/doc/docdraw.cxx  |2 -
 sw/source/core/doc/docfld.cxx   |4 +-
 sw/source/core/doc/tblafmt.cxx  |2 -
 sw/source/core/docnode/ndcopy.cxx   |4 +-
 sw/source/core/edit/edattr.cxx  |6 +--
 sw/source/core/edit/editsh.cxx  |2 -
 sw/source/core/frmedt/tblsel.cxx|5 +--
 sw/source/core/layout/atrfrm.cxx|6 +--
 sw/source/core/layout/laycache.cxx  |8 ++--
 sw/source/core/layout/paintfrm.cxx  |   26 
 sw/source/core/text/noteurl.cxx |2 -
 sw/source/core/text/porlay.cxx  |   14 
 sw/source/core/tox/tox.cxx  |   10 +++---
 sw/source/core/txtnode/modeltoviewhelper.cxx|   12 +++
 sw/source/core/txtnode/txtedt.cxx   |2 -
 sw/source/core/undo/undraw.cxx  |3 -
 sw/source/core/undo/unnum.cxx   |2 -
 sw/source/core/undo/untbl.cxx   |4 +-
 sw/source/core/unocore/unoportenum.cxx  |   10 +++---
 sw/source/core/unocore/unosett.cxx  |4 +-
 sw/source/core/unocore/unotbl.cxx   |4 +-
 sw/source/core/unocore/unotext.cxx  |2 -
 sw/source/filter/ww8/docxattributeoutput.cxx|6 +--
 sw/source/filter/ww8/writerhelper.cxx   |4 +-
 sw/source/filter/ww8/writerwordglue.cxx |   11 +++---
 sw/source/filter/ww8/wrtw8sty.cxx   |   12 +++
 sw/source/filter/ww8/wrtww8gr.cxx   |2 -
 sw/source/filter/ww8/ww8graf.cxx|2 -
 sw/source/filter/ww8/ww8par.cxx |2 -
 sw/source/filter/ww8/ww8par2.cxx|4 +-
 sw/source/filter/ww8/ww8par5.cxx|2 -
 sw/source/filter/ww8/ww8scan.cxx|8 ++--
 sw/source/filter/xml/xmlexp.cxx |2 -
 sw/source/filter/xml/xmltbli.cxx|4 +-
 sw/source/ui/chrdlg/drpcps.cxx  |2 -
 sw/source/ui/index/cnttab.cxx   |4 +-
 sw/source/ui/misc/bookmark.cxx  |2 -
 sw/source/ui/misc/glosbib.cxx   |2 -
 sw/source/ui/vba/vbaeventshelper.cxx|6 +--
 sw/source/uibase/config/StoredChapterNumbering.cxx  |2 -
 sw/source/uibase/dbui/dbmgr.cxx |2 -
 sw/source/uibase/dbui/mmconfigitem.cxx  |2 -
 sw/source/uibase/dochdl/gloshdl.cxx |2 -
 sw/source/uibase/docvw/AnnotationWin2.cxx   |4 +-
 sw/source/uibase/misc/glosdoc.cxx   |6 +--
 sw/source/uibase/shells/txtattr.cxx |2 -
 sw/source/uibase/uiview/uivwimp.cxx |2 -
 59 files changed, 165 insertions(+), 168 deletions(-)

New commits:
commit b0b0aef18fff981fa1f4a1539c150260cc526595
Author: Noel Grandin 
Date:   Wed Sep 13 14:56:28 2017 +0200

clang-tidy modernize-use-emplace in sw

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

diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx 
b/sw/qa/extras/mailmerge/mailmerge.cxx
index 60b5c0bd9011..d7413f33a68a 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -147,36 +147,36 @@ public:
 
 mMMargs.reserve( 15 );
 
-mMMargs.push_back( beans::NamedValue( UNO_NAME_OUTPUT_TYPE, uno::Any( 
file ? text::MailMergeType::FILE : text::MailMergeType::SHELL ) ) );
-mMMargs.push_back( beans::NamedValue( UNO_NAME_DOCUMENT_URL, uno::Any(
- ( OUString( 
m_directories.getURLF

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

2017-09-13 Thread Noel Grandin

 sc/inc/attarray.hxx  |   31 -
 sc/inc/documentimport.hxx|9 
 sc/source/core/data/attarray.cxx |  628 ++-
 sc/source/core/data/dociter.cxx  |   10 
 sc/source/core/data/document.cxx |   14 
 sc/source/core/data/documentimport.cxx   |8 
 sc/source/core/data/fillinfo.cxx |   10 
 sc/source/filter/excel/xistyle.cxx   |   16 
 sc/source/filter/inc/stylesbuffer.hxx|4 
 sc/source/filter/inc/xistyle.hxx |2 
 sc/source/filter/oox/sheetdatabuffer.cxx |8 
 11 files changed, 353 insertions(+), 387 deletions(-)

New commits:
commit a4fb52ac0f48b10b72be330fe49d99a9a2471751
Author: Noel Grandin 
Date:   Wed Sep 13 10:10:01 2017 +0200

convert ScAttrArray to use std::vector

instead of re-implementing it ourselves.

Which lead to some changes in Xf::AttrList since the import process
wants to donate it's array to ScAttrArray.

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

diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index aa5d8ad91e61..726c5a831114 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -89,10 +89,7 @@ private:
 SCTAB   nTab;
 ScDocument* pDocument;
 
-SCSIZE  nCount;
-SCSIZE  nLimit;
-std::unique_ptr
-pData;
+std::vector mvData;
 
 friend class ScDocument;// for FillInfo
 friend class ScDocumentIterator;
@@ -145,7 +142,7 @@ public:
 voidApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet* 
pStyle );
 voidApplyCacheArea( SCROW nStartRow, SCROW nEndRow, SfxItemPoolCache* 
pCache,
 ScEditDataArray* pDataArray = nullptr, bool* const 
pIsChanged = nullptr );
-voidSetAttrEntries(ScAttrEntry* pNewData, SCSIZE nSize);
+voidSetAttrEntries(std::vector && vNewData);
 voidApplyLineStyleArea( SCROW nStartRow, SCROW nEndRow,
 const ::editeng::SvxBorderLine* pLine, bool 
bColorOnly );
 
@@ -210,7 +207,7 @@ public:
 
 /* i123909: Pre-calculate needed memory, and pre-reserve enough memory */
 boolReserve( SCSIZE nReserve );
-SCSIZE  Count() const { return nCount; }
+SCSIZE  Count() const { return mvData.size(); }
 SCSIZE  Count( SCROW nRow1, SCROW nRow2 ) const;
 };
 
@@ -236,7 +233,7 @@ inline ScAttrIterator::ScAttrIterator( const ScAttrArray* 
pNewArray, SCROW nStar
 nRow( nStart ),
 nEndRow( nEnd )
 {
-if ( pArray->nCount )
+if ( pArray->Count() )
 {
 if ( nStart > 0 )
 pArray->Search( nStart, nPos );
@@ -250,7 +247,7 @@ inline ScAttrIterator::ScAttrIterator( const ScAttrArray* 
pNewArray, SCROW nStar
 inline const ScPatternAttr* ScAttrIterator::Next( SCROW& rTop, SCROW& rBottom )
 {
 const ScPatternAttr* pRet;
-if ( !pArray->nCount )
+if ( !pArray->Count() )
 {
 if ( !nPos )
 {
@@ -265,11 +262,11 @@ inline const ScPatternAttr* ScAttrIterator::Next( SCROW& 
rTop, SCROW& rBottom )
 return nullptr;
 }
 
-if ( nPos < pArray->nCount && nRow <= nEndRow )
+if ( nPos < pArray->Count() && nRow <= nEndRow )
 {
 rTop = nRow;
-rBottom = std::min( pArray->pData[nPos].nEndRow, nEndRow );
-pRet = pArray->pData[nPos].pPattern;
+rBottom = std::min( pArray->mvData[nPos].nEndRow, nEndRow );
+pRet = pArray->mvData[nPos].pPattern;
 nRow = rBottom + 1;
 ++nPos;
 }
@@ -281,7 +278,7 @@ inline const ScPatternAttr* ScAttrIterator::Next( SCROW& 
rTop, SCROW& rBottom )
 inline const ScPatternAttr* ScAttrIterator::Resync( SCROW nRowP, SCROW& rTop, 
SCROW& rBottom )
 {
 nRow = nRowP;
-if ( !pArray->nCount )
+if ( !pArray->Count() )
 {
 nPos = 0;
 return Next( rTop, rBottom );
@@ -290,13 +287,13 @@ inline const ScPatternAttr* ScAttrIterator::Resync( SCROW 
nRowP, SCROW& rTop, SC
 // starting right there. Assume that Next() was called so nPos already
 // advanced. Another high chance is that the change extended a previous or
 // next pattern. In all these cases we don't need to search.
-if (3 <= nPos && nPos <= pArray->nCount && pArray->pData[nPos-3].nEndRow < 
nRowP &&
-nRowP <= pArray->pData[nPos-2].nEndRow)
+if (3 <= nPos && nPos <= pArray->Count() && pArray->mvData[nPos-3].nEndRow 
< nRowP &&
+nRowP <= pArray->mvData[nPos-2].nEndRow)
 nPos -= 2;
-else if (2 <= nPos && nPos <= pArray->nCount && 
pArray->pData[nPos-2].nEndRow < nRowP &&
-nRowP <= pArray->pData[nPos-1].nEndRow)
+else if (2 <= nPos && nPos <= pArray->Count() && 
pArray->mvData[nPos-2].nEndRow < nRowP &&
+nRowP <= pArray->mvData[nPos-1].nEndRow)
 --nPos;
-else if (pArray->nCount > 0 && nRowP <= p

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - instsetoo_native/inc_openoffice README

2017-09-13 Thread Matthias Seidel

 README|2 -
 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |   18 
+-
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 00706a1a9b5bfdb6db32086043a74af61ebf824d
Author: Matthias Seidel 
Date:   Tue Sep 12 22:48:56 2017 +

Minor changes to OpenOffice Windows installer 
(AdminNetworkLocation/CustomSetup/FilesInUse)

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index b9f23f0acff9..ae6a69d30354 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -18,15 +18,15 @@ AdminChangeFolder   Up  PushButton  310 64  
19  19  3670019 UpIco   NewFolder   OOO_CONTRO
 AdminNetworkLocation   BackPushButton  164 243 66  17  
3   OOO_CONTROL_14  InstallNow  
 AdminNetworkLocation   Banner  Bitmap  0   0   374 44  1   
BannerBmp   
 AdminNetworkLocation   BannerLine  Line0   44  376 0   
1   
-AdminNetworkLocation   Browse  PushButton  286 124 66  17  
3   OOO_CONTROL_17  Back
+AdminNetworkLocation   Browse  PushButton  301 124 66  17  
3   OOO_CONTROL_17  Back
 AdminNetworkLocation   Cancel  PushButton  301 243 66  17  
3   OOO_CONTROL_18  LBBrowse
 AdminNetworkLocation   DlgDesc Text21  23  249 25  65539   
OOO_CONTROL_19  
 AdminNetworkLocation   DlgLine Line0   234 376 0   1   

-AdminNetworkLocation   DlgText Text21  51  326 40  3   
OOO_CONTROL_20  
+AdminNetworkLocation   DlgText Text21  51  345 40  3   
OOO_CONTROL_20  
 AdminNetworkLocation   DlgTitleText13  6   257 25  
65539   OOO_CONTROL_21  
 AdminNetworkLocation   InstallNow  PushButton  230 243 66  
17  3   OOO_CONTROL_22  Cancel  
 AdminNetworkLocation   LBBrowseText21  90  100 10  
3   OOO_CONTROL_23  SetupPathEdit   
-AdminNetworkLocation   SetupPathEdit   PathEdit21  102 330 
17  3   TARGETDIR   Browse  
+AdminNetworkLocation   SetupPathEdit   PathEdit21  102 345 
17  3   TARGETDIR   Browse  
 AdminWelcome   BackPushButton  164 243 66  17  1   
OOO_CONTROL_24  Next
 AdminWelcome   Cancel  PushButton  301 243 66  17  3   
OOO_CONTROL_25  Back
 AdminWelcome   DlgLine Line0   234 376 0   1   

@@ -67,14 +67,14 @@ CustomSetup DlgDesc Text21  23  249 25  
65539   OOO_CONTROL_52
 CustomSetupDlgLine Line0   234 376 0   1   

 CustomSetupDlgText Text21  51  345 10  3   
OOO_CONTROL_53  
 CustomSetupDlgTitleText13  6   257 25  65539   
OOO_CONTROL_54  
-CustomSetupFeatureGroupGroupBox233 65  134 133 
1   OOO_CONTROL_55  
+CustomSetupFeatureGroupGroupBox233 65  134 132 
1   OOO_CONTROL_55  
 CustomSetupHelpPushButton  21  243 66  17  3   
OOO_CONTROL_56  Details 
 CustomSetupInstallLabelText21  200 278 10  3   
OOO_CONTROL_57  
 CustomSetupItemDescription Text239 78  125 50  3   
OOO_CONTROL_58  
 CustomSetupLocationText21  213 278 20  3   
OOO_CONTROL_59  
 CustomSetupNextPushButton  230 243 66  17  3   
OOO_CONTROL_60  Cancel  
 CustomSetupSizeText239 134 125 60  3   
OOO_CONTROL_61  
-CustomSetupTreeSelectionTree   21  68  205 129 3   
_BrowseProperty ChangeFolder
+CustomSetupTreeSelectionTree   21  68  206 129 3   
_BrowseProperty ChangeFolder
 CustomSetupTipsBanner  Bitmap  0   0   374 44  1   
BannerBmp   
 CustomSetupTipsBannerLine  Line0   44  376 0   
1   
 CustomSetupTipsDlgDesc Text21  23  249 25  65539   
OOO_CONTROL_64

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

2017-09-13 Thread Thorsten Behrens

 include/LibreOfficeKit/LibreOfficeKit.h  |   37 ---
 include/LibreOfficeKit/LibreOfficeKit.hxx|   13 +++--
 include/LibreOfficeKit/LibreOfficeKitTypes.h |5 ++-
 3 files changed, 36 insertions(+), 19 deletions(-)

New commits:
commit f70e0ec6b3c61a7c7caa469949b0ac8016c89854
Author: Thorsten Behrens 
Date:   Wed Sep 13 14:50:47 2017 +0200

lokit: make parts of unstable API public for 6.0

[API CHANGE] publish all of LibreOfficeKitClass, and the
getDocumentType callback for the LibreOfficeKitDocumentClass

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

diff --git a/include/LibreOfficeKit/LibreOfficeKit.h 
b/include/LibreOfficeKit/LibreOfficeKit.h
index a4035c7351f0..34b67ac092b1 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -12,13 +12,11 @@
 
 #include 
 
-#if defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
-# ifndef _WIN32
+#ifndef _WIN32
 // the unstable API needs C99's bool
-#  include 
-# endif
-# include 
+# include 
 #endif
+#include 
 
 #include 
 
@@ -62,28 +60,37 @@ struct _LibreOfficeKitClass
 /// @since LibreOffice 5.2
 void (*freeError) (char* pFree);
 
-#if defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
+/// @since LibreOffice 6.0
 void (*registerCallback) (LibreOfficeKit* pThis,
   LibreOfficeKitCallback pCallback,
   void* pData);
 
-/// @see lok::Office::getFilterTypes().
+/** @see lok::Office::getFilterTypes().
+@since LibreOffice 6.0
+ */
 char* (*getFilterTypes) (LibreOfficeKit* pThis);
 
-/// @see lok::Office::setOptionalFeatures().
+/** @see lok::Office::setOptionalFeatures().
+@since LibreOffice 6.0
+ */
 void (*setOptionalFeatures)(LibreOfficeKit* pThis, uint64_t features);
 
-/// @see lok::Office::setDocumentPassword().
+/** @see lok::Office::setDocumentPassword().
+@since LibreOffice 6.0
+ */
 void (*setDocumentPassword) (LibreOfficeKit* pThis,
 char const* pURL,
 char const* pPassword);
 
-/// @see lok::Office::getVersionInfo().
+/** @see lok::Office::getVersionInfo().
+@since LibreOffice 6.0
+ */
 char* (*getVersionInfo) (LibreOfficeKit* pThis);
 
+/** @see lok::Office::runMacro().
+@since LibreOffice 6.0
+ */
 bool (*runMacro) (LibreOfficeKit *pThis, const char* pURL);
-#endif
-
 };
 
 #define LIBREOFFICEKIT_DOCUMENT_HAS(pDoc,member) 
LIBREOFFICEKIT_HAS_MEMBER(LibreOfficeKitDocumentClass,member,(pDoc)->pClass->nSize)
@@ -104,10 +111,12 @@ struct _LibreOfficeKitDocumentClass
const char* pFormat,
const char* pFilterOptions);
 
-#if defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
-/// @see lok::Document::getDocumentType().
+/** @see lok::Document::getDocumentType().
+@since LibreOffice 6.0
+ */
 int (*getDocumentType) (LibreOfficeKitDocument* pThis);
 
+#if defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
 /// @see lok::Document::getParts().
 int (*getParts) (LibreOfficeKitDocument* pThis);
 
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx 
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index 46a32a406934..18122a7e3b05 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -62,10 +62,10 @@ public:
 /// Gives access to the underlying C pointer.
 LibreOfficeKitDocument *get() { return mpDoc; }
 
-#if defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
 /**
  * Get document type.
  *
+ * @since LibreOffice 6.0
  * @return an element of the LibreOfficeKitDocumentType enum.
  */
 int getDocumentType()
@@ -73,6 +73,7 @@ public:
 return mpDoc->pClass->getDocumentType(mpDoc);
 }
 
+#if defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
 /**
  * Get number of part that the document contains.
  *
@@ -513,11 +514,11 @@ public:
 mpThis->pClass->freeError(pFree);
 }
 
-#if defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
 /**
  * Registers a callback. LOK will invoke this function when it wants to
  * inform the client about events.
  *
+ * @since LibreOffice 6.0
  * @param pCallback the callback to invoke
  * @param pData the user data, will be passed to the callback on invocation
  */
@@ -539,6 +540,8 @@ public:
  * "MediaType": "application/vnd.oasis.opendocument.spreadsheet"
  * }
  * }
+ *
+ * @since LibreOffice 6.0
  */
 char* getFilterTypes()
 {
@@ -548,6 +551,7 @@ public:
 /**
  * Set bitmask of optional features supported by the client.
  *
+ * @since LibreOffice 6.0
  * @see LibreOffice

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

2017-09-13 Thread Andrea Gelmini

 sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 41b7713334351d7cc455eef5241bd3988b9d1e94
Author: Andrea Gelmini 
Date:   Wed Sep 13 20:49:16 2017 +0200

Fix typo

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

diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui 
b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
index 7656f678fdad..7bf05857ee3e 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
@@ -3264,7 +3264,7 @@
 True
 False
 .uno:StyleApply?Style:string=Quotation&FamilyName:string=CharacterStyles
-Quotation
+Quotation
   
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-13 Thread Henry Castro

 wsd/LOOLWSD.cpp |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 2556c2b4418de502a69fac4a2b3267eae91a4c41
Author: Henry Castro 
Date:   Wed Sep 13 17:02:26 2017 -0400

wsd: debug: log when the wsd is ready to accept connections

Change-Id: I56ea17af47bc85f30e74f5e93b94e0f3f3d95be4

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index c2a452c7..5bcb1613 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2616,6 +2616,9 @@ int LOOLWSD::innerMain()
 
 /// The main-poll does next to nothing:
 SocketPoll mainWait("main");
+#if ENABLE_DEBUG
+std::cerr << "Ready to accept connections.\n" << std::endl;
+#endif
 
 const auto startStamp = std::chrono::steady_clock::now();
 
___
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' - onlineupdate/source

2017-09-13 Thread Michael Stahl

 onlineupdate/source/libmar/tool/mar.c  |1 +
 onlineupdate/source/update/updater/updater.cxx |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 01b91fdd843e1689a69544bdf8a816239f9d848e
Author: Michael Stahl 
Date:   Wed Sep 13 20:59:21 2017 +0200

onlineupdate: work around GCC7 -Werror=implicit-fallthrough

This is pretty stupid, but oh well...

Change-Id: I56a8e921d9df0276d0f607f0f59cd68d51604bc4
Reviewed-on: https://gerrit.libreoffice.org/42256
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/onlineupdate/source/libmar/tool/mar.c 
b/onlineupdate/source/libmar/tool/mar.c
index dba07ac10467..bef280d325b7 100644
--- a/onlineupdate/source/libmar/tool/mar.c
+++ b/onlineupdate/source/libmar/tool/mar.c
@@ -289,6 +289,7 @@ int main(int argc, char **argv) {
 printf("\n");
 /* The fall through from 'T' to 't' is intentional */
   }
+  /* Fall through */
   case 't':
 return mar_test(argv[2]);
 
diff --git a/onlineupdate/source/update/updater/updater.cxx 
b/onlineupdate/source/update/updater/updater.cxx
index c8d3bb9bafa0..9b57850ec4ec 100644
--- a/onlineupdate/source/update/updater/updater.cxx
+++ b/onlineupdate/source/update/updater/updater.cxx
@@ -3530,7 +3530,7 @@ int add_dir_entries(const NS_tchar *dirpath, ActionList 
*list)
   case FTS_DEFAULT:
 LOG(("add_dir_entries: found a non-standard file: " LOG_S,
  ftsdirEntry->fts_path));
-// Fall through and try to remove as a file
+/* Fall through */ // and try to remove as a file
 
   // Files
   case FTS_F:
___
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' - vcl/source

2017-09-13 Thread Miklos Vajna

 vcl/source/gdi/pdfwriter_impl.cxx |   12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit da421e63733bffd064eeabb4a2106adae2fdca03
Author: Miklos Vajna 
Date:   Mon Sep 11 22:38:49 2017 +0200

tdf#108963 PDF export of editeng text highlight: handle rotated text

The highlight rectangle was not rotated, handle it similar to
PDFWriterImpl::drawStrikeoutChar().

(cherry picked from commit da705eff910f512623a689aaf28604270fb8f1c4, but
testcase is left out as pdfium in libreoffice-5-4 does not provide the
FPDFPageObj_GetBounds() API)

Change-Id: I97a5b1fc05706729c58c92b90d6808629af8ca4c
Reviewed-on: https://gerrit.libreoffice.org/42185
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 17ed3e07ff3a..c0ebe40f2c88 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -8736,7 +8736,17 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, 
const OUString& rText, bool
 
aRectangle.SetSize(m_pReferenceDevice->PixelToLogic(Size(rLayout.GetTextWidth(),
 0)));
 // This includes ascent / descent.
 aRectangle.setHeight(aRefDevFontMetric.GetLineHeight());
-drawRectangle(aRectangle);
+
+LogicalFontInstance* pFontInstance = 
m_pReferenceDevice->mpFontInstance;
+if (pFontInstance->mnOrientation)
+{
+// Adapt rectangle for rotated text.
+tools::Polygon aPolygon(aRectangle);
+
aPolygon.Rotate(m_pReferenceDevice->PixelToLogic(rLayout.GetDrawPosition()), 
pFontInstance->mnOrientation);
+drawPolygon(aPolygon);
+}
+else
+drawRectangle(aRectangle);
 
 pop();
 }
___
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' - sw/qa writerfilter/source

2017-09-13 Thread Szymon Kłos

 sw/qa/extras/ooxmlexport/data/tdf109184.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx|   19 +++
 writerfilter/source/dmapper/CellColorHandler.cxx |2 +-
 3 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 75c9f9768c8511ae6bab7677192511c6d1f2f7cb
Author: Szymon KÅos 
Date:   Thu Aug 17 12:18:23 2017 +0200

tdf#109184 auto cell color should be transparent

Don't add color to the property map if is set to auto.
In this case white color was assumed and tables were
white instead of transparent.

Change-Id: I7f203b8f3831b86ba8de33dc57de227b3029c6d9
Reviewed-on: https://gerrit.libreoffice.org/41255
Reviewed-by: Szymon KÅos 
Tested-by: Szymon KÅos 
Reviewed-on: https://gerrit.libreoffice.org/41520
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf109184.docx 
b/sw/qa/extras/ooxmlexport/data/tdf109184.docx
new file mode 100755
index ..36e5232ae671
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf109184.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index f281144d70e2..a22ab5d7e13f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -636,6 +636,25 @@ DECLARE_OOXMLEXPORT_TEST(tdf112169, "tdf112169.odt")
 // LO crashed while export because of chararacter background color handling
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf109184, "tdf109184.docx")
+{
+uno::Reference xTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
+uno::Reference xTable(xTables->getByIndex(0), 
uno::UNO_QUERY);
+
+// Before table background color was white, should be transparent (auto).
+uno::Reference xCell1(xTable->getCellByName("A1"), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(static_cast(-1), 
getProperty(xCell1, "BackColor"));
+
+// Cell with auto color but with 15% fill, shouldn't be transparent.
+uno::Reference xCell2(xTable->getCellByName("B1"), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(static_cast(0xd8d8d8), 
getProperty(xCell2, "BackColor"));
+
+// Cell with color defined (red).
+uno::Reference xCell3(xTable->getCellByName("A2"), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(static_cast(0xff), 
getProperty(xCell3, "BackColor"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx 
b/writerfilter/source/dmapper/CellColorHandler.cxx
index 58c2a35457cc..a1cfa2f3cbd1 100644
--- a/writerfilter/source/dmapper/CellColorHandler.cxx
+++ b/writerfilter/source/dmapper/CellColorHandler.cxx
@@ -281,7 +281,7 @@ TablePropertyMapPtr  CellColorHandler::getProperties()
 
 pPropertyMap->Insert(PROP_FILL_COLOR, uno::makeAny(nApplyColor));
 }
-else
+else if (nWW8BrushStyle || !m_bAutoFillColor)
 pPropertyMap->Insert( m_OutputFormat == Form ? PROP_BACK_COLOR
 : PROP_CHAR_BACK_COLOR, uno::makeAny( nApplyColor 
));
 
___
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' - svtools/source

2017-09-13 Thread Michael Stahl

 svtools/source/svrtf/svparser.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d34e0fdf23f88bb8f8b5db5e4318b3a706bd14fb
Author: Michael Stahl 
Date:   Thu Sep 7 23:01:26 2017 +0200

svtools: HTML import: don't put lone surrogates in OUString

The bytes "ed b3 b5" in fdo67610-1.doc (which, as the name indicates,
is an HTML file) are converted to the lone UTF-16 surrogate "dcf5",
which is inserted into SwTextNode and causes asserts later on.

The actual encoding of the HTML document is probably GBK (at least
VIM doesn't display any missing characters with that), but
because it doesn't contain any indication of its encoding
it's apparently imported as UTF-8; the ImplConvertUtf8ToUnicode()
thinking a surrogate code point is valid even if the Java-compatible
mode RTL_TEXTENCODING_JAVA_UTF8 is not specified is a bit of a
surprise.

[note: the master commit says "JSON-compatible mode" but i was
 confusing different text encoding perversions there]

Change-Id: Idd788d9d461fed150171dd907439166f3075a834
(cherry picked from commit fc670f637d4271246691904fd649358ce2e7be59)
Reviewed-on: https://gerrit.libreoffice.org/42100
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/svtools/source/svrtf/svparser.cxx 
b/svtools/source/svrtf/svparser.cxx
index 947ef75a98f3..cb7174f519d2 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -423,7 +423,8 @@ sal_uInt32 SvParser::GetNextChar()
 while( 0 == nChars  && !bErr );
 }
 
-if ( ! rtl::isUnicodeCodePoint( c ) )
+// Note: ImplConvertUtf8ToUnicode() may produce a surrogate!
+if (!rtl::isUnicodeCodePoint(c) || rtl::isHighSurrogate(c) || 
rtl::isLowSurrogate(c))
 c = '?' ;
 
 if( bErr )
___
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' - sw/qa sw/source

2017-09-13 Thread Luke Deller

 sw/qa/extras/odfimport/data/tdf94882.odt |binary
 sw/qa/extras/odfimport/odfimport.cxx |   13 +
 sw/source/core/layout/newfrm.cxx |2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 342a65bdb3ca3db19eb6b1244b6f866a0e526a86
Author: Luke Deller 
Date:   Mon Sep 4 22:40:34 2017 +1000

tdf#94882 use first page header on first page

The very first page of the document should always be formatted using
the "first page" settings in the page style, regardless of the page
number set for that page.

(cherry picked from commit 232885c66422ab8f05d86cfeac9b377a97462ae4)

Change-Id: I49cb00cef8b1d10120349073dee1511657dc84d1
Reviewed-on: https://gerrit.libreoffice.org/41892
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/sw/qa/extras/odfimport/data/tdf94882.odt 
b/sw/qa/extras/odfimport/data/tdf94882.odt
new file mode 100644
index ..2aacb9836da2
Binary files /dev/null and b/sw/qa/extras/odfimport/data/tdf94882.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index 2439334ea512..9f871c08ea4e 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -837,5 +837,18 @@ DECLARE_ODFIMPORT_TEST(testTdf109228, "tdf109228.odt")
 CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AS_CHARACTER, 
getProperty(getShape(1), "AnchorType"));
 }
 
+DECLARE_ODFIMPORT_TEST(testTdf94882, "tdf94882.odt")
+{
+// Get the header of the page containing our content
+// (done this way to skip past any blank page inserted before it
+//  due to the page number being even)
+OUString headertext = parseDump(
+"/root/page[starts-with(body/txt/text(),'The paragraph style on 
this')]"
+"/header/txt/text()"
+);
+// This header should be the first page header
+CPPUNIT_ASSERT_EQUAL(OUString("This is the first page header"), 
headertext);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index dae63d1f8aa6..ee4674b54c40 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -538,7 +538,7 @@ void SwRootFrame::Init( SwFrameFormat* pFormat )
 if ( !pDesc )
 pDesc = &pDoc->GetPageDesc( 0 );
 const bool bOdd = !oPgNum || 0 != ( oPgNum.get() % 2 );
-bool bFirst = !oPgNum || 1 == oPgNum.get();
+const bool bFirst = true;
 
 // Create a page and put it in the layout
 SwPageFrame *pPage = ::InsertNewPage( *pDesc, this, bOdd, bFirst, false, 
false, nullptr );
___
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' - filter/source

2017-09-13 Thread Samuel Mehrbrodt

 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6b9470405f63e169ce9098797213c4520f053811
Author: Samuel Mehrbrodt 
Date:   Wed Sep 6 16:07:10 2017 +0200

tdf#111492 Numbering: entry B.1 is exported as 2.1

Look for the current number format, not always for the first one

Change-Id: Ic11bcb420873bc0a5a644a05623bb801a1579dd7
Reviewed-on: https://gerrit.libreoffice.org/42000
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 
Reviewed-on: https://gerrit.libreoffice.org/42009
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 98358fd48627..3043c1f1d312 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -1337,7 +1337,7 @@



-   
+   



@@ -1367,7 +1367,7 @@



-   
+   



___
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' - filter/source

2017-09-13 Thread Samuel Mehrbrodt

 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3de0b7ecaac7b00d82a7ce74212d98ce44c30818
Author: Samuel Mehrbrodt 
Date:   Wed Sep 6 14:51:09 2017 +0200

xhtml export: Rather use rem than cm for margin

follow-up for 46b4eb8b0e9325f8c29cd391baf9504bccee1837

Change-Id: I70986537b842b7fd26de9c2efd1fbdad7b5271a1
Reviewed-on: https://gerrit.libreoffice.org/41990
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 3811da1b854896fa96f65a87efb1876523353618)
Reviewed-on: https://gerrit.libreoffice.org/42003
Reviewed-by: Christian Lohmaier 

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index c0ba08f5e8a7..98358fd48627 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -1282,7 +1282,7 @@



-   
margin-right:0.64cm;
+   
margin-right:0.8rem;



___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-13 Thread Christian Lohmaier

 config_host.mk.in |3 
 configure.ac  |  201 +-
 2 files changed, 50 insertions(+), 154 deletions(-)

New commits:
commit 1a7b5c921dbedd515f332f7a6bd39b6bbd08028a
Author: Christian Lohmaier 
Date:   Wed Sep 13 17:07:43 2017 +0200

simplify configure for android that started to bitrot a little

aarch64 (and mips) for that matter were not updated to adjust for clang
As clang now is default and only toolchain, also got rid of some now
unnecessary conditionals/variables.
additionally group the target-dependent vars in one block instead of
spreading them around in the file

Change-Id: Ie7fa19d14bf9fc7c05a9bea5345309f42f414db7
Reviewed-on: https://gerrit.libreoffice.org/42252
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/config_host.mk.in b/config_host.mk.in
index e125bd90641f..08385695f0f9 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -18,12 +18,9 @@ export ABW_LIBS=$(gb_SPACE)@ABW_LIBS@
 export ALLOC=@ALLOC@
 export ANDROID_NDK_HOME=@ANDROID_NDK_HOME@
 export ANDROID_APP_ABI=@ANDROID_APP_ABI@
-export ANDROID_NDK_GDBSERVER=@ANDROID_NDK_GDBSERVER@
 export ANDROID_SDK_HOME=@ANDROID_SDK_HOME@
 export ANDROID_PACKAGE_NAME=@ANDROID_PACKAGE_NAME@
-export ANDROID_CLANG_TOOLCHAIN=@ANDROID_CLANG_TOOLCHAIN@
 export ANDROID_GCC_TOOLCHAIN_VERSION=@ANDROID_GCC_TOOLCHAIN_VERSION@
-export ANDROID_PLATFORM_DIRECTORY=@ANDROID_PLATFORM_DIRECTORY@
 export ANT=@ANT@
 export ANT_HOME=@ANT_HOME@
 export ANT_LIB=@ANT_LIB@
diff --git a/configure.ac b/configure.ac
index 5f7f7c918fc1..d49c20a09dac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -351,12 +351,12 @@ AC_ARG_WITH(android-ndk,
 AC_ARG_WITH(android-ndk-toolchain-version,
 AS_HELP_STRING([--with-android-ndk-toolchain-version],
 [Specify which toolchain version to use, of those present in the
-Android NDK you are using. The default is clang 5.0 currently.]), ,)
+Android NDK you are using. The default (and only supported version 
currently) is "clang5.0"]),,
+with_android_ndk_toolchain_version=clang5.0)
 
 AC_ARG_WITH(android-sdk,
 AS_HELP_STRING([--with-android-sdk],
-[Specify location of the Android SDK. Mandatory when building for 
Android,
-or when building the Impress Remote Android app.]),
+[Specify location of the Android SDK. Mandatory when building for 
Android.]),
 ,)
 
 ANDROID_NDK_HOME=
@@ -394,32 +394,44 @@ if test -n "$with_android_ndk"; then
 ;;
 esac
 
+ANDROID_API_LEVEL=14
+android_cpu=$host_cpu
+ANDROID_ARCH=$android_cpu
 if test $host_cpu = arm; then
-android_cpu=arm
 android_platform_prefix=$android_cpu-linux-androideabi
+android_gnu_prefix=$android_platform_prefix
+LLVM_TRIPLE=armv7-none-linux-androideabi
+ANDROID_APP_ABI=armeabi-v7a
+ANDROIDCFLAGS="-mthumb -march=armv7-a -mfloat-abi=softfp -mfpu=neon 
-Wl,--fix-cortex-a8"
 elif test $host_cpu = aarch64; then
-android_cpu=aarch64
 android_platform_prefix=$android_cpu-linux-android
+android_gnu_prefix=$android_platform_prefix
+LLVM_TRIPLE=aarch64-none-linux-android
+# minimum android version that supports aarch64
+ANDROID_API_LEVEL=21
+ANDROID_APP_ABI=arm64-v8a
+ANDROID_ARCH=arm64
 elif test $host_cpu = mips; then
-android_cpu=mips
-android_platform_prefix=$android_cpu-linux-androideabi
+android_platform_prefix=mipsel-linux-android
+android_gnu_prefix=$android_platform_prefix
+LLVM_TRIPLE=mipsel-none-linux-android
+ANDROID_APP_ABI=mips
 else
 # host_cpu is something like "i386" or "i686" I guess, NDK uses
 # "x86" in some contexts
 android_cpu=x86
 android_platform_prefix=$android_cpu
+android_gnu_prefix=i686-linux-android
+LLVM_TRIPLE=i686-none-linux-android
+ANDROID_APP_ABI=x86
+ANDROIDCFLAGS="-march=atom"
 fi
 
-if test -z "$with_android_ndk_toolchain_version"; then
-# Default to Clang 5.0
-with_android_ndk_toolchain_version=clang5.0
-fi
 case "$with_android_ndk_toolchain_version" in
 clang5.0)
 ANDROID_GCC_TOOLCHAIN_VERSION=4.9
 
ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_platform_prefix-$ANDROID_GCC_TOOLCHAIN_VERSION
 ANDROID_COMPILER_DIR=$ANDROID_NDK_HOME/toolchains/llvm
-ANDROID_USING_CLANG=true
 ;;
 *)
 AC_MSG_ERROR([Unrecognized value for the 
--with-android-ndk-toolchain-version option. Building for Android is only 
supported with Clang 5.*])
@@ -427,18 +439,16 @@ if test -n "$with_android_ndk"; then
 
 if test ! -d $ANDROID_BINUTILS_DIR; then
 AC_MSG_ERROR([No directory $ANDROID_BINUTILS_DIR])
-elif test $ANDROID_COMPILER_DIR != $ANDROID_BINUTILS_DIR -a ! -d 
$ANDROID_COMPILER_DIR; then
+elif test ! -d $ANDROID_COMPIL

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

2017-09-13 Thread Michael Stahl

 onlineupdate/source/libmar/tool/mar.c  |1 +
 onlineupdate/source/update/updater/updater.cxx |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 7af14994b58e8d81cb6bdfc5ffd444f564d4355b
Author: Michael Stahl 
Date:   Wed Sep 13 20:44:42 2017 +0200

onlineupdate: work around GCC7 -Werror=implicit-fallthrough

This is pretty stupid, but oh well...

Change-Id: I1e605b2858a917f61922df757809a2aceb14a914

diff --git a/onlineupdate/source/libmar/tool/mar.c 
b/onlineupdate/source/libmar/tool/mar.c
index d67935bd559d..3db3bb86e431 100644
--- a/onlineupdate/source/libmar/tool/mar.c
+++ b/onlineupdate/source/libmar/tool/mar.c
@@ -327,6 +327,7 @@ int main(int argc, char **argv) {
 printf("\n");
 /* The fall through from 'T' to 't' is intentional */
   }
+  /* Fall through */
   case 't':
 return mar_test(argv[2]);
 
diff --git a/onlineupdate/source/update/updater/updater.cxx 
b/onlineupdate/source/update/updater/updater.cxx
index 1509d570ba23..53bdc71fbd22 100644
--- a/onlineupdate/source/update/updater/updater.cxx
+++ b/onlineupdate/source/update/updater/updater.cxx
@@ -4234,7 +4234,7 @@ int add_dir_entries(const NS_tchar *dirpath, ActionList 
*list)
 case FTS_DEFAULT:
 LOG(("add_dir_entries: found a non-standard file: " LOG_S,
  ftsdirEntry->fts_path));
-// Fall through and try to remove as a file
+/* Fall through */ // and try to remove as a file
 
 // Files
 case FTS_F:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst

2017-09-13 Thread David Tardon

 download.lst |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1a2b33348e53a4c3262494cfc5bfa7cbd1bb4e36
Author: David Tardon 
Date:   Wed Sep 13 12:44:18 2017 +0200

upload libwpg 0.3.2

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

diff --git a/download.lst b/download.lst
index 3a07c6d75ff6..37e1ab01e160 100644
--- a/download.lst
+++ b/download.lst
@@ -226,9 +226,9 @@ export VISIO_TARBALL := libvisio-0.1.5.tar.bz2
 export WPD_SHA256SUM := 
efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d
 export WPD_VERSION_MICRO := 1
 export WPD_TARBALL := libwpd-0.10.$(WPD_VERSION_MICRO).tar.bz2
-export WPG_SHA256SUM := 
29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59
-export WPG_VERSION_MICRO := 1
-export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.bz2
+export WPG_SHA256SUM := 
57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33
+export WPG_VERSION_MICRO := 2
+export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.xz
 export WPS_SHA256SUM := 
2f2cab630bceace24f9dbb7d187cd6cd1f4c9f8a7b682c5f7e49c1e2cb58b217
 export WPS_VERSION_MICRO := 7
 export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Temporary files written to predetermined location during build

2017-09-13 Thread Anthony Youngman


On 11/09/17 10:07, Rene Engelhard wrote:

that definitely looks like a bug, it should create that inside some
random subdirectory..



Yes, especially as/tmp/ is (also) a security-related bug
(possible symlink attack)..

See alsohttp://bugs.debian.org/875415  which I just received...


My experience of /tmp is that most things seem to create and write to 
/tmp/username or similar - it's odd to write straight into /tmp.


And that I guess is what's behind the original bug reported - the first 
user obviously created a directory with permissions set for him, then 
the second user came along, tried to use the same directory, and without 
write permission the second build fell over. (Obviously, whether that 
happens depends on how fast the reaper reaps the contents of /tmp.)


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

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

2017-09-13 Thread Michael Stahl

 download.lst  |4 -
 external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk |2 
 external/jpeg-turbo/jpeg-turbo.arm_build.patch.1  |   11 --
 external/jpeg-turbo/jpeg-turbo.limits.patch.1 |   83 --
 4 files changed, 2 insertions(+), 98 deletions(-)

New commits:
commit 108bd86137f8967681d2cd4742d1d46f22990c51
Author: Michael Stahl 
Date:   Wed Sep 13 15:40:44 2017 +0200

jpeg-turbo: upgrade to release 1.5.2

* jpeg-turbo.limits.patch.1, jpeg-turbo.arm_build.patch.1:
drop these, merged upstream

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

diff --git a/download.lst b/download.lst
index e3bb5d884e4b..3a07c6d75ff6 100644
--- a/download.lst
+++ b/download.lst
@@ -117,8 +117,8 @@ export JFREEREPORT_LIBXML_SHA256SUM := 
7d2797fe9f79a77009721e3f14fa4a1dec17a6d70
 export JFREEREPORT_LIBXML_TARBALL := 
ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
 export JFREEREPORT_SAC_SHA256SUM := 
085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045
 export JFREEREPORT_SAC_TARBALL := 
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-export JPEG_TURBO_SHA256SUM := 
41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c
-export JPEG_TURBO_TARBALL := libjpeg-turbo-1.5.1.tar.gz
+export JPEG_TURBO_SHA256SUM := 
9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528
+export JPEG_TURBO_TARBALL := libjpeg-turbo-1.5.2.tar.gz
 export LANGTAGREG_SHA256SUM := 
d6a97fc8da5ae54d867e7f1b65ffb51e816cadd11714e45fc23ee0abf81a51ab
 export LANGTAGREG_TARBALL := language-subtag-registry-2017-08-15.tar.bz2
 export LANGUAGETOOL_SHA256SUM := 
48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d
diff --git a/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk 
b/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk
index 3a87a578e916..f149e037ea69 100644
--- a/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk
+++ b/external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk
@@ -16,9 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,jpeg-turbo,0))
 $(eval $(call gb_UnpackedTarball_add_patches,jpeg-turbo,\
external/jpeg-turbo/jpeg-turbo.build.patch.1 \
$(if $(filter 
WNT,$(OS)),external/jpeg-turbo/jpeg-turbo.win_build.patch.1) \
-   external/jpeg-turbo/jpeg-turbo.arm_build.patch.1 \
external/jpeg-turbo/ubsan.patch \
-   external/jpeg-turbo/jpeg-turbo.limits.patch.1 \
external/jpeg-turbo/jpeg-turbo.iOS.patch.1 \
 ))
 
diff --git a/external/jpeg-turbo/jpeg-turbo.arm_build.patch.1 
b/external/jpeg-turbo/jpeg-turbo.arm_build.patch.1
deleted file mode 100644
index dbd449ef4b33..
--- a/external/jpeg-turbo/jpeg-turbo.arm_build.patch.1
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur jpeg.org/Makefile.am jpeg/Makefile.am
 jpeg.org/jmemmgr.c  2017-03-15 14:29:29.286587049 +
-+++ jpeg/jmemmgr.c 2017-03-15 14:31:21.096378506 +
-@@ -33,6 +33,7 @@
- #include "jpeglib.h"
- #include "jmemsys.h"/* import the system-dependent declarations */
- #include 
-+#include 
- 
- #ifndef NO_GETENV
- #ifndef HAVE_STDLIB_H   /*  should declare getenv() */
diff --git a/external/jpeg-turbo/jpeg-turbo.limits.patch.1 
b/external/jpeg-turbo/jpeg-turbo.limits.patch.1
deleted file mode 100644
index 77979956309b..
--- a/external/jpeg-turbo/jpeg-turbo.limits.patch.1
+++ /dev/null
@@ -1,83 +0,0 @@
-From da2a27ef056a0179cbd80f9146e58b89403d9933 Mon Sep 17 00:00:00 2001
-From: DRC 
-Date: Sat, 18 Mar 2017 16:15:14 -0500
-Subject: [PATCH] Honor max_memory_to_use/JPEGMEM/-maxmemory
-
-This re-introduces a feature of the obsolete system-specific libjpeg
-memory managers-- namely the ability to limit the amount of main memory
-used by the library during decompression or multi-pass compression.
-This is mainly beneficial for two reasons:
-
-- Works around a 2 GB limit in libFuzzer
-- Allows security-sensitive applications to set a memory limit for the
-  JPEG decoder so as to work around the progressive JPEG exploit
-  (LJT-01-004) described here:
-  
http://www.libjpeg-turbo.org/pmwiki/uploads/About/TwoIssueswiththeJPEGStandard.pdf
-
-This commit also removes obsolete documentation regarding the MS-DOS
-memory manager (which itself was removed long ago) and changes the
-documentation of the -maxmemory switch and JPEGMEM environment variable
-to reflect the fact that backing stores are never used in libjpeg-turbo.
-
-Inspired by:
-https://github.com/caolanm/libjpeg-turbo/commit/066fee2e7d6834f24838bc1896aa38ca77209e3c
-
-Closes #143

- ChangeLog.md  | 15 +++
- cjpeg.1   |  4 ++--
- djpeg.1   |  4 ++--
- jmemnobs.c| 16 +++-
- jpegtran.1|  4 ++--
- libjpeg.txt   | 14 ++
- structure.txt | 24 +++-
- usage.txt | 35 +--
- 8 files changed, 54 insertions(+),

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - 2 commits - desktop/unx solenv/gbuild

2017-09-13 Thread Michael Stahl

 desktop/unx/source/pagein.c|1 +
 solenv/gbuild/platform/com_GCC_defs.mk |   14 ++
 2 files changed, 15 insertions(+)

New commits:
commit 387974a78a68d54db38e3b74a1ac687928cd04a4
Author: Michael Stahl 
Date:   Wed Sep 13 15:01:09 2017 +0200

gbuild: suppress -Werror on new GCC 7 warnings for release branch

These are endemic and fixes too many to backport.

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

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 6b697fc9461c..0b8911436347 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -96,6 +96,20 @@ gb_CXXFLAGS_COMMON += \
 -Wunused-const-variable=1
 endif
 
+# for release branch, exclude all new GCC7 warnings from Werror
+ifeq ($(shell expr '$(GCC_VERSION)' '>=' 700),1)
+gb_CFLAGS_COMMON += \
+   -Wno-deprecated \
+   -Wno-error=implicit-fallthrough \
+
+gb_CXXFLAGS_COMMON += \
+   -Wno-deprecated \
+   -Wno-error=implicit-fallthrough \
+   -Wno-error=format-truncation \
+   -Wno-error=int-in-bool-context \
+
+endif
+
 ifeq ($(COM_IS_CLANG),TRUE)
 gb_CXXFLAGS_COMMON += -Wimplicit-fallthrough
 endif
commit 831c187d831972ed96ac4d535ef5773503c3db00
Author: David Tardon 
Date:   Wed Mar 8 10:37:38 2017 +0100

WaE: include needed header

"error: In the GNU C Library, "major" is defined
by . For historical compatibility, it is
currently defined by  as well, but we plan to
remove this soon. To use "major", include 
directly. If you did not intend to use a system-defined macro
"major", you should undefine it after including ."

Change-Id: I7f5741d4c2eae277e316c5fc97aa73b9430fbdc1
(cherry picked from commit 01bf741a79241829b0d5c048e8f45e3cf6914d3e)
Reviewed-on: https://gerrit.libreoffice.org/42246
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 

diff --git a/desktop/unx/source/pagein.c b/desktop/unx/source/pagein.c
index 56baffa79ca3..a401419fc162 100644
--- a/desktop/unx/source/pagein.c
+++ b/desktop/unx/source/pagein.c
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 /* do_pagein */
___
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

2017-09-13 Thread Jean-Sebastien Bevilacqua

 sc/inc/globstr.hrc |2 
 sc/source/core/data/table3.cxx |  153 ++---
 2 files changed, 99 insertions(+), 56 deletions(-)

New commits:
commit e8d370e84af5dc9b8817cbf5aa66e50db150a0c6
Author: Jean-Sebastien Bevilacqua 
Date:   Thu Sep 7 11:15:21 2017 +0200

tdf#107267: Fix grand total calculation

To fix the grand total calculation, we add another step.
This step loop through all row to find the min and max of each value.
These min and max are then used by the grand total.

Patch by Linagora

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

diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 644ecae7afe2..bd27e9ef0bba 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -137,7 +137,7 @@
 #define STR_MSSG_SOLVE_2NC_("STR_MSSG_SOLVE_2", "Goal 
Seek failed.\n\n")
 #define STR_MSSG_SOLVE_3NC_("STR_MSSG_SOLVE_3", 
"Insert the closest value (")
 #define STR_MSSG_SOLVE_4NC_("STR_MSSG_SOLVE_4", ") 
into the variable cell anyway?")
-#define STR_TABLE_GESAMTERGEBNIS
NC_("STR_TABLE_GESAMTERGEBNIS", "Grand Total")
+#define STR_TABLE_GRAND NC_("STR_TABLE_GRAND", "Grand")
 #define STR_TABLE_ERGEBNIS  NC_("STR_TABLE_ERGEBNIS", 
"Result")
 #define STR_UNDO_SPELLING   NC_("STR_UNDO_SPELLING", 
"Spellcheck")
 #define STR_TABLE_UND   NC_("STR_TABLE_UND", "AND")
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 6aa3cdf1e3c2..3b1a1c393a9b 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1964,6 +1964,30 @@ typedef struct lcl_ScTable_DoSubTotals_RowEntry
 SCROW   nFuncEnd;
 } RowEntry;
 
+
+static const char* lcl_GetSubTotalStrId(int id)
+{
+switch ( id )
+{
+case SUBTOTAL_FUNC_AVE: return STR_FUN_TEXT_AVG;
+case SUBTOTAL_FUNC_CNT:
+case SUBTOTAL_FUNC_CNT2:return STR_FUN_TEXT_COUNT;
+case SUBTOTAL_FUNC_MAX: return STR_FUN_TEXT_MAX;
+case SUBTOTAL_FUNC_MIN: return STR_FUN_TEXT_MIN;
+case SUBTOTAL_FUNC_PROD:return STR_FUN_TEXT_PRODUCT;
+case SUBTOTAL_FUNC_STD:
+case SUBTOTAL_FUNC_STDP:return STR_FUN_TEXT_STDDEV;
+case SUBTOTAL_FUNC_SUM: return STR_FUN_TEXT_SUM;
+case SUBTOTAL_FUNC_VAR:
+case SUBTOTAL_FUNC_VARP:return STR_FUN_TEXT_VAR;
+default:
+{
+ return STR_EMPTYDATA;
+// added to avoid warnings
+}
+}
+}
+
 //  new intermediate results
 //  rParam.nRow2 is changed!
 
@@ -2019,10 +2043,9 @@ bool ScTable::DoSubTotals( ScSubTotalParam& rParam )
 RowEntry aRowEntry;
 ::std::vector< RowEntry > aRowVector;
 
-for (sal_uInt16 nLevel=0; nLevel<=nLevelCount && bSpaceLeft; nLevel++) 
 // including grand total
+for (sal_uInt16 nLevel=0; nLeveluppercase(aString);
-//  when sorting, blanks are separate group
-//  otherwise blank cells are allowed below
-bChanged = ( ( !aString.isEmpty() || 
rParam.bDoSort ) &&
-aString != aCompString[i] );
-}
-if ( bChanged && bTestPrevSub )
+GetString( nGroupCol[i], nRow, aString );
+if (bIgnoreCase)
+aString = ScGlobal::pCharClass->uppercase(aString);
+//  when sorting, blanks are separate group
+//  otherwise blank cells are allowed below
+bChanged = ( ( !aString.isEmpty() || rParam.bDoSort ) 
&&
+aString != aCompString[i] );
+}
+if ( bChanged && bTestPrevSub )
+{
+// No group change on rows that will contain subtotal 
formulas
+for ( ::std::vector< RowEntry >::const_iterator
+iEntry( aRowVector.begin());
+iEntry != aRowVector.end(); ++iEntry)
 {
-// No group change on rows that will contain 
subtotal formulas
-for ( ::std::vector< RowEntry >::const_iterator
-iEntry( aRowVector.begin());
-iEntry != aRowVector.end(); ++iEntry)
+if ( iEntry->nDestRow == nRow )
 {
-if ( iEntry->nDestRow == nRow )
-{
-bChanged = false;
-

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

2017-09-13 Thread Winfried Donkers

 sc/qa/unit/data/functions/statistical/fods/geomean.fods |   83 ++--
 sc/source/core/tool/interpr3.cxx|   50 +
 2 files changed, 124 insertions(+), 9 deletions(-)

New commits:
commit 65ea925d173db0f319a8ca78855587d089e5270d
Author: Winfried Donkers 
Date:   Fri Sep 8 16:44:22 2017 +0200

tdf#109096 Allow 0 as argument value(s) to GEOMEAN()

Both ODFF1.2 and the mathematical definition allow 0 as value(s).
Excel does not allow 0 as argument value(s), but IMHO this is to be
regarded as an aberration of Excel.

Also added tests for no arguments or negative arguments, which is not 
allowed by ODFF1.2.

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

diff --git a/sc/qa/unit/data/functions/statistical/fods/geomean.fods 
b/sc/qa/unit/data/functions/statistical/fods/geomean.fods
index 76b0257f9cd7..2a8fdf3fdf1e 100644
--- a/sc/qa/unit/data/functions/statistical/fods/geomean.fods
+++ b/sc/qa/unit/data/functions/statistical/fods/geomean.fods
@@ -3547,13 +3547,13 @@
  
 
 
- 
-  Err:502
- 
- 
-  Err:502
+ 
+  0
  
- 
+ 
+  0
+  
+ 
   TRUE
  
  
@@ -3699,7 +3699,10 @@
  
   0.5
  
- 
+ 
+  -9
+ 
+ 
  
  
  
@@ -4558,6 +4561,40 @@
  
   =GEOMEAN(J2:K5)
  
+
+
+ 
+  #NUM!
+ 
+ 
+  #NUM!
+ 
+ 
+  TRUE
+ 
+ 
+  =GEOMEAN(J21:J25)
+ 
+ 
+  at least 1 value must be given
+ 
+
+
+ 
+  #NUM!
+ 
+ 
+  #NUM!
+ 
+ 
+  TRUE
+ 
+ 
+  =GEOMEAN()
+ 
+ 
+  at least 1 value must be given
+ 
  
  
  
@@ -4568,9 +4605,37 @@
  
  
  
+ 
+
+
+ 
+  Err:502
+ 
+ 
+  Err:502
+ 
+ 
+  TRUE
+ 
+ 
+  =GEOMEAN(J2:J6)
+ 
+ 
+  negative values are not allowed
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
  
 
-
+
  
  
  
@@ -5186,4 +5251,4 @@

   
  
-
\ No newline at end of file
+
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 7b60e39dc6f4..e6ae4c2649d8 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -3042,6 +3042,14 @@ void ScInterpreter::ScGeoMean()
 nVal += log(x);
 nValCount++;
 }
+else if ( x == 0.0 )
+{
+// value of 0 means that function result will be 0
+while ( nParamCount-- > 0 )
+PopError();
+PushDouble( 0.0 );
+return;
+}
 else
 SetError( FormulaError::IllegalArgument);
 break;
@@ -3058,6 +3066,14 @@ void ScInterpreter::ScGeoMean()
 nVal += log(x);
 nValCount++;
 }
+else if ( x == 0.0 )
+{
+// value of 0 means that function result will be 0
+while ( nParamCount-- > 0 )
+PopError();
+PushDouble( 0.0 );
+return;
+}
 else
 SetError( FormulaError::IllegalArgument);
 }
@@ -3077,6 +3093,14 @@ void ScInterpreter::ScGeoMean()
 nVal += log(nCellVal);
 nValCount++;
 }
+else if ( nCellVal == 0.0 )
+{
+// value of 0 means that function result will be 0
+while ( nParamCount-- > 0 )
+PopError();
+PushDouble( 0.0 );
+return;
+}
 else
 SetError( FormulaError::IllegalArgument);
 SetError(nErr);
@@ -3087,6 +3111,14 @@ void ScInterpreter::ScGeoMean()
 nVal += log(nCellVal);
 nValCount++;
 }
+else if ( nCellVal == 0.0 )
+{
+// value of 0 means that function result will be 0
+while ( nParamCount-- > 0 )
+PopError();
+PushDouble( 0.0 );
+return;
+}
 else
 SetError( FormulaError::IllegalArgument);
 }
@@ -3112,6 +3144,14 @@ void ScInterpreter

[Libreoffice-commits] core.git: Branch 'feature/borderline3' - drawinglayer/source svx/source

2017-09-13 Thread Armin Le Grand

 drawinglayer/source/primitive2d/borderlineprimitive2d.cxx |   83 -
 svx/source/dialog/framelink.cxx   |  225 --
 svx/source/dialog/framelinkarray.cxx  |8 
 3 files changed, 203 insertions(+), 113 deletions(-)

New commits:
commit 3aa80a7fda57a8e2c1caf25cc9c26d780dbadf70
Author: Armin Le Grand 
Date:   Wed Sep 13 18:37:02 2017 +0200

borderline: extended the expand logic

Extended and checked the expand logic for creating
the line extends. Now creating quite the right lines,
will need to check some speccial cases. Also some
cleanups.

Change-Id: I3a3bd4d23c7017ecd873147df2d93af61de39fa6

diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx 
b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
index eba1f7f0d996..6295d4673c36 100644
--- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
@@ -165,89 +165,6 @@ namespace drawinglayer
 }
 }
 
-
-
-
-// static double fPatScFact(10.0); // 10.0 multiply, see old 
code
-// const std::vector 
aDashing(svtools::GetLineDashing(getStyle(), getPatternScale() * fPatScFact));
-// const attribute::StrokeAttribute aStrokeAttribute(aDashing);
-
-// if (3 == getBorderLines().size())
-// {
-// // double line with gap. Use 
mfSmallestAllowedDiscreteGapDistance (see get2DDecomposition) as distance.
-// // That value is prepared to be at least one pixel 
(discrete unit) so that the
-// // decomposition is view-dependent in this cases
-// const BorderLine& rLeft(getBorderLines()[0]);
-// const BorderLine& rGap(getBorderLines()[1]);
-// const BorderLine& rRight(getBorderLines()[2]);
-// const double fFullWidth(rLeft.getWidth() + 
mfSmallestAllowedDiscreteGapDistance + rRight.getWidth());
-
-// {
-// // inside line (left of vector). Create stroke 
primitive centered on left line width
-// const double fDeltaY((rLeft.getWidth() - 
fFullWidth) * 0.5);
-// const basegfx::B2DVector aDeltaY(aPerpendicular * 
fDeltaY);
-// const basegfx::B2DPoint aStart(getStart() - 
(aVector * rLeft.getBorderLineExtend().getStartAverage()) + aDeltaY);
-// const basegfx::B2DPoint aEnd(getEnd() + (aVector * 
rLeft.getBorderLineExtend().getEndAverage()) + aDeltaY);
-// const attribute::LineAttribute 
aLineAttribute(rLeft.getRGBColor(), rLeft.getWidth());
-
-// addPolygonStrokePrimitive2D(
-// rContainer,
-// aStart,
-// aEnd,
-// aLineAttribute,
-// aStrokeAttribute);
-// }
-
-// if (hasGapColor())
-// {
-// // gap (if visible, found practical usage in Writer 
MultiColorBorderLines).
-// // Create stroke primitive on vector with given 
color centered on gap position
-// const double fDeltaY(((fFullWidth - 
mfSmallestAllowedDiscreteGapDistance) * 0.5) - rRight.getWidth());
-// const basegfx::B2DVector aDeltaY(aPerpendicular * 
fDeltaY);
-// const basegfx::B2DPoint aStart(getStart() - 
(aVector * rGap.getBorderLineExtend().getStartAverage()) + aDeltaY);
-// const basegfx::B2DPoint aEnd(getEnd() + (aVector * 
rGap.getBorderLineExtend().getEndAverage()) + aDeltaY);
-// const attribute::LineAttribute 
aLineAttribute(rGap.getRGBColor(), mfSmallestAllowedDiscreteGapDistance);
-
-// addPolygonStrokePrimitive2D(
-// rContainer,
-// aStart,
-// aEnd,
-// aLineAttribute,
-// aStrokeAttribute);
-// }
-
-// {
-// // outside line (right of vector). Create stroke 
primitive centered on right line width
-// const double fDeltaY((fFullWidth - 
rRight.getWidth()) * 0.5);
-// const basegfx::B2DVector aDeltaY(aPerpendicular * 
fDeltaY);
-// const basegfx::B2DPoint aStart(getStart() - 
(aVector * rRight.getBorderLineExtend().getStartAverage()) + aDeltaY);
-// const basegfx::B2DPoint aEnd(getEnd() + (aVector * 
rRight.getBorderLineExtend().getEndAverage()) + aDeltaY);
-// const attribute::LineAttribute 
aLineAttribute

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

2017-09-13 Thread Henry Castro

 loleaflet/dist/menubar.css |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9c3393fc44875c359518310d61c195cdb27b8b1e
Author: Henry Castro 
Date:   Wed Sep 13 12:37:10 2017 -0400

loleaflet: fix background color of the menu item in disabled state

Change-Id: Idbe08dcd1fd1bb885f77478e3ad314be392a140d

diff --git a/loleaflet/dist/menubar.css b/loleaflet/dist/menubar.css
index d3a35fce..e74b4e21 100644
--- a/loleaflet/dist/menubar.css
+++ b/loleaflet/dist/menubar.css
@@ -40,6 +40,7 @@
 }
 
 .lo-menu a.disabled {
+background: #efefef;
 cursor: default;
 }
 .lo-menu > li > a.has-submenu {
___
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' - include/oox oox/source

2017-09-13 Thread Michael Stahl

 include/oox/vml/vmlshapecontainer.hxx |8 
 include/oox/vml/vmlshapecontext.hxx   |9 +
 oox/source/vml/vmlshapecontainer.cxx  |4 ++--
 oox/source/vml/vmlshapecontext.cxx|   30 ++
 4 files changed, 29 insertions(+), 22 deletions(-)

New commits:
commit 561cf96d8e91adf141d165b818bb2be6e3e97f90
Author: Michael Stahl 
Date:   Wed Sep 13 10:48:38 2017 +0200

tdf#112311 oox: fix UAF of std::shared_ptr

OOXMLFastContextHandlerShape::sendShape() deletes the parent context's
ShapeTypeContext::mrTypeModel.

It looks like the sendShape() can't be delayed because writerfilter
wants to import the v:textbox content into a text frame.

Keep the shape alive until the end of the containing context.

Not sure if it's going to process the v:fill element properly,
but at lest valgrind is happy.

(probably regression from CWS writerfilter32bugfixes01)

Change-Id: Ifeab84751a1b20b2f272c4dd74b7097deb5eece0
(cherry picked from commit 88c84e71e2559ec6d0b4f8c5101a149daa4a2b2b)
Reviewed-on: https://gerrit.libreoffice.org/42249
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/include/oox/vml/vmlshapecontainer.hxx 
b/include/oox/vml/vmlshapecontainer.hxx
index 76e294fc279d..692beafad555 100644
--- a/include/oox/vml/vmlshapecontainer.hxx
+++ b/include/oox/vml/vmlshapecontainer.hxx
@@ -61,10 +61,10 @@ public:
 Drawing& getDrawing() { return mrDrawing; }
 
 /** Creates and returns a new shape template object. */
-ShapeType&  createShapeType();
+std::shared_ptr createShapeType();
 /** Creates and returns a new shape object of the specified type. */
 template< typename ShapeT >
-ShapeT& createShape();
+std::shared_ptr createShape();
 
 /** Final processing after import of the drawing fragment. */
 voidfinalizeFragmentImport();
@@ -123,11 +123,11 @@ private:
 
 
 template< typename ShapeT >
-ShapeT& ShapeContainer::createShape()
+std::shared_ptr ShapeContainer::createShape()
 {
 std::shared_ptr< ShapeT > xShape( new ShapeT( mrDrawing ) );
 maShapes.push_back( xShape );
-return *xShape;
+return xShape;
 }
 
 template< typename Functor >
diff --git a/include/oox/vml/vmlshapecontext.hxx 
b/include/oox/vml/vmlshapecontext.hxx
index 1c1565b62397..14533b8b35ab 100644
--- a/include/oox/vml/vmlshapecontext.hxx
+++ b/include/oox/vml/vmlshapecontext.hxx
@@ -99,7 +99,7 @@ class ShapeTypeContext : public ShapeContextBase
 public:
 explicitShapeTypeContext(
 ::oox::core::ContextHandler2Helper& rParent,
-ShapeType& rShapeType,
+std::shared_ptr const& pShapeType,
 const AttributeList& rAttribs );
 
 virtual ::oox::core::ContextHandlerRef
@@ -113,6 +113,7 @@ private:
 OptValue< OUString > decodeFragmentPath( const AttributeList& rAttribs, 
sal_Int32 nToken ) const;
 
 private:
+std::shared_ptr m_pShapeType;
 ShapeTypeModel& mrTypeModel;
 };
 
@@ -122,7 +123,7 @@ class ShapeContext : public ShapeTypeContext
 public:
 explicitShapeContext(
 ::oox::core::ContextHandler2Helper& rParent,
-ShapeBase& rShape,
+std::shared_ptr pShape,
 const AttributeList& rAttribs );
 
 virtual ::oox::core::ContextHandlerRef
@@ -155,7 +156,7 @@ class GroupShapeContext : public ShapeContext
 public:
 explicitGroupShapeContext(
 ::oox::core::ContextHandler2Helper& rParent,
-GroupShape& rShape,
+std::shared_ptr pShape,
 const AttributeList& rAttribs );
 
 virtual ::oox::core::ContextHandlerRef
@@ -172,7 +173,7 @@ public:
 explicitRectangleShapeContext(
 ::oox::core::ContextHandler2Helper& rParent,
 const AttributeList& rAttribs,
-RectangleShape& rShape );
+std::shared_ptr pShape);
 
 virtual ::oox::core::ContextHandlerRef
 onCreateContext( sal_Int32 nElement, const 
AttributeList& rAttribs ) override;
diff --git a/oox/source/vml/vmlshapecontainer.cxx 
b/oox/source/vml/vmlshapecontainer.cxx
index 055365202d5d..31359f862fba 100644
--- a/oox/source/vml/vmlshapecontainer.cxx
+++ b/oox/source/vml/vmlshapecontainer.cxx
@@ -59,11 +59,11 @@ ShapeContainer::~ShapeContainer()
 {
 }
 
-ShapeType& ShapeContainer::createShapeType()
+std::shared_ptr ShapeContainer::createShapeType()
 {
 std::shared_ptr< ShapeType > xShape( new ShapeType( mrDrawing ) );
 maTypes.push_back( xShape );
-return *xShape;
+return xShape;
 }
 
 void ShapeContainer::fin

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

2017-09-13 Thread Stephan Bergmann

 sd/qa/unit/dialogs-test.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 23332fd6505cfa4784d131f7b45e68e4dab236f1
Author: Stephan Bergmann 
Date:   Wed Sep 13 17:53:09 2017 +0200

Silence -Werror,-Wunreachable-code

Change-Id: I87faa8501b14a770194979cd1c575ed05b162e48

diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx
index 685ccf556e30..b77c7755a6bf 100644
--- a/sd/qa/unit/dialogs-test.cxx
+++ b/sd/qa/unit/dialogs-test.cxx
@@ -607,13 +607,13 @@ void SdDialogsTest::openAnyDialog()
 }
 
 /// example how to dump all known dialogs
-if (false)
+if ((false))
 {
 processAllKnownDialogs();
 }
 
 /// example how to dump exactly one known dialog
-if (false)
+if ((false))
 {
 // example for SfxTabDialog: 5 -> "modules/sdraw/ui/drawpagedialog.ui"
 // example for TabDialog: 22 -> 
"modules/simpress/ui/headerfooterdialog.ui"
@@ -634,7 +634,7 @@ void SdDialogsTest::openAnyDialog()
 }
 
 /// example how to dump a dialog using fallback functionality
-if (false)
+if ((false))
 {
 // unknown dialog, try fallback to generic created
 // VclBuilder-generated instance. Keep in mind that Dialogs
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 4e/2b0c14b49d5e74a2c7493ed4bcc1f8080efdb3

2017-09-13 Thread Caolán McNamara

 4e/2b0c14b49d5e74a2c7493ed4bcc1f8080efdb3 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6864b87ca9f5214a6192b7f3b60a61a7aa5c2804
Author: CaolÃ¡n McNamara 
Date:   Wed Sep 13 16:11:36 2017 +0100

Notes added by 'git notes add'

diff --git a/4e/2b0c14b49d5e74a2c7493ed4bcc1f8080efdb3 
b/4e/2b0c14b49d5e74a2c7493ed4bcc1f8080efdb3
new file mode 100644
index ..102d9bbb5283
--- /dev/null
+++ b/4e/2b0c14b49d5e74a2c7493ed4bcc1f8080efdb3
@@ -0,0 +1 @@
+merged as: 14164f75a5e8d4c803c6c9aeda1d0dd4c8930f0f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

2017-09-13 Thread Matthias Seidel

 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 14164f75a5e8d4c803c6c9aeda1d0dd4c8930f0f
Author: Matthias Seidel 
Date:   Sun Sep 3 14:50:58 2017 +

Removed quotation marks that destroyed some strings for Pootle export

(cherry picked from commit 4e2b0c14b49d5e74a2c7493ed4bcc1f8080efdb3)

Change-Id: I3d5e003a313228188119ee439c858c1ee505c9b0

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 121a7f49e486..7f9eb7ee16c7 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -659,13 +659,13 @@ en-US = "The version specified in the folder below cannot 
be updated."
 en-US = "Check the destination folder."
 
 [OOO_CONTROL_305]
-en-US = "To continue, click "Next"."
+en-US = "To continue, click Next."
 
 [OOO_CONTROL_306]
-en-US = "To select a different version, click "Change". Otherwise click 
"Cancel" to abort the Installation Wizard."
+en-US = "To select a different version, click Change. Otherwise click Cancel 
to abort the Installation Wizard."
 
 [OOO_CONTROL_307]
-en-US = "To select a different folder, click "Change"."
+en-US = "To select a different folder, click Change."
 
 [OOO_CONTROL_308]
 en-US = "Install [ProductName] to:"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-13 Thread Henry Castro

 loleaflet/main.js|1 +
 loleaflet/src/core/Socket.js |6 +-
 loleaflet/src/map/Map.js |4 
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 7c1e1120c63661d84a5696c5b10a961477228e19
Author: Henry Castro 
Date:   Wed Sep 13 11:09:56 2017 -0400

loleaflet: ensure initialize map components before the document is loaded

Change-Id: I3b6219926f0f9d0306ef25bc5f9a9145410bac74

diff --git a/loleaflet/main.js b/loleaflet/main.js
index ece21653..5d8aaed0 100644
--- a/loleaflet/main.js
+++ b/loleaflet/main.js
@@ -132,6 +132,7 @@ map.addControl(L.control.columnHeader());
 map.addControl(L.control.rowHeader());
 map.addControl(L.control.contextMenu());
 map.addControl(L.control.menubar());
+map.loadDocument();
 
 window.addEventListener('beforeunload', function () {
if (global.map && global.map._socket) {
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 4614a00d..3ca32cc0 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -18,6 +18,11 @@ L.Socket = L.Class.extend({
initialize: function (map) {
console.debug('socket.initialize:');
this._map = map;
+   this._msgQueue = [];
+   },
+
+   connect: function() {
+   var map = this._map;
try {
if (map.options.permission) {
map.options.docParams['permission'] = 
map.options.permission;
@@ -43,7 +48,6 @@ L.Socket = L.Class.extend({
this._accessTokenExpireTimeout = 
setTimeout(L.bind(this._sessionExpiredWarning, this),

parseInt(map.options.docParams.access_token_ttl) - Date.now() - 
tokenExpiryWarning);
}
-   this._msgQueue = [];
},
 
_sessionExpiredWarning: function() {
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index d66d75f4..df1a3607 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -169,6 +169,10 @@ L.Map = L.Evented.extend({
}, this);
},
 
+   loadDocument: function() {
+   this._socket.connect();
+   },
+
// public methods that modify map state
 
getViewId: function (username) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract561' - 2 commits - desktop/source include/LibreOfficeKit

2017-09-13 Thread Miklos Vajna

 desktop/source/lib/init.cxx   |2 +-
 include/LibreOfficeKit/LibreOfficeKit.h   |7 ---
 include/LibreOfficeKit/LibreOfficeKit.hxx |   12 +---
 3 files changed, 10 insertions(+), 11 deletions(-)

New commits:
commit 9a702a3e31db38d83c12c7da3868b8a606fd9b20
Author: Miklos Vajna 
Date:   Thu Jan 21 09:10:29 2016 +0100

Clean up lok::Office::freeError()

- let it take a non-const pointer, just like free() or g_free() does
- remove lok::Document::freeError(), which was declared, but not
  implemented
- move the declaration at the end of the stable API, but before the
  unstable section

Change-Id: I5a8ced61fc87641dc2fa0ea3615a350361fae3a1

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index ff156399926f..7a49c0b962d2 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -300,7 +300,7 @@ static int lo_initialize
(LibreOfficeKit* pThis, const ch
 static LibreOfficeKitDocument* lo_documentLoad  (LibreOfficeKit* pThis, const 
char* pURL);
 static boollo_runMacro  (LibreOfficeKit* pThis, const 
char* pURL);
 static char *  lo_getError  (LibreOfficeKit* pThis);
-static voidlo_freeError (const char *pfree);
+static voidlo_freeError (char* pFree);
 static LibreOfficeKitDocument* lo_documentLoadWithOptions  (LibreOfficeKit* 
pThis,
const char* pURL,
const char* 
pOptions);
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h 
b/include/LibreOfficeKit/LibreOfficeKit.h
index ad453ef37ab3..85b37d3e6f25 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -50,14 +50,15 @@ struct _LibreOfficeKitClass
 LibreOfficeKitDocument* (*documentLoadWithOptions) (LibreOfficeKit* pThis,
 const char* pURL,
 const char* pOptions);
-#ifdef LOK_USE_UNSTABLE_API
+void (*freeError) (char* pFree);
+
+#if defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
 void (*registerCallback) (LibreOfficeKit* pThis,
   LibreOfficeKitCallback pCallback,
   void* pData);
 
 bool (*runMacro) (LibreOfficeKit *pThis, const char* pURL);
 #endif
-void  (*freeError) (const char *pfree);
 
 };
 
@@ -78,7 +79,6 @@ struct _LibreOfficeKitDocumentClass
const char* pUrl,
const char* pFormat,
const char* pFilterOptions);
-void  (*freeError) (const char *pfree);
 
 #ifdef LOK_USE_UNSTABLE_API
 /// @see lok::Document::getDocumentType().
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx 
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index 060158d08800..f70bfea3beac 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -247,10 +247,6 @@ public:
 mpDoc->pClass->resetSelection(mpDoc);
 }
 #endif // LOK_USE_UNSTABLE_API
-inline void freeError(const char *pfree)
-{
-mpDoc->pClass->freeError(pfree);
-}
 };
 
 /// The lok::Office class represents one started LibreOfficeKit instance.
@@ -296,12 +292,14 @@ public:
 {
 return mpThis->pClass->getError(mpThis);
 }
-inline void freeError(const char *pfree)
+
+/// Frees the memory pointed to by pFree.
+inline void freeError(char* pFree)
 {
-mpThis->pClass->freeError(pfree);
+mpThis->pClass->freeError(pFree);
 }
 
-#ifdef LOK_USE_UNSTABLE_API
+#if defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
 /**
  * Run a macro.
  *
commit 912fd5046410f1f32f7273155d9ce17450a2df6d
Author: Oliver Specht 
Date:   Wed Jan 20 07:52:51 2016 +0100

freeError function moved to the end of the list

Change-Id: I4aed102b25ddcd5f2e8fa03395e2ffd89c858bb9
Reviewed-on: https://gerrit.libreoffice.org/21619
Tested-by: Jenkins 
Reviewed-by: Oliver Specht 

diff --git a/include/LibreOfficeKit/LibreOfficeKit.h 
b/include/LibreOfficeKit/LibreOfficeKit.h
index 3e0797417243..ad453ef37ab3 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -46,7 +46,6 @@ struct _LibreOfficeKitClass
  const char* pURL);
 
 char* (*getError) (LibreOfficeKit* pThis);
-void  (*freeError) (const char *pfree);
 
 LibreOfficeKitDocument* (*documentLoadWithOptions) (LibreOfficeKit* pThis,
 const char* pURL,
@@ -58,6 +57,8 @@ struct _LibreOfficeKitClass
 
 bool (*runMacro) (LibreOfficeKit *pThis, const char* pURL);
 #endif
+void  (*freeError) (const char *pfree);
+
 };
 
 #define LI

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

2017-09-13 Thread Takeshi Abe

 include/svx/svdhlpln.hxx   |   23 ++-
 svx/source/svdraw/svdhlpln.cxx |8 ++--
 2 files changed, 12 insertions(+), 19 deletions(-)

New commits:
commit 84b8e14ad30bc3bfbd52b38fe5472a6d85e4f41a
Author: Takeshi Abe 
Date:   Wed Sep 13 18:34:58 2017 +0900

svx: Simplify SdrHelpLineList with std::unique_ptr

This also kills no longer used SdrHelpLineList::GetObject().

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

diff --git a/include/svx/svdhlpln.hxx b/include/svx/svdhlpln.hxx
index 86890979f91d..ede56f82d279 100644
--- a/include/svx/svdhlpln.hxx
+++ b/include/svx/svdhlpln.hxx
@@ -26,6 +26,7 @@
 
 #include 
 #include 
+#include 
 
 class OutputDevice;
 
@@ -58,34 +59,30 @@ public:
 #define SDRHELPLINE_NOTFOUND 0x
 
 class SVX_DLLPUBLIC SdrHelpLineList {
-std::vector aList;
-protected:
-SdrHelpLine* GetObject(sal_uInt16 i) const { return aList[i]; }
+std::vector> aList;
+
 public:
-SdrHelpLineList(): aList() {}
-SdrHelpLineList(const SdrHelpLineList& rSrcList): aList()  { 
*this=rSrcList; }
-~SdrHelpLineList() { 
Clear(); }
+SdrHelpLineList() {}
+SdrHelpLineList(const SdrHelpLineList& rSrcList) { *this=rSrcList; }
 void   Clear();
 SdrHelpLineList&   operator=(const SdrHelpLineList& rSrcList);
 bool operator==(const SdrHelpLineList& rCmp) const;
 bool operator!=(const SdrHelpLineList& rCmp) const { 
return !operator==(rCmp); }
 sal_uInt16 GetCount() const{ 
return sal_uInt16(aList.size()); }
-void   Insert(const SdrHelpLine& rHL)  
{ aList.push_back(new SdrHelpLine(rHL)); }
+void   Insert(const SdrHelpLine& rHL)  
{ aList.emplace_back(new SdrHelpLine(rHL)); }
 void   Insert(const SdrHelpLine& rHL, sal_uInt16 nPos)
 {
 if(nPos==0x)
-aList.push_back(new SdrHelpLine(rHL));
+aList.emplace_back(new SdrHelpLine(rHL));
 else
-aList.insert(aList.begin() + nPos, new SdrHelpLine(rHL));
+aList.emplace(aList.begin() + nPos, new SdrHelpLine(rHL));
 }
 void   Delete(sal_uInt16 nPos)
 {
-SdrHelpLine* p = aList[nPos];
-delete p;
 aList.erase(aList.begin() + nPos);
 }
-SdrHelpLine&   operator[](sal_uInt16 nPos) 
{ return *GetObject(nPos); }
-const SdrHelpLine& operator[](sal_uInt16 nPos) const   
{ return *GetObject(nPos); }
+SdrHelpLine&   operator[](sal_uInt16 nPos) 
{ return *aList[nPos]; }
+const SdrHelpLine& operator[](sal_uInt16 nPos) const   
{ return *aList[nPos]; }
 sal_uInt16 HitTest(const Point& rPnt, sal_uInt16 nTolLog, 
const OutputDevice& rOut) const;
 };
 
diff --git a/svx/source/svdraw/svdhlpln.cxx b/svx/source/svdraw/svdhlpln.cxx
index 622ae221b78d..a1260d51dd95 100644
--- a/svx/source/svdraw/svdhlpln.cxx
+++ b/svx/source/svdraw/svdhlpln.cxx
@@ -75,10 +75,6 @@ tools::Rectangle SdrHelpLine::GetBoundRect(const 
OutputDevice& rOut) const
 
 void SdrHelpLineList::Clear()
 {
-sal_uInt16 nCount=GetCount();
-for (sal_uInt16 i=0; i0;) {
 i--;
-if (GetObject(i)->IsHit(rPnt,nTolLog,rOut)) return i;
+if (aList[i]->IsHit(rPnt,nTolLog,rOut)) return i;
 }
 return SDRHELPLINE_NOTFOUND;
 }
___
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' - svx/source

2017-09-13 Thread Caolán McNamara

 svx/source/tbxctrls/layctrl.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 3181238d88c01245d9fd1aba5cca388174113c83
Author: CaolÃ¡n McNamara 
Date:   Tue Sep 12 12:12:19 2017 +0100

Resolves: tdf#106163 safe fix for wrong final row/col selection in rtl

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

diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 33da56fe3227..3140923ade31 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -161,6 +161,8 @@ void TableWindow::dispose()
 void TableWindow::MouseMove( const MouseEvent& rMEvt )
 {
 SfxPopupWindow::MouseMove( rMEvt );
+if (IsInCleanUp())
+return;
 Point aPos = rMEvt.GetPosPixel();
 Point aMousePos( aPos );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - svx/source

2017-09-13 Thread Caolán McNamara

 svx/source/tbxctrls/layctrl.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit a3ea07e14bab234ee04c441e0dca7a9d12dc7a9b
Author: CaolÃ¡n McNamara 
Date:   Tue Sep 12 12:12:19 2017 +0100

Resolves: tdf#106163 safe fix for wrong final row/col selection in rtl

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

diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index b0e707f58cfe..d0bcb9cb3eb4 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -161,6 +161,8 @@ void TableWindow::dispose()
 void TableWindow::MouseMove( const MouseEvent& rMEvt )
 {
 SfxPopupWindow::MouseMove( rMEvt );
+if (IsInCleanUp())
+return;
 Point aPos = rMEvt.GetPosPixel();
 Point aMousePos( aPos );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: writerperfect/Library_wpftwriter.mk writerperfect/source writerperfect/uiconfig writerperfect/UIConfig_writerperfect.mk

2017-09-13 Thread Miklos Vajna

 writerperfect/Library_wpftwriter.mk   |1 
 writerperfect/UIConfig_writerperfect.mk   |1 
 writerperfect/source/writer/EPUBExportDialog.cxx  |  121 +++
 writerperfect/source/writer/EPUBExportDialog.hxx  |   41 +++
 writerperfect/source/writer/EPUBExportFilter.cxx  |   14 +
 writerperfect/source/writer/EPUBExportFilter.hxx  |5 
 writerperfect/source/writer/EPUBExportUIComponent.cxx |9 
 writerperfect/uiconfig/ui/exportepub.ui   |  194 ++
 8 files changed, 383 insertions(+), 3 deletions(-)

New commits:
commit 1f582e38dd8f2f9c556720e5d66d0d17318b095a
Author: Miklos Vajna 
Date:   Wed Sep 13 14:13:46 2017 +0200

EPUB export: add options dialog

It just exposes the two options available at libepubgen level already.

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

diff --git a/writerperfect/Library_wpftwriter.mk 
b/writerperfect/Library_wpftwriter.mk
index d3d2cc9a209b..bf605e718dc1 100644
--- a/writerperfect/Library_wpftwriter.mk
+++ b/writerperfect/Library_wpftwriter.mk
@@ -68,6 +68,7 @@ $(eval $(call gb_Library_use_externals,wpftwriter,\
 $(eval $(call gb_Library_add_exception_objects,wpftwriter,\
writerperfect/source/writer/AbiWordImportFilter \
writerperfect/source/writer/EBookImportFilter \
+   writerperfect/source/writer/EPUBExportDialog \
writerperfect/source/writer/EPUBExportFilter \
writerperfect/source/writer/EPUBExportUIComponent \
writerperfect/source/writer/EPUBPackage \
diff --git a/writerperfect/UIConfig_writerperfect.mk 
b/writerperfect/UIConfig_writerperfect.mk
index d0d8ef5030fb..8599babf7bde 100644
--- a/writerperfect/UIConfig_writerperfect.mk
+++ b/writerperfect/UIConfig_writerperfect.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UIConfig_UIConfig,writerperfect))
 
 $(eval $(call gb_UIConfig_add_uifiles,writerperfect,\
writerperfect/uiconfig/ui/wpftencodingdialog \
+   writerperfect/uiconfig/ui/exportepub \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/writerperfect/source/writer/EPUBExportDialog.cxx 
b/writerperfect/source/writer/EPUBExportDialog.cxx
new file mode 100644
index ..50bad98b4281
--- /dev/null
+++ b/writerperfect/source/writer/EPUBExportDialog.cxx
@@ -0,0 +1,121 @@
+/* -*- 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/.
+ */
+
+#include "EPUBExportDialog.hxx"
+
+#include "EPUBExportFilter.hxx"
+
+using namespace com::sun::star;
+
+namespace
+{
+/// Converts version value to a listbox entry position.
+sal_Int32 VersionToPosition(sal_Int32 nVersion)
+{
+sal_Int32 nPosition = 0;
+
+switch (nVersion)
+{
+case 30:
+nPosition = 0;
+break;
+case 20:
+nPosition = 1;
+break;
+default:
+assert(false);
+break;
+}
+
+return nPosition;
+}
+
+/// Converts listbox entry position to a version value.
+sal_Int32 PositionToVersion(sal_Int32 nPosition)
+{
+sal_Int32 nVersion = 0;
+
+switch (nPosition)
+{
+case 0:
+nVersion = 30;
+break;
+case 1:
+nVersion = 20;
+break;
+default:
+assert(false);
+break;
+}
+
+return nVersion;
+}
+}
+
+namespace writerperfect
+{
+
+EPUBExportDialog::EPUBExportDialog(vcl::Window *pParent, 
comphelper::SequenceAsHashMap &rFilterData)
+: ModalDialog(pParent, "EpubDialog", "writerperfect/ui/exportepub.ui"),
+  mrFilterData(rFilterData)
+{
+get(m_pVersion, "versionlb");
+assert(PositionToVersion(m_pVersion->GetSelectEntryPos()) == 
EPUBExportFilter::GetDefaultVersion());
+
+auto it = rFilterData.find("EPUBVersion");
+if (it != rFilterData.end())
+{
+sal_Int32 nVersion = 0;
+if (it->second >>= nVersion)
+m_pVersion->SelectEntryPos(VersionToPosition(nVersion));
+}
+m_pVersion->SetSelectHdl(LINK(this, EPUBExportDialog, VersionSelectHdl));
+
+get(m_pSplit, "splitlb");
+it = rFilterData.find("EPUBSplitMethod");
+if (it != rFilterData.end())
+{
+sal_Int32 nSplitMethod = 0;
+if (it->second >>= nSplitMethod)
+// No conversion, 1:1 mapping between libepubgen::EPUBSplitMethod
+// and entry positions.
+m_pVersion->SelectEntryPos(nSplitMethod);
+}
+else
+m_pSplit->SelectEntryPos(EPUBExportFilter::GetDefaultSplitMethod());
+m_pSplit->SetSelectHdl(LINK(this, EPUBExportDialog, SplitSelectHdl));
+}
+
+IMPL_LINK_NOARG(EPUBExportDialog, VersionSelectHdl, ListBox &, void)
+{
+mrFilterData["EPUBVersion"] <<= 
Po

[Libreoffice-commits] core.git: sc/source sd/source svtools/source svx/source sw/source vcl/source

2017-09-13 Thread Noel Grandin

 sc/source/core/data/column2.cxx   |4 ++--
 sc/source/ui/unoobj/viewuno.cxx   |2 +-
 sc/source/ui/view/gridwin4.cxx|3 +--
 sc/source/ui/view/tabview.cxx |4 ++--
 sc/source/ui/view/tabvwsh3.cxx|3 +--
 sc/source/ui/view/tabvwsha.cxx|5 ++---
 sc/source/ui/view/viewdata.cxx|   12 ++--
 sd/source/ui/annotations/annotationwindow.cxx |3 +--
 sd/source/ui/view/sdwindow.cxx|3 +--
 svtools/source/brwbox/datwin.cxx  |5 +
 svtools/source/misc/imap.cxx  |6 +++---
 svx/source/customshapes/EnhancedCustomShape3d.cxx |7 +++
 svx/source/svdraw/svdxcgv.cxx |   16 
 sw/source/core/txtnode/fntcache.cxx   |3 +--
 sw/source/uibase/docvw/AnnotationWin2.cxx |   20 +---
 sw/source/uibase/docvw/PostItMgr.cxx  |   10 +-
 sw/source/uibase/uiview/viewport.cxx  |2 +-
 vcl/source/window/window2.cxx |   14 +++---
 18 files changed, 47 insertions(+), 75 deletions(-)

New commits:
commit 158434ee87cfff8870f7c411f435ad46782ab818
Author: Noel Grandin 
Date:   Wed Sep 13 10:16:23 2017 +0200

no need to call GetNumerator() / GetDenominator() for Fraction

simplify the calculations - why have a Fraction and then just split
it up for the calculation?

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

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 5591f570e462..b6432a735132 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -426,7 +426,7 @@ long ScColumn::GetNeededSize(
 
 // space for AutoFilter button:  20 * nZoom/100
 if ( pFlag->HasAutoFilter() && !bTextWysiwyg )
-nDocWidth -= 
(rZoomX.GetNumerator()*20)/rZoomX.GetDenominator();
+nDocWidth -= long(rZoomX*20);
 
 aPaper.Width() = nDocWidth;
 
@@ -564,7 +564,7 @@ long ScColumn::GetNeededSize(
 
 ScMF nFlags = static_cast(pPattern->GetItem(ATTR_MERGE_FLAG)).GetValue();
 if (nFlags & ScMF::Auto)
-nValue += (rZoomX.GetNumerator()*20)/rZoomX.GetDenominator();
+nValue += long(rZoomX*20);
 }
 return nValue;
 }
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index d0708935c440..3ddf6dd0af62 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -1406,7 +1406,7 @@ sal_Int16 ScTabViewObj::GetZoom() const
 if (pViewSh)
 {
 const Fraction& rZoomY = pViewSh->GetViewData().GetZoomY();// Y 
will be shown
-return (sal_Int16)(( rZoomY.GetNumerator() * 100 ) / 
rZoomY.GetDenominator());
+return (sal_Int16)long( rZoomY * 100 );
 }
 return 0;
 }
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index eb059ddd024a..e631bbaed818 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -135,8 +135,7 @@ static void lcl_DrawOneFrame( vcl::RenderContext* pDev, 
const tools::Rectangle&
 
 ScDDComboBoxButton aComboButton(pDev);
 aComboButton.SetOptSizePixel();
-long nBWidth  = ( aComboButton.GetSizePixel().Width() * 
rZoomY.GetNumerator() )
-/ rZoomY.GetDenominator();
+long nBWidth  = long(aComboButton.GetSizePixel().Width() * rZoomY);
 long nBHeight = nVer + aTextSize.Height() + 1;
 Size aButSize( nBWidth, nBHeight );
 long nButtonPos = bLayoutRTL ? aOuter.Left() : aOuter.Right()-nBWidth+1;
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 576c564ec2b3..ee238ffa9dac 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -756,7 +756,7 @@ void ScTabView::UpdateVarZoom()
 bInZoomUpdate = true;
 const Fraction& rOldX = GetViewData().GetZoomX();
 const Fraction& rOldY = GetViewData().GetZoomY();
-long nOldPercent = ( rOldY.GetNumerator() * 100 ) / 
rOldY.GetDenominator();
+long nOldPercent = long(rOldY * 100);
 sal_uInt16 nNewZoom = CalcZoom( eZoomType, (sal_uInt16)nOldPercent );
 Fraction aNew( nNewZoom, 100 );
 
@@ -977,7 +977,7 @@ bool ScTabView::ScrollCommand( const CommandEvent& rCEvt, 
ScSplitPos ePos )
 //  and can't be changed directly
 
 const Fraction& rOldY = aViewData.GetZoomY();
-long nOld = (long)(( rOldY.GetNumerator() * 100 ) / 
rOldY.GetDenominator());
+long nOld = (long)( rOldY * 100 );
 long nNew;
 if ( pData->GetDelta() < 0 )
 nNew = std::max( (long) MINZOOM, basegfx::zoomtools::zoomOut( 
nOld ))

[Libreoffice-commits] core.git: chart2/source cui/source filter/source include/tools reportdesign/source sc/source sd/source sfx2/source starmath/source svtools/source svx/source sw/qa sw/source write

2017-09-13 Thread Noel Grandin

 chart2/source/controller/main/ChartWindow.cxx   |8 ++--
 cui/source/tabpages/transfrm.cxx|3 -
 filter/source/graphicfilter/eps/eps.cxx |4 +-
 include/tools/fract.hxx |   23 +++--
 reportdesign/source/ui/report/EndMarker.cxx |2 -
 reportdesign/source/ui/report/ReportWindow.cxx  |7 +---
 reportdesign/source/ui/report/SectionWindow.cxx |   18 --
 reportdesign/source/ui/report/StartMarker.cxx   |7 +---
 reportdesign/source/ui/report/ViewsWindow.cxx   |9 ++---
 sc/source/ui/app/client.cxx |6 +--
 sd/source/ui/dlg/copydlg.cxx|   34 ++--
 sd/source/ui/dlg/dlgsnap.cxx|   16 -
 sd/source/ui/tools/PreviewRenderer.cxx  |8 ++--
 sd/source/ui/view/drviewsa.cxx  |   20 +--
 sfx2/source/view/ipclient.cxx   |   20 +--
 sfx2/source/view/lokcharthelper.cxx |4 +-
 starmath/source/utility.cxx |4 +-
 svtools/source/filter/DocumentToGraphicRenderer.cxx |4 +-
 svtools/source/graphic/provider.cxx |4 +-
 svx/source/form/fmvwimp.cxx |4 +-
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |   30 +++--
 svx/source/svdraw/svddrgmt.cxx  |9 ++---
 svx/source/svdraw/svdoole2.cxx  |8 ++--
 svx/source/svdraw/svdsnpv.cxx   |4 +-
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx|4 +-
 sw/source/core/doc/tblrwcl.cxx  |2 -
 sw/source/core/layout/paintfrm.cxx  |   12 +++
 sw/source/core/view/viewsh.cxx  |2 -
 sw/source/filter/ww8/writerhelper.cxx   |4 +-
 sw/source/filter/ww8/ww8graf.cxx|4 +-
 sw/source/uibase/docvw/PostItMgr.cxx|2 -
 sw/source/uibase/uiview/swcli.cxx   |8 ++--
 sw/source/uibase/wrtsh/wrtsh1.cxx   |4 +-
 writerfilter/source/dmapper/WrapPolygonHandler.cxx  |4 +-
 34 files changed, 151 insertions(+), 151 deletions(-)

New commits:
commit 1b1afc10f4d90e37c5e81961b8b8902133e65b00
Author: Noel Grandin 
Date:   Wed Sep 13 10:20:59 2017 +0200

Fraction: make conversion operators and constructor explicit

and simplify some of the calculations that needed to be changed.

Which resulted in one unit test needing to change by one pixel,
let's hope not an indication of a real problem.

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

diff --git a/chart2/source/controller/main/ChartWindow.cxx 
b/chart2/source/controller/main/ChartWindow.cxx
index 1b5ffa817373..c0f9d242610c 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -343,8 +343,8 @@ void ChartWindow::LogicInvalidate(const tools::Rectangle* 
pRectangle)
 if (pEditWin)
 {
 MapMode aCWMapMode = GetMapMode();
-double fXScale = aCWMapMode.GetScaleX();
-double fYScale = aCWMapMode.GetScaleY();
+double fXScale( aCWMapMode.GetScaleX() );
+double fYScale( aCWMapMode.GetScaleY() );
 
 if (!IsMapModeEnabled())
 {
@@ -410,8 +410,8 @@ tools::Rectangle ChartWindow::GetBoundingBox()
 // In all cases, the following code fragment
 // returns the chart bounding box in twips.
 MapMode aCWMapMode = GetMapMode();
-double fXScale = aCWMapMode.GetScaleX();
-double fYScale = aCWMapMode.GetScaleY();
+double fXScale( aCWMapMode.GetScaleX() );
+double fYScale( aCWMapMode.GetScaleY() );
 Point aOffset = GetOffsetPixelFrom(*pRootWin);
 aOffset.X() *= (TWIPS_PER_PIXEL / fXScale);
 aOffset.Y() *= (TWIPS_PER_PIXEL / fYScale);
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index fd024e1295fc..71221cacd3b9 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -487,8 +487,7 @@ bool SvxSlantTabPage::FillItemSet(SfxItemSet* rAttrs)
 if( m_pMtrRadius->IsValueChangedFromSaved() )
 {
 Fraction aUIScale = pView->GetModel()->GetUIScale();
-long nTmp = GetCoreValue( *m_pMtrRadius, ePoolUnit );
-nTmp = Fraction( nTmp ) * aUIScale;
+long nTmp = long(GetCoreValue( *m_pMtrRadius, ePoolUnit ) * aUIScale);
 
 rAttrs->Put( makeSdrEckenradiusItem( nTmp ) );
 bModified = true;
diff --git a/filter/source/graphicfilter/eps/eps.cxx 
b/filter/source/graphicfilter/eps/eps.cxx
index 7f4dd74e9982..6a30a3ffd4fd 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/sourc

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

2017-09-13 Thread Noel Grandin

 slideshow/source/engine/eventqueue.cxx  |5 ++---
 slideshow/source/engine/opengl/TransitionImpl.cxx   |   14 +++---
 slideshow/source/engine/pointersymbol.cxx   |2 +-
 slideshow/source/engine/rehearsetimingsactivity.cxx |2 +-
 slideshow/source/engine/screenupdater.cxx   |3 +--
 slideshow/source/engine/shapes/drawshape.cxx|   15 ++-
 slideshow/source/engine/shapes/drawshapesubsetting.cxx  |   16 
 slideshow/source/engine/shapes/gdimtftools.cxx  |3 +--
 slideshow/source/engine/shapes/viewshape.cxx|2 +-
 slideshow/source/engine/slide/layer.cxx |5 ++---
 slideshow/source/engine/slide/slideimpl.cxx |5 ++---
 slideshow/source/engine/transitions/slidechangebase.cxx |2 +-
 slideshow/source/engine/waitsymbol.cxx  |2 +-
 13 files changed, 34 insertions(+), 42 deletions(-)

New commits:
commit cc233992dfe0fa9732c24774852d037d161546ce
Author: Noel Grandin 
Date:   Wed Sep 13 13:20:59 2017 +0200

clang-tidy modernize-use-emplace in slideshow

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

diff --git a/slideshow/source/engine/eventqueue.cxx 
b/slideshow/source/engine/eventqueue.cxx
index df2ce3cdf3cb..3ecad820b1a7 100644
--- a/slideshow/source/engine/eventqueue.cxx
+++ b/slideshow/source/engine/eventqueue.cxx
@@ -119,9 +119,8 @@ namespace slideshow
 
 ENSURE_OR_RETURN_FALSE( rEvent.get() != nullptr,
"EventQueue::addEvent: event ptr NULL" );
-maNextEvents.push_back(
-EventEntry( rEvent, rEvent->getActivationTime(
-mpTimer->getElapsedTime()) ) );
+maNextEvents.emplace_back( rEvent, rEvent->getActivationTime(
+mpTimer->getElapsedTime()) );
 return true;
 }
 
diff --git a/slideshow/source/engine/opengl/TransitionImpl.cxx 
b/slideshow/source/engine/opengl/TransitionImpl.cxx
index ad83e50b5dc6..706816f55bd4 100644
--- a/slideshow/source/engine/opengl/TransitionImpl.cxx
+++ b/slideshow/source/engine/opengl/TransitionImpl.cxx
@@ -961,7 +961,7 @@ std::shared_ptr makeRevolvingCircles( 
sal_uInt16 nCircles , s
 float TempAngle(0.0);
 for(unsigned int Point(0); Point < nPointsOnCircles; ++Point)
 {
-unScaledTexCoords.push_back( glm::vec2( cos(TempAngle - 3.1415926/2.0) 
, sin(TempAngle- 3.1415926/2.0) ) );
+unScaledTexCoords.emplace_back( cos(TempAngle - 3.1415926/2.0) , 
sin(TempAngle- 3.1415926/2.0) );
 
 TempAngle += dAngle;
 }
@@ -1157,9 +1157,9 @@ void Primitive::pushTriangle(const glm::vec2& 
SlideLocation0,const glm::vec2& Sl
 Verts.reserve(3);
 Texs.reserve(3);
 
-Verts.push_back(glm::vec3( 2*SlideLocation0.x - 1, -2*SlideLocation0.y + 1 
, 0.0 ));
-Verts.push_back(glm::vec3( 2*SlideLocation1.x - 1, -2*SlideLocation1.y + 1 
, 0.0 ));
-Verts.push_back(glm::vec3( 2*SlideLocation2.x - 1, -2*SlideLocation2.y + 1 
, 0.0 ));
+Verts.emplace_back( 2*SlideLocation0.x - 1, -2*SlideLocation0.y + 1 , 0.0 
);
+Verts.emplace_back( 2*SlideLocation1.x - 1, -2*SlideLocation1.y + 1 , 0.0 
);
+Verts.emplace_back( 2*SlideLocation2.x - 1, -2*SlideLocation2.y + 1 , 0.0 
);
 
 //figure out if they're facing the correct way, and make them face the 
correct way.
 glm::vec3 Normal( glm::cross( Verts[0] - Verts[1] , Verts[1] - Verts[2] ) 
);
@@ -1175,9 +1175,9 @@ void Primitive::pushTriangle(const glm::vec2& 
SlideLocation0,const glm::vec2& Sl
 Texs.push_back(SlideLocation2);
 Texs.push_back(SlideLocation1);
 Verts.clear();
-Verts.push_back(glm::vec3( 2*SlideLocation0.x - 1, -2*SlideLocation0.y 
+ 1 , 0.0 ));
-Verts.push_back(glm::vec3( 2*SlideLocation2.x - 1, -2*SlideLocation2.y 
+ 1 , 0.0 ));
-Verts.push_back(glm::vec3( 2*SlideLocation1.x - 1, -2*SlideLocation1.y 
+ 1 , 0.0 ));
+Verts.emplace_back( 2*SlideLocation0.x - 1, -2*SlideLocation0.y + 1 , 
0.0 );
+Verts.emplace_back( 2*SlideLocation2.x - 1, -2*SlideLocation2.y + 1 , 
0.0 );
+Verts.emplace_back( 2*SlideLocation1.x - 1, -2*SlideLocation1.y + 1 , 
0.0 );
 }
 
 Vertices.push_back({Verts[0], glm::vec3(0, 0, 1), Texs[0]}); //all normals 
always face the screen when untransformed.
diff --git a/slideshow/source/engine/pointersymbol.cxx 
b/slideshow/source/engine/pointersymbol.cxx
index b539cf6a1055..29728a522189 100644
--- a/slideshow/source/engine/pointersymbol.cxx
+++ b/slideshow/source/engine/pointersymbol.cxx
@@ -128,7 +128,7 @@ void PointerSymbol::viewAdded( const UnoViewSharedPtr& 
rView )
 SAL_WARN( "slideshow", comphelper::anyToString( 
cppu::getCaughtException() ) );
 }
 
-maViews.push_back( ViewsVecT::value_type( rView, sprite

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

2017-09-13 Thread Stephan Bergmann

 vcl/osx/printaccessoryview.mm |   10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 781267bc8de0ac5962363e22ac368190b98d
Author: Stephan Bergmann 
Date:   Wed Sep 13 13:57:12 2017 +0200

Blind macOS -Werror,-Wunreachable-code fix

Change-Id: Ice41b6394bc4fc8e4b1d7b9c5689019361883b59

diff --git a/vcl/osx/printaccessoryview.mm b/vcl/osx/printaccessoryview.mm
index c0f882f4abc5..ad4ea5af9de7 100644
--- a/vcl/osx/printaccessoryview.mm
+++ b/vcl/osx/printaccessoryview.mm
@@ -163,21 +163,17 @@ public:
 , mnLastPageCount( [i_pAccessoryController 
printerController]->getFilteredPageCount() )
 , mpAccessoryController( i_pAccessoryController )
 {
-assert( SAL_N_ELEMENTS(SV_PRINT_NATIVE_STRINGS) >= 5 && "resources not 
found" );
+static_assert( SAL_N_ELEMENTS(SV_PRINT_NATIVE_STRINGS) == 5, 
"resources not found" );
 }
 
 static rtl::OUString getMoreString()
 {
-return SAL_N_ELEMENTS(SV_PRINT_NATIVE_STRINGS) >= 4
-   ? VclResId(SV_PRINT_NATIVE_STRINGS[3])
-   : OUString("More");
+return VclResId(SV_PRINT_NATIVE_STRINGS[3]);
 }
 
 static rtl::OUString getPrintSelectionString()
 {
-return SAL_N_ELEMENTS(SV_PRINT_NATIVE_STRINGS) >= 5
-   ? VclResId(SV_PRINT_NATIVE_STRINGS[4])
-   : OUString("Print selection only");
+return VclResId(SV_PRINT_NATIVE_STRINGS[4]);
 }
 
 int addNameTag( const rtl::OUString& i_rPropertyName )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: odf2xhtml (and other xslt filters) - tabs or spaces?

2017-09-13 Thread Miklos Vajna

Hi,

On Tue, Sep 12, 2017 at 05:44:04PM +0200, Jan Holesovsky  
wrote:
> I'd agree with Miklos.  It's true that git blame is less useful then,

As long as the changes are really just whitespace, you can use 'git
blame -w' to ignore those.

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: 2 commits - sc/uiconfig sw/uiconfig

2017-09-13 Thread Christian Lohmaier

 sc/uiconfig/scalc/ui/dataprovider.ui |   16 +++
 sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui |2 -
 sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui|2 -
 3 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit f4be69b407f33d541623ade19fccacfc20f1d139
Author: Christian Lohmaier 
Date:   Wed Sep 13 13:44:46 2017 +0200

add missing context to translatable strings in ui files

the context is requires to create translation templates (pot files,
using "make translate") to guarantee uniqueness of strings

Change-Id: Ie3df130f69c72ad468839235769f55286f4f3e48

diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui 
b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index 4adf4b0339d8..d35740b9f561 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
@@ -3346,7 +3346,7 @@
 True
 False
 .uno:StyleApply?Style:string=Quotation&FamilyName:string=CharacterStyles
-Quotation
+Quotation
   
 
 
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui 
b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
index 79e8f2d0e1aa..7656f678fdad 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
@@ -3264,7 +3264,7 @@
 True
 False
 .uno:StyleApply?Style:string=Quotation&FamilyName:string=CharacterStyles
-Quotation
+Quotation
   
 
 
commit 9a7c53e589e60a731ad06ce34f62ad1c623fe689
Author: Christian Lohmaier 
Date:   Wed Sep 13 13:41:29 2017 +0200

having context in strings is not enough, it should also be ~unique

using the same context as in datastreams.ui causes duplicate (identical)
strings in pot files, and some translation tools stumble over those
see also tdf#109258

Change-Id: I88b083f56a45123a6cf7521ceaaefa89f77e0477

diff --git a/sc/uiconfig/scalc/ui/dataprovider.ui 
b/sc/uiconfig/scalc/ui/dataprovider.ui
index 4a3bdb0ed60d..ff4c55a7192b 100644
--- a/sc/uiconfig/scalc/ui/dataprovider.ui
+++ b/sc/uiconfig/scalc/ui/dataprovider.ui
@@ -6,7 +6,7 @@
   
 False
 6
-Live Data Streams
+Live Data Streams
 dialog
 
   
@@ -104,7 +104,7 @@
   
 True
 False
-URL:
+URL:
   
   
 False
@@ -117,7 +117,7 @@
 True
 False
 True
-Enter the URL of the 
source document in the local file system or Internet here.
+Enter the URL of the 
source document in the local file system or Internet here.
 True
 True
 48
@@ -135,7 +135,7 @@
 
 
   
-_Browse...
+_Browse...
 True
 True
 True
@@ -162,7 +162,7 @@
   
 True
 False
-Database Range:
+Database Range:
   
   
 False
@@ -196,7 +196,7 @@
   
 True
 False
-Data Provider:
+Data Provider:
   
   
 False
@@ -231,7 +231,7 @@
   
 True
 False
-Search String:
+Search String:
   
   
 False
@@ -265,7 +265,7 @@
   
 True
 False
-Source Stream
+Source Stream
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-13 Thread Eike Rathke

 external/icu/UnpackedTarball_icu.mk|1 +
 external/icu/icu4c-59-icu13329-xlocale.patch.1 |   14 ++
 2 files changed, 15 insertions(+)

New commits:
commit 9e399bc613bb4ea1470bd52c64af920d4e9bc39b
Author: Eike Rathke 
Date:   Wed Sep 13 13:42:29 2017 +0200

icu: do not include non-standardized xlocale.h if U_PLATFORM_IS_LINUX_BASED

... should be more platforms ... but be conservative.
U_PLATFORM_IMPLEMENTS_POSIX does not hold what it promises.

"The file and this data structure is not standardized.  Don't rely on it.  
It
can go away without warning."

...

And since glibc 2.26 it's gone.

https://ssl.icu-project.org/trac/ticket/13329

Change-Id: I4c1f6130571f5d094cb35ce70e4d333763cee32a

diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index 1ba15a448c75..7fa891f07d6d 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-59-werror-undef.patch.1 \
external/icu/icu4c-59-werror-shadow.patch.1 \
external/icu/icu4c-iOS.patch.1 \
+   external/icu/icu4c-59-icu13329-xlocale.patch.1 \
 ))
 
 $(eval $(call 
gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
diff --git a/external/icu/icu4c-59-icu13329-xlocale.patch.1 
b/external/icu/icu4c-59-icu13329-xlocale.patch.1
new file mode 100644
index ..93e14d23fa5a
--- /dev/null
+++ b/external/icu/icu4c-59-icu13329-xlocale.patch.1
@@ -0,0 +1,14 @@
+# xlocale.h is gone with glibc 2.26 and should never had been included.
+# https://ssl.icu-project.org/trac/ticket/13329
+diff -ur icu.org/source/i18n/digitlst.cpp icu/source/i18n/digitlst.cpp
+--- icu.org/source/i18n/digitlst.cpp   2017-01-20 01:20:31.0 +0100
 icu/source/i18n/digitlst.cpp   2017-09-13 13:25:59.980160603 +0200
+@@ -63,6 +63,8 @@
+ #if U_USE_STRTOD_L
+ # if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN
+ #   include 
++# elif U_PLATFORM_IS_LINUX_BASED
++#   include// should be for all POSIX.2008 compliant platforms, 
but..
+ # else
+ #   include 
+ # endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configmgr/source include/rtl sal/rtl sal/textenc sax/source stoc/source svtools/source tools/source

2017-09-13 Thread Stephan Bergmann

 configmgr/source/access.cxx   |4 -
 include/rtl/character.hxx |   27 
++
 sal/rtl/uri.cxx   |5 -
 sal/rtl/ustrbuf.cxx   |2 
 sal/textenc/tcvtutf8.cxx  |5 -
 sax/source/expatwrap/saxwriter.cxx|4 -
 stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx |4 -
 svtools/source/svrtf/svparser.cxx |2 
 tools/source/fsys/urlobj.cxx  |6 --
 9 files changed, 40 insertions(+), 19 deletions(-)

New commits:
commit 3f0fba004badec01e536ca0fe2889e7e0bb93d7a
Author: Stephan Bergmann 
Date:   Wed Sep 13 13:35:49 2017 +0200

New rtl::isUnicodeScalarValue, rtl::isSurrogate

There are apparently various places that want to check for a Unicode scalar
value rather than for a Unicode code point.  Changed those uses of
rtl::isUnicodeCodePoint where that was obvious.  (For changing
svtools/source/svrtf/svparser.cxx see 
8e0fb74dc01927b60d8b868548ef8fe1d7a80ce3
"Revert 'svtools: HTML import: don't put lone surrogates in OUString'".)  
Other
uses of rtl::isUnicodeCodePoint might also want to use 
rtl::isUnicodeScalarValue
instead.

As a side effect, this change also introduces rtl::isSurrogate, which is 
useful
in a few places as well.

Change-Id: I9245f4f98b83877145a4d392f0ddb7c5d824a535

diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index 6eb692cc5430..0d19af353b49 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -113,8 +113,8 @@ bool isValidName(OUString const & name, bool setMember) {
 for (sal_Int32 i = 0; i != name.getLength();) {
 sal_uInt32 c = name.iterateCodePoints(&i);
 if ((c < 0x20 && !(c == 0x09 || c == 0x0A || c == 0x0D))
-|| rtl::isHighSurrogate(c) || rtl::isLowSurrogate(c) || c == 0xFFFE
-|| c == 0x || (!setMember && c == '/'))
+|| rtl::isSurrogate(c) || c == 0xFFFE || c == 0x
+|| (!setMember && c == '/'))
 {
 return false;
 }
diff --git a/include/rtl/character.hxx b/include/rtl/character.hxx
index b83121a4a6d4..ee26f4ae1f9a 100644
--- a/include/rtl/character.hxx
+++ b/include/rtl/character.hxx
@@ -335,6 +335,20 @@ sal_uInt32 const surrogatesLowLast = 0xDFFF;
 }
 /// @endcond
 
+/** Check for surrogate.
+
+@param code  A Unicode code point.
+
+@return  True if code is a surrogate code point (0xD800--0xDFFF).
+
+@since LibreOffice 6.0
+*/
+inline bool isSurrogate(sal_uInt32 code) {
+assert(isUnicodeCodePoint(code));
+return code >= detail::surrogatesHighFirst
+&& code <= detail::surrogatesLowLast;
+}
+
 /** Check for high surrogate.
 
 @param code  A Unicode code point.
@@ -433,6 +447,19 @@ inline std::size_t splitSurrogates(sal_uInt32 code, 
sal_Unicode * output) {
 }
 }
 
+/** Check for Unicode scalar value.
+
+@param code  An integer.
+
+@return  True if code is a Unicode scalar value.
+
+@since LibreOffice 6.0
+*/
+inline bool isUnicodeScalarValue(sal_uInt32 code)
+{
+return isUnicodeCodePoint(code) && !isSurrogate(code);
+}
+
 }
 
 #endif
diff --git a/sal/rtl/uri.cxx b/sal/rtl/uri.cxx
index 257a0a27abac..57a7102a38eb 100644
--- a/sal/rtl/uri.cxx
+++ b/sal/rtl/uri.cxx
@@ -133,9 +133,8 @@ sal_uInt32 readUcs4(sal_Unicode const ** pBegin, 
sal_Unicode const * pEnd,
 p += 3;
 nEncoded |= ((nWeight1 & 3) << 4 | nWeight2) << nShift;
 }
-if (bUTF8 && rtl::isUnicodeCodePoint(nEncoded)
-&& nEncoded >= nMin && !rtl::isHighSurrogate(nEncoded)
-&& !rtl::isLowSurrogate(nEncoded))
+if (bUTF8 && rtl::isUnicodeScalarValue(nEncoded)
+&& nEncoded >= nMin)
 {
 *pBegin = p;
 *pType = EscapeChar;
diff --git a/sal/rtl/ustrbuf.cxx b/sal/rtl/ustrbuf.cxx
index cef31a5da2ea..508c8d7a9c7c 100644
--- a/sal/rtl/ustrbuf.cxx
+++ b/sal/rtl/ustrbuf.cxx
@@ -168,7 +168,7 @@ void rtl_uStringbuffer_insertUtf32(
 {
 sal_Unicode buf[2];
 sal_Int32 len;
-OSL_ASSERT(rtl::isUnicodeCodePoint(c) && !(c >= 0xD800 && c <= 0xDFFF));
+OSL_ASSERT(rtl::isUnicodeScalarValue(c));
 if (c <= 0x) {
 buf[0] = (sal_Unicode) c;
 len = 1;
diff --git a/sal/textenc/tcvtutf8.cxx b/sal/textenc/tcvtutf8.cxx
index d9c3c134a83a..f5ed9dfb995c 100644
--- a/sal/textenc/tcvtutf8.cxx
+++ b/sal/textenc/tcvtutf8.cxx
@@ -170,10 +170,7 @@ sal_Size ImplConvertUtf8ToUnicode(
 }
 break;
 case 3:
-if (nUtf32 < 0x800
-|| (!bJavaUtf8
-&&

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

2017-09-13 Thread Stephan Bergmann

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

New commits:
commit 2d22b39fb7ddbb02f246e2943b228931e5d583e1
Author: Stephan Bergmann 
Date:   Wed Sep 13 13:16:10 2017 +0200

Clamp minor/patchlevel when computing CLANG_VERSION

...so it doesn't overflow for odd version numbers like
's 'clang --version' reportedly returning 
"Android
clang version 5.0.300080  (based on LLVM 5.0.300080) [â¦]"

Change-Id: I7e3b3e0fa93d48fbbfa7a9b71e91776f976ed0da

diff --git a/configure.ac b/configure.ac
index edfc281ebfb0..5f7f7c918fc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3668,7 +3668,8 @@ if test "$COM_IS_CLANG" = TRUE; then
 fi
 clang_version=`echo __clang_major__.__clang_minor__.__clang_patchlevel__ | 
$CC_PLAIN $my_args -`
 CLANG_FULL_VERSION=`echo __clang_version__ | $CC_PLAIN $my_args -`
-CLANGVER=`echo $clang_version | $AWK -F. '{ print \$1*1+\$2*100+\$3 }'`
+CLANGVER=`echo $clang_version \
+| $AWK -F. '{ print \$1*1+(\$2<100?\$2:99)*100+(\$3<100?\$3:99) }'`
 AC_MSG_RESULT([Clang $CLANG_FULL_VERSION, $CLANGVER])
 AC_DEFINE_UNQUOTED(CLANG_VERSION,$CLANGVER)
 AC_DEFINE_UNQUOTED(CLANG_FULL_VERSION,$CLANG_FULL_VERSION)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-13 Thread Muhammet Kara

 cui/source/customize/SvxMenuConfigPage.cxx |9 +
 cui/source/customize/cfg.cxx   |2 -
 cui/uiconfig/ui/menuassignpage.ui  |   50 ++---
 3 files changed, 28 insertions(+), 33 deletions(-)

New commits:
commit 6f60cfe259277e45f858ba5cbf39750217cb0953
Author: Muhammet Kara 
Date:   Wed Sep 13 12:08:14 2017 +0300

tdf#112133: Drop the Add and Remove labels

and ensure consistent height of the controls
in the first row of the Customize dialog.

Change-Id: I6c2d75b647cad7a2ead8c875afc4fd38a182eef0
Reviewed-on: https://gerrit.libreoffice.org/42233
Tested-by: Jenkins 
Reviewed-by: Muhammet Kara 

diff --git a/cui/source/customize/SvxMenuConfigPage.cxx 
b/cui/source/customize/SvxMenuConfigPage.cxx
index 6d02d8d4442d..481723867af5 100644
--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -150,6 +150,15 @@ SvxMenuConfigPage::SvxMenuConfigPage(vcl::Window *pParent, 
const SfxItemSet& rSe
 if ( !bIsMenuBar )
 {
 // Context menus cannot be added/removed
+// These height requests are needed to keep the height of
+// the top level list boxes consistent for all tabs
+m_pTopLevelListBox->set_height_request(
+m_pPlusBtn->GetOptimalSize().Height() );
+m_pCommandCategoryListBox->set_height_request(
+m_pPlusBtn->GetOptimalSize().Height() );
+
+m_pPlusBtn->Disable();
+m_pMinusBtn->Disable();
 m_pPlusBtn->Hide();
 m_pMinusBtn->Hide();
 }
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index fa415d43f6f7..8626ddf68ba8 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1175,7 +1175,7 @@ SvxConfigPage::SvxConfigPage(vcl::Window *pParent, const 
SfxItemSet& rSet)
 //TODO: Add SvxMenuEntriesListBox into the glade catalog, and use it on the
 //  .ui file to get rid of the extra VCLContainer, and all these manual
 //  sizing and widget creation tricks.
-m_pFunctions->set_width_request(aSize.Width() * 1.4);
+m_pFunctions->set_width_request(aSize.Width() * 1.45);
 
 // Make the middle buttons bigger
 m_pAddCommandButton->set_height_request( 
m_pAddCommandButton->GetOptimalSize().Height() * 1.5 );
diff --git a/cui/uiconfig/ui/menuassignpage.ui 
b/cui/uiconfig/ui/menuassignpage.ui
index 9b1da649f7d6..44b85edc2b86 100644
--- a/cui/uiconfig/ui/menuassignpage.ui
+++ b/cui/uiconfig/ui/menuassignpage.ui
@@ -164,6 +164,8 @@
 True
 False
 center
+6
+6
 6
 
   
@@ -175,6 +177,7 @@
 True
 True
 True
+Add item
 center
 start
 5
@@ -188,22 +191,6 @@
 0
   
 
-
-  
-True
-False
-_Add
-True
-add
-
-  
-
-  
-  
-0
-1
-  
-
   
   
 0
@@ -220,6 +207,7 @@
 True
 True
 True
+Remove item
 center
 end
 5
@@ -233,22 +221,6 @@
 0
   
 
-
-  
-True
-False
-Remo_ve
-True
-remove
-
-  
-
-  
-  
-0
-1
-  
-
   
   
 0
@@ -527,6 +499,20 @@
   
 
   
+  
+vertical
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
   
 True
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-13 Thread Caolán McNamara

 include/vcl/slider.hxx |2 --
 include/vcl/spinfld.hxx|4 
 vcl/source/control/slider.cxx  |   24 
 vcl/source/control/spinfld.cxx |4 ++--
 4 files changed, 2 insertions(+), 32 deletions(-)

New commits:
commit 53548b8d74a34aa30b36b44f6e41f5949da9681d
Author: CaolÃ¡n McNamara 
Date:   Wed Sep 13 09:23:29 2017 +0100

drop first/last link callback

of course this stuff is exposed through uno through
com::sun::star::awt::XSpinListener so VclEventId::SpinfieldFirst
and VclEventId::SpinfieldLast have to be retained

Change-Id: Icbf31cc8c62f2bc3bc0ccf966c0fd4f5c43dcf6b
Reviewed-on: https://gerrit.libreoffice.org/42231
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx
index 879340fc387f..426727c15ae7 100644
--- a/include/vcl/slider.hxx
+++ b/include/vcl/slider.hxx
@@ -57,8 +57,6 @@ private:
 Link   maEndSlideHdl;
 
 DECL_LINK(LinkedFieldModifyHdl, Edit&, void);
-DECL_LINK(LinkedFieldLoseFocusHdl, Control&, void);
-DECL_LINK(LinkedFieldSpinnerHdl, SpinField&, void);
 
 using Control::ImplInitSettings;
 using Window::ImplInit;
diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx
index 6e3a2c35811b..02df5ded9066 100644
--- a/include/vcl/spinfld.hxx
+++ b/include/vcl/spinfld.hxx
@@ -53,8 +53,6 @@ public:
 voidSetUpHdl( const Link& rLink ) { 
maUpHdlLink = rLink; }
 voidSetDownHdl( const Link& rLink ) { 
maDownHdlLink = rLink; }
 const Link&   GetDownHdl() const { return maDownHdlLink; }
-voidSetFirstHdl( const Link& rLink ) { 
maFirstHdlLink = rLink; }
-voidSetLastHdl( const Link& rLink ) { 
maLastHdlLink = rLink; }
 
 virtual SizeCalcMinimumSize() const override;
 virtual SizeCalcMinimumSizeForText(const OUString &rString) const 
override;
@@ -87,8 +85,6 @@ private:
 AutoTimer   maRepeatTimer;
 Link  maUpHdlLink;
 Link  maDownHdlLink;
-Link  maFirstHdlLink;
-Link  maLastHdlLink;
 boolmbRepeat:1,
 mbSpin:1,
 mbInitialUp:1,
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index 102e10aae82a..61075e8b89e4 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -815,36 +815,12 @@ void Slider::Resize()
 void Slider::SetLinkedField(VclPtr const & pField)
 {
 if (mpLinkedField)
-{
 mpLinkedField->SetModifyHdl(Link());
-mpLinkedField->SetUpHdl(Link());
-mpLinkedField->SetDownHdl(Link());
-mpLinkedField->SetFirstHdl(Link());
-mpLinkedField->SetLastHdl(Link());
-mpLinkedField->SetLoseFocusHdl(Link());
-}
 mpLinkedField = pField;
 if (mpLinkedField)
-{
 mpLinkedField->SetModifyHdl(LINK(this, Slider, LinkedFieldModifyHdl));
-mpLinkedField->SetUpHdl(LINK(this, Slider, LinkedFieldSpinnerHdl));
-mpLinkedField->SetDownHdl(LINK(this, Slider, LinkedFieldSpinnerHdl));
-mpLinkedField->SetFirstHdl(LINK(this, Slider, LinkedFieldSpinnerHdl));
-mpLinkedField->SetLastHdl(LINK(this, Slider, LinkedFieldSpinnerHdl));
-mpLinkedField->SetLoseFocusHdl(LINK(this, Slider, 
LinkedFieldLoseFocusHdl));
-}
 }
 
-IMPL_LINK_NOARG(Slider, LinkedFieldSpinnerHdl, SpinField&, void)
-{
-if (mpLinkedField)
-SetThumbPos(mpLinkedField->GetValue());
-}
-IMPL_LINK_NOARG(Slider, LinkedFieldLoseFocusHdl, Control&, void)
-{
-if (mpLinkedField)
-SetThumbPos(mpLinkedField->GetValue());
-}
 IMPL_LINK_NOARG(Slider, LinkedFieldModifyHdl, Edit&, void)
 {
 if (mpLinkedField)
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 0459160a9b03..37f88ea6b252 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -366,12 +366,12 @@ void SpinField::Down()
 
 void SpinField::First()
 {
-ImplCallEventListenersAndHandler( VclEventId::SpinfieldFirst, [this] () { 
maFirstHdlLink.Call(*this); } );
+ImplCallEventListenersAndHandler(VclEventId::SpinfieldFirst, nullptr);
 }
 
 void SpinField::Last()
 {
-ImplCallEventListenersAndHandler( VclEventId::SpinfieldLast, [this] () { 
maLastHdlLink.Call(*this); } );
+ImplCallEventListenersAndHandler(VclEventId::SpinfieldLast, nullptr);
 }
 
 void SpinField::MouseButtonDown( const MouseEvent& rMEvt )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-13 Thread Noel Grandin

 svx/source/accessibility/ChildrenManagerImpl.cxx   |   10 
 svx/source/dialog/charmap.cxx  |  540 ++---
 svx/source/dialog/framelink.cxx|   18 
 svx/source/dialog/frmsel.cxx   |   26 -
 svx/source/dialog/orienthelper.cxx |6 
 svx/source/engine3d/helperhittest3d.cxx|2 
 svx/source/fmcomp/fmgridcl.cxx |   60 +-
 svx/source/form/fmobjfac.cxx   |6 
 svx/source/form/fmshimp.cxx|6 
 svx/source/form/formcontroller.cxx |4 
 svx/source/gallery2/galbrws1.cxx   |   10 
 svx/source/sdr/contact/viewcontactofsdrobj.cxx |2 
 svx/source/sdr/primitive2d/sdrattributecreator.cxx |   16 
 svx/source/svdraw/sdrpaintwindow.cxx   |2 
 svx/source/svdraw/svddrgmt.cxx |2 
 svx/source/svdraw/svdedxv.cxx  |5 
 svx/source/svdraw/svdotextdecomposition.cxx|8 
 svx/source/svdraw/svdotextpathdecomposition.cxx|2 
 svx/source/tbxctrls/Palette.cxx|6 
 svx/source/tbxctrls/PaletteManager.cxx |4 
 svx/source/tbxctrls/fontworkgallery.cxx|2 
 svx/source/tbxctrls/tbcontrl.cxx   |   24 
 svx/source/xml/xmlgrhlp.cxx|2 
 23 files changed, 381 insertions(+), 382 deletions(-)

New commits:
commit 0e3911478349349fb59dcc52cb5f5419fbdc7c0e
Author: Noel Grandin 
Date:   Wed Sep 13 11:04:58 2017 +0200

clang-tidy modernize-use-emplace in svx

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

diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx 
b/svx/source/accessibility/ChildrenManagerImpl.cxx
index c4b72ffd70ff..7cf63fdf7f49 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -298,7 +298,7 @@ void ChildrenManagerImpl::CreateListOfVisibleShapes (
 // bounding box has non-zero extensions.
 awt::Rectangle aPixelBBox (xComponent->getBounds());
 if ((aPixelBBox.Width > 0) && (aPixelBBox.Height > 0))
-raDescriptorList.push_back (ChildDescriptor (*I));
+raDescriptorList.emplace_back(*I);
 }
 }
 }
@@ -327,7 +327,7 @@ void ChildrenManagerImpl::CreateListOfVisibleShapes (
 // Insert shape if it is visible, i.e. its bounding box overlaps
 // the visible area.
 if ( aBoundingBox.IsOver (aVisibleArea) )
-raDescriptorList.push_back (ChildDescriptor (xShape));
+raDescriptorList.emplace_back(xShape);
 }
 }
 }
@@ -456,7 +456,7 @@ void ChildrenManagerImpl::AddShape (const 
Reference& rxShape)
 if (aBoundingBox.IsOver (aVisibleArea))
 {
 // Add shape to list of visible shapes.
-maVisibleChildren.push_back (ChildDescriptor (rxShape));
+maVisibleChildren.emplace_back(rxShape);
 
 // Create accessibility object.
 ChildDescriptor& rDescriptor = maVisibleChildren.back();
@@ -883,7 +883,7 @@ void ChildrenManagerImpl::UpdateSelection()
 {
 if (bDrawShape)
 {
-
vecSelect.push_back(std::make_pair(pAccessibleShape,true));
+vecSelect.emplace_back(pAccessibleShape,true);
 ++nAddSelect;
 }
 }
@@ -899,7 +899,7 @@ void ChildrenManagerImpl::UpdateSelection()
 {
 if(bDrawShape)
 {
-
vecSelect.push_back(std::make_pair(pAccessibleShape,false));
+vecSelect.emplace_back(pAccessibleShape,false);
 }
 }
 }
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 9a1b22ad34e9..d4643b5988b2 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -1010,826 +1010,826 @@ void SubsetMap::InitList()
 case UBLOCK_LOW_SURROGATES:
 break;
 case UBLOCK_BASIC_LATIN:
-aAllSubsets.push_back( Subset( 0x, 0x007F, 
SvxResId(RID_SUBSETSTR_BASIC_LATIN) ) );
+aAllSubsets.emplace_back( 0x, 0x007F, 
SvxResId(RID_SUBSETSTR_BASIC_LATIN) );
 break;
 case UBLOCK_LATIN_1_SUPPLEMENT:
-aAllSubsets.push_back( Subset( 0x0080, 0x00FF, 
SvxResId(RID_SUBSETSTR_LATIN_1) ) );
+aAllSubsets.emplace_back( 0x0080, 0x00FF, 
SvxResId(RID_SUBSETSTR_LATIN_1) );
 break;

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

2017-09-13 Thread Tamás Zolnai

 sc/source/filter/excel/xipivot.cxx |   10 --
 sc/source/filter/inc/xipivot.hxx   |2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 39f4a8a60b0d0d2075369adf750f159bf73b0fa3
Author: TamÃ¡s Zolnai 
Date:   Wed Sep 13 09:13:19 2017 +0200

This return value is unused now

Change-Id: I6145e9bd5736b5c48683d0a85d13ad02d66d5084
Reviewed-on: https://gerrit.libreoffice.org/42227
Reviewed-by: TamÃ¡s Zolnai 
Tested-by: TamÃ¡s Zolnai 

diff --git a/sc/source/filter/excel/xipivot.cxx 
b/sc/source/filter/excel/xipivot.cxx
index b382c6f088fe..b756f273aca5 100644
--- a/sc/source/filter/excel/xipivot.cxx
+++ b/sc/source/filter/excel/xipivot.cxx
@@ -1103,19 +1103,19 @@ static OUString lcl_convertExcelSubtotalName(const 
OUString& rName)
 return aBuf.makeStringAndClear();
 }
 
-ScDPSaveDimension* XclImpPTField::ConvertRCPField( ScDPSaveData& rSaveData ) 
const
+void XclImpPTField::ConvertRCPField( ScDPSaveData& rSaveData ) const
 {
 const OUString& rFieldName = GetFieldName();
 if( rFieldName.isEmpty() )
-return nullptr;
+return;
 
 const XclImpPCField* pCacheField = GetCacheField();
 if( !pCacheField || !pCacheField->IsSupportedField() )
-return nullptr;
+return;
 
 ScDPSaveDimension* pTest = rSaveData.GetNewDimensionByName(rFieldName);
 if (!pTest)
-return nullptr;
+return;
 
 ScDPSaveDimension& rSaveDim = *pTest;
 
@@ -1163,8 +1163,6 @@ ScDPSaveDimension* XclImpPTField::ConvertRCPField( 
ScDPSaveData& rSaveData ) con
 OUString aSubName = 
lcl_convertExcelSubtotalName(*maFieldExtInfo.mpFieldTotalName);
 rSaveDim.SetSubtotalName(aSubName);
 }
-
-return &rSaveDim;
 }
 
 void XclImpPTField::ConvertFieldInfo( const ScDPSaveData& rSaveData, 
ScDPObject* pObj, const XclImpRoot& rRoot, bool bPageField ) const
diff --git a/sc/source/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx
index 3fd656cee83a..93425806f69d 100644
--- a/sc/source/filter/inc/xipivot.hxx
+++ b/sc/source/filter/inc/xipivot.hxx
@@ -273,7 +273,7 @@ public:
 voidConvertFieldInfo( const ScDPSaveData& rSaveData, 
ScDPObject* pObj, const XclImpRoot& rRoot, bool bPageField = false ) const;
 
 private:
-ScDPSaveDimension*  ConvertRCPField( ScDPSaveData& rSaveData ) const;
+voidConvertRCPField( ScDPSaveData& rSaveData ) const;
 
 voidConvertDataField( ScDPSaveDimension& rSaveDim, const 
XclPTDataFieldInfo& rDataInfo ) const;
 voidConvertDataFieldInfo( ScDPSaveDimension& rSaveDim, 
const XclPTDataFieldInfo& rDataInfo ) const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: To get some help - Bug 38835

2017-09-13 Thread Shinnok

Hi Gayan,

Always use the original thread discussion you started on this list and reply to 
all, this way it's easier to keep track of the conversation backlog.

Congratulations on getting LO built and running! The next step for you is to 
look  over the comments in Bugzilla and try to figure out if there's any cases 
left where static globals for non-trivial types/functions could be changed. 
Issue #3885 is not a bug per-se, but an improvement to the code base.

Use the "git grep" commands that Jan posted in the comments to find your way 
around the code and identify potential issues. Also take a look over the 
commits already merged for this issue by following the links. Another way to 
find out what work has already been done for this issue is to check 
gerrit.libreoffice.org  for the tracking number 
#3885:
https://gerrit.libreoffice.org/#/q/%252338835 

If you need more help, you can ask in the comments section in Bugzilla.

Shinnok

> On Sep 13, 2017, at 9:10 AM, Gayan Thejawansha  
> wrote:
> 
> Hi Shinnok, 
> 
> I have build the core and observed that it is running and I'm currently work 
> from there. Just in case can I know that how to re-create the bug so that I 
> can get better understanding of the bug.  
> I already have assigned to the bug in Bugzilla. 
> 
> Thank in advanced 
> 
> On Mon, Aug 28, 2017 at 4:28 AM, Shinnok  > wrote:
> Hi Gayan,
> 
> You first step would be to setup a LibreOffice core build of current master 
> and start working from there.  Platform specific instructions on how to setup 
> a build as well as other useful starter info can be found on the Wiki:
> https://wiki.documentfoundation.org/Development 
> 
> 
> Then you need to register on Bugzilla and assign issue 38835 to yourself 
> using the (take) action next to Assignee label. As soon as you have a 
> workable patch for us you need to register on Gerrit and submit it for review:
> https://gerrit.libreoffice.org/#/q/status:open 
> 
> 
> Let us know of your progress and if you get stuck, need help or anything in 
> between please e-mail the dev list or hop on to irc at freenode.net 
>  on channel #libreoffice-dev.
> 
> https://lists.freedesktop.org/mailman/listinfo/libreoffice 
> 
> 
> Regards,
> Shinnok
> 
> 
>> On Aug 25, 2017, at 12:07 PM, Gayan Thejawansha > > wrote:
>> 
>> Hello there,
>> 
>> I hope to working on the bug of Bug 38835 - strip out non-trivial globals 
>> before main
>>  which is shown in here. ( 
>> https://bugs.documentfoundation.org/show_bug.cgi?id=38835 
>>  ) 
>>  I understood the problem there but I don't have any idea of how to start 
>> the bug fixing. Since I have the average
>>  programming skills, if anyone can guide me how to start the process, it 
>> will be a great help.
>> 
>> Thank in advance,
>> Gayan
>> 
>> ___
>> LibreOffice mailing list
>> LibreOffice@lists.freedesktop.org 
>> https://lists.freedesktop.org/mailman/listinfo/libreoffice 
>> 
> 
> 

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

[Libreoffice-commits] core.git: Branch 'feature/borderline3' - svx/source

2017-09-13 Thread Armin Le Grand

 svx/source/dialog/framelinkarray.cxx |   13 -
 1 file changed, 13 deletions(-)

New commits:
commit d9e912b83f66e4cd5e7505dcc71fb8c359688fe3
Author: Armin Le Grand 
Date:   Wed Sep 13 11:21:34 2017 +0200

borderline: more clang changes

Change-Id: I886885b1fffc36df6e29afb31ad4fa19eb99f23e

diff --git a/svx/source/dialog/framelinkarray.cxx 
b/svx/source/dialog/framelinkarray.cxx
index 2d81caebd3a7..db54294640c5 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -249,9 +249,6 @@ struct ArrayImpl
 longGetColPosition( size_t nCol ) const;
 longGetRowPosition( size_t nRow ) const;
 
-longGetColWidth( size_t nFirstCol, size_t nLastCol ) const;
-longGetRowHeight( size_t nFirstRow, size_t nLastRow ) 
const;
-
 boolHasCellRotation() const;
 };
 
@@ -375,16 +372,6 @@ long ArrayImpl::GetRowPosition( size_t nRow ) const
 return maYCoords[ nRow ];
 }
 
-long ArrayImpl::GetColWidth( size_t nFirstCol, size_t nLastCol ) const
-{
-return GetColPosition( nLastCol + 1 ) - GetColPosition( nFirstCol );
-}
-
-long ArrayImpl::GetRowHeight( size_t nFirstRow, size_t nLastRow ) const
-{
-return GetRowPosition( nLastRow + 1 ) - GetRowPosition( nFirstRow );
-}
-
 bool ArrayImpl::HasCellRotation() const
 {
 // check cell array
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-13 Thread Stephan Bergmann

 sal/osl/unx/file_volume.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 9088ef89b792cbb9eeb06137c391b7cab5042330
Author: Stephan Bergmann 
Date:   Wed Sep 13 11:17:26 2017 +0200

Silence -Werror,-Wunreachable-code on Android

Change-Id: Ide7591b4012f23e8a3faa705537937efcac435a2

diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx
index 6db0beba2a39..3388019bd8d2 100644
--- a/sal/osl/unx/file_volume.cxx
+++ b/sal/osl/unx/file_volume.cxx
@@ -216,7 +216,7 @@ static oslFileError osl_psz_getVolumeInformation (
 {
 OSL_detail_STATFS_STRUCT sfs;
 OSL_detail_STATFS_INIT(sfs);
-if ((OSL_detail_STATFS(pszDirectory, &sfs)) < 0)
+if ((OSL_detail_STATFS(pszDirectory, &sfs)) < (0))
 {
 oslFileError result = oslTranslateFileError(OSL_FET_ERROR, errno);
 return result;
@@ -225,7 +225,9 @@ static oslFileError osl_psz_getVolumeInformation (
 /* FIXME: how to detect the kind of storage (fixed, cdrom, ...) */
 if (uFieldMask & osl_VolumeInfo_Mask_Attributes)
 {
-if (OSL_detail_STATFS_ISREMOTE(sfs))
+bool const remote = OSL_detail_STATFS_ISREMOTE(sfs);
+// extracted from the 'if' to avoid Clang -Wunreachable-code
+if (remote)
 pInfo->uAttributes  |= osl_Volume_Attribute_Remote;
 
 pInfo->uValidFields |= osl_VolumeInfo_Mask_Attributes;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - include/oox include/sal oox/source sax/README sax/source

2017-09-13 Thread Michael Stahl

 include/oox/vml/vmlshapecontainer.hxx |8 
 include/oox/vml/vmlshapecontext.hxx   |9 +
 include/sal/log-areas.dox |1 +
 oox/source/vml/vmlshapecontainer.cxx  |4 ++--
 oox/source/vml/vmlshapecontext.cxx|   30 ++
 sax/README|   14 +-
 sax/source/fastparser/fastparser.cxx  |6 +-
 7 files changed, 48 insertions(+), 24 deletions(-)

New commits:
commit 403c7729734ed1a545f0436e31c4d14a2724606d
Author: Michael Stahl 
Date:   Wed Sep 13 11:05:31 2017 +0200

sax: allow some debug logging in FastParser

Multi-threading makes this difficult; have it print synchronously
where it is in the input when setting:
SAL_LOG="+INFO.sax.fastparser+WARN" SAX_DISABLE_THREADS=1

Change-Id: I8c77974acb2b4d4e273fc9c0f273c345d8feb2ff

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index e99a05bbfbc9..d12ae1675bfe 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -421,6 +421,7 @@ certain functionality.
 @section sax
 
 @li @c sax.cppunit
+@li @c sax.fastparser
 
 @section stoc
 
diff --git a/sax/README b/sax/README
index 0e1e6175f3f1..00ca0f1af5ae 100644
--- a/sax/README
+++ b/sax/README
@@ -8,3 +8,6 @@ UNO services for SAX parsing and C++ functions for XMLSchema-2 
data types.
 + C++ wrapper for fast SAX parser
 + C++ XMLSchema-2 data type conversion helpers
 
+Multi-threading in FastParser can be disabled for debugging purposes with:
+SAX_DISABLE_THREADS=1 SAL_LOG="+INFO.sax.fastparser+WARN"
+
diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index 8188724a91d9..a0cfc2f9e740 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -759,7 +759,8 @@ void FastSaxParserImpl::parseStream(const InputSource& 
maStructSource)
 rEntity.mxDocumentHandler->startDocument();
 }
 
-rEntity.mbEnableThreads = 
(rEntity.maStructSource.aInputStream->available() > 1);
+rEntity.mbEnableThreads = 
rEntity.maStructSource.aInputStream->available() > 1
+&& !getenv("SAX_DISABLE_THREADS");
 
 if (rEntity.mbEnableThreads)
 {
@@ -1199,7 +1200,10 @@ void FastSaxParserImpl::callbackStartElement(const 
xmlChar *localName , const xm
 if (rEntity.mbEnableThreads)
 produce();
 else
+{
+SAL_INFO("sax.fastparser", " startElement line " << 
mxDocumentLocator->getLineNumber() << " column " << 
mxDocumentLocator->getColumnNumber() << " " << prefix << ":" << localName);
 rEntity.startElement( &rEvent );
+}
 }
 catch (const Exception&)
 {
commit 88c84e71e2559ec6d0b4f8c5101a149daa4a2b2b
Author: Michael Stahl 
Date:   Wed Sep 13 10:48:38 2017 +0200

tdf#112311 oox: fix UAF of std::shared_ptr

OOXMLFastContextHandlerShape::sendShape() deletes the parent context's
ShapeTypeContext::mrTypeModel.

It looks like the sendShape() can't be delayed because writerfilter
wants to import the v:textbox content into a text frame.

Keep the shape alive until the end of the containing context.

Not sure if it's going to process the v:fill element properly,
but at lest valgrind is happy.

(probably regression from CWS writerfilter32bugfixes01)

Change-Id: Ifeab84751a1b20b2f272c4dd74b7097deb5eece0

diff --git a/include/oox/vml/vmlshapecontainer.hxx 
b/include/oox/vml/vmlshapecontainer.hxx
index 10c8e74094e0..ff39d5f7212c 100644
--- a/include/oox/vml/vmlshapecontainer.hxx
+++ b/include/oox/vml/vmlshapecontainer.hxx
@@ -61,10 +61,10 @@ public:
 Drawing& getDrawing() { return mrDrawing; }
 
 /** Creates and returns a new shape template object. */
-ShapeType&  createShapeType();
+std::shared_ptr createShapeType();
 /** Creates and returns a new shape object of the specified type. */
 template< typename ShapeT >
-ShapeT& createShape();
+std::shared_ptr createShape();
 
 /** Final processing after import of the drawing fragment. */
 voidfinalizeFragmentImport();
@@ -123,11 +123,11 @@ private:
 
 
 template< typename ShapeT >
-ShapeT& ShapeContainer::createShape()
+std::shared_ptr ShapeContainer::createShape()
 {
 std::shared_ptr< ShapeT > xShape( new ShapeT( mrDrawing ) );
 maShapes.push_back( xShape );
-return *xShape;
+return xShape;
 }
 
 template< typename Functor >
diff --git a/include/oox/vml/vmlshapecontext.hxx 
b/include/oox/vml/vmlshapecontext.hxx
index f73055b3355f..7243684f6350 100644
--- a/include/oox/vml/vmlshapecontext.hxx
+++ b/include/oox/vml/vmlshapecontext.hxx
@@ -99,7 +99,7 @@ class ShapeTypeContext : public ShapeContextBase
 public:
 explicitShapeTypeContext(
 ::oox::core::ContextHandler2Helper const & rParent,
-ShapeType& r

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

2017-09-13 Thread Noel Grandin

 sfx2/source/appl/linkmgr2.cxx   |2 
 sfx2/source/dialog/backingwindow.cxx|2 
 sfx2/source/dialog/filedlghelper.cxx|2 
 sfx2/source/dialog/filtergrouping.cxx   |   10 ++--
 sfx2/source/dialog/infobar.cxx  |2 
 sfx2/source/dialog/splitwin.cxx |4 -
 sfx2/source/dialog/styfitem.cxx |2 
 sfx2/source/doc/SfxDocumentMetaData.cxx |   73 +++-
 sfx2/source/sidebar/ContextList.cxx |2 
 sfx2/source/sidebar/FocusManager.cxx|4 -
 sfx2/source/view/frame.cxx  |   10 ++--
 sfx2/source/view/viewfrm.cxx|2 
 12 files changed, 48 insertions(+), 67 deletions(-)

New commits:
commit c460201dfdfae3a15db70ccefd689048c1ba2996
Author: Noel Grandin 
Date:   Wed Sep 13 10:19:00 2017 +0200

clang-tidy modernize-use-emplace in sfx2

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

diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index cb7541be015a..bf8907fd1f6b 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -161,7 +161,7 @@ bool LinkManager::Insert( SvBaseLink* pLink )
 }
 
 pLink->SetLinkManager( this );
-aLinkTbl.push_back( tools::SvRef(pLink) );
+aLinkTbl.emplace_back(pLink );
 return true;
 }
 
diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index 516bb5418d3b..3ca873ed74e5 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -123,7 +123,7 @@ BackingWindow::BackingWindow( vcl::Window* i_pParent ) :
 get(mpAllRecentThumbnails, "all_recent");
 get(mpLocalView, "local_view");
 
-maDndWindows.push_back(mpAllRecentThumbnails);
+maDndWindows.emplace_back(mpAllRecentThumbnails);
 
 try
 {
diff --git a/sfx2/source/dialog/filedlghelper.cxx 
b/sfx2/source/dialog/filedlghelper.cxx
index 45d840854e79..53f706761454 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -2199,7 +2199,7 @@ bool 
FileDialogHelper_Impl::isShowFilterExtensionEnabled() const
 void FileDialogHelper_Impl::addFilterPair( const OUString& rFilter,
const OUString& 
rFilterWithExtension )
 {
-maFilters.push_back( css::beans::StringPair( rFilter, rFilterWithExtension 
) );
+maFilters.emplace_back( rFilter, rFilterWithExtension );
 
 }
 
diff --git a/sfx2/source/dialog/filtergrouping.cxx 
b/sfx2/source/dialog/filtergrouping.cxx
index b8762a49318f..04e09f66807b 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -176,7 +176,7 @@ namespace sfx2
 void operator() ( const FilterName& _rLogicalFilterName )
 {
 // insert a new (empty) class
-m_rClassList.push_back( FilterClass() );
+m_rClassList.emplace_back( );
 // get the position of this new entry
 FilterClassList::iterator aInsertPos = m_rClassList.end();
 --aInsertPos;
@@ -476,7 +476,7 @@ namespace sfx2
 {
 if ( ( s_cWildcardSeparator == *pTokenLoop ) && ( pTokenLoop > 
pTokenStart ) )
 {   // found a new token separator (and a non-empty token)
-aWildCards.push_back( OUString( pTokenStart, pTokenLoop - 
pTokenStart ) );
+aWildCards.emplace_back( pTokenStart, pTokenLoop - pTokenStart 
);
 
 // search the start of the next token
 while ( ( pTokenStart != pTokenLoopEnd ) && ( *pTokenStart != 
s_cWildcardSeparator ) )
@@ -492,7 +492,7 @@ namespace sfx2
 }
 if ( pTokenLoop > pTokenStart )
 // the last one 
-aWildCards.push_back( OUString( pTokenStart, pTokenLoop - 
pTokenStart ) );
+aWildCards.emplace_back( pTokenStart, pTokenLoop - pTokenStart );
 }
 
 
@@ -575,7 +575,7 @@ namespace sfx2
 // (this assumes that both numbers are the same, which, speaking 
strictly, must not hold - but it does, as we know ...)
 sal_Int32 nGlobalClasses = aGlobalClasses.size();
 while ( nGlobalClasses-- )
-_rAllFilters.push_back( FilterGroup() );
+_rAllFilters.emplace_back( );
 
 
 // for the local classes:
@@ -685,7 +685,7 @@ namespace sfx2
 FilterGroup::iterator aInsertPos = aCurrentGroup->end();
 --aInsertPos;
 // remember this pos
-aLocalFinalPositions.push_back( 
MapGroupEntry2GroupEntry::value_type( aBelongsToLocal->second, aInsertPos ) );
+aLocalFinalPositions.emplace_back( 
aBelongsToLocal->second, aInsertPos );
 }
 }
 else
diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx
index e51a24520d96..43200f0ac00d 1

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

2017-09-13 Thread Miklos Vajna

 sw/inc/fmtfld.hxx |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 2d5c3782f34510812f271717f5a04b789b16c121
Author: Miklos Vajna 
Date:   Wed Sep 13 09:13:40 2017 +0200

sw: prefix members of SwFormatFieldHint

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

diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index ec2ff450f472..86f114fd7fb3 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -124,20 +124,20 @@ enum class SwFormatFieldHintWhich
 
 class SW_DLLPUBLIC SwFormatFieldHint : public SfxHint
 {
-const SwFormatField*   pField;
-SwFormatFieldHintWhich nWhich;
-const SwView* pView;
+const SwFormatField*   m_pField;
+SwFormatFieldHintWhich m_nWhich;
+const SwView* m_pView;
 
 public:
-SwFormatFieldHint( const SwFormatField* p, SwFormatFieldHintWhich n, const 
SwView* pV = nullptr)
-: pField(p)
-, nWhich(n)
-, pView(pV)
+SwFormatFieldHint( const SwFormatField* pField, SwFormatFieldHintWhich 
nWhich, const SwView* pView = nullptr)
+: m_pField(pField)
+, m_nWhich(nWhich)
+, m_pView(pView)
 {}
 
-const SwFormatField* GetField() const { return pField; }
-SwFormatFieldHintWhich Which() const { return nWhich; }
-const SwView* GetView() const { return pView; }
+const SwFormatField* GetField() const { return m_pField; }
+SwFormatFieldHintWhich Which() const { return m_nWhich; }
+const SwView* GetView() const { return m_pView; }
 };
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/borderline3' - drawinglayer/source include/svx svx/source sw/source

2017-09-13 Thread Armin Le Grand

 drawinglayer/source/primitive2d/borderlineprimitive2d.cxx |   27 ++
 include/svx/framelinkarray.hxx|5 ++
 svx/source/table/viewcontactoftableobj.cxx|   12 +++---
 sw/source/core/layout/paintfrm.cxx|   16 ++--
 4 files changed, 45 insertions(+), 15 deletions(-)

New commits:
commit ae9941f6515dd1a655dd88a5219f27409a5bb064
Author: Armin Le Grand 
Date:   Wed Sep 13 10:29:29 2017 +0200

borderline: Added merge BorderLinePrimitive2D

Added BorderLinePrimitive2D merges for Writer and fixes,
also clang fixes for clang build

Change-Id: Ia4172a5db085569f899a4c5ad3faca57823e7b52

diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx 
b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
index 5fc3b57fbbda..eba1f7f0d996 100644
--- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
@@ -439,7 +439,15 @@ namespace drawinglayer
 return Primitive2DReference();
 }
 
-if(!rBT.isGap())
+if(rBT.isGap())
+{
+// when gap, width has to be equal
+
if(!rtl::math::approxEqual(rBT.getLineAttribute().getWidth(), 
rBC.getLineAttribute().getWidth()))
+{
+return Primitive2DReference();
+}
+}
+else
 {
 // when not gap, the line extends have at least reach to 
the center ( > 0.0),
 // else there is a extend usage. When > 0.0 they just 
overlap, no problem
@@ -465,11 +473,18 @@ namespace drawinglayer
 const BorderLine& rBT(pCandidateA->getBorderLines()[a]);
 const BorderLine& rBC(pCandidateB->getBorderLines()[a]);
 
-aMergedBorderLines.push_back(
-BorderLine(
-rBT.getLineAttribute(),
-rBT.getStartLeft(), rBT.getStartRight(),
-rBC.getEndLeft(), rBC.getEndRight()));
+if(rBT.isGap())
+{
+aMergedBorderLines.push_back(rBT);
+}
+else
+{
+aMergedBorderLines.push_back(
+BorderLine(
+rBT.getLineAttribute(),
+rBT.getStartLeft(), rBT.getStartRight(),
+rBC.getEndLeft(), rBC.getEndRight()));
+}
 }
 
 return Primitive2DReference(
diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx
index 83b6c28d2524..2b06d29a41b2 100644
--- a/include/svx/framelinkarray.hxx
+++ b/include/svx/framelinkarray.hxx
@@ -319,6 +319,11 @@ private:
 std::unique_ptrmxImpl;
 };
 
+// helper to merge B2DPrimitive(s) in rSource and add to rTarget
+void SVX_DLLPUBLIC HelperMergeInB2DPrimitiveArray(
+const drawinglayer::primitive2d::Primitive2DContainer& rSource,
+drawinglayer::primitive2d::Primitive2DContainer& rTarget);
+
 }
 }
 
diff --git a/svx/source/table/viewcontactoftableobj.cxx 
b/svx/source/table/viewcontactoftableobj.cxx
index 52d6ce42b943..90d143665140 100644
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -208,14 +208,14 @@ namespace sdr
 const basegfx::B2DVector 
aY(basegfx::getNormalizedPerpendicular(rX));
 
 /// Fill top-left Style Table
-if(rLeftA.IsUsed()) 
aStart.push_back(svx::frame::StyleVectorCombination(rLeftA, -aY, bHor ? true : 
false));
-if(rLeftB.IsUsed()) 
aStart.push_back(svx::frame::StyleVectorCombination(rLeftB, -rX, bHor ? true : 
true));
-if(rLeftC.IsUsed()) 
aStart.push_back(svx::frame::StyleVectorCombination(rLeftC, aY, bHor ? false : 
true));
+if(rLeftA.IsUsed()) 
aStart.push_back(svx::frame::StyleVectorCombination(rLeftA, -aY, bHor)); // 
bHor ? true : false));
+if(rLeftB.IsUsed()) 
aStart.push_back(svx::frame::StyleVectorCombination(rLeftB, -rX, true)); // 
bHor ? true : true));
+if(rLeftC.IsUsed()) 
aStart.push_back(svx::frame::StyleVectorCombination(rLeftC, aY, !bHor)); // 
bHor ? false : true));
 
 /// Fill bottom-right Style Table
-if(rRightA.IsUsed()) 
aEnd.push_back(svx::frame::StyleVectorCombination(rRightA, -aY, bHor ? true : 
false));
-if(rRightB.IsUsed()) 
aEnd.push_back(svx::frame::StyleVectorCombination(rRightB, rX, bHor ? false : 
false));
-if(rRightC.IsUsed()) 
aEnd.push_back(svx::frame::StyleVectorCombination(rRightC, aY, bHor ? false : 
true));
+if(rRightA.IsUsed()) 
aEnd.push_back(svx::frame::StyleVectorCombination(rRightA, -aY, bHor)); // bHor 
? true : false));
+if(rRightB.IsUsed()) 
aEnd.pu

[Libreoffice-commits] core.git: basic/source chart2/source compilerplugins/clang cppu/qa cui/source sc/source sd/source solenv/gbuild sw/source unotools/source unoxml/source vcl/unx

2017-09-13 Thread Stephan Bergmann

 basic/source/sbx/sbxvalue.cxx |  103 +-
 chart2/source/view/main/PropertyMapper.cxx|2 
 compilerplugins/clang/test/unnecessaryparen.cxx   |6 
 compilerplugins/clang/test/vclwidgets.cxx |2 
 compilerplugins/clang/unnecessaryparen.cxx|6 
 cppu/qa/test_unotype.cxx  |2 
 cui/source/dialogs/about.cxx  |4 
 sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx |2 
 sd/source/ui/remotecontrol/BluetoothServer.cxx|5 
 solenv/gbuild/platform/com_GCC_defs.mk|2 
 sw/source/core/doc/tblrwcl.cxx|2 
 sw/source/core/undo/undobj1.cxx   |2 
 unotools/source/i18n/localedatawrapper.cxx|4 
 unoxml/source/rdf/CLiteral.cxx|2 
 unoxml/source/rdf/CURI.cxx|2 
 vcl/unx/gtk/gtkinst.cxx   |4 
 16 files changed, 90 insertions(+), 60 deletions(-)

New commits:
commit 7f3ca309513c8e7712378f05948ded3a34739d9d
Author: Stephan Bergmann 
Date:   Tue Sep 12 18:24:46 2017 +0200

Enable -Wunreachable-code

...motivated by  adding dead 
code
at the end of a switch statement, after the last case's "break".

-Wunreachable-code appears to work well on Clang, while it appears to have 
no
effect on GCC.

Most of the affected places are apparently temporary/TODO/FIXME cases of
disabling code via "if (false)", which can be written with an extra set of
parentheses as "if ((false))" to silence -Wunreachable-code on Clang (which 
thus
needed loplugin:unnecessaryparen to be adapted accordingly).  In some cases,
the controlling expression was more complex than just "false" and needed to 
be
rewritten by taking it out of the if statement to silence Clang.

One noteworthy case where the nature of the disabled code wasn't immediately
apparent:

  Sep 12 16:59:58  quikee, is that "if (false)" in
   ScExponentialSmoothingDialog::ApplyOutput
   (sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx) some 
work-in-
   progress or dead code?
  Sep 12 17:02:03  sberg: WIP, but you can remove it
  Sep 12 17:04:47  quikee, I'll wrap the false in an extra set of
   parentheses for now, to silence -Wunreachable-code (I wouldn't want to
   remove it, as I have no idea whether I should then also remove the 
"Initial
   value" comment preceding it)
  Sep 12 17:07:29  sberg: both are different ways to calculate the
   "intital value"... so no

Another case where the nature of the dead code, following while (true) loops
without breaks, is unclear is 
sd/source/ui/remotecontrol/BluetoothServer.cxx,
where I added TODO markers to the workarounds that silence the warnings for 
now.

basic/source/sbx/sbxvalue.cxx had a variable of type double, of automatic
storage duration, and without an initalizer at the top of a switch 
statement.
Clang warning about it is arguably a false positive.

Apart from that, this didn't find any cases of genuinely dead code in the
existing code base.

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

diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index fb52f2e3f0d1..0d5a1c432156 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -1062,73 +1062,80 @@ bool SbxValue::Compute( SbxOperator eOp, const 
SbxValue& rOp )
 
 if( Get( aL ) ) switch( eOp )
 {
-double dTest;
 case SbxMUL:
-// first overflow check: see if product will fit - 
test real value of product (hence 2 curr factors)
-dTest = (double)aL.nInt64 * (double)aR.nInt64 / 
(double)CURRENCY_FACTOR_SQUARE;
-if( dTest < SbxMINCURR || SbxMAXCURR < dTest)
 {
-aL.nInt64 = SAL_MAX_INT64;
-if( dTest < SbxMINCURR ) aL.nInt64 = SAL_MIN_INT64;
-SetError( ERRCODE_BASIC_MATH_OVERFLOW );
-break;
-}
-// second overflow check: see if unscaled product 
overflows - if so use doubles
-dTest = (double)aL.nInt64 * (double)aR.nInt64;
-if( dTest < SAL_MIN_INT64 || SAL_MAX_INT64 < dTest)
-{
-aL.nInt64 = (sal_Int64)( dTest / 
(double)CURRENCY

Crash test update

2017-09-13 Thread Crashtest VM

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/22e39ae69825e0b83f03b343f22faf065602a72a/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


validationErrors.csv
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2d/382cef5450cf1593322184649257d3666cbbd8

2017-09-13 Thread Stephan Bergmann

 2d/382cef5450cf1593322184649257d3666cbbd8 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1313b21a857daa0dc49ef79a969672f232cd8bf1
Author: Stephan Bergmann 
Date:   Wed Sep 13 10:20:21 2017 +0200

Notes added by 'git notes add'

diff --git a/2d/382cef5450cf1593322184649257d3666cbbd8 
b/2d/382cef5450cf1593322184649257d3666cbbd8
new file mode 100644
index ..73575ecc3f20
--- /dev/null
+++ b/2d/382cef5450cf1593322184649257d3666cbbd8
@@ -0,0 +1 @@
+merged as: 1963dc64554a8b64c229ddd72bc615f3e736731a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-13 Thread Damjan Jovanovic

 javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 1963dc64554a8b64c229ddd72bc615f3e736731a
Author: Damjan Jovanovic 
Date:   Fri Sep 8 02:17:19 2017 +

Fix a locking bug in our Java ComponentBase class, where after the 
transition

to disposed, the relevant variables (bDisposed and bInDispose) are written 
to
outside a synchronized block.

The equivalent C++ implementation in main/cppuhelper/source/implbase.cxx,
method WeakComponentImplHelperBase::dispose(), already does this.

Patch by: me

(cherry picked from commit 2d382cef5450cf1593322184649257d3666cbbd8)

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

diff --git a/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java 
b/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java
index 783c1d0cfcc2..d886ef7020d5 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java
@@ -87,8 +87,11 @@ public class ComponentBase extends WeakBase implements 
XComponent
 {
 // finally makes sure that the  flags are set even if a 
RuntimeException is thrown.
 // That ensures that this function is only called once.
-bDisposed= true;
-bInDispose= false;
+synchronized (this)
+{
+bDisposed= true;
+bInDispose= false;
+}
 }
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-13 Thread Caolán McNamara

 sw/source/ui/frmdlg/wrap.cxx  |   37 ++---
 sw/source/uibase/inc/wrap.hxx |3 +--
 2 files changed, 7 insertions(+), 33 deletions(-)

New commits:
commit 5c0bb1088a678d36309866c4eee43e58901f6b7b
Author: CaolÃ¡n McNamara 
Date:   Wed Sep 13 09:11:36 2017 +0100

listening to modify is sufficient to get all changes

Change-Id: I9dc7301bed990838ac5fbb3bb5394bae5171bc22

diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index fd4de58df11a..3c3b2e243770 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -90,31 +90,11 @@ SwWrapTabPage::SwWrapTabPage(vcl::Window *pParent, const 
SfxItemSet &rSet)
 
 SetExchangeSupport();
 
-Link aLk = LINK(this, SwWrapTabPage, RangeModifyHdl);
-Link aLk3 = LINK(this, SwWrapTabPage, RangeLoseFocusHdl);
-m_pLeftMarginED->SetUpHdl(aLk);
-m_pLeftMarginED->SetDownHdl(aLk);
-m_pLeftMarginED->SetFirstHdl(aLk);
-m_pLeftMarginED->SetLastHdl(aLk);
-m_pLeftMarginED->SetLoseFocusHdl(aLk3);
-
-m_pRightMarginED->SetUpHdl(aLk);
-m_pRightMarginED->SetDownHdl(aLk);
-m_pRightMarginED->SetFirstHdl(aLk);
-m_pRightMarginED->SetLastHdl(aLk);
-m_pRightMarginED->SetLoseFocusHdl(aLk3);
-
-m_pTopMarginED->SetUpHdl(aLk);
-m_pTopMarginED->SetDownHdl(aLk);
-m_pTopMarginED->SetFirstHdl(aLk);
-m_pTopMarginED->SetLastHdl(aLk);
-m_pTopMarginED->SetLoseFocusHdl(aLk3);
-
-m_pBottomMarginED->SetUpHdl(aLk);
-m_pBottomMarginED->SetDownHdl(aLk);
-m_pBottomMarginED->SetFirstHdl(aLk);
-m_pBottomMarginED->SetLastHdl(aLk);
-m_pBottomMarginED->SetLoseFocusHdl(aLk3);
+Link aLk = LINK(this, SwWrapTabPage, RangeModifyHdl);
+m_pLeftMarginED->SetModifyHdl(aLk);
+m_pRightMarginED->SetModifyHdl(aLk);
+m_pTopMarginED->SetModifyHdl(aLk);
+m_pBottomMarginED->SetModifyHdl(aLk);
 
 Link aLk2 = LINK(this, SwWrapTabPage, WrapTypeHdl);
 m_pNoWrapRB->SetClickHdl(aLk2);
@@ -572,12 +552,7 @@ DeactivateRC SwWrapTabPage::DeactivatePage(SfxItemSet* 
_pSet)
 return DeactivateRC::LeavePage;
 }
 
-// range check
-IMPL_LINK( SwWrapTabPage, RangeLoseFocusHdl, Control&, rControl, void )
-{
-RangeModifyHdl( static_cast(rControl) );
-}
-IMPL_LINK( SwWrapTabPage, RangeModifyHdl, SpinField&, rSpin, void )
+IMPL_LINK( SwWrapTabPage, RangeModifyHdl, Edit&, rSpin, void )
 {
 MetricField& rEdit = static_cast(rSpin);
 sal_Int64 nValue = rEdit.GetValue();
diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx
index a2807b1e7bed..bbd4a0605b69 100644
--- a/sw/source/uibase/inc/wrap.hxx
+++ b/sw/source/uibase/inc/wrap.hxx
@@ -79,8 +79,7 @@ class SwWrapTabPage: public SfxTabPage
 virtual voidActivatePage(const SfxItemSet& rSet) override;
 virtual DeactivateRC   DeactivatePage(SfxItemSet *pSet) override;
 
-DECL_LINK( RangeModifyHdl, SpinField&, void );
-DECL_LINK( RangeLoseFocusHdl, Control&, void );
+DECL_LINK( RangeModifyHdl, Edit&, void );
 DECL_LINK( WrapTypeHdl, Button *, void );
 DECL_LINK( ContourHdl, Button *, void);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Bug 38835

2017-09-13 Thread Gayan Thejawansha

I have build the core and observed that it is running and I'm currently
work from there. Just in case can I know that how to re-create the bug so
that I can get better understanding of the bug (Bug 38835).
I already have assigned to the bug in Bugzilla.

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - vcl/opengl

2017-09-13 Thread Dennis Francis

 vcl/opengl/salbmp.cxx |   14 ++
 1 file changed, 14 insertions(+)

New commits:
commit 6d5d07c1ac00af40858effe8d075a16c016a08fc
Author: Dennis Francis 
Date:   Tue Sep 12 15:47:58 2017 +0530

tdf#108299: Limit the width and height of opengl bitmap to...

GL_MAX_TEXTURE_SIZE in OpenGLSalBitmap::Create()

Change-Id: I3d9538cc8004241972bc63d09eeb2914ce511df6
Reviewed-on: https://gerrit.libreoffice.org/42194
Reviewed-by: Michael Meeks 
Tested-by: Jenkins 
(cherry picked from commit de55aa0f639a451aae05ec515cfa58d4bbdd8816)
Reviewed-on: https://gerrit.libreoffice.org/42226

diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 5c94dfdaa2a9..aed6adfef963 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -124,6 +124,20 @@ bool OpenGLSalBitmap::Create( const OpenGLTexture& rTex, 
long nX, long nY, long
 VCL_GL_INFO( "OpenGLSalBitmap::Create from FBO: ["
   << nX << ", " << nY << "] " << nWidth << "x" << nHeight );
 
+GLint nMaxTextureSize;
+glGetIntegerv( GL_MAX_TEXTURE_SIZE, &nMaxTextureSize );
+if ( nWidth > nMaxTextureSize )
+{
+nWidth = nMaxTextureSize;
+VCL_GL_INFO( "Width limited to " << nMaxTextureSize );
+}
+
+if ( nHeight > nMaxTextureSize )
+{
+nHeight = nMaxTextureSize;
+VCL_GL_INFO( "Height limited to " << nMaxTextureSize );
+}
+
 mnWidth = nWidth;
 mnHeight = nHeight;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/borderline3' - svx/source

2017-09-13 Thread Armin Le Grand

 svx/source/dialog/framelink.cxx|2 +-
 svx/source/table/viewcontactoftableobj.cxx |2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit ca5a5a8ffb3d0702a8c7541d7407795d5929d6a7
Author: Armin Le Grand 
Date:   Wed Sep 13 09:20:26 2017 +0200

borderline: clang/linux build corrections

Change-Id: Ifc0bb3e0099a9ae5bdebd8cb615828c5cd7ecfd4

diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index ce7168040228..c7a6377ab3e8 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -88,7 +88,7 @@ void Style::SetPatternScale( double fScale )
 {
 if(!maImplStyle)
 {
-if(1.0 == fScale)
+if(rtl::math::approxEqual(1.0, fScale))
 {
 return;
 }
diff --git a/svx/source/table/viewcontactoftableobj.cxx 
b/svx/source/table/viewcontactoftableobj.cxx
index 87f44432713e..52d6ce42b943 100644
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -206,7 +206,6 @@ namespace sdr
 svx::frame::StyleVectorTable aStart;
 svx::frame::StyleVectorTable aEnd;
 const basegfx::B2DVector 
aY(basegfx::getNormalizedPerpendicular(rX));
-const double fTwipsToMM(127.0 / 72.0);
 
 /// Fill top-left Style Table
 if(rLeftA.IsUsed()) 
aStart.push_back(svx::frame::StyleVectorCombination(rLeftA, -aY, bHor ? true : 
false));
@@ -350,7 +349,6 @@ namespace sdr
 const basegfx::B2DPoint 
aOrigin(aCellMatrix * basegfx::B2DPoint(0.0, 0.0));
 const basegfx::B2DVector 
aX(aCellMatrix * basegfx::B2DVector(1.0, 0.0));
 const basegfx::B2DVector 
aY(aCellMatrix * basegfx::B2DVector(0.0, 1.0));
-const double fTwipsToMM(127.0 / 72.0);
 
 if(aLeftLine.IsUsed())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-13 Thread Miklos Vajna

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

New commits:
commit 84e4ea2c3d352a9058aa43e030acf483043ecb06
Author: Miklos Vajna 
Date:   Wed Sep 13 09:13:26 2017 +0200

Kit: pass by const reference and avoid redundant initializer

Change-Id: I550334ec9392121ff9084c35b5c8c6b410917080

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 63ebdbe1..1d1e700d 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -482,7 +482,7 @@ public:
 class Watermark
 {
 public:
-Watermark(std::shared_ptr loKitDoc, std::string text)
+Watermark(const std::shared_ptr& loKitDoc, const 
std::string& text)
 : _loKitDoc(loKitDoc)
 , _text(text)
 , _font("Liberation Sans")
@@ -628,7 +628,6 @@ public:
 _haveDocPassword(false),
 _isDocPasswordProtected(false),
 _docPasswordType(PasswordType::ToView),
-_docWatermark(),
 _stop(false),
 _isLoading(0),
 _editorId(-1),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/textenc

2017-09-13 Thread Stephan Bergmann

 sal/textenc/tcvtutf8.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 66322c5f4a5465c74fa3ceefaa2f76e86a277c16
Author: Stephan Bergmann 
Date:   Wed Sep 13 09:12:04 2017 +0200

Silence warning C4701: potentially uninitialized local variable

Change-Id: Ia37347108f9fe7094f055a5c6f2ec9511c3aff1d

diff --git a/sal/textenc/tcvtutf8.cxx b/sal/textenc/tcvtutf8.cxx
index 4943f6987a29..d9c3c134a83a 100644
--- a/sal/textenc/tcvtutf8.cxx
+++ b/sal/textenc/tcvtutf8.cxx
@@ -68,7 +68,7 @@ sal_Size ImplConvertUtf8ToUnicode(
 {
 bool bJavaUtf8 = pData != nullptr;
 sal_uInt32 nUtf32 = 0;
-int nBytes;
+int nBytes = int();
 int nShift = -1;
 bool bCheckBom = true;
 sal_uInt32 nInfo = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-13 Thread Jan Holesovsky

 sw/inc/shellio.hxx   |2 +-
 sw/qa/extras/txtexport/txtexport.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d0d026a1589b8d8d97d4c64a48343c2d55774741
Author: Jan Holesovsky 
Date:   Wed Sep 13 09:09:42 2017 +0200

Actually no need to make GetASCWriter public.

Change-Id: I6f0f18629c6a61b6a4c52c2b16cc7b45525a5259

diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 92544413bdfa..cec8b453e3f4 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -544,7 +544,7 @@ namespace SwReaderWriter
 }
 
 void GetRTFWriter( const OUString&, const OUString&, WriterRef& );
-SW_DLLPUBLIC void GetASCWriter(const OUString&, const OUString&, WriterRef&);
+void GetASCWriter(const OUString&, const OUString&, WriterRef&);
 void GetHTMLWriter( const OUString&, const OUString&, WriterRef& );
 void GetXMLWriter( const OUString&, const OUString&, WriterRef& );
 
diff --git a/sw/qa/extras/txtexport/txtexport.cxx 
b/sw/qa/extras/txtexport/txtexport.cxx
index 59e64d215872..2213f53b34b7 100644
--- a/sw/qa/extras/txtexport/txtexport.cxx
+++ b/sw/qa/extras/txtexport/txtexport.cxx
@@ -27,7 +27,7 @@ public:
 void assertExportedRange(const OString& aExpected, SwPaM& rPaM)
 {
 WriterRef rAsciiWriter;
-GetASCWriter(aEmptyOUStr, OUString(), rAsciiWriter);
+SwReaderWriter::GetWriter(FILTER_TEXT, OUString(), rAsciiWriter);
 CPPUNIT_ASSERT(rAsciiWriter.is());
 
 // no start char
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-13 Thread Stephan Bergmann

 external/icu/UnpackedTarball_icu.mk|1 -
 external/icu/icu4c-59-icu13329-xlocale.patch.1 |   14 --
 2 files changed, 15 deletions(-)

New commits:
commit f7d01f3ea5b472878255345ac6ddc113b0de9e2e
Author: Stephan Bergmann 
Date:   Wed Sep 13 09:04:50 2017 +0200

Revert "Do not include non-standardized xlocale.h, include locale.h instead"

This reverts commit 274b2aee3bf65f139292d08a46d86f90d5ac8acb, which breaks 
in
external/icu on macOS, 
:

> digitlst.cpp:497:8: error: unknown type name 'locale_t'
> static locale_t gCLocale = (locale_t)0;
>^

diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index 7fa891f07d6d..1ba15a448c75 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-59-werror-undef.patch.1 \
external/icu/icu4c-59-werror-shadow.patch.1 \
external/icu/icu4c-iOS.patch.1 \
-   external/icu/icu4c-59-icu13329-xlocale.patch.1 \
 ))
 
 $(eval $(call 
gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
diff --git a/external/icu/icu4c-59-icu13329-xlocale.patch.1 
b/external/icu/icu4c-59-icu13329-xlocale.patch.1
deleted file mode 100644
index f57ec61e3ca6..
--- a/external/icu/icu4c-59-icu13329-xlocale.patch.1
+++ /dev/null
@@ -1,14 +0,0 @@
-# xlocale.h is gone with glibc 2.26 and should never had been included.
-# https://ssl.icu-project.org/trac/ticket/13329
-diff -ur icu.org/source/i18n/digitlst.cpp icu/source/i18n/digitlst.cpp
 icu.org/source/i18n/digitlst.cpp   2017-01-20 01:20:31.0 +0100
-+++ icu/source/i18n/digitlst.cpp   2017-09-12 22:03:15.019034749 +0200
-@@ -64,7 +64,7 @@
- # if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN
- #   include 
- # else
--#   include 
-+#   include 
- # endif
- #endif
- 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libvisio.git: src/lib

2017-09-13 Thread Miklos Vajna

 src/lib/VDXParser.h  |   14 ++--
 src/lib/VSD5Parser.h |   58 
 src/lib/VSD6Parser.h |   22 +++---
 src/lib/VSDCharacterList.cpp |   10 +-
 src/lib/VSDContentCollector.h|  134 +++
 src/lib/VSDFieldList.h   |   28 
 src/lib/VSDGeometryList.cpp  |  130 ++---
 src/lib/VSDInternalStream.h  |   22 +++---
 src/lib/VSDOutputElementList.cpp |  108 +++
 src/lib/VSDParagraphList.cpp |   10 +-
 src/lib/VSDStylesCollector.h |  134 +++
 src/lib/VSDXParser.h |   14 ++--
 12 files changed, 342 insertions(+), 342 deletions(-)

New commits:
commit f6c7fe7974fae43cc98c061f4a47d55a422d2d16
Author: Miklos Vajna 
Date:   Wed Sep 13 09:04:07 2017 +0200

Mark overriding member functions as 'override'

This does not affect the generated code (API or ABI), but:

1) Makes sure that in case the signature of one of these functions would
change by accident, the build breaks as the function no longer overrides
a base function.

2) Makes the code readable by explicitly marking all overriding
functions as 'override', where previously the reader had to read the
interface of the base class(es) as well to find out if the function is
virtual or not.

3) Since 'override' implies 'virtual', remove the 'virtual' keyword
where 'override' is present.

Change-Id: I482cbb5d22726b9a16c0f445fb945c24c69a5dd0

diff --git a/src/lib/VDXParser.h b/src/lib/VDXParser.h
index 0293911..6070047 100644
--- a/src/lib/VDXParser.h
+++ b/src/lib/VDXParser.h
@@ -28,9 +28,9 @@ class VDXParser : public VSDXMLParserBase
 
 public:
   explicit VDXParser(librevenge::RVNGInputStream *input, 
librevenge::RVNGDrawingInterface *painter);
-  virtual ~VDXParser();
-  bool parseMain();
-  bool extractStencils();
+  ~VDXParser() override;
+  bool parseMain() override;
+  bool extractStencils() override;
 
 private:
   VDXParser();
@@ -39,10 +39,10 @@ private:
 
   // Helper functions
 
-  xmlChar *readStringData(xmlTextReaderPtr reader);
+  xmlChar *readStringData(xmlTextReaderPtr reader) override;
 
-  int getElementToken(xmlTextReaderPtr reader);
-  int getElementDepth(xmlTextReaderPtr reader);
+  int getElementToken(xmlTextReaderPtr reader) override;
+  int getElementDepth(xmlTextReaderPtr reader) override;
 
   // Functions to read the DatadiagramML document structure
 
@@ -65,7 +65,7 @@ private:
   void readTabs(xmlTextReaderPtr reader);
   void readTab(xmlTextReaderPtr reader);
 
-  void getBinaryData(xmlTextReaderPtr reader);
+  void getBinaryData(xmlTextReaderPtr reader) override;
 
   // Private data
 
diff --git a/src/lib/VSD5Parser.h b/src/lib/VSD5Parser.h
index 02326ee..334cd05 100644
--- a/src/lib/VSD5Parser.h
+++ b/src/lib/VSD5Parser.h
@@ -23,44 +23,44 @@ class VSD5Parser : public VSD6Parser
 {
 public:
   explicit VSD5Parser(librevenge::RVNGInputStream *input, 
librevenge::RVNGDrawingInterface *painter);
-  ~VSD5Parser();
+  ~VSD5Parser() override;
 
 protected:
-  virtual void readPointer(librevenge::RVNGInputStream *input, Pointer &ptr);
-  virtual bool getChunkHeader(librevenge::RVNGInputStream *input);
-  virtual void readPointerInfo(librevenge::RVNGInputStream *input, unsigned 
ptrType, unsigned shift, unsigned &listSize, int &pointerCount);
-
-  virtual void readGeomList(librevenge::RVNGInputStream *input);
-  virtual void readCharList(librevenge::RVNGInputStream *input);
-  virtual void readParaList(librevenge::RVNGInputStream *input);
-  virtual void readShapeList(librevenge::RVNGInputStream *input);
-  virtual void readPropList(librevenge::RVNGInputStream *input);
-  virtual void readFieldList(librevenge::RVNGInputStream *input);
-  virtual void readNameList2(librevenge::RVNGInputStream *input);
-  virtual void readTabsDataList(librevenge::RVNGInputStream *input);
-
-  virtual void readLine(librevenge::RVNGInputStream *input);
-  virtual void readFillAndShadow(librevenge::RVNGInputStream *input);
-  virtual void readTextBlock(librevenge::RVNGInputStream *input);
-  virtual void readCharIX(librevenge::RVNGInputStream *input);
-  virtual void readParaIX(librevenge::RVNGInputStream *input);
-  virtual void readTextField(librevenge::RVNGInputStream *input);
-
-  virtual void readShape(librevenge::RVNGInputStream *input);
-  virtual void readPage(librevenge::RVNGInputStream *input);
+  void readPointer(librevenge::RVNGInputStream *input, Pointer &ptr) override;
+  bool getChunkHeader(librevenge::RVNGInputStream *input) override;
+  void readPointerInfo(librevenge::RVNGInputStream *input, unsigned ptrType, 
unsigned shift, unsigned &listSize, int &pointerCount) override;
+
+  void readGeomList(librevenge::RVNGInputStream *input) override;
+  void readCharList(librevenge::RVNGInputStream *input) override;
+  void readParaList(librevenge::RVNGInputStream *input) o

76 matches

Mail list logo