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

[Noel Grandin]

 include/svl/itemset.hxx  |2 +-
 svl/source/items/itemset.cxx |   16 ++--
 2 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 8de24d16520b8ae95d793f3c804f1fc7294afbe7
Author: Noel Grandin 
Date:   Thu Nov 3 08:47:47 2016 +0200

Revert "remove unnecessary casts"

This reverts commit fa80dae9a79a7414af8adcb91bc04dfff13bbb63.

because current Clang master complains with

/home/noel/libo3/svl/source/items/itemset.cxx:189:26: error: passing an 
object that undergoes default argument promotion to 'va_start' has undefined 
behavior [-Werror,-Wvarargs]
va_start( pArgs, nNull );
 ^
/home/noel/libo3/svl/source/items/itemset.cxx:176:89: note: parameter of 
type 'sal_uInt16' (aka 'unsigned short') is declared here
SfxItemSet::SfxItemSet(SfxItemPool& rPool, sal_uInt16 nWh1, sal_uInt16 
nWh2, sal_uInt16 nNull, ...)

diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index 5793007..f327f92 100644
--- a/include/svl/itemset.hxx
+++ b/include/svl/itemset.hxx
@@ -66,7 +66,7 @@ public:
 
 SfxItemSet( SfxItemPool&);
 SfxItemSet( SfxItemPool&, sal_uInt16 nWhich1, 
sal_uInt16 nWhich2 );
-SfxItemSet( SfxItemPool&, sal_uInt16 nWh1, 
sal_uInt16 nWh2, sal_uInt16 nNull, ... );
+SfxItemSet( SfxItemPool&, int nWh1, int nWh2, 
int nNull, ... );
 SfxItemSet( SfxItemPool&, const sal_uInt16* 
nWhichPairTable );
 virtual ~SfxItemSet();
 
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index e47f3be..d2388c3 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -173,7 +173,7 @@ void SfxItemSet::InitRanges_Impl(va_list pArgs, sal_uInt16 
nWh1, sal_uInt16 nWh2
 memset(static_cast(m_pItems), 0, sizeof(SfxPoolItem*) * nSize);
 }
 
-SfxItemSet::SfxItemSet(SfxItemPool& rPool, sal_uInt16 nWh1, sal_uInt16 nWh2, 
sal_uInt16 nNull, ...)
+SfxItemSet::SfxItemSet(SfxItemPool& rPool, int nWh1, int nWh2, int nNull, ...)
 : m_pPool( &rPool )
 , m_pParent(nullptr)
 , m_pWhichRanges(nullptr)
@@ -181,13 +181,17 @@ SfxItemSet::SfxItemSet(SfxItemPool& rPool, sal_uInt16 
nWh1, sal_uInt16 nWh2, sal
 {
 assert(nWh1 <= nWh2);
 
-if (nNull == 0) // delimiter
-InitRanges_Impl(nWh1, nWh2);
-else
-{
+if(!nNull)
+InitRanges_Impl(
+sal::static_int_cast< sal_uInt16 >(nWh1),
+sal::static_int_cast< sal_uInt16 >(nWh2));
+else {
 va_list pArgs;
 va_start( pArgs, nNull );
-InitRanges_Impl(pArgs, nWh1, nWh2, nNull);
+InitRanges_Impl(
+pArgs, sal::static_int_cast< sal_uInt16 >(nWh1),
+sal::static_int_cast< sal_uInt16 >(nWh2),
+sal::static_int_cast< sal_uInt16 >(nNull));
 va_end(pArgs);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[melikeyurtoglu]

 cui/source/customize/acccfg.cxx  |   11 --
 cui/source/customize/cfgutil.cxx |   22 +---
 cui/source/customize/macropg.cxx |   11 --
 cui/source/customize/selector.cxx|   22 +---
 cui/source/dialogs/colorpicker.cxx   |   33 ++-
 cui/source/dialogs/cuigrfflt.cxx |   13 
 cui/source/dialogs/hlmarkwn.cxx  |9 
 cui/source/tabpages/grfpage.cxx  |9 
 dbaccess/source/ui/control/tabletree.cxx |9 
 9 files changed, 13 insertions(+), 126 deletions(-)

New commits:
commit 164d8e3b1aa660d65c1af9570e67b66520bd953a
Author: melikeyurtoglu 
Date:   Thu Nov 3 02:35:00 2016 +0200

tdf#91222 VclBuilder constructor cleanup

Change-Id: I53bca2a9113862b8e7058937e231721c5f81a9de
Signed-off-by: melikeyurtoglu 
Reviewed-on: https://gerrit.libreoffice.org/30511
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index ae7d1cc..1c98ae8 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -664,16 +664,7 @@ void SfxAccCfgLBoxString_Impl::Paint(const Point& aPos, 
SvTreeListBox& /*rDevice
 
 }
 
-VCL_BUILDER_DECL_FACTORY(SfxAccCfgTabListBox)
-{
-WinBits nWinBits = WB_TABSTOP;
-
-OString sBorder = VclBuilder::extractCustomProperty(rMap);
-if (!sBorder.isEmpty())
-   nWinBits |= WB_BORDER;
-
-rRet = VclPtr::Create(pParent, nWinBits);
-}
+VCL_BUILDER_FACTORY_CONSTRUCTOR(SfxAccCfgTabListBox_Impl, WB_TABSTOP)
 
 SfxAccCfgTabListBox_Impl::~SfxAccCfgTabListBox_Impl()
 {
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 1019821..1209658 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -258,16 +258,7 @@ 
SfxConfigFunctionListBox::SfxConfigFunctionListBox(vcl::Window* pParent, WinBits
 GetModel()->SetSortMode( SortAscending );
 }
 
-VCL_BUILDER_DECL_FACTORY(SfxConfigFunctionListBox)
-{
-WinBits nWinBits = WB_TABSTOP;
-
-OString sBorder = VclBuilder::extractCustomProperty(rMap);
-if (!sBorder.isEmpty())
-   nWinBits |= WB_BORDER;
-
-rRet = VclPtr::Create(pParent, nWinBits);
-}
+VCL_BUILDER_FACTORY_CONSTRUCTOR(SfxConfigFunctionListBox, WB_TABSTOP)
 
 SfxConfigFunctionListBox::~SfxConfigFunctionListBox()
 {
@@ -398,16 +389,7 @@ SfxConfigGroupListBox::SfxConfigGroupListBox(vcl::Window* 
pParent, WinBits nStyl
 SetNodeBitmaps( pImp->m_collapsedImage, pImp->m_expandedImage );
 }
 
-VCL_BUILDER_DECL_FACTORY(SfxConfigGroupListBox)
-{
-WinBits nWinBits = WB_TABSTOP;
-
-OString sBorder = VclBuilder::extractCustomProperty(rMap);
-if (!sBorder.isEmpty())
-   nWinBits |= WB_BORDER;
-
-rRet = VclPtr::Create(pParent, nWinBits);
-}
+VCL_BUILDER_FACTORY_CONSTRUCTOR(SfxConfigGroupListBox, WB_TABSTOP)
 
 SfxConfigGroupListBox::~SfxConfigGroupListBox()
 {
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 7ff2f55..4575e9f 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -153,16 +153,7 @@ void MacroEventListBox::dispose()
 Control::dispose();
 }
 
-VCL_BUILDER_DECL_FACTORY(MacroEventListBox)
-{
-WinBits nWinBits = WB_TABSTOP;
-
-OString sBorder = VclBuilder::extractCustomProperty(rMap);
-if (!sBorder.isEmpty())
-   nWinBits |= WB_BORDER;
-
-rRet = VclPtr::Create(pParent, nWinBits);
-}
+VCL_BUILDER_FACTORY_CONSTRUCTOR(MacroEventListBox, WB_TABSTOP)
 
 Size MacroEventListBox::GetOptimalSize() const
 {
diff --git a/cui/source/customize/selector.cxx 
b/cui/source/customize/selector.cxx
index 17cb9f1..f578c71 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -88,16 +88,7 @@ 
SvxConfigFunctionListBox::SvxConfigFunctionListBox(vcl::Window* pParent, WinBits
 LINK( this, SvxConfigFunctionListBox, TimerHdl ) );
 }
 
-VCL_BUILDER_DECL_FACTORY(SvxConfigFunctionListBox)
-{
-WinBits nWinBits = WB_TABSTOP;
-
-OString sBorder = VclBuilder::extractCustomProperty(rMap);
-if (!sBorder.isEmpty())
-   nWinBits |= WB_BORDER;
-
-rRet = VclPtr::Create(pParent, nWinBits);
-}
+VCL_BUILDER_FACTORY_CONSTRUCTOR(SvxConfigFunctionListBox, WB_TABSTOP)
 
 SvxConfigFunctionListBox::~SvxConfigFunctionListBox()
 {
@@ -225,16 +216,7 @@ SvxConfigGroupListBox::SvxConfigGroupListBox(vcl::Window* 
pParent, WinBits nStyl
 );
 }
 
-VCL_BUILDER_DECL_FACTORY(SvxConfigGroupListBox)
-{
-WinBits nWinBits = WB_TABSTOP;
-
-OString sBorder = VclBuilder::extractCustomProperty(rMap);
-if (!sBorder.isEmpty())
-   nWinBits |= WB_BORDER;
-
-rRet = VclPtr::Create(pParent, nWinBits);
-}
+VCL_BUILDER_FACTORY_CONSTRUCTOR(SvxConfigGroupListBox, WB_TABSTOP)
 
 SvxConfigGroupListBox::~SvxConfigGroupListBox()
 {
diff --git a/cui/source/dialogs/colorpicker.cxx 
b/cui/source/dialogs

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

[melikeyurtoglu]

 basctl/source/basicide/bastype2.cxx|9 +
 basctl/source/basicide/moduldl2.cxx|9 +
 basctl/source/basicide/moduldlg.cxx|9 +
 chart2/source/controller/dialogs/tp_DataSourceControls.cxx |9 +
 4 files changed, 4 insertions(+), 32 deletions(-)

New commits:
commit 10197c094b3267adc8071bcef482b64dc291deed
Author: melikeyurtoglu 
Date:   Thu Nov 3 00:47:13 2016 +0200

tdf#91222 VclBuilder constructor cleanup

Change-Id: Ief4a9dfc0e0a2dad04c3ac9f1840b823fd9357de
Signed-off-by: melikeyurtoglu 
Reviewed-on: https://gerrit.libreoffice.org/30507
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/basctl/source/basicide/bastype2.cxx 
b/basctl/source/basicide/bastype2.cxx
index 7b836c8..7b7c64f 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -166,14 +166,7 @@ TreeListBox::TreeListBox (vcl::Window* pParent, WinBits 
nStyle)
 nMode = 0xFF;   // everything
 }
 
-VCL_BUILDER_DECL_FACTORY(TreeListBox)
-{
-WinBits nWinBits = WB_TABSTOP;
-OString sBorder = VclBuilder::extractCustomProperty(rMap);
-if (!sBorder.isEmpty())
-   nWinBits |= WB_BORDER;
-rRet = VclPtr::Create(pParent, nWinBits);
-}
+VCL_BUILDER_FACTORY_CONSTRUCTOR(TreeListBox, WB_TABSTOP)
 
 TreeListBox::~TreeListBox ()
 {
diff --git a/basctl/source/basicide/moduldl2.cxx 
b/basctl/source/basicide/moduldl2.cxx
index 1b661a8..b51ae9e 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -155,14 +155,7 @@ CheckBox::CheckBox(vcl::Window* pParent, WinBits nStyle)
 Init();
 }
 
-VCL_BUILDER_DECL_FACTORY(CheckBox)
-{
-WinBits nWinBits = WB_TABSTOP;
-OString sBorder = VclBuilder::extractCustomProperty(rMap);
-if (!sBorder.isEmpty())
-   nWinBits |= WB_BORDER;
-rRet = VclPtr::Create(pParent, nWinBits);
-}
+VCL_BUILDER_FACTORY_CONSTRUCTOR(CheckBox, WB_TABSTOP)
 
 CheckBox::~CheckBox()
 {
diff --git a/basctl/source/basicide/moduldlg.cxx 
b/basctl/source/basicide/moduldlg.cxx
index 8636097..4d4df19 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -53,14 +53,7 @@ ExtTreeListBox::ExtTreeListBox(vcl::Window* pParent, WinBits 
nStyle)
 {
 }
 
-VCL_BUILDER_DECL_FACTORY(ExtTreeListBox)
-{
-WinBits nWinBits = WB_TABSTOP;
-OString sBorder = VclBuilder::extractCustomProperty(rMap);
-if (!sBorder.isEmpty())
-   nWinBits |= WB_BORDER;
-rRet = VclPtr::Create(pParent, nWinBits);
-}
+VCL_BUILDER_FACTORY_CONSTRUCTOR(ExtTreeListBox, WB_TABSTOP)
 
 bool ExtTreeListBox::EditingEntry( SvTreeListEntry* pEntry, Selection& )
 {
diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx 
b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx
index 10de201..0a31bcb 100644
--- a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx
@@ -33,14 +33,7 @@ SeriesListBox::SeriesListBox(vcl::Window* pParent, WinBits 
nStyle)
 : SvTreeListBox(pParent, nStyle)
 {}
 
-VCL_BUILDER_DECL_FACTORY(SeriesListBox)
-{
-WinBits nWinStyle = 0;
-OString sBorder = VclBuilder::extractCustomProperty(rMap);
-if (!sBorder.isEmpty())
-nWinStyle |= WB_BORDER;
-rRet = VclPtr::Create(pParent, nWinStyle);
-}
+VCL_BUILDER_FACTORY_CONSTRUCTOR(SeriesListBox, 0)
 
 SvTreeListEntry* SeriesListBox::CreateEntry() const
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jochen Nitschke]

 include/svl/itemset.hxx  |2 +-
 svl/source/items/itemset.cxx |   16 ++--
 2 files changed, 7 insertions(+), 11 deletions(-)

New commits:
commit fa80dae9a79a7414af8adcb91bc04dfff13bbb63
Author: Jochen Nitschke 
Date:   Wed Nov 2 16:04:29 2016 +0100

remove unnecessary casts

Which IDs are always sal_uInt16 and likely passed from defines

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

diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index f327f92..5793007 100644
--- a/include/svl/itemset.hxx
+++ b/include/svl/itemset.hxx
@@ -66,7 +66,7 @@ public:
 
 SfxItemSet( SfxItemPool&);
 SfxItemSet( SfxItemPool&, sal_uInt16 nWhich1, 
sal_uInt16 nWhich2 );
-SfxItemSet( SfxItemPool&, int nWh1, int nWh2, 
int nNull, ... );
+SfxItemSet( SfxItemPool&, sal_uInt16 nWh1, 
sal_uInt16 nWh2, sal_uInt16 nNull, ... );
 SfxItemSet( SfxItemPool&, const sal_uInt16* 
nWhichPairTable );
 virtual ~SfxItemSet();
 
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index d2388c3..e47f3be 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -173,7 +173,7 @@ void SfxItemSet::InitRanges_Impl(va_list pArgs, sal_uInt16 
nWh1, sal_uInt16 nWh2
 memset(static_cast(m_pItems), 0, sizeof(SfxPoolItem*) * nSize);
 }
 
-SfxItemSet::SfxItemSet(SfxItemPool& rPool, int nWh1, int nWh2, int nNull, ...)
+SfxItemSet::SfxItemSet(SfxItemPool& rPool, sal_uInt16 nWh1, sal_uInt16 nWh2, 
sal_uInt16 nNull, ...)
 : m_pPool( &rPool )
 , m_pParent(nullptr)
 , m_pWhichRanges(nullptr)
@@ -181,17 +181,13 @@ SfxItemSet::SfxItemSet(SfxItemPool& rPool, int nWh1, int 
nWh2, int nNull, ...)
 {
 assert(nWh1 <= nWh2);
 
-if(!nNull)
-InitRanges_Impl(
-sal::static_int_cast< sal_uInt16 >(nWh1),
-sal::static_int_cast< sal_uInt16 >(nWh2));
-else {
+if (nNull == 0) // delimiter
+InitRanges_Impl(nWh1, nWh2);
+else
+{
 va_list pArgs;
 va_start( pArgs, nNull );
-InitRanges_Impl(
-pArgs, sal::static_int_cast< sal_uInt16 >(nWh1),
-sal::static_int_cast< sal_uInt16 >(nWh2),
-sal::static_int_cast< sal_uInt16 >(nNull));
+InitRanges_Impl(pArgs, nWh1, nWh2, nNull);
 va_end(pArgs);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jochen Nitschke]

 include/svl/nranges.hxx  |   51 
 svl/Library_svl.mk   |1 
 svl/source/items/itemset.cxx |   85 ++
 svl/source/items/nranges.cxx |  105 ---
 4 files changed, 84 insertions(+), 158 deletions(-)

New commits:
commit 1bbf7f653b6b159afb0bf2c34dd463f58333852c
Author: Jochen Nitschke 
Date:   Wed Nov 2 12:56:44 2016 +0100

bin nranges.*, move remaining functions into itemset.cxx

Change-Id: I1b88d98e00415e9c32a48486912d577a00fbfbda
Reviewed-on: https://gerrit.libreoffice.org/30486
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/include/svl/nranges.hxx b/include/svl/nranges.hxx
deleted file mode 100644
index d9329d1..000
--- a/include/svl/nranges.hxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_SVL_NRANGES_HXX
-#define INCLUDED_SVL_NRANGES_HXX
-
-#include 
-#include 
-
-/**
- * Creates a sal_uInt16-ranges-array in 'rpRanges' using 'nWh1' and 'nWh2' as
- * first range, 'nNull' as terminator or start of 2nd range and 'pArgs' as
- * remainder.
- *
- * It returns the number of sal_uInt16s which are contained in the described
- * set of sal_uInt16s.
- */
-sal_uInt16 InitializeRanges_Impl( sal_uInt16 *&rpRanges, va_list pArgs,
-   sal_uInt16 nWh1, sal_uInt16 nWh2, sal_uInt16 
nNull );
-
-/**
- * Determines the number of sal_uInt16s in a 0-terminated array of pairs of
- * sal_uInt16s.
- * The terminating 0 is not included in the count.
- */
-sal_uInt16 Count_Impl( const sal_uInt16 *pRanges );
-
-/**
- * Determines the total number of sal_uInt16s described in a 0-terminated
- * array of pairs of sal_uInt16s, each representing an range of sal_uInt16s.
- */
-sal_uInt16 Capacity_Impl( const sal_uInt16 *pRanges );
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index dc4e70a..8e7b9a2 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -91,7 +91,6 @@ $(eval $(call gb_Library_add_exception_objects,svl,\
 svl/source/items/itemset \
 svl/source/items/lckbitem \
 svl/source/items/macitem \
-svl/source/items/nranges \
 svl/source/items/poolcach \
 svl/source/items/poolio \
 svl/source/items/poolitem \
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index 6c00f5c..d2388c3 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -29,7 +29,6 @@
 #include 
 #include 
 #include 
-#include 
 #include "whassert.hxx"
 
 #include 
@@ -40,6 +39,90 @@
 
 static const sal_uInt16 nInitCount = 10; // Single USHORTs => 5 pairs without 
'0'
 
+namespace
+{
+
+/**
+ * Creates a sal_uInt16-ranges-array in 'rpRanges' using 'nWh1' and 'nWh2' as
+ * first range, 'nNull' as terminator or start of 2nd range and 'pArgs' as
+ * remainder.
+ *
+ * It returns the number of sal_uInt16s which are contained in the described
+ * set of sal_uInt16s.
+ */
+sal_uInt16 InitializeRanges_Impl( sal_uInt16 *&rpRanges, va_list pArgs,
+   sal_uInt16 nWh1, sal_uInt16 nWh2, sal_uInt16 
nNull )
+{
+sal_uInt16 nSize = 0, nIns = 0;
+std::vector aNumArr;
+aNumArr.push_back( nWh1 );
+aNumArr.push_back( nWh2 );
+DBG_ASSERT( nWh1 <= nWh2, "Invalid range" );
+nSize += nWh2 - nWh1 + 1;
+aNumArr.push_back( nNull );
+bool bEndOfRange = false;
+while ( 0 !=
+( nIns =
+  sal::static_int_cast< sal_uInt16 >(
+  va_arg( pArgs, int ) ) ) )
+{
+bEndOfRange = !bEndOfRange;
+if ( bEndOfRange )
+{
+const sal_uInt16 nPrev(*aNumArr.rbegin());
+DBG_ASSERT( nPrev <= nIns, "Invalid range" );
+nSize += nIns - nPrev + 1;
+}
+aNumArr.push_back( nIns );
+}
+
+assert( bEndOfRange ); // odd number of WhichIds
+
+// Now all ranges are present
+rpRanges = new sal_uInt16[ aNumArr.size() + 1 ];
+std::copy( aNumArr.begin(), aNumArr.end(), rpRanges);
+*(rpRanges + aNumArr.si

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

[Noel Grandin]

 sc/Library_scfilt.mk  |1 
 sc/source/filter/inc/addressconverter.hxx |2 
 sc/source/filter/inc/biffhelper.hxx   |7 
 sc/source/filter/inc/biffinputstream.hxx  |  250 
 sc/source/filter/inc/excelhandlers.hxx|   17 -
 sc/source/filter/inc/pivotcachebuffer.hxx |   25 -
 sc/source/filter/oox/addressconverter.cxx |2 
 sc/source/filter/oox/autofilterbuffer.cxx |2 
 sc/source/filter/oox/autofiltercontext.cxx|1 
 sc/source/filter/oox/biffcodec.cxx|1 
 sc/source/filter/oox/biffhelper.cxx   |   13 
 sc/source/filter/oox/biffinputstream.cxx  |  386 --
 sc/source/filter/oox/chartsheetfragment.cxx   |1 
 sc/source/filter/oox/commentsbuffer.cxx   |1 
 sc/source/filter/oox/condformatbuffer.cxx |2 
 sc/source/filter/oox/connectionsbuffer.cxx|2 
 sc/source/filter/oox/defnamesbuffer.cxx   |2 
 sc/source/filter/oox/excelfilter.cxx  |1 
 sc/source/filter/oox/excelhandlers.cxx|6 
 sc/source/filter/oox/externallinkbuffer.cxx   |1 
 sc/source/filter/oox/externallinkfragment.cxx |1 
 sc/source/filter/oox/formulabase.cxx  |2 
 sc/source/filter/oox/formulaparser.cxx|2 
 sc/source/filter/oox/numberformatsbuffer.cxx  |2 
 sc/source/filter/oox/pagesettings.cxx |1 
 sc/source/filter/oox/pivotcachebuffer.cxx |  141 -
 sc/source/filter/oox/pivotcachefragment.cxx   |1 
 sc/source/filter/oox/pivottablebuffer.cxx |2 
 sc/source/filter/oox/pivottablefragment.cxx   |2 
 sc/source/filter/oox/querytablebuffer.cxx |2 
 sc/source/filter/oox/querytablefragment.cxx   |2 
 sc/source/filter/oox/richstring.cxx   |2 
 sc/source/filter/oox/scenariobuffer.cxx   |2 
 sc/source/filter/oox/sharedstringsbuffer.cxx  |2 
 sc/source/filter/oox/sheetdatabuffer.cxx  |1 
 sc/source/filter/oox/sheetdatacontext.cxx |1 
 sc/source/filter/oox/stylesbuffer.cxx |1 
 sc/source/filter/oox/tablecolumnsbuffer.cxx   |1 
 sc/source/filter/oox/tablecolumnscontext.cxx  |1 
 sc/source/filter/oox/viewsettings.cxx |2 
 sc/source/filter/oox/workbookfragment.cxx |1 
 sc/source/filter/oox/workbookhelper.cxx   |1 
 sc/source/filter/oox/workbooksettings.cxx |3 
 sc/source/filter/oox/worksheetbuffer.cxx  |1 
 sc/source/filter/oox/worksheetfragment.cxx|1 
 sc/source/filter/oox/worksheetsettings.cxx|3 
 46 files changed, 18 insertions(+), 886 deletions(-)

New commits:
commit 58b662141a955375c24614c7dd0aeac7c96e7366
Author: Noel Grandin 
Date:   Wed Nov 2 14:44:14 2016 +0200

remove unused BiffInputStream

Change-Id: If34bc1d5ea0e0153991d4891b88550e471b4ec07
Reviewed-on: https://gerrit.libreoffice.org/30489
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 98445c8..467a2d6 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -166,7 +166,6 @@ $(eval $(call gb_Library_add_exception_objects,scfilt,\
sc/source/filter/oox/autofiltercontext \
sc/source/filter/oox/biffcodec \
sc/source/filter/oox/biffhelper \
-   sc/source/filter/oox/biffinputstream \
sc/source/filter/oox/chartsheetfragment \
sc/source/filter/oox/commentsbuffer \
sc/source/filter/oox/commentsfragment \
diff --git a/sc/source/filter/inc/addressconverter.hxx 
b/sc/source/filter/inc/addressconverter.hxx
index 2eafdb5..add5401 100644
--- a/sc/source/filter/inc/addressconverter.hxx
+++ b/sc/source/filter/inc/addressconverter.hxx
@@ -28,8 +28,6 @@
 namespace oox {
 namespace xls {
 
-class BiffInputStream;
-
 /** A vector of com.sun.star.table.CellRangeAddress elements and additional
 functionality. */
 class ApiCellRangeList
diff --git a/sc/source/filter/inc/biffhelper.hxx 
b/sc/source/filter/inc/biffhelper.hxx
index 834b327..c0d95907 100644
--- a/sc/source/filter/inc/biffhelper.hxx
+++ b/sc/source/filter/inc/biffhelper.hxx
@@ -27,8 +27,6 @@ namespace oox { class SequenceInputStream; }
 namespace oox {
 namespace xls {
 
-class BiffInputStream;
-
 // BIFF12 record identifiers ==
 
 const sal_Int32 BIFF12_ID_ARRAY = 0x01AA;
@@ -609,11 +607,6 @@ public:
 /** Reads a BIFF12 string with leading 16-bit or 32-bit length field. */
 static OUString readString( SequenceInputStream& rStrm, bool b32BitLen = 
true, bool bAllowNulChars = false );
 
-// BIFF2-BIFF8 import -
-
-/** Returns true, if the current record of the stream is a BOF record. */
-static bool isBofRecord( BiffInputStream& rStrm );
-
 private:
 BiffHelper() = delete;
 ~BiffHelper() = delete;
diff --git a/sc/source/filter/in

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

[Noel Grandin]

 sc/Library_scfilt.mk   |1 
 sc/source/filter/inc/biff.hxx  |   47 
 sc/source/filter/inc/qpro.hxx  |   17 +--
 sc/source/filter/qpro/biff.cxx |   95 -
 sc/source/filter/qpro/qpro.cxx |   64 ---
 5 files changed, 69 insertions(+), 155 deletions(-)

New commits:
commit afdd4606e947cfd564aee66ed9ce419091350482
Author: Noel Grandin 
Date:   Wed Nov 2 14:32:22 2016 +0200

merge ScBiffReader and ScQProReader

Change-Id: I7267ffb4ad5c874d6c836a8d6ab823d63f8e2610
Reviewed-on: https://gerrit.libreoffice.org/30488
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 308eecb..98445c8 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -145,7 +145,6 @@ $(eval $(call gb_Library_add_exception_objects,scfilt,\
sc/source/filter/lotus/op \
sc/source/filter/lotus/optab \
sc/source/filter/lotus/tool \
-   sc/source/filter/qpro/biff \
sc/source/filter/qpro/qpro \
sc/source/filter/qpro/qproform \
sc/source/filter/qpro/qprostyle \
diff --git a/sc/source/filter/inc/biff.hxx b/sc/source/filter/inc/biff.hxx
deleted file mode 100644
index 29735fe..000
--- a/sc/source/filter/inc/biff.hxx
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SC_SOURCE_FILTER_INC_BIFF_HXX
-#define INCLUDED_SC_SOURCE_FILTER_INC_BIFF_HXX
-
-#include 
-#include "filter.hxx"
-
-#include "flttypes.hxx"
-#include "ftools.hxx"
-
-// Stream wrapper class
-class ScBiffReader
-{
-protected:
-sal_uInt16 mnId;
-sal_uInt16 mnLength;
-sal_uInt32 mnOffset;
-SvStream *mpStream;
-bool mbEndOfFile;
-
-public:
-ScBiffReader( SfxMedium& rMedium );
-~ScBiffReader();
-bool recordsLeft() { return mpStream && !mpStream->IsEof(); }
-bool nextRecord();
-};
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/inc/qpro.hxx b/sc/source/filter/inc/qpro.hxx
index b2b7c3e..751ec85 100644
--- a/sc/source/filter/inc/qpro.hxx
+++ b/sc/source/filter/inc/qpro.hxx
@@ -27,22 +27,29 @@
 #include "flttypes.hxx"
 #include "ftools.hxx"
 #include "qprostyle.hxx"
-#include "biff.hxx"
 
 class ScDocument;
 
 // Stream wrapper class
-class ScQProReader : public ScBiffReader
+class ScQProReader
 {
-public:
+sal_uInt16 mnId;
+sal_uInt16 mnLength;
+sal_uInt32 mnOffset;
+SvStream *mpStream;
+bool mbEndOfFile;
+
+public:
+ScQProReader( SfxMedium &rMedium );
+~ScQProReader();
+
 bool recordsLeft();
 void SetEof( bool bValue ){ mbEndOfFile = bValue; }
 bool nextRecord();
 sal_uInt16 getId() { return mnId; }
 sal_uInt16 getLength() { return mnLength; }
 void readString( OUString &rString, sal_uInt16 nLength );
-ScQProReader( SfxMedium &rMedium );
-~ScQProReader(){ };
+
 FltError import( ScDocument *pDoc );
 FltError readSheet( SCTAB nTab, ScDocument* pDoc, ScQProStyle *pStyle );
 };
diff --git a/sc/source/filter/qpro/biff.cxx b/sc/source/filter/qpro/biff.cxx
deleted file mode 100644
index ce02767..000
--- a/sc/source/filter/qpro/biff.cxx
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the Licen

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

[Noel Grandin]

 cui/source/dialogs/hltpbase.cxx  |2 -
 include/sfx2/frame.hxx   |5 ---
 include/sfx2/viewfrm.hxx |4 --
 sd/source/ui/slideshow/slideshow.cxx |4 +-
 sd/source/ui/slideshow/slideshowimpl.cxx |2 -
 sd/source/ui/tools/EventMultiplexer.cxx  |2 -
 sd/source/ui/view/outlview.cxx   |2 -
 sfx2/source/appl/workwin.cxx |2 -
 sfx2/source/control/dispatch.cxx |   16 +
 sfx2/source/doc/objserv.cxx  |   50 +--
 sfx2/source/doc/objxtor.cxx  |2 -
 sfx2/source/view/frame.cxx   |   49 +-
 sfx2/source/view/frame2.cxx  |1 
 sfx2/source/view/ipclient.cxx|   12 +++
 sfx2/source/view/viewfrm.cxx |   37 ++
 sw/source/ui/chrdlg/chardlg.cxx  |2 -
 sw/source/uibase/docvw/romenu.cxx|6 +--
 sw/source/uibase/shells/basesh.cxx   |2 -
 sw/source/uibase/shells/frmsh.cxx|2 -
 sw/source/uibase/shells/grfsh.cxx|2 -
 sw/source/uibase/uiview/pview.cxx|3 -
 sw/source/uibase/uiview/view.cxx |7 
 22 files changed, 35 insertions(+), 179 deletions(-)

New commits:
commit 2b3de550ef1e28cd4231352c91634f67aa6d642f
Author: Noel Grandin 
Date:   Wed Nov 2 12:03:28 2016 +0200

remove pParentFrame from SfxFrame

Found by the singlevalfields loplugin.

Dead as least as far back as
  commit 93a7b558588be1f12e137329548b706daccc07df
  Author: Frank Schoenheit [fs] 
  Date:   Fri Nov 27 21:16:24 2009 +0100
  [CWS autorecovery] merged SfxTopFrame into SfxFrame
  SfxTopFrame was the only class deriving from the abstract class SfxFrame, 
so both
  can effectively be treated as one class.

Arguably when that commit was done, SfxFrame should also have been renamed
to SfxTopFrame, since that it was it now seems to be.

Expanding the nullptr value off that field means that:
SfxFrame::GetTopFrame
   always return this
SfxFrame::IsParent
   always returns false
SfxViewFrame::GetTopFrame
   is now the same as SfxViewFrame::GetFrame
SfxViewFrame::GetParentViewFrame
   now returns null

Change-Id: Iac088fa485c3d7299d1553845ced2f5ced3c85f2
Reviewed-on: https://gerrit.libreoffice.org/30485
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index bb63d88..efa0335 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -152,7 +152,7 @@ void SvxHyperlinkTabPageBase::InitStdControls ()
 
 SfxDispatcher* pDispatch = GetDispatcher();
 SfxViewFrame* pViewFrame = pDispatch ? pDispatch->GetFrame() : nullptr;
-SfxFrame* pFrame = pViewFrame ? &pViewFrame->GetTopFrame() : nullptr;
+SfxFrame* pFrame = pViewFrame ? &pViewFrame->GetFrame() : nullptr;
 if ( pFrame )
 {
 std::unique_ptr pList(new TargetList);
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index 284075a..209fb69 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -95,7 +95,6 @@ class SFX2_DLLPUBLIC SfxFrame : public 
SvCompatWeakBase
 friend class SfxFrameWindow_Impl;
 
 private:
-SfxFrame*   pParentFrame;
 SfxFrameArr_Impl*   pChildArr;
 std::unique_ptr< SfxFrame_Impl > pImpl;
 VclPtr pWindow;
@@ -119,8 +118,6 @@ public:
 boolDoClose();
 sal_uInt16  GetChildFrameCount() const;
 SfxFrame*   GetChildFrame( sal_uInt16 nPos ) const;
-SfxFrame*   GetParentFrame() const
-{ return pParentFrame; }
 
 voidSetPresentationMode( bool bSet );
 SystemWindow*   GetSystemWindow() const;
@@ -130,8 +127,6 @@ public:
 
 SfxObjectShell* GetCurrentDocument() const;
 SfxViewFrame*   GetCurrentViewFrame() const;
-SfxFrame&   GetTopFrame() const;
-boolIsParent( SfxFrame* ) const;
 
 sal_uInt32  GetFrameType() const;
 static void GetDefaultTargetList( TargetList& );
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 99f5fbc..fcfdf31 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -110,8 +110,6 @@ public:
 voidDoActivate(bool bMDI);
 voidDoDeactivate(bool bMDI, SfxViewFrame 
*pOld=nullptr);
 
-SfxViewFrame*   GetParentViewFrame() const;
-
 using SfxShell::GetDispatcher;
 SfxDispatcher*  GetDispatcher() { return m_pDispatcher; }
 SfxBindings&GetBindings() { return *m_pBindings; }
@@ -149,8 +147,6 @@ public:
 boolDoClose();
 sal_uIntPtr GetFrameType() const
  

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

[Takeshi Abe]

 starmath/inc/document.hxx|1 -
 starmath/source/document.cxx |9 -
 2 files changed, 10 deletions(-)

New commits:
commit 063593972e556f8f0e65881ccd77d5ea64175e8b
Author: Takeshi Abe 
Date:   Wed Nov 2 18:46:51 2016 +0900

starmath: Remove unnecessary overriding

Change-Id: If64c3a1dbb27e85e2562cca78b608250b7e90c6d
Reviewed-on: https://gerrit.libreoffice.org/30480
Tested-by: Jenkins 
Reviewed-by: Takeshi Abe 

diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 622c506..cb189af 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -124,7 +124,6 @@ class SM_DLLPUBLIC SmDocShell : public SfxObjectShell, 
public SfxListener
 virtual boolLoad( SfxMedium& rMedium ) override;
 virtual boolSave() override;
 virtual boolSaveAs( SfxMedium& rMedium ) override;
-virtual boolSaveCompleted( const css::uno::Reference< 
css::embed::XStorage >& xStorage ) override;
 
 Printer *GetPrt();
 OutputDevice*   GetRefDev();
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 64847fd..142bc78 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -912,15 +912,6 @@ void SmDocShell::readFormulaOoxml( 
oox::formulaimport::XmlStream& stream )
 SetText( aEquation.ConvertToStarMath());
 }
 
-bool SmDocShell::SaveCompleted( const css::uno::Reference< 
css::embed::XStorage >& xStorage )
-{
-if( SfxObjectShell::SaveCompleted( xStorage ))
-return true;
-
-return false;
-}
-
-
 void SmDocShell::Execute(SfxRequest& rReq)
 {
 switch (rReq.GetSlot())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Takeshi Abe]

 svx/source/svdraw/svddrgmt.cxx |   10 +-
 1 file changed, 1 insertion(+), 9 deletions(-)

New commits:
commit fdc77804d681ea36b8dd257d7a8669a99e1dbb98
Author: Takeshi Abe 
Date:   Mon Oct 31 16:35:42 2016 +0900

Omit the default comparator std::less

Change-Id: Iaf873fc8b5ca673d5e829be33074dffd8680ae03
Reviewed-on: https://gerrit.libreoffice.org/30452
Tested-by: Jenkins 
Reviewed-by: Takeshi Abe 

diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 8dc2744..b1d509a 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -667,15 +667,7 @@ void SdrDragMethod::CancelSdrDrag()
 Hide();
 }
 
-struct compareConstSdrObjectRefs
-{
-bool operator()(const SdrObject* p1, const SdrObject* p2) const
-{
-return (p1 < p2);
-}
-};
-
-typedef std::map< const SdrObject*, SdrObject*, compareConstSdrObjectRefs> 
SdrObjectAndCloneMap;
+typedef std::map< const SdrObject*, SdrObject* > SdrObjectAndCloneMap;
 
 void SdrDragMethod::CreateOverlayGeometry(sdr::overlay::OverlayManager& 
rOverlayManager)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Merging feature/commonsallayout branch

[Khaled Hosny]

On Mon, Oct 17, 2016 at 09:30:14PM +0200, Khaled Hosny wrote:
> Currently the new layout is off by default and can be enabled at runtime
> by setting SAL_USE_COMMON_LAYOUT env variable. After merging with
> master, I’m going to wait a week or so for any potential build issues
> then swap the default.

The new layout engine is the default now and can be disabled at runtime
by setting SAL_NO_COMMON_LAYOUT (notice the NO) env variable.
 
Regards,
Khaled
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: CppunitTest_svgio fails on macOS with the new layout engine

[Khaled Hosny]

On Wed, Nov 02, 2016 at 06:34:32PM +0200, Khaled Hosny wrote:
> On Tue, Nov 01, 2016 at 10:14:49PM +0100, Tomaž Vajngerl wrote:
> > Hi,
> > 
> > On Tue, Nov 1, 2016 at 8:33 PM, Khaled Hosny  wrote:
> > > I tried to find what is the source of difference, but to no avail. I
> > > can’t figure out why the choice of the layout engine can make a
> > > difference here.
> > 
> > I don't know the cause and if this is possible but just a quick check
> > at the svgio code my speculation is that it could make a difference if
> > it determines for example that text overflows the bounds and it needs
> > to clip. If you look at the XML and what the test checks you see the
> > mask primitive is inserted just suddenly. I saw in the svgio code that
> > the mask primitive is used at many places to do clipping.
> 
> Thanks for the pointers, that was very helpful. I now found the part
> that does the mask; if I set bDoCorrectCanvasClipping to false in
> svgio/source/svgreader/svgsvgnode.cxx the test passes. Now I need to
> find the part that actually calculates the bounding box...

After further debugging it turned out we were returning bad text
bounding boxes on macOS with the new layout engine, apparently
CoreTextStyle::GetGlyphBoundRect() was returning wrong bounding box all
along but it was not detected before because we were using Core Text to
get the bounding box of the whole text at once and this function was not
used (not for this at least).

This is now fixed in:
https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=8cef9b4dbafdebc0566d6d7f715f27f978ddfe5b

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

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

[Khaled Hosny]

 vcl/README.vars  |2 +-
 vcl/source/gdi/sallayout.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8f2dd1df1d6cc94ebbc1149de72bc6d6dffa6533
Author: Khaled Hosny 
Date:   Wed Nov 2 23:52:06 2016 +0200

Revert "Revert "Enable the new text layout engine by default""

This reverts commit 3950166877bf1308f9e449992e20b558342af825.

Change-Id: Ie22a99885a23d44a9870fcd286bee4ccf10c53ac
Reviewed-on: https://gerrit.libreoffice.org/30505
Tested-by: Jenkins 
Reviewed-by: Khaled Hosny 

diff --git a/vcl/README.vars b/vcl/README.vars
index 10e6356..d50a03b 100644
--- a/vcl/README.vars
+++ b/vcl/README.vars
@@ -6,7 +6,7 @@ SAL_USE_VCLPLUGIN - use a VCL plugin
 SAL_NO_NWF - disable native widgets
 SAL_FORCEDPI - force a specific DPI (gtk & gtk3 plugins only)
 SAL_FORCE_HC - force high-contrast mode
-SAL_USE_COMMON_LAYOUT - use CommonSalLayout layout engine for text layout
+SAL_NO_COMMON_LAYOUT - disable CommonSalLayout layout engine for text layout
 
 VCL_DOUBLEBUFFERING_AVOID_PAINT - don't paint the buffer, useful to see where 
we do direct painting
 VCL_DOUBLEBUFFERING_FORCE_ENABLE - enable double buffered painting
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index b865ff9..2e09aaf 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -770,7 +770,7 @@ bool SalLayout::IsSpacingGlyph( sal_GlyphId nGlyph )
 
 bool SalLayout::UseCommonLayout()
 {
-static bool bUse = getenv("SAL_USE_COMMON_LAYOUT") != nullptr;
+static bool bUse = getenv("SAL_NO_COMMON_LAYOUT") == nullptr;
 return bUse;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 xmlsecurity/source/helper/xsecctl.cxx |4 
 xmlsecurity/source/helper/xsecctl.hxx |   10 --
 2 files changed, 14 deletions(-)

New commits:
commit c8be45889217c555e4bec92af838d0524ceba4e0
Author: Tor Lillqvist 
Date:   Wed Nov 2 23:53:38 2016 +0200

No XFastPropertySet here

It has been commented out since creation in 2004.

Change-Id: I25ff3ff953430ecbb84fecd3228e662a9c3e1276

diff --git a/xmlsecurity/source/helper/xsecctl.cxx 
b/xmlsecurity/source/helper/xsecctl.cxx
index 81a4e9c..92a26c4 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -868,10 +868,6 @@ SignatureInformations 
XSecController::getSignatureInformations() const
  */
 
 /*
- * XFastPropertySet
- */
-
-/*
  * XSAXEventKeeperStatusChangeListener
  */
 
diff --git a/xmlsecurity/source/helper/xsecctl.hxx 
b/xmlsecurity/source/helper/xsecctl.hxx
index e4693a9..86dbec0 100644
--- a/xmlsecurity/source/helper/xsecctl.hxx
+++ b/xmlsecurity/source/helper/xsecctl.hxx
@@ -37,7 +37,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -98,7 +97,6 @@ public:
 class XSecController : public cppu::WeakImplHelper
 <
 css::xml::crypto::sax::XSecurityController,
-//css::beans::XFastPropertySet,
 css::xml::crypto::sax::XSAXEventKeeperStatusChangeListener,
 css::xml::crypto::sax::XSignatureCreationResultListener,
 css::xml::crypto::sax::XSignatureVerifyResultListener
@@ -112,10 +110,6 @@ class XSecController : public cppu::WeakImplHelper
  *  Controls the whole xml security framework to create signatures or to
  *  verify signatures.
  *
- *   NOTES
- *  The XFastPropertySet interface is used to transfer common values to
- *  classes in other module, for instance, the signature id for all
- *  sessions is transferred to xmloff module through this interface.
  
**/
 {
 friend class XSecParser;
@@ -423,10 +417,6 @@ public:
  */
 
 /*
- * XFastPropertySet
- */
-
-/*
  * XSAXEventKeeperStatusChangeListener
  */
 virtual void SAL_CALL blockingStatusChanged( sal_Bool isBlocking )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Khaled Hosny]

 vcl/quartz/ctfonts.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8cef9b4dbafdebc0566d6d7f715f27f978ddfe5b
Author: Khaled Hosny 
Date:   Wed Nov 2 23:38:13 2016 +0200

Fix GetGlyphBoundRect() on macOS

The Y sign should be reversed to match VCL, apparently it was either
unused on macOS before CommonSalLayout or it was wrong all along.

This was the source of CppunitTest_svgio failure on macOS with
CommonSalLayout.

Change-Id: I3108aab7b6780c912e86e5591ca0f41ea437137b

diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index 948bfb5..11905c2 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -157,9 +157,9 @@ bool CoreTextStyle::GetGlyphBoundRect( sal_GlyphId 
aGlyphId, Rectangle& rRect )
 const CGRect aCGRect = CTFontGetBoundingRectsForGlyphs( aCTFontRef, 
aFontOrientation, &nCGGlyph, nullptr, 1 );
 
 rRect.Left()   = lrint( aCGRect.origin.x );
-rRect.Top()= lrint( aCGRect.origin.y );
+rRect.Top()= lrint(-aCGRect.origin.y );
 rRect.Right()  = lrint( aCGRect.origin.x + aCGRect.size.width );
-rRect.Bottom() = lrint( aCGRect.origin.y + aCGRect.size.height );
+rRect.Bottom() = lrint( aCGRect.origin.y - aCGRect.size.height );
 return true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 external/jpeg-turbo/jpeg-turbo.win_build.patch.1 |   28 +++
 1 file changed, 28 insertions(+)

New commits:
commit f2761b62b3d0b45a3e57781a16c8c5c6ee94ded0
Author: Michael Stahl 
Date:   Wed Nov 2 22:47:48 2016 +0100

jpeg-turbo: resolve some conflicts to fix poppler build

poppler uses both windows.h and jpeg headers, so runs into the conflict
between Win32 definitions of boolean, INT16, INT32, and jpeg's.

Tweak jpeg-turbo headers so it uses the Win32 definitions.

Change-Id: I2dc2b35a8d08d521c95494e528c1e47ccbfc390a

diff --git a/external/jpeg-turbo/jpeg-turbo.win_build.patch.1 
b/external/jpeg-turbo/jpeg-turbo.win_build.patch.1
index ce00851..b5dabaa 100644
--- a/external/jpeg-turbo/jpeg-turbo.win_build.patch.1
+++ b/external/jpeg-turbo/jpeg-turbo.win_build.patch.1
@@ -1,3 +1,7 @@
+Copy definitions of "boolean", "INT16", "INT32" from win/jconfig.h.in
+
+... into jconfig.h.in, which is the one we use via configure.
+
 diff -ru jpeg-turbo.orig/simd/Makefile.in jpeg-turbo/simd/Makefile.in
 --- jpeg-turbo.orig/simd/Makefile.in   2015-09-21 20:48:45.0 +0200
 +++ jpeg-turbo/simd/Makefile.in2015-11-22 10:52:46.975285184 +0100
@@ -24,3 +28,27 @@ diff -ru jpeg-turbo.orig/configure jpeg-turbo/configure
 
  fi
  done
+--- jpeg-turbo/jconfig.h.in.orig   2016-11-02 22:43:55.01260 +0100
 jpeg-turbo/jconfig.h.in2016-11-02 22:45:01.90540 +0100
+@@ -71,3 +71,21 @@
+ 
+ /* The size of `size_t', as computed by sizeof. */
+ #undef SIZEOF_SIZE_T
++
++#ifdef _MSC_VER
++
++/* Define "boolean" as unsigned char, not int, per Windows custom */
++#ifndef __RPCNDR_H__  /* don't conflict if rpcndr.h already read */
++typedef unsigned char boolean;
++#endif
++#define HAVE_BOOLEAN  /* prevent jmorecfg.h from redefining it */
++
++/* Define "INT32" as int, not long, per Windows custom */
++#if !(defined(_BASETSD_H_) || defined(_BASETSD_H))   /* don't conflict if 
basetsd.h already read */
++typedef short INT16;
++typedef signed int INT32;
++#endif
++#define XMD_H   /* prevent jmorecfg.h from redefining it */
++
++#endif /* _MSC_VER */
++
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 xmlsecurity/inc/xmlsignaturehelper.hxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 6f82a540c505fca37292f4b5cb74a1441a25ca98
Author: Tor Lillqvist 
Date:   Wed Nov 2 23:37:51 2016 +0200

Add FIXME

Change-Id: I37e614f6dfa0778cb126a6de282921a15417af1c

diff --git a/xmlsecurity/inc/xmlsignaturehelper.hxx 
b/xmlsecurity/inc/xmlsignaturehelper.hxx
index 4ba359c..3ff3a9c 100644
--- a/xmlsecurity/inc/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsignaturehelper.hxx
@@ -91,6 +91,12 @@ class XMLSECURITY_DLLPUBLIC XMLSignatureHelper
 {
 private:
 css::uno::Reference< css::uno::XComponentContext > mxCtx;
+// FIXME: This field appears to be unused (it is only assigned to in the 
XMLSignatureHelper
+// constructor), but it can't be removed as it is that very assignment 
which causes the object
+// it to be acquired, and otherwise its reference counting will be borked 
and we get a
+// crash. This is stupid of course. Probably we should just kill the 
separate XSecController
+// class and move its contents inside this class. Nothing else uses 
XSecController anyway, as
+// far as I see.
 css::uno::Reference< css::xml::crypto::sax::XSecurityController > 
mxSecurityController;
 css::uno::Reference< css::xml::crypto::XUriBinding > mxUriBinding;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - slideshow/source

[David Tardon]

 slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 832951ed5bac5800910293e29d2ccaeb7e032e72
Author: David Tardon 
Date:   Mon Oct 31 19:51:56 2016 +0100

convert angle from degrees to radians for glm

This makes simple (i.e., not implemented as a shader) OpenGL transitions
work correctly again.

(cherry picked from commit 7445399af829c48e8c71eed66f132d96fa195c37)

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

diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx 
b/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx
index c61209f..97d8902 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx
@@ -31,6 +31,8 @@
 #include 
 #include 
 
+#include 
+
 #include "OGLTrans_Operation.hxx"
 
 SRotate::SRotate(const glm::vec3& Axis, const glm::vec3& Origin,
@@ -38,7 +40,7 @@ SRotate::SRotate(const glm::vec3& Axis, const glm::vec3& 
Origin,
 Operation(bInter, T0, T1),
 axis(Axis),
 origin(Origin),
-angle(Angle)
+angle(basegfx::deg2rad(Angle))
 {
 }
 
@@ -55,7 +57,7 @@ RotateAndScaleDepthByWidth::RotateAndScaleDepthByWidth(const 
glm::vec3& Axis,
 Operation(bInter, T0, T1),
 axis(Axis),
 origin(Origin),
-angle(Angle),
+angle(basegfx::deg2rad(Angle)),
 scale(bScale)
 {
 }
@@ -65,7 +67,7 @@ 
RotateAndScaleDepthByHeight::RotateAndScaleDepthByHeight(const glm::vec3& Axis,
 Operation(bInter, T0, T1),
 axis(Axis),
 origin(Origin),
-angle(Angle),
+angle(basegfx::deg2rad(Angle)),
 scale(bScale)
 {
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 stoc/source/javavm/javavm.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0a1e6954a11df2d8ae13ea4f3b9086c050a2bbed
Author: Caolán McNamara 
Date:   Wed Nov 2 20:26:28 2016 +

coverity#1375798 Uncaught exception

Change-Id: Id7e968170a038d9316503ee796cfd6a99e9fc3ae

diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index d27c081..b7bc59f 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -539,7 +539,7 @@ void setTimeZone(stoc_javavm::JVM * pjvm) throw() {
 void initVMConfiguration(
 stoc_javavm::JVM * pjvm,
 const css::uno::Reference & xSMgr,
-const css::uno::Reference &xCtx) 
throw(css::uno::Exception)
+const css::uno::Reference &xCtx) 
throw(css::uno::Exception, std::exception)
 {
 stoc_javavm::JVM jvm;
 try {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/control/menubtn.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 98479f1429eed10b913c69a3fa49e0d8d84acc3e
Author: Caolán McNamara 
Date:   Wed Nov 2 20:24:27 2016 +

widgetery warnings

Change-Id: I5f9c8011a43e2b15b9b2f58772f6f08ad103f4aa

diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index 6b62d84..7e01e09d 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -90,6 +90,7 @@ MenuButton::~MenuButton()
 void MenuButton::dispose()
 {
 delete mpMenuTimer;
+mpFloatingWindow.clear();
 mpMenu.clear();
 PushButton::dispose();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

Please find the latest report on new defect(s) introduced to LibreOffice found 
with Coverity Scan.

1 new defect(s) introduced to LibreOffice found with Coverity Scan.
13 defect(s), reported by Coverity Scan earlier, were marked fixed in the 
recent build analyzed by Coverity Scan.

New defect(s) Reported-by: Coverity Scan
Showing 1 of 1 defect(s)


** CID 1375798:  Error handling issues  (UNCAUGHT_EXCEPT)
/stoc/source/javavm/javavm.cxx: 539 in 
::initVMConfiguration(stoc_javavm::JVM *, const 
com::sun::star::uno::Reference &, 
const com::sun::star::uno::Reference 
&)()



*** CID 1375798:  Error handling issues  (UNCAUGHT_EXCEPT)
/stoc/source/javavm/javavm.cxx: 539 in 
::initVMConfiguration(stoc_javavm::JVM *, const 
com::sun::star::uno::Reference &, 
const com::sun::star::uno::Reference 
&)()
533 #endif
534 
535 if (!strcmp(TIMEZONE, p))
536 pjvm->pushProp("user.timezone=ECT");
537 }
538 
>>> CID 1375798:  Error handling issues  (UNCAUGHT_EXCEPT)
>>> An exception of type "std::length_error" is thrown but the throw list 
>>> "throw(com::sun::star::uno::Exception)" doesn't allow it to be thrown. This 
>>> will cause a call to unexpected() which usually calls terminate().
539 void initVMConfiguration(
540 stoc_javavm::JVM * pjvm,
541 const css::uno::Reference & 
xSMgr,
542 const css::uno::Reference &xCtx) 
throw(css::uno::Exception)
543 {
544 stoc_javavm::JVM jvm;



To view the defects in Coverity Scan visit, 
https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRZBnDJeNb0HijxaS4JNJPxk3kpyAm2AYqo71yXmnOxB72ibeUH-2F-2F1Lhi9AZq3dRu-2F4-3D_g-2BrHdvqzaBa155F-2F8AmPhpJzY63UzWDisJV95WUBpGhqFw1ICExHG8aMaV2EoFpy6yRDTb42hh0lp05XgdhLdJG7CGXciWRPidQY9c5BTxlpCioxBZ0qZFtDM2-2BYYqPV4htO2-2B-2BoPdW48-2B-2FSHkZ09ecYh0ZlahyDwtFHZIigAkw0NN5qSxLG2PDQBc2AzXUfqAxUG1mgcL-2BleZFSRpKO8BoSioCDvkCXej0pqKjtXdA-3D

To manage Coverity Scan email notifications for 
"libreoffice@lists.freedesktop.org", click 
https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRbVDbis712qZDP-2FA8y06Nq4k1FZJSDV-2FTHi5VQof9xGafB4oBwGYxuHHknceo2QLpCrZ44Ciy7AqBR2QyX6OCB5N5X-2B1MAElavPQhH6nLwozJzqOkt2k8uOkYf2ZoppNa9QVe0T3fEZVQ7Kky1tOkLz_g-2BrHdvqzaBa155F-2F8AmPhpJzY63UzWDisJV95WUBpGhqFw1ICExHG8aMaV2EoFpy6yRDTb42hh0lp05XgdhLdFR50zkOMijarxp7mWhP4dl0biMv7eDPwdXgmuXDcpF-2B1UrkvpW1L6v7H4BUFiaJdPzILYYI-2BRTf2KI-2FQWIKtM8BdSepLqluOjVvQJ7SDw7uM12Cyoy47mvKtFIVI8zdcQk-2FJPyglMqxfmMxKWw79Wo-3D

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

[Libreoffice-commits] core.git: config_host.mk.in configure.ac external/poppler RepositoryExternal.mk

[Michael Stahl]

 RepositoryExternal.mk   |   23 +--
 config_host.mk.in   |2 ++
 configure.ac|   12 +---
 external/poppler/ExternalProject_poppler.mk |2 +-
 external/poppler/UnpackedTarball_poppler.mk |1 +
 external/poppler/poppler-libjpeg.patch.1|   23 +++
 6 files changed, 53 insertions(+), 10 deletions(-)

New commits:
commit eea709f67d91e271e3df37e6c6724b7b5870b1ee
Author: Michael Stahl 
Date:   Wed Nov 2 14:13:54 2016 +0100

poppler: build against libjpeg

Albert Astals Cid points out that --disable-libjpeg causes poppler to
use internal JPEG code instead, which is not actively maintained.

Add LIBJPEG_CFLAGS / LIBJPEG_LIBS to config_host.mk and patch poppler to
respect LIBJPEG_LIBS.

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

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 93a5459..1f891d5 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -425,32 +425,37 @@ endif # SYSTEM_ZLIB
 ifneq ($(SYSTEM_JPEG),)
 
 define gb_LinkTarget__use_jpeg
-$(call gb_LinkTarget_add_libs,$(1),-ljpeg)
+$(call gb_LinkTarget_add_libs,$(1),$(LIBJPEG_LIBS))
 $(call gb_LinkTarget_set_ldflags,$(1),\
$$(filter-out -L/usr/lib/jvm%,$$(T_LDFLAGS)) \
 )
 
 endef
 
+gb_ExternalProject__use_jpeg :=
+
 else ifneq ($(filter JPEG_TURBO,$(BUILD_TYPE)),)
 
 define gb_LinkTarget__use_jpeg
 $(call gb_LinkTarget_set_include,$(1),\
-   -I$(call gb_UnpackedTarball_get_dir,jpeg-turbo) \
+   $(LIBJPEG_CFLAGS) \
$$(INCLUDE) \
 )
-$(call gb_LinkTarget_add_libs,$(1),\
-   $(call 
gb_UnpackedTarball_get_dir,jpeg-turbo)/.libs/libjpeg$(gb_StaticLibrary_PLAINEXT)
 \
-)
+$(call gb_LinkTarget_add_libs,$(1),$(LIBJPEG_LIBS))
 $(call gb_LinkTarget_use_external_project,$(1),jpeg-turbo,full)
 
 endef
 
+define gb_ExternalProject__use_jpeg
+$(call gb_ExternalProject_use_external_project,$(1),jpeg-turbo)
+
+endef
+
 else # !SYSTEM_JPEG
 
 define gb_LinkTarget__use_jpeg
 $(call gb_LinkTarget_set_include,$(1),\
-   -I$(call gb_UnpackedTarball_get_dir,jpeg) \
+   $(LIBJPEG_CFLAGS) \
$$(INCLUDE) \
 )
 
@@ -458,6 +463,11 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
jpeg \
 )
 
+define gb_ExternalProject__use_jpeg
+$(call gb_ExternalProject_use_static_libraries,$(1),jpeg)
+
+endef
+
 endef
 
 endif # SYSTEM_JPEG
@@ -2752,6 +2762,7 @@ endef
 else # !SYSTEM_POPPLER
 
 define gb_LinkTarget__use_poppler
+$(call gb_LinkTarget_use_external,$(1),jpeg)
 $(call gb_LinkTarget_use_external_project,$(1),poppler,full)
 
 $(call gb_LinkTarget_set_include,$(1),\
diff --git a/config_host.mk.in b/config_host.mk.in
index 260acf7..7eebae6 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -320,6 +320,8 @@ export LIBFONTS_JAR=@LIBFONTS_JAR@
 export LIBFORMULA_JAR=@LIBFORMULA_JAR@
 export LIBGCRYPT_CFLAGS=@LIBGCRYPT_CFLAGS@
 export LIBGCRYPT_LIBS=@LIBGCRYPT_LIBS@
+export LIBJPEG_CFLAGS=$(gb_SPACE)@LIBJPEG_CFLAGS@
+export LIBJPEG_LIBS=$(gb_SPACE)@LIBJPEG_LIBS@
 export LIBLANGTAG_CFLAGS=$(gb_SPACE)@LIBLANGTAG_CFLAGS@
 export LIBLANGTAG_LIBS=$(gb_SPACE)@LIBLANGTAG_LIBS@
 export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@
diff --git a/configure.ac b/configure.ac
index 66a11a9..9c24cbb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7716,10 +7716,10 @@ fi
 if test "$with_system_jpeg" = "yes"; then
 AC_MSG_RESULT([external])
 SYSTEM_JPEG=TRUE
-AC_CHECK_HEADER(jpeglib.h, [],
+AC_CHECK_HEADER(jpeglib.h, [ LIBJPEG_CFLAGS= ],
 [AC_MSG_ERROR(jpeg.h not found. install libjpeg)], [])
-AC_CHECK_LIB(jpeg, jpeg_resync_to_restart, [ JPEG3RDLIB=-ljpeg ],
-[AC_MSG_CHECKING(jpeg library not found or fuctional)], [])
+AC_CHECK_LIB(jpeg, jpeg_resync_to_restart, [ LIBJPEG_LIBS="-ljpeg" ],
+[AC_MSG_ERROR(jpeg library not found or fuctional)], [])
 libo_MINGW_CHECK_DLL([libjpeg])
 else
 SYSTEM_JPEG=
@@ -7768,12 +7768,18 @@ Alternatively, you can install the 'new' nasm where 
ever you want and make sure
 _EOS
 AC_MSG_ERROR([no nasm (Netwide Assembler) found])
 fi
+LIBJPEG_CFLAGS="-I${WORKDIR}/UnpackedTarball/jpeg-turbo"
+LIBJPEG_LIBS="${WORKDIR}/UnpackedTarball/jpeg-turbo/.libs/libjpeg.lib"
 else
 AC_MSG_RESULT([internal, jpeg])
 BUILD_TYPE="$BUILD_TYPE JPEG"
+LIBJPEG_CFLAGS="-I${WORKDIR}/UnpackedTarball/jpeg"
+LIBJPEG_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -ljpeg"
 fi
 fi
 AC_SUBST(NASM)
+AC_SUBST(LIBJPEG_CFLAGS)
+AC_SUBST(LIBJPEG_LIBS)
 AC_SUBST(SYSTEM_JPEG)
 
 dnl ===
diff --git a/external/poppler/ExternalProject_poppler.mk 
b/external/poppler/ExternalProject_poppler.mk
index eab1d91..f75dddc 100644
--- a/external/poppler/ExternalProject_poppler.mk
+++ b/external/p

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

[Eike Rathke]

 external/libzmf/ExternalProject_libzmf.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 092261ffd497f752c342f1fbdca6e7267e312a21
Author: Eike Rathke 
Date:   Wed Nov 2 20:33:45 2016 +0100

add missing gb_ExternalProject_use_externals, icu

Change-Id: Iaaa3363f315eb88f3be48e29bb82917695c3cfe0

diff --git a/external/libzmf/ExternalProject_libzmf.mk 
b/external/libzmf/ExternalProject_libzmf.mk
index 713d55d..87e6693 100644
--- a/external/libzmf/ExternalProject_libzmf.mk
+++ b/external/libzmf/ExternalProject_libzmf.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,libzmf,\
 
 $(eval $(call gb_ExternalProject_use_externals,libzmf,\
boost_headers \
+   icu \
revenge \
 ))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: writerperfect/Library_wpftcalc.mk writerperfect/Library_wpftdraw.mk writerperfect/Library_wpftwriter.mk

[Eike Rathke]

 writerperfect/Library_wpftcalc.mk   |1 +
 writerperfect/Library_wpftdraw.mk   |1 +
 writerperfect/Library_wpftwriter.mk |1 +
 3 files changed, 3 insertions(+)

New commits:
commit 6b36f514fb148a106318d339abf0b304ef64
Author: Eike Rathke 
Date:   Wed Nov 2 20:11:59 2016 +0100

add missing dependency to gb_Library_use_externals, icu_headers

Change-Id: Ia414b02c52f73724df6829431d090a18e76baa68

diff --git a/writerperfect/Library_wpftcalc.mk 
b/writerperfect/Library_wpftcalc.mk
index 3d378cb..1748c3f8 100644
--- a/writerperfect/Library_wpftcalc.mk
+++ b/writerperfect/Library_wpftcalc.mk
@@ -54,6 +54,7 @@ $(eval $(call gb_Library_use_externals,wpftcalc,\
zlib \
lcms2 \
libxml2 \
+   icu_headers \
icui18n \
icuuc \
 ))
diff --git a/writerperfect/Library_wpftdraw.mk 
b/writerperfect/Library_wpftdraw.mk
index cff3090..be7300d 100644
--- a/writerperfect/Library_wpftdraw.mk
+++ b/writerperfect/Library_wpftdraw.mk
@@ -61,6 +61,7 @@ $(eval $(call gb_Library_use_externals,wpftdraw,\
zlib \
lcms2 \
libxml2 \
+   icu_headers \
icui18n \
icuuc \
 ))
diff --git a/writerperfect/Library_wpftwriter.mk 
b/writerperfect/Library_wpftwriter.mk
index b260dc4..a7ab452 100644
--- a/writerperfect/Library_wpftwriter.mk
+++ b/writerperfect/Library_wpftwriter.mk
@@ -51,6 +51,7 @@ $(eval $(call gb_Library_use_externals,wpftwriter,\
boost_headers \
ebook \
etonyek \
+   icu_headers \
icui18n \
icuuc \
libxml2 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 download.lst  |4 ++--
 external/curl/ExternalProject_curl.mk |2 +-
 external/curl/UnpackedTarball_curl.mk |2 +-
 external/curl/curl-7.26.0_win-proxy.patch |   13 +++--
 external/curl/curl-msvc-schannel.patch.1  |4 ++--
 external/curl/curl-msvc.patch.1   |   12 ++--
 6 files changed, 23 insertions(+), 14 deletions(-)

New commits:
commit 3edb365f2651848ae8bc3b85bf0b56bd00d93270
Author: Michael Stahl 
Date:   Wed Nov 2 11:48:21 2016 +0100

curl: upgrade to version 7.51.0

- fixes about a dozen CVEs
- tweak curl-7.26.0_win-proxy.patch:
  there is a "checksrc" thing now in curl that fails the build with:
warning: use of strtok is banned (BANNEDFUNC)
  so use strtok_s instead (which is MSVC's name for standard strtok_r)
- use Makefile.vc12 instead of Makefile.vc10
- remove strequal.obj from Makefile.vc12, it does not actually exist

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

diff --git a/download.lst b/download.lst
index 0770a4d..6a6bace 100644
--- a/download.lst
+++ b/download.lst
@@ -24,8 +24,8 @@ export COLLADA2GLTF_TARBALL := 
4b87018f7fff1d054939d19920b751a0-collada2gltf-mas
 export CPPUNIT_MD5SUM := d1c6bdd5a76c66d2c38331e2d287bc01
 export CPPUNIT_TARBALL := cppunit-1.13.2.tar.gz
 export CT2N_TARBALL := 
1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
-export CURL_MD5SUM := c264788f2e4313a05140d712c1ec90c2
-export CURL_TARBALL := curl-7.50.1.tar.gz
+export CURL_MD5SUM := 490e19a8ccd1f4a244b50338a0eb9456
+export CURL_TARBALL := curl-7.51.0.tar.gz
 export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll
 export EBOOK_MD5SUM := 6b48eda57914e6343efebc9381027b78
 export EBOOK_TARBALL := libe-book-0.1.2.tar.bz2
diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 8446d82..76b4a45 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -79,7 +79,7 @@ else ifeq ($(COM),MSC)
 
 $(call gb_ExternalProject_get_state_target,curl,build):
$(call gb_ExternalProject_run,build,\
-   MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc10 \
+   MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc12 \
cfg=$(if 
$(MSVC_USE_DEBUG_RUNTIME),debug-dll,release-dll) \
EXCFLAGS="/EHs /D_CRT_SECURE_NO_DEPRECATE 
/DUSE_WINDOWS_SSPI /D_USING_V110_SDK71_ $(SOLARINC)" $(if $(filter 
X86_64,$(CPUNAME)),MACHINE=X64) \
,lib)
diff --git a/external/curl/UnpackedTarball_curl.mk 
b/external/curl/UnpackedTarball_curl.mk
index f1e9209..536474d 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -14,7 +14,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,curl,$(CURL_TARBALL),,curl))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,curl,1))
 
 $(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\
-   lib/Makefile.vc10 \
+   lib/Makefile.vc12 \
 ))
 
 $(eval $(call gb_UnpackedTarball_add_patches,curl,\
diff --git a/external/curl/curl-7.26.0_win-proxy.patch 
b/external/curl/curl-7.26.0_win-proxy.patch
index dff1e37..cf41850 100644
--- a/external/curl/curl-7.26.0_win-proxy.patch
+++ b/external/curl/curl-7.26.0_win-proxy.patch
@@ -1,5 +1,5 @@
 curl-7.26.0/lib/Makefile.vc10
-+++ misc/build/curl-7.26.0/lib/Makefile.vc10
+--- curl-7.26.0/lib/Makefile.vc12
 misc/build/curl-7.26.0/lib/Makefile.vc12
 @@ -118,7 +118,7 @@
  WINSSLLIBS   = crypt32.lib
  ZLIBLIBSDLL  = zdll.lib
@@ -13,7 +13,7 @@
 +++ misc/build/curl-7.26.0/lib/url.c
 @@ -78,6 +78,10 @@
  bool curl_win32_idn_to_ascii(const char *in, char **out);
- #endif  /* USE_LIBIDN */
+ #endif  /* USE_LIBIDN2 */
  
 +#ifdef _WIN32
 +#include 
@@ -52,7 +52,7 @@
  
  #ifndef CURL_DISABLE_HTTP
/* If proxy was not specified, we check for default proxy environment
-@@ -4613,7 +4633,63 @@
+@@ -4613,7 +4633,64 @@
 * For compatibility, the all-uppercase versions of these variables are
 * checked if the lowercase versions don't exist.
 */
@@ -83,9 +83,10 @@
 +  if(!check_noproxy(conn->host.name, no_proxy)) {
 +/* Look for the http proxy setting */
 +char* tok;
++char *saveptr;
 +
 +if(NULL != ieProxy) {
-+  tok = strtok(ieProxy, ";");
++  tok = strtok_s(ieProxy, ";", &saveptr);
 +  if(strchr(tok, '=') == NULL) {
 +proxy = strdup(ieProxy);
 +  }
@@ -95,7 +96,7 @@
 +/* We found HTTP proxy value, then use it */
 +proxy = strdup(tok + 5);
 +  }
-+  tok = strtok(NULL, ";");
++  tok = strtok_s(NULL, ";", &saveptr);
 +}
 +while(NULL != tok);
 +  }
diff --git a/external/curl/curl-msvc-schannel.patch.1 
b/external/curl/curl-msvc-schannel.patch.1
i

[Libreoffice-commits] core.git: configure.ac download.lst external/icu i18npool/source i18nutil/source include/svx svx/source

[Eike Rathke]

 configure.ac|2 
 download.lst|2 
 external/icu/icu-ubsan.patch.0  |   11 
 external/icu/icu4c-warnings.patch   |   12 
 i18npool/source/breakiterator/breakiterator_unicode.cxx |   12 
 i18nutil/source/utility/unicode.cxx |   26 +
 include/svx/ucsubset.hrc|   11 
 svx/source/dialog/charmap.cxx   |   35 
 svx/source/dialog/ucsubset.src  |   44 
 9 files changed, 130 insertions(+), 25 deletions(-)

New commits:
commit 3e42714c76b1347babfdea0564009d8d82a83af4
Author: Eike Rathke 
Date:   Wed Nov 2 13:07:48 2016 +0100

upgrade to ICU 58

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

diff --git a/configure.ac b/configure.ac
index f06ef8e..66a11a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9136,7 +9136,7 @@ SYSTEM_GENBRK=
 SYSTEM_GENCCODE=
 SYSTEM_GENCMN=
 
-ICU_MAJOR=57
+ICU_MAJOR=58
 ICU_MINOR=1
 ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
 ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE"
diff --git a/download.lst b/download.lst
index 4571338..0770a4d 100644
--- a/download.lst
+++ b/download.lst
@@ -62,7 +62,7 @@ export HARFBUZZ_TARBALL := harfbuzz-1.3.2.tar.bz2
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 export HUNSPELL_TARBALL := 
33d370f7fe5a030985e445a5672b2067-hunspell-1.4.1.tar.gz
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
-export ICU_TARBALL := 976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz
+export ICU_TARBALL := 1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 export JFREEREPORT_FLUTE_TARBALL := 
d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
 export JFREEREPORT_LIBBASE_TARBALL := 
eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
diff --git a/external/icu/icu-ubsan.patch.0 b/external/icu/icu-ubsan.patch.0
index 6d1d3bc..8a47242 100644
--- a/external/icu/icu-ubsan.patch.0
+++ b/external/icu/icu-ubsan.patch.0
@@ -151,14 +151,3 @@
length(len), next(subNode) {}
  virtual UBool operator==(const Node &other) const;
  virtual int32_t markRightEdgesFirst(int32_t edgeNumber);
 source/common/unifiedcache.h
-+++ source/common/unifiedcache.h
-@@ -139,7 +139,7 @@
-: CacheKey(other), fLoc(other.fLoc) { }
-virtual ~LocaleCacheKey() { }
-virtual int32_t hashCode() const {
--   return 37 *CacheKey::hashCode() + fLoc.hashCode();
-+   return 37U *CacheKey::hashCode() + fLoc.hashCode();
-}
-virtual UBool operator == (const CacheKeyBase &other) const {
-// reflexive
diff --git a/external/icu/icu4c-warnings.patch 
b/external/icu/icu4c-warnings.patch
index d146093..96608d7 100644
--- a/external/icu/icu4c-warnings.patch
+++ b/external/icu/icu4c-warnings.patch
@@ -8,15 +8,3 @@
  } \
  }
  
 misc/icu/source/common/unicode/utypes.h
-+++ misc/build/icu/source/common/unicode/utypes.h
-@@ -399,7 +399,7 @@
-  * some Linux/Unix compilers have problems with defining global new/delete.
-  * On Windows, it is _MSC_VER>=1200 for MSVC 6.0 and higher.
-  */
--#if defined(__cplusplus) && U_DEBUG && U_OVERRIDE_CXX_ALLOCATION && 
(_MSC_VER>=1200) && !defined(U_STATIC_IMPLEMENTATION) && 
(defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || 
defined(U_IO_IMPLEMENTATION) || defined(U_LAYOUT_IMPLEMENTATION) || 
defined(U_LAYOUTEX_IMPLEMENTATION))
-+#if defined(__cplusplus) && U_DEBUG && U_OVERRIDE_CXX_ALLOCATION && defined 
(_MSC_VER) && (_MSC_VER>=1200) && !defined(U_STATIC_IMPLEMENTATION) && 
(defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || 
defined(U_IO_IMPLEMENTATION) || defined(U_LAYOUT_IMPLEMENTATION) || 
defined(U_LAYOUTEX_IMPLEMENTATION))
- 
- #ifndef U_HIDE_INTERNAL_API
- /**
-
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx 
b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 3b0b227..76ae209 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -63,10 +63,13 @@ BreakIterator_Unicode::~BreakIterator_Unicode()
 class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator
 {
 public:
+#if (U_ICU_VERSION_MAJOR_NUM < 58)
+// RuleBasedBreakIterator::setBreakType() is private as of ICU 58.
 inline void publicSetBreakType(int32_t type)
 {
 setBreakType(type);
 };
+#endif
 OOoRuleBasedBreakIterator(UDataMemory* image,
   UErrorCode &status)
 : RuleBasedBreakIterator(image, status)
@@ -142,12 +145,21 @@ void SAL_CALL 
Brea

[Libreoffice-commits] core.git: 3 commits - filter/source

[David Tardon]

 filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit b68ed302830fd1c44212eeb6c23d5a08b7dc97ec
Author: David Tardon 
Date:   Wed Nov 2 19:30:20 2016 +0100

check only Column elements when computing column index

Change-Id: I4856227c05e97daefbae7e98c0e9d70f84e1a2b4

diff --git a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl 
b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
index 2916dc1..00b3cc9 100644
--- a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
+++ b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
@@ -5122,18 +5122,18 @@



+   
select="preceding-sibling::ss:Column[@ss:Index][last()]"/>



+   
select="set:intersection(preceding-sibling::ss:Column, 
$recent-index/following-sibling::ss:Column)"/>




-   
+   
 


commit 6f3642986f819430c16c8c804ac62aab47778245
Author: David Tardon 
Date:   Wed Nov 2 19:29:23 2016 +0100

check only Row elements when computing row index

Change-Id: I3bd1b0749f8889cbd1d92a0edfa84d754e888f03

diff --git a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl 
b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
index 41b37e9..2916dc1 100644
--- a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
+++ b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
@@ -5255,15 +5255,15 @@



-   
+   


-   
+   




-   
+   



commit 30e2171b6eac8e373e31f20de4a0cee6d5d64a08
Author: David Tardon 
Date:   Wed Nov 2 19:26:45 2016 +0100

rhbz#1390776 check only Row elements when computing row index

Change-Id: Ic5ef3971829597170acfdc0606b3c0f16c42be04

diff --git a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl 
b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
index 6ee9114..41b37e9 100644
--- a/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
+++ b/filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
@@ -5960,15 +5960,15 @@



-   
+   


-   
+   




-   
+   



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

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

[Jan-Marek Glogowski]

 connectivity/source/drivers/kab/KStatement.cxx |5 -
 connectivity/source/drivers/kab/KStatement.hxx |2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 079610f6ca215817bfff93b753e07a4a3e35ecc6
Author: Jan-Marek Glogowski 
Date:   Wed Nov 2 12:32:39 2016 +0100

KAB loplugin:unnecessaryoverride

Change-Id: I62e6f2488554df663e0ae6c72b6af9e2ec9976a1

diff --git a/connectivity/source/drivers/kab/KStatement.cxx 
b/connectivity/source/drivers/kab/KStatement.cxx
index 51ed99c..dd6f22b 100644
--- a/connectivity/source/drivers/kab/KStatement.cxx
+++ b/connectivity/source/drivers/kab/KStatement.cxx
@@ -76,11 +76,6 @@ KabCommonStatement::~KabCommonStatement()
 {
 }
 
-void KabCommonStatement::disposing()
-{
-KabCommonStatement_BASE::disposing();
-}
-
 void KabCommonStatement::resetParameters() const throw(css::sdbc::SQLException)
 {
 lcl_throwError(STR_PARA_ONLY_PREPARED);
diff --git a/connectivity/source/drivers/kab/KStatement.hxx 
b/connectivity/source/drivers/kab/KStatement.hxx
index 31907fd..d0fe69f 100644
--- a/connectivity/source/drivers/kab/KStatement.hxx
+++ b/connectivity/source/drivers/kab/KStatement.hxx
@@ -97,7 +97,7 @@ namespace connectivity
 using KabCommonStatement_BASE::operator css::uno::Reference< 
css::uno::XInterface >;
 
 // OComponentHelper
-virtual void SAL_CALL disposing() override;
+using KabCommonStatement_BASE::disposing;
 
 // XInterface
 virtual void SAL_CALL release() throw() override;
___
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' - 41/b5e943aebdd661198311103775e9edc300572e

[Caolán McNamara]

 41/b5e943aebdd661198311103775e9edc300572e |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2761e078308213cbd70ceb412723908b0e409c6b
Author: Caolán McNamara 
Date:   Wed Nov 2 17:30:38 2016 +

Notes added by 'git notes add'

diff --git a/41/b5e943aebdd661198311103775e9edc300572e 
b/41/b5e943aebdd661198311103775e9edc300572e
new file mode 100644
index 000..08b1b3e
--- /dev/null
+++ b/41/b5e943aebdd661198311103775e9edc300572e
@@ -0,0 +1 @@
+prefer: effb27326746945763bda70e2c375c86a40a05fc
___
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' - 90/3b2240b3ad8fe050d2db659eeffb5b8983f66d

[Caolán McNamara]

 90/3b2240b3ad8fe050d2db659eeffb5b8983f66d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d73db1fb172c1fc3a8d42c8f26dfeb6132b8f26a
Author: Caolán McNamara 
Date:   Wed Nov 2 17:29:18 2016 +

Notes added by 'git notes add'

diff --git a/90/3b2240b3ad8fe050d2db659eeffb5b8983f66d 
b/90/3b2240b3ad8fe050d2db659eeffb5b8983f66d
new file mode 100644
index 000..8e9a2b5
--- /dev/null
+++ b/90/3b2240b3ad8fe050d2db659eeffb5b8983f66d
@@ -0,0 +1 @@
+prefer: 48c5739700039acdb247d70de8472b27c4113b73
___
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

[Caolán McNamara]

 include/vcl/menubtn.hxx|7 +-
 vcl/source/control/menubtn.cxx |   46 -
 2 files changed, 38 insertions(+), 15 deletions(-)

New commits:
commit 4b7435e31ac821d1738eda23a6688461efcbd311
Author: Caolán McNamara 
Date:   Wed Nov 2 17:26:03 2016 +

let menu button launch arbitrary floating windows

and not just menus, this is like how the gtk equivalent can launch popovers

Change-Id: I53ae96aab0c51d75405dba15ab8080d7315471e3

diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx
index e6b7015..5bff050 100644
--- a/include/vcl/menubtn.hxx
+++ b/include/vcl/menubtn.hxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 
+class FloatingWindow;
 class Timer;
 class PopupMenu;
 class VclBuilder;
@@ -35,6 +36,7 @@ private:
 
 Timer*  mpMenuTimer;
 VclPtr mpMenu;
+VclPtr mpFloatingWindow;
 sal_uInt16  mnCurItemId;
 boolmbDelayMenu;
 Link maActivateHdl;
@@ -70,9 +72,12 @@ public:
 //before being shown
 voidSetDelayMenu(bool bDelay) { mbDelayMenu = bDelay; }
 
-voidSetPopupMenu( PopupMenu* pNewMenu );
+voidSetPopupMenu(PopupMenu* pNewMenu);
 PopupMenu*  GetPopupMenu() const { return mpMenu; }
 
+voidSetPopover(FloatingWindow* pFloatingWindow);
+FloatingWindow* GetPopover() const { return mpFloatingWindow; }
+
 sal_uInt16  GetCurItemId() const { return mnCurItemId; }
 OString GetCurItemIdent() const;
 
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index b3a0167..6b62d84 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -39,20 +40,29 @@ void MenuButton::ExecuteMenu()
 {
 Activate();
 
-if ( mpMenu )
+if (!mpMenu && !mpFloatingWindow)
+return;
+
+Size aSize = GetSizePixel();
+SetPressed( true );
+EndSelection();
+if (mpMenu)
 {
-Point aPos( 0, 1 );
-Size aSize = GetSizePixel();
-Rectangle aRect( aPos, aSize );
-SetPressed( true );
-EndSelection();
-mnCurItemId = mpMenu->Execute( this, aRect, 
PopupMenuFlags::ExecuteDown );
-SetPressed( false );
-if ( mnCurItemId )
-{
-Select();
-mnCurItemId = 0;
-}
+Point aPos(0, 1);
+Rectangle aRect(aPos, aSize );
+mnCurItemId = mpMenu->Execute(this, aRect, 
PopupMenuFlags::ExecuteDown);
+}
+else
+{
+Point aPos(GetParent()->OutputToScreenPixel(GetPosPixel()));
+Rectangle aRect(aPos, aSize );
+mpFloatingWindow->StartPopupMode(aRect, FloatWinPopupFlags::Down | 
FloatWinPopupFlags::GrabFocus);
+}
+SetPressed(false);
+if (mnCurItemId)
+{
+Select();
+mnCurItemId = 0;
 }
 }
 
@@ -152,7 +162,7 @@ void MenuButton::Select()
 maSelectHdl.Call( this );
 }
 
-void MenuButton::SetPopupMenu( PopupMenu* pNewMenu )
+void MenuButton::SetPopupMenu(PopupMenu* pNewMenu)
 {
 if (pNewMenu == mpMenu)
 return;
@@ -160,6 +170,14 @@ void MenuButton::SetPopupMenu( PopupMenu* pNewMenu )
 mpMenu = pNewMenu;
 }
 
+void MenuButton::SetPopover(FloatingWindow* pFloatingWindow)
+{
+if (pFloatingWindow == mpFloatingWindow)
+return;
+
+mpFloatingWindow = pFloatingWindow;
+}
+
 //class MenuToggleButton 
 
 MenuToggleButton::MenuToggleButton( vcl::Window* pParent, WinBits nWinBits )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 vcl/source/gdi/pdfwriter_impl.cxx |  259 +++---
 1 file changed, 136 insertions(+), 123 deletions(-)

New commits:
commit 4f6028ad7610d36379aba36470e47e701f8a87d5
Author: Miklos Vajna 
Date:   Wed Nov 2 15:03:41 2016 +0100

vcl: implement PDFWriter::Sign() on Windows

Move Windows-specific code from PDFWriterImpl::finalizeSignature() to
PDFWriter::Sign(), this way the pdfverify cmdline tool can sign a
previously unsigned file.

Change-Id: I1144e228bf8f12a284c3fc32fd3e74c355855ff3

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index c20446f..94c730e 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -7058,121 +7058,8 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
 
 return true;
 
-#else
-// Not implemented
-(void)rContext;
-
-return false;
-#endif
-}
-
-bool PDFWriterImpl::finalizeSignature()
-{
-
-if (!m_aContext.SignCertificate.is())
-return false;
-
-// 1- calculate last ByteRange value
-sal_uInt64 nOffset = ~0U;
-CHECK_RETURN( (osl::File::E_None == m_aFile.getPos(nOffset) ) );
-
-sal_Int64 nLastByteRangeNo = nOffset - (m_nSignatureContentOffset + 
MAX_SIGNATURE_CONTENT_LENGTH + 1);
-
-// 2- overwrite the value to the m_nSignatureLastByteRangeNoOffset position
-sal_uInt64 nWritten = 0;
-CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolut, 
m_nSignatureLastByteRangeNoOffset) ) );
-OStringBuffer aByteRangeNo( 256 );
-aByteRangeNo.append( nLastByteRangeNo );
-aByteRangeNo.append( " ]" );
-
-if (m_aFile.write(aByteRangeNo.getStr(), aByteRangeNo.getLength(), 
nWritten) != osl::File::E_None)
-{
-CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolut, 
nOffset)) );
-return false;
-}
-
-// 3- create the PKCS#7 object using NSS
-css::uno::Sequence< sal_Int8 > derEncoded = 
m_aContext.SignCertificate->getEncoded();
-
-if (!derEncoded.hasElements())
-return false;
-
-sal_Int8* n_derArray = derEncoded.getArray();
-sal_Int32 n_derLength = derEncoded.getLength();
-
-#ifndef _WIN32
-
-// Prepare buffer and calculate PDF file digest
-CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolut, 0)) );
-
-std::unique_ptr buffer1(new char[m_nSignatureContentOffset + 1]);
-sal_uInt64 bytesRead1;
-
-//FIXME: Check if SHA1 is calculated from the correct byterange
-CHECK_RETURN( (osl::File::E_None == m_aFile.read(buffer1.get(), 
m_nSignatureContentOffset - 1 , bytesRead1)) );
-if (bytesRead1 != (sal_uInt64)m_nSignatureContentOffset - 1)
-SAL_WARN("vcl.pdfwriter", "First buffer read failed");
-
-CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolut, 
m_nSignatureContentOffset + MAX_SIGNATURE_CONTENT_LENGTH + 1)) );
-std::unique_ptr buffer2(new char[nLastByteRangeNo + 1]);
-sal_uInt64 bytesRead2;
-CHECK_RETURN( (osl::File::E_None == m_aFile.read(buffer2.get(), 
nLastByteRangeNo, bytesRead2)) );
-if (bytesRead2 != (sal_uInt64) nLastByteRangeNo)
-SAL_WARN("vcl.pdfwriter", "Second buffer read failed");
-
-OStringBuffer cms_hexbuffer;
-PDFWriter::PDFSignContext aSignContext(cms_hexbuffer);
-aSignContext.m_pDerEncoded = n_derArray;
-aSignContext.m_nDerEncoded = n_derLength;
-aSignContext.m_pByteRange1 = buffer1.get();
-aSignContext.m_nByteRange1 = bytesRead1;
-aSignContext.m_pByteRange2 = buffer2.get();
-aSignContext.m_nByteRange2 = bytesRead2;
-aSignContext.m_aSignTSA = m_aContext.SignTSA;
-aSignContext.m_aSignPassword = m_aContext.SignPassword;
-if (!PDFWriter::Sign(aSignContext))
-{
-SAL_WARN("vcl.pdfwriter", "PDFWriter::Sign() failed");
-return false;
-}
-
-assert(cms_hexbuffer.getLength() <= MAX_SIGNATURE_CONTENT_LENGTH);
-
-// Set file pointer to the m_nSignatureContentOffset, we're ready to 
overwrite PKCS7 object
-nWritten = 0;
-CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolut, 
m_nSignatureContentOffset)) );
-m_aFile.write(cms_hexbuffer.getStr(), cms_hexbuffer.getLength(), nWritten);
-
-CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolut, 
nOffset)) );
-return true;
-
-#else
-
-// Prepare buffer and calculate PDF file digest
-CHECK_RETURN( (osl::File::E_None == m_aFile.setPos(osl_Pos_Absolut, 0)) );
-
-std::unique_ptr buffer1(new char[m_nSignatureContentOffset - 1]);
-sal_uInt64 bytesRead1;
-
-if (osl::File::E_None != m_aFile.read(buffer1.get(), 
m_nSignatureContentOffset - 1 , bytesRead1) ||
-bytesRead1 != (sal_uInt64)m_nSignatureContentOffset - 1)
-{
-SAL_WARN("vcl.pdfwriter", "First buffer read failed");
-return false;
-}
-
-std::unique_ptr buffer2(new char[nLastByteRangeNo]);
-sal_uInt64 bytesRead2;
-
-if (osl::File::E_None != m_aFile.setPos(osl_Pos_Absolut, 
m_

Re: CppunitTest_svgio fails on macOS with the new layout engine

[Khaled Hosny]

On Tue, Nov 01, 2016 at 10:14:49PM +0100, Tomaž Vajngerl wrote:
> Hi,
> 
> On Tue, Nov 1, 2016 at 8:33 PM, Khaled Hosny  wrote:
> > I tried to find what is the source of difference, but to no avail. I
> > can’t figure out why the choice of the layout engine can make a
> > difference here.
> 
> I don't know the cause and if this is possible but just a quick check
> at the svgio code my speculation is that it could make a difference if
> it determines for example that text overflows the bounds and it needs
> to clip. If you look at the XML and what the test checks you see the
> mask primitive is inserted just suddenly. I saw in the svgio code that
> the mask primitive is used at many places to do clipping.

Thanks for the pointers, that was very helpful. I now found the part
that does the mask; if I set bDoCorrectCanvasClipping to false in
svgio/source/svgreader/svgsvgnode.cxx the test passes. Now I need to
find the part that actually calculates the bounding box...

> You need insert the SVG as you would insert any other image to use
> this SVG parser.

I tried that as well, they look identical to my eye, though pixel
diffing of the generated PDFs shows some 1 pixel or so baseline shift.
Might be different font metrics, not sure if that is the cause.

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

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

[Jean-Pierre Ledure]

 wizards/source/access2base/DoCmd.xba |   22 ++
 1 file changed, 10 insertions(+), 12 deletions(-)

New commits:
commit 9e93ae3ddc2262ae98abf1ce50a5ea154bd00192
Author: Jean-Pierre Ledure 
Date:   Wed Nov 2 16:51:12 2016 +0100

Access2Base - Simplify CopyObject

Avoid Field object buffering in CopyObject
as it is now done in the Recordset class

Change-Id: I35ee9e953e27554cb361adbb22baa619e4b73aaf

diff --git a/wizards/source/access2base/DoCmd.xba 
b/wizards/source/access2base/DoCmd.xba
index f85f3c0..d13bce6 100644
--- a/wizards/source/access2base/DoCmd.xba
+++ b/wizards/source/access2base/DoCmd.xba
@@ -209,7 +209,7 @@ Dim oSourceTable As Object, oSourceColumns As Object, 
oSourceCol As Object, oTar
 Dim oSourceKeys As Object, oSourceKey As Object, oTargetKey As Object
 Dim i As Integer, j As Integer, sSql As String, vPrimaryKeys() As Variant
 Dim vNameComponents() As Variant, iNames As Integer, sSurround As String
-Dim vInputFields() As Variant, vFieldBinary() As Variant, vOutputFields() As 
Variant
+Dim vInputField As Variant, vFieldBinary() As Variant, vOutputField As Variant
 Dim oInput as Object, oOutput As Object, iNbFields As Integer, vValue As 
Variant
 Dim vBinary As Variant, lInputSize As Long, lOutputSize As Long
 Dim lInputRecs As Long, lInputMax As Long, vField As Variant, bProgressMeter 
As Boolean, sFile As String
@@ -318,14 +318,10 @@ Const cstProgressMeterLimit = 100
bProgressMeter 
= ( lInputMax > cstProgressMeterLimit )
 
iNbFields = 
.Fields().Count - 1
-   vInputFields = 
Array()
vFieldBinary = 
Array()
-   vOutputFields = 
Array()
-   ReDim 
vInputFields(0 To iNbFields), vFieldBinary(0 To iNbFields), vOutputFields(0 To 
iNbFields)
+   ReDim 
vFieldBinary(0 To iNbFields)
For i = 0 To 
iNbFields
-   Set 
vInputFields(i) = .Fields(i)
-   
vFieldBinary(i) = Utils._IsBinaryType(vInputFields(i).Column.Type)
-   Set 
vOutputFields(i) = oOutput.Fields(i)
+   
vFieldBinary(i) = Utils._IsBinaryType(.Fields(i).Column.Type)
Next i
Else
bProgressMeter 
= False
@@ -335,20 +331,22 @@ Const cstProgressMeterLimit = 100

oOutput.RowSet.moveToInsertRow()

oOutput._EditMode = dbEditAdd
For i = 0 To 
iNbFields
+   Set 
vInputField = .Fields(i)
+   Set 
vOutputField = oOutput.Fields(i)
If 
vFieldBinary(i) Then
-   
lInputSize = vInputFields(i).FieldSize
+   
lInputSize = vInputField.FieldSize

If lInputSize <= cstMaxBinlength Then

vField =  Utils._getResultSetColumnValue(.RowSet, i + 1, True)

Utils._updateResultSetColumnValue(iRDBMS, oOutput.RowSet, i + 1, vField)

ElseIf oDatabase._BinaryStream Then

'  Typically for SQLite where binary fields are limited
-   
If lInputSize > vOutputFields(i).Column.Precision Then
-   
TraceError(TRACEWARNING, ERRPRECISION, Utils._CalledSub(), 0, 
1, Array(vOutputFields(i)._Name, lInputRecs + 1))
+  

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

[Tor Lillqvist]

 include/sfx2/signaturestate.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f9f1042773795aa82bc0034122fac8271e3dabc7
Author: Tor Lillqvist 
Date:   Wed Nov 2 17:53:21 2016 +0200

Remove noise comment, add FIXME

Change-Id: I1ad8ff94744e3a4b0844a04eabb7f19a3b15bb1a

diff --git a/include/sfx2/signaturestate.hxx b/include/sfx2/signaturestate.hxx
index b2bccf3..740fd06 100644
--- a/include/sfx2/signaturestate.hxx
+++ b/include/sfx2/signaturestate.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_SFX2_SIGNATURESTATE_HXX
 #define INCLUDED_SFX2_SIGNATURESTATE_HXX
 
-// xmlsec05, check with SFX team
 enum class SignatureState
 {
+// FIXME: Do these values have to be these, and given at all, or is this 
just cargo cult?
 UNKNOWN   = 0x, // used to be -1 when this was a sal_uInt16
 NOSIGNATURES  = 0,
 OK= 1,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jean-Pierre Ledure]

 wizards/source/access2base/Recordset.xba |   91 ---
 1 file changed, 60 insertions(+), 31 deletions(-)

New commits:
commit f8b9763042afa4aa642c78179ec5b390bd643aa0
Author: Jean-Pierre Ledure 
Date:   Wed Nov 2 16:22:16 2016 +0100

Access2Base - Buffer field objects in recordset

Field objects are buffered in a _Fields() array,
part of a Recordset instance,
to improve speed and memory consumption

Change-Id: Iac732ab5a1db24341aa30c3c934853a21c76e2e4

diff --git a/wizards/source/access2base/Recordset.xba 
b/wizards/source/access2base/Recordset.xba
index b16b153..0f7be5b 100644
--- a/wizards/source/access2base/Recordset.xba
+++ b/wizards/source/access2base/Recordset.xba
@@ -17,6 +17,7 @@ REM 

 Private_Type   As String   
'  Must be RECORDSET
 Private _Name  As String   
'  Unique, generated
 Private _This  As Object
+Private _Fields()  As Variant
 Private _ParentNameAs String
 Private _ParentTypeAs String
 Private _ParentDatabaseAs Object
@@ -51,6 +52,7 @@ Private Sub Class_Initialize()
_Type = OBJRECORDSET
_Name = ""
Set _This = Nothing
+   _Fields = Array()
_ParentName = ""
Set _ParentDatabase = Nothing
_ParentType = ""
@@ -371,6 +373,7 @@ Public Function mClose(ByVal Optional pbRemove As Boolean) 
As Variant
 ' If pbRemove = True, remove recordset from Recordsets collection
 
 Const cstThisSub = "Recordset.Close"
+Dim i As Integer
 
If _ErrorHandler() Then On Local Error Goto Exit_Function   
'  Do not stop execution
Utils._SetCalledSub(cstThisSub)
@@ -393,6 +396,13 @@ Const cstThisSub = "Recordset.Close"
_BookmarkBeforeNew = Null
_BookmarkLastModified = Null
_IsClone = False
+   For i = 0 To UBound(_Fields)
+   If Not IsNull(_Fields(i)) Then
+   _Fields(i).Dispose()
+   Set _Fields(i) = Nothing
+   End If
+   Next i
+   _Fields = Array()
Set RowSet = Nothing
If IsMissing(pbRemove) Then pbRemove = True
If pbRemove Then _ParentDatabase.RecordsetsColl.Remove(_Name)
@@ -486,42 +496,61 @@ Const cstThisSub = "Recordset.Fields"
End If

 Dim sObjects() As String, sObjectName As String, oObject As Object
-Dim i As Integer, bFound As Boolean, oFields As Object
+Dim i As Integer, oFields As Object, iIndex As Integer
+
+   '  No argument, return a collection
+   If IsMissing(pvIndex) Then
+   Set oObject = New Collect
+   oObject._CollType = COLLFIELDS
+   oObject._ParentType = OBJRECORDSET
+   oObject._ParentName = _Name
+   Set oObject._ParentDatabase = _ParentDatabase
+   oObject._Count = RowSet.getColumns().Count
+   Goto Exit_Function
+   End If
 
Set oFields = RowSet.getColumns()
sObjects = oFields.ElementNames()
-   Select Case True
-   Case IsMissing(pvIndex)
-   Set oObject = New Collect
-   oObject._CollType = COLLFIELDS
-   oObject._ParentType = OBJRECORDSET
-   oObject._ParentName = _Name
-   Set oObject._ParentDatabase = _ParentDatabase
-   oObject._Count = UBound(sObjects) + 1
-   Goto Exit_Function
-   Case VarType(pvIndex) = vbString
-   bFound = False
+
+   '  Argument is the field name
+   If VarType(pvIndex) = vbString Then
+   iIndex = -1
'  Check existence of object and find its exact 
(case-sensitive) name
-   For i = 0 To UBound(sObjects)
-   If UCase(pvIndex) = UCase(sObjects(i)) Then
-   sObjectName = sObjects(i)
-   bFound = True
-   Exit For
-   End If
-   Next i
-   If Not bFound Then Goto Trace_NotFound
-   Case Else   '  pvIndex is numeric
-   If pvIndex < 0 Or pvIndex > UBound(sObjects) Then 
Goto Trace_IndexError
-   sObjectName = sObjects(pvIndex)
-   End Select
+   For i = 0 To UBound(sObjects)
+   If UCase(pvIndex) = UCase(sObjects(i)) Then
+   sObjectName = sObjects(i)
+   iIndex = i
+   Exit For
+   End I

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

[Michael Meeks]

 loleaflet/src/core/Socket.js |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 59d28fdebafc5b2d971af12b293bed9a0f67192d
Author: Michael Meeks 
Date:   Wed Nov 2 14:38:43 2016 +

Help->About can point to the log more helpfully than the commit.

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index afc04f0..49617d5 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -142,7 +142,7 @@ L.Socket = L.Class.extend({
var loolwsdVersionObj = 
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
var h = loolwsdVersionObj.Hash;
if (parseInt(h,16).toString(16) === h.toLowerCase()) {
-   h = 'https://gerrit.libreoffice.org/gitweb?p=online.git;a=commit;h=' + h + 
'">' + h + '';
+   h = 'https://gerrit.libreoffice.org/gitweb?p=online.git;a=log;h=' + h + '">' + 
h + '';

$('#loolwsd-version').html(loolwsdVersionObj.Version + ' (git hash: ' + h + 
')');
}
else {
@@ -158,7 +158,7 @@ L.Socket = L.Class.extend({
var lokitVersionObj = 
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
var h = lokitVersionObj.BuildId.substring(0, 7);
if (parseInt(h,16).toString(16) === h.toLowerCase()) {
-   h = 'https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=' + h + '">' 
+ h + '';
+   h = 'https://gerrit.libreoffice.org/gitweb?p=core.git;a=log;h=' + h + '">' + h 
+ '';
}
$('#lokit-version').html(lokitVersionObj.ProductName + 
' ' +
 lokitVersionObj.ProductVersion 
+ lokitVersionObj.ProductExtension.replace('.10.','-') +
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/qa/unit/ucalc_formula.cxx |   24 
 1 file changed, 24 insertions(+)

New commits:
commit 01875c4514c777a43ee18014d9b0cb3f34eebbba
Author: Eike Rathke 
Date:   Wed Nov 2 16:15:36 2016 +0100

unit test for tdf#99291, empty array elements match 0.0, not empty

Change-Id: I65cac442583ecd90831ebea01d2be6c0b1e60b9a

diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 2780d08..b572c54 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -3924,6 +3924,30 @@ void Test::testFuncCOUNTIF()
 // We should correctly count with empty string key.
 CPPUNIT_ASSERT_EQUAL(4.0, m_pDoc->GetValue(ScAddress(0,4,0)));
 
+// Another test case adopted from tdf#99291, empty array elements should
+// not match empty cells, but cells with 0.
+clearSheet(m_pDoc, 0);
+ScMarkData aMark;
+aMark.SelectOneTable(0);
+m_pDoc->InsertMatrixFormula(0,0, 0,1, aMark, "=COUNTIF(B1:B5;C1:C2)");
+// As we will be testing for 0.0 values, check that formulas are actually 
present.
+OUString aFormula;
+m_pDoc->GetFormula(0,0,0, aFormula);
+CPPUNIT_ASSERT_EQUAL(OUString("{=COUNTIF(B1:B5;C1:C2)}"), aFormula);
+m_pDoc->GetFormula(0,1,0, aFormula);
+CPPUNIT_ASSERT_EQUAL(OUString("{=COUNTIF(B1:B5;C1:C2)}"), aFormula);
+// The 0.0 results expected.
+CPPUNIT_ASSERT_EQUAL(0.0, m_pDoc->GetValue(ScAddress(0,0,0)));
+CPPUNIT_ASSERT_EQUAL(0.0, m_pDoc->GetValue(ScAddress(0,1,0)));
+// 0.0 in B2, 1.0 in B3 and B4
+m_pDoc->SetValue( ScAddress(1,1,0), 0.0);
+m_pDoc->SetValue( ScAddress(1,2,0), 1.0);
+m_pDoc->SetValue( ScAddress(1,3,0), 1.0);
+// Matched by 0.0 produced by empty cell in array, and 1.0 in C2.
+m_pDoc->SetValue( ScAddress(2,1,0), 1.0);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("One cell with 0.0",  1.0, 
m_pDoc->GetValue(ScAddress(0,0,0)));
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Two cells with 1.0", 2.0, 
m_pDoc->GetValue(ScAddress(0,1,0)));
+
 m_pDoc->DeleteTab(0);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/Module_solenv.mk

[Bjoern Michaelsen]

 solenv/Module_solenv.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 15a8271eb8222efe374c48e9f895676a5618afc1
Author: Bjoern Michaelsen 
Date:   Wed Nov 2 11:11:30 2016 +0100

disable gbuildtoide test on Windows as CI builders are unstable

Change-Id: Ib5eb4fece2bae3e04089f2389198df800620e6f8
Reviewed-on: https://gerrit.libreoffice.org/30483
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk
index 78fe4b9..4f29231 100644
--- a/solenv/Module_solenv.mk
+++ b/solenv/Module_solenv.mk
@@ -23,10 +23,12 @@ $(eval $(call gb_Module_add_targets,solenv,\
 endif
 
 ifneq ($(DISABLE_PYTHON),TRUE)
+ifneq ($(OS),WNT) # disable on Windows for now, causes gerrit/jenkins failures
 $(eval $(call gb_Module_add_subsequentcheck_targets,solenv,\
CustomTarget_gbuildtesttools \
PythonTest_solenv_python \
 ))
 endif
+endif
 
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/inc/unx/gtk/gtkframe.hxx  |6 +-
 vcl/unx/gtk3/gtk3gtkframe.cxx |   35 ++-
 2 files changed, 31 insertions(+), 10 deletions(-)

New commits:
commit 6ca910adfed9906be587cb82284a631377490303
Author: Caolán McNamara 
Date:   Wed Nov 2 13:38:17 2016 +

gtk3: grabs on floating window inside floating window

under gtk3 with the floating window of the listbox inside
the color floating window if the toplevel window is dismissed
the focus doesn't remain locked to its parent, but skips to
the grandparent

so grab and ungrab only once elements in the hierarchy

Change-Id: I14b1b671634c0c01c6416493f912e4abd2f9

diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 4b891b6..4d675c6 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -351,6 +351,7 @@ public:
 #if GTK_CHECK_VERSION(3,0,0)
 cairo_surface_t*m_pSurface;
 DamageHandler   m_aDamageHandler;
+int m_nGrabLevel;
 #endif
 GtkSalFrame( SalFrame* pParent, SalFrameStyleFlags nStyle );
 GtkSalFrame( SystemParentData* pSysData );
@@ -425,6 +426,9 @@ public:
 
 void closePopup();
 
+void addGrabLevel();
+void removeGrabLevel();
+
 #endif
 virtual ~GtkSalFrame() override;
 
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 60e1a1d..d377f32 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -980,6 +980,7 @@ static void damaged(void *handle,
 void GtkSalFrame::InitCommon()
 {
 m_pSurface = nullptr;
+m_nGrabLevel = 0;
 
 m_aDamageHandler.handle = this;
 m_aDamageHandler.damaged = ::damaged;
@@ -1441,7 +1442,7 @@ void GtkSalFrame::Show( bool bVisible, bool 
/*bNoActivate*/ )
 if (isFloatGrabWindow() && !getDisplay()->GetCaptureFrame())
 {
 m_pParent->grabPointer(true, true);
-gtk_grab_add(m_pParent->getMouseEventWidget());
+m_pParent->addGrabLevel();
 }
 
 gtk_widget_show(m_pWindow);
@@ -1452,7 +1453,7 @@ void GtkSalFrame::Show( bool bVisible, bool 
/*bNoActivate*/ )
 if (!getDisplay()->GetCaptureFrame())
 {
 grabPointer(true, true);
-gtk_grab_add(getMouseEventWidget());
+addGrabLevel();
 }
 // #i44068# reset parent's IM context
 if( m_pParent )
@@ -1466,9 +1467,9 @@ void GtkSalFrame::Show( bool bVisible, bool 
/*bNoActivate*/ )
 m_nFloats--;
 if (!getDisplay()->GetCaptureFrame())
 {
-gtk_grab_remove(getMouseEventWidget());
+removeGrabLevel();
 grabPointer(false);
-gtk_grab_remove(m_pParent->getMouseEventWidget());
+m_pParent->removeGrabLevel();
 m_pParent->grabPointer(false);
 }
 }
@@ -2550,6 +2551,20 @@ void GtkSalFrame::StartToolKitMoveBy()
pEvent->button.time);
 }
 
+void GtkSalFrame::addGrabLevel()
+{
+if (m_nGrabLevel == 0)
+gtk_grab_add(getMouseEventWidget());
+++m_nGrabLevel;
+}
+
+void GtkSalFrame::removeGrabLevel()
+{
+--m_nGrabLevel;
+if (m_nGrabLevel == 0)
+gtk_grab_remove(getMouseEventWidget());
+}
+
 void GtkSalFrame::closePopup()
 {
 if (!m_nFloats)
commit b99bff93a3dd2f76c9c98ff3bc72a60cbd79730a
Author: Caolán McNamara 
Date:   Tue Nov 1 20:32:57 2016 +

gtk3: allow float grab inside float grab

this is so that the floating window belonging to the listbox inside the
floating window color popup will track the mouse as it moves up and down 
over
the menu.

Change-Id: If108b5b3866fdbc04513c48c8d859bedd3867379

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 704e4ce..60e1a1d 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -1438,7 +1438,7 @@ void GtkSalFrame::Show( bool bVisible, bool 
/*bNoActivate*/ )
 SetDefaultSize();
 setMinMaxSize();
 
-if (isFloatGrabWindow() && !getDisplay()->GetCaptureFrame() && 
m_nFloats == 0)
+if (isFloatGrabWindow() && !getDisplay()->GetCaptureFrame())
 {
 m_pParent->grabPointer(true, true);
 gtk_grab_add(m_pParent->getMouseEventWidget());
@@ -1449,7 +1449,7 @@ void GtkSalFrame::Show( bool bVisible, bool 
/*bNoActivate*/ )
 if( isFloatGrabWindow() )
 {
 m_nFloats++;
-if( ! getDisplay()->GetCaptureFrame() && m_nFloats == 1 )
+if (!getDisplay()->GetCaptureFrame())
 {
 grabPointer(true, true);
 gtk_grab_add(getMouse

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

[Caolán McNamara]

 vcl/source/window/winproc.cxx |   21 -
 1 file changed, 16 insertions(+), 5 deletions(-)

New commits:
commit 6f9ce98bd0b33e4823f1f99314a478efb9ce0638
Author: Caolán McNamara 
Date:   Tue Nov 1 21:25:17 2016 +

support unfocused float window inside a focused float window

if a floating window is inside a floating window, go up the floating
windows until we find the first one that accepts focus, rather than
pass the input to the toplevel frame

Change-Id: I6c2a3de02ab436b8441b1fec15d51dec4f96c931

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 43e5692..170e946 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -813,12 +813,23 @@ static vcl::Window* ImplGetKeyInputWindow( vcl::Window* 
pWindow )
 
 // find window - is every time the window which has currently the
 // focus or the last time the focus.
-// the first floating window always has the focus
+
+// the first floating window always has the focus, try it, or any parent 
floating windows, first
 vcl::Window* pChild = pSVData->maWinData.mpFirstFloat;
-if( !pChild || ( pChild->ImplGetWindowImpl()->mbFloatWin && 
!static_cast(pChild)->GrabsFocus() ) )
-pChild = pWindow->ImplGetWindowImpl()->mpFrameData->mpFocusWin;
-else
-pChild = pChild->ImplGetWindowImpl()->mpFrameData->mpFocusWin;
+while (pChild)
+{
+if (pChild->ImplGetWindowImpl()->mbFloatWin)
+{
+if (static_cast(pChild)->GrabsFocus())
+break;
+}
+pChild = pChild->GetParent();
+}
+
+if (!pChild)
+pChild = pWindow;
+
+pChild = pChild->ImplGetWindowImpl()->mpFrameData->mpFocusWin;
 
 // no child - than no input
 if ( !pChild )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 xmlsecurity/inc/pdfio/pdfdocument.hxx  |   50 ++
 xmlsecurity/qa/unit/pdfsigning/data/pdf16adobe.pdf |binary
 xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx  |   14 
 xmlsecurity/source/pdfio/pdfdocument.cxx   |  439 +++--
 4 files changed, 382 insertions(+), 121 deletions(-)

New commits:
commit b0d1a39e995871ef81cb58e8f1587a771fdd2deb
Author: Miklos Vajna 
Date:   Wed Nov 2 11:10:35 2016 +0100

xmlsecurity PDF verify: add support for object streams

Adobe Acrobat uses object streams (PDF 1.6) when it signs a PDF exported
from LO (PDF 1.4), with this we can verify that signature.

If the PDF had at least one signature in LO, then the doc is not
upgraded from PDF 1.4, so that was working already.

Change-Id: I54b4447ca965a8ba1ffc69bde228ab6f0bda59ee

diff --git a/xmlsecurity/inc/pdfio/pdfdocument.hxx 
b/xmlsecurity/inc/pdfio/pdfdocument.hxx
index 95663e6c..37457c0 100644
--- a/xmlsecurity/inc/pdfio/pdfdocument.hxx
+++ b/xmlsecurity/inc/pdfio/pdfdocument.hxx
@@ -45,7 +45,40 @@ enum class TokenizeMode
 /// Till the first %%EOF token.
 EOF_TOKEN,
 /// Till the end of the current object.
-END_OF_OBJECT
+END_OF_OBJECT,
+/// Same as END_OF_OBJECT, but for object streams (no endobj keyword).
+STORED_OBJECT
+};
+
+/// The type column of an entry in a cross-reference stream.
+enum class XRefEntryType
+{
+/// xref "n" or xref stream "1".
+NOT_COMPRESSED,
+/// xref stream "2.
+COMPRESSED
+};
+
+/// An entry in a cross-reference stream.
+struct XRefEntry
+{
+XRefEntryType m_eType;
+/**
+ * Non-compressed: The byte offset of the object, starting from the
+ * beginning of the file.
+ * Compressed: The object number of the object stream in which this object 
is
+ * stored.
+ */
+sal_uInt64 m_nOffset;
+/**
+ * Non-compressed: The generation number of the object.
+ * Compressed: The index of this object within the object stream.
+ */
+sal_uInt64 m_nGenerationNumber;
+/// Are changed as part of an incremental update?.
+bool m_bDirty;
+
+XRefEntry();
 };
 
 /**
@@ -60,9 +93,7 @@ class XMLSECURITY_DLLPUBLIC PDFDocument
 /// This vector owns all elements.
 std::vector< std::unique_ptr > m_aElements;
 /// Object ID <-> object offset map.
-std::map m_aXRef;
-/// Object ID <-> "are changed as part of an incremental update?" map.
-std::map m_aXRefDirty;
+std::map m_aXRef;
 /// Object offset <-> Object pointer map.
 std::map m_aOffsetObjects;
 /// Object ID <-> Object pointer map.
@@ -80,8 +111,6 @@ class XMLSECURITY_DLLPUBLIC PDFDocument
 static int AsHex(char ch);
 /// Decode a hex dump.
 static std::vector DecodeHexString(PDFHexStringElement* 
pElement);
-/// Tokenize elements from current offset.
-bool Tokenize(SvStream& rStream, TokenizeMode eMode);
 
 public:
 PDFDocument();
@@ -99,7 +128,14 @@ public:
 std::vector GetPages();
 /// Remember the end location of an EOF token.
 void PushBackEOF(size_t nOffset);
-const std::map& GetIDObjects() const;
+/// Look up object based on object number, possibly by parsing object 
streams.
+PDFObjectElement* LookupObject(size_t nObjectNumber);
+/// Access to the input document, even after the inpust ream is gone.
+SvMemoryStream& GetEditBuffer();
+/// Tokenize elements from current offset.
+bool Tokenize(SvStream& rStream, TokenizeMode eMode, std::vector< 
std::unique_ptr >& rElements, PDFObjectElement* pObject);
+/// Register an object (owned directly or indirectly by m_aElements) as a 
provder for a given ID.
+void SetIDObject(size_t nID, PDFObjectElement* pObject);
 
 /// Read elements from the start of the stream till its end.
 bool Read(SvStream& rStream);
diff --git a/xmlsecurity/qa/unit/pdfsigning/data/pdf16adobe.pdf 
b/xmlsecurity/qa/unit/pdfsigning/data/pdf16adobe.pdf
new file mode 100644
index 000..ac1c5f3
Binary files /dev/null and b/xmlsecurity/qa/unit/pdfsigning/data/pdf16adobe.pdf 
differ
diff --git a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx 
b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
index 469ded6..2f7ef57 100644
--- a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
+++ b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
@@ -57,6 +57,8 @@ public:
 void testPDFRemoveAll();
 /// Test a PDF 1.4 document, signed by Adobe.
 void testPDF14Adobe();
+/// Test a PDF 1.6 document, signed by Adobe.
+void testPDF16Adobe();
 
 CPPUNIT_TEST_SUITE(PDFSigningTest);
 CPPUNIT_TEST(testPDFAdd);
@@ -64,6 +66,7 @@ public:
 CPPUNIT_TEST(testPDFRemove);
 CPPUNIT_TEST(testPDFRemoveAll);
 CPPUNIT_TEST(testPDF14Adobe);
+CPPUNIT_TEST(testPDF16Adobe);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -254,6 +257,17 @@ void PDFSigningTest::testPDF14Adobe()
 #endif
 }
 
+void PDFSigningTest::testPDF16Adobe()
+{
+#ifndef _WIN32
+// Contains a cross-reference str

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

[Caolán McNamara]

 include/vcl/layout.hxx   |3 ---
 vcl/source/window/event.cxx  |7 +--
 vcl/source/window/layout.cxx |   11 ---
 3 files changed, 1 insertion(+), 20 deletions(-)

New commits:
commit 2734a6ce77b9b104e065b0bc3cc593b107f49883
Author: Caolán McNamara 
Date:   Tue Nov 1 16:36:43 2016 +

getNonLayoutRealParent is unused

Change-Id: Ie003bc7ccc9985162ea52a1b0164118d9c2ce437

diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 800f5ac..542788e 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -733,9 +733,6 @@ Size getLegacyBestSizeForChildren(const vcl::Window 
&rWindow);
 //Get first parent which is not a layout widget
 VCL_DLLPUBLIC vcl::Window* getNonLayoutParent(vcl::Window *pParent);
 
-//Get first real parent which is not a layout widget
-vcl::Window* getNonLayoutRealParent(vcl::Window *pParent);
-
 //return true if this window and its stack of containers are all shown
 bool isVisibleInLayout(const vcl::Window *pWindow);
 
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index d77de1b..8bed651 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -2676,17 +2676,6 @@ vcl::Window* getNonLayoutParent(vcl::Window *pWindow)
 return pWindow;
 }
 
-vcl::Window* getNonLayoutRealParent(vcl::Window *pWindow)
-{
-while (pWindow)
-{
-pWindow = pWindow->ImplGetParent();
-if (!pWindow || !isContainerWindow(*pWindow))
-break;
-}
-return pWindow;
-}
-
 bool isVisibleInLayout(const vcl::Window *pWindow)
 {
 bool bVisible = true;
commit fd40e3ea09a481a2e97452d2244ecdfd6c3508c1
Author: Caolán McNamara 
Date:   Tue Nov 1 16:34:22 2016 +

lock tab-cycling inside the WB_DIALOGCONTROL widget

activate the color selector in the toolbar in the sidebar panel, press tab
to cycle between its widgets, when it hits the bottom it will
not return to the first widget, but escape out of the floating
window into the next sibling of the toolbar

Change-Id: I806fd4d94c477e9cfb2ea238830f7b646ea274d2

diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index 5f145c7..7eb98cf 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -169,14 +169,9 @@ bool Window::Notify( NotifyEvent& rNEvt )
 // manage the dialogs
 if ( (GetStyle() & (WB_DIALOGCONTROL | WB_NODIALOGCONTROL)) == 
WB_DIALOGCONTROL )
 {
-// if the parent also has dialog control activated, the parent takes 
over control
 if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) || 
(rNEvt.GetType() == MouseNotifyEvent::KEYUP) )
 {
-if ( ImplIsOverlapWindow() ||
- ((getNonLayoutRealParent(this)->GetStyle() & 
(WB_DIALOGCONTROL | WB_NODIALOGCONTROL)) != WB_DIALOGCONTROL) )
-{
-bRet = ImplDlgCtrl( *rNEvt.GetKeyEvent(), rNEvt.GetType() == 
MouseNotifyEvent::KEYINPUT );
-}
+bRet = ImplDlgCtrl(*rNEvt.GetKeyEvent(), rNEvt.GetType() == 
MouseNotifyEvent::KEYINPUT);
 }
 else if ( (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS) || 
(rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 include/svx/colorwindow.hxx   |   81 +
 svx/source/tbxctrls/colorwindow.hxx   |   83 --
 svx/source/tbxctrls/extrusioncontrols.cxx |2 
 svx/source/tbxctrls/tbcontrl.cxx  |6 --
 4 files changed, 83 insertions(+), 89 deletions(-)

New commits:
commit c7b0d2f107ee0088516ed14cc570f12c28ad067d
Author: Caolán McNamara 
Date:   Fri Oct 28 13:22:31 2016 +0100

drop SvxColorWindow::Resize

Change-Id: I22ed6ace464cdfd4ee0c12e8269d8141efce57a6

diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx
index b9def74..8b185d9 100644
--- a/include/svx/colorwindow.hxx
+++ b/include/svx/colorwindow.hxx
@@ -58,9 +58,6 @@ private:
 DECL_LINK( AutoColorClickHdl, Button*, void );
 DECL_LINK( OpenPickerClickHdl, Button*, void );
 
-protected:
-virtual voidResize() override;
-
 public:
 SvxColorWindow( const OUString& rCommand,
  PaletteManager& rPaletteManager,
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index c1cc24c..5d3b359 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1474,10 +1474,6 @@ IMPL_LINK_NOARG(SvxColorWindow, OpenPickerClickHdl, 
Button*, void)
 mrPaletteManager.PopupColorPicker(maCommand);
 }
 
-void SvxColorWindow::Resize()
-{
-}
-
 void SvxColorWindow::StartSelection()
 {
 mpColorSet->StartSelection();
commit eb153b8f1af3044ec8b621f29c81ddff89b99584
Author: Caolán McNamara 
Date:   Fri Oct 28 13:19:20 2016 +0100

move SvxColorWindow to include/svx

Change-Id: Ie2e11c8582cbb204178c0616580f942d1ce773fb

diff --git a/svx/source/tbxctrls/colorwindow.hxx b/include/svx/colorwindow.hxx
similarity index 97%
rename from svx/source/tbxctrls/colorwindow.hxx
rename to include/svx/colorwindow.hxx
index 19b9132..b9def74 100644
--- a/svx/source/tbxctrls/colorwindow.hxx
+++ b/include/svx/colorwindow.hxx
@@ -32,8 +32,9 @@
 #include 
 
 class BorderColorStatus;
+class Button;
 
-class SvxColorWindow : public SfxPopupWindow
+class SVX_DLLPUBLIC SvxColorWindow : public SfxPopupWindow
 {
 private:
 const sal_uInt16theSlotId;
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx 
b/svx/source/tbxctrls/extrusioncontrols.cxx
index 4a74d5d..9bc40b2 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -23,6 +23,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -41,7 +42,6 @@
 #include "helpid.hrc"
 #include "extrusioncontrols.hxx"
 #include "extrusioncontrols.hrc"
-#include "colorwindow.hxx"
 #include "extrusiondepthdialog.hxx"
 
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index c93eb0e..c1cc24c 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -84,11 +84,11 @@
 #include 
 #include 
 #include 
+#include 
 #include "svx/drawitem.hxx"
 #include 
 #include "svx/dlgutil.hxx"
 #include 
-#include "colorwindow.hxx"
 #include 
 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 svx/source/tbxctrls/colorwindow.hxx |6 ++---
 svx/source/tbxctrls/tbcontrl.cxx|   42 ++--
 2 files changed, 24 insertions(+), 24 deletions(-)

New commits:
commit 4778444d20e5396d012164603018fa968331e012
Author: Caolán McNamara 
Date:   Fri Oct 28 13:15:18 2016 +0100

rename SvxColorWindow_Impl to SvxColorWindow

Change-Id: I84941f4566792e11a9070f8623857a3fac44591d

diff --git a/svx/source/tbxctrls/colorwindow.hxx 
b/svx/source/tbxctrls/colorwindow.hxx
index 551db2b..19b9132 100644
--- a/svx/source/tbxctrls/colorwindow.hxx
+++ b/svx/source/tbxctrls/colorwindow.hxx
@@ -33,7 +33,7 @@
 
 class BorderColorStatus;
 
-class SvxColorWindow_Impl : public SfxPopupWindow
+class SvxColorWindow : public SfxPopupWindow
 {
 private:
 const sal_uInt16theSlotId;
@@ -61,14 +61,14 @@ protected:
 virtual voidResize() override;
 
 public:
-SvxColorWindow_Impl( const OUString& rCommand,
+SvxColorWindow( const OUString& rCommand,
  PaletteManager& rPaletteManager,
  BorderColorStatus& rBorderColorStatus,
  sal_uInt16 nSlotId,
  const css::uno::Reference< css::frame::XFrame >& 
rFrame,
  vcl::Window* pParentWindow,
  std::function 
const & maColorSelectFunction);
-virtual ~SvxColorWindow_Impl() override;
+virtual ~SvxColorWindow() override;
 virtual voiddispose() override;
 voidStartSelection();
 
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 2f8a09e..c93eb0e 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1245,7 +1245,7 @@ void SvxFontNameBox_Impl::Select()
 #endif
 
 
-SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&rCommand,
+SvxColorWindow::SvxColorWindow( const OUString&rCommand,
   PaletteManager&
rPaletteManager,
   BorderColorStatus& 
rBorderColorStatus,
   sal_uInt16 nSlotId,
@@ -1341,7 +1341,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& 
   rCommand,
 mpColorSet->SetAccessibleName( aWindowTitle );
 
 mpPaletteListBox->SetStyle( mpPaletteListBox->GetStyle() | WB_BORDER | 
WB_AUTOSIZE );
-mpPaletteListBox->SetSelectHdl( LINK( this, SvxColorWindow_Impl, 
SelectPaletteHdl ) );
+mpPaletteListBox->SetSelectHdl( LINK( this, SvxColorWindow, 
SelectPaletteHdl ) );
 mpPaletteListBox->AdaptDropDownLineCountToMaximum();
 std::vector aPaletteList = mrPaletteManager.GetPaletteList();
 for( std::vector::iterator it = aPaletteList.begin(); it != 
aPaletteList.end(); ++it )
@@ -1352,11 +1352,11 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const 
OUString&rCommand,
 mpPaletteListBox->SelectEntry( aPaletteName );
 SelectPaletteHdl( *mpPaletteListBox );
 
-mpButtonAutoColor->SetClickHdl( LINK( this, SvxColorWindow_Impl, 
AutoColorClickHdl ) );
-mpButtonPicker->SetClickHdl( LINK( this, SvxColorWindow_Impl, 
OpenPickerClickHdl ) );
+mpButtonAutoColor->SetClickHdl( LINK( this, SvxColorWindow, 
AutoColorClickHdl ) );
+mpButtonPicker->SetClickHdl( LINK( this, SvxColorWindow, 
OpenPickerClickHdl ) );
 
-mpColorSet->SetSelectHdl( LINK( this, SvxColorWindow_Impl, SelectHdl ) );
-mpRecentColorSet->SetSelectHdl( LINK( this, SvxColorWindow_Impl, SelectHdl 
) );
+mpColorSet->SetSelectHdl( LINK( this, SvxColorWindow, SelectHdl ) );
+mpRecentColorSet->SetSelectHdl( LINK( this, SvxColorWindow, SelectHdl ) );
 SetHelpId( HID_POPUP_COLOR );
 mpColorSet->SetHelpId( HID_POPUP_COLOR_CTRL );
 
@@ -1378,12 +1378,12 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const 
OUString&rCommand,
 }
 }
 
-SvxColorWindow_Impl::~SvxColorWindow_Impl()
+SvxColorWindow::~SvxColorWindow()
 {
 disposeOnce();
 }
 
-void SvxColorWindow_Impl::dispose()
+void SvxColorWindow::dispose()
 {
 mpColorSet.clear();
 mpRecentColorSet.clear();
@@ -1394,14 +1394,14 @@ void SvxColorWindow_Impl::dispose()
 SfxPopupWindow::dispose();
 }
 
-void SvxColorWindow_Impl::KeyInput( const KeyEvent& rKEvt )
+void SvxColorWindow::KeyInput( const KeyEvent& rKEvt )
 {
 mpColorSet->KeyInput(rKEvt);
 }
 
-IMPL_LINK(SvxColorWindow_Impl, SelectHdl, ValueSet*, pColorSet, void)
+IMPL_LINK(SvxColorWindow, SelectHdl, ValueSet*, pColorSet, void)
 {
-VclPtr xThis(this);
+VclPtr xThis(this);
 
 Color aColor = pColorSet->GetItemColor( pColorSet->GetSelectItemId() );
 /*  #i33380# DR 2004-09-03 Moved the following line above the Dispatch() 
calls.
@@ -1424,7 +1424,7 @@ IMPL_LINK(SvxColorWindow_Impl, SelectHdl, ValueSet*, 
pColorSet, void)
 maColorSelectFunction(maCommand, aColor);
 }
 
-IMPL_LINK_NOARG(SvxColorWindow_Impl, SelectPa

[Libreoffice-commits] online.git: loolwsd/LOOLSession.cpp loolwsd/LOOLSession.hpp

[Ashod Nakashian]

 loolwsd/LOOLSession.cpp |   44 +---
 loolwsd/LOOLSession.hpp |6 +++---
 2 files changed, 24 insertions(+), 26 deletions(-)

New commits:
commit f02b98b4324edc30f6c295fa8ce5248cb30a3eef
Author: Ashod Nakashian 
Date:   Mon Oct 31 21:49:28 2016 -0400

loolwsd: use new log macros in LOOLSession

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

diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index 6c3b5a4..d671066 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -73,14 +73,14 @@ LOOLSession::~LOOLSession()
 
 bool LOOLSession::sendTextFrame(const char* buffer, const int length)
 {
-Log::trace(getName() + ": Send: " + getAbbreviatedMessage(buffer, length));
+LOG_TRC(getName() << ": Send: " << getAbbreviatedMessage(buffer, length));
 try
 {
 std::unique_lock lock(_mutex);
 
 if (!_ws || _ws->poll(Poco::Timespan(0), 
Socket::SelectMode::SELECT_ERROR))
 {
-Log::error(getName() + ": Bad socket while sending [" + 
getAbbreviatedMessage(buffer, length) + "].");
+LOG_ERR(getName() << ": Bad socket while sending [" << 
getAbbreviatedMessage(buffer, length) << "].");
 return false;
 }
 
@@ -96,9 +96,8 @@ bool LOOLSession::sendTextFrame(const char* buffer, const int 
length)
 }
 catch (const Exception& exc)
 {
-Log::error() << "LOOLSession::sendTextFrame: "
- << "Exception: " << exc.displayText()
- << (exc.nested() ? "( " + exc.nested()->displayText() + 
")" : "");
+LOG_ERR("LOOLSession::sendTextFrame: Exception: " << exc.displayText() 
<<
+(exc.nested() ? "( " + exc.nested()->displayText() + ")" : 
""));
 }
 
 return false;
@@ -106,14 +105,14 @@ bool LOOLSession::sendTextFrame(const char* buffer, const 
int length)
 
 bool LOOLSession::sendBinaryFrame(const char *buffer, int length)
 {
-Log::trace(getName() + ": Send: " + std::to_string(length) + " bytes");
+LOG_TRC(getName() << ": Send: " << std::to_string(length) << " bytes.");
 try
 {
 std::unique_lock lock(_mutex);
 
 if (!_ws || _ws->poll(Poco::Timespan(0), 
Socket::SelectMode::SELECT_ERROR))
 {
-Log::error(getName() + ": Bad socket while sending binary frame of 
" + std::to_string(length) + " bytes.");
+LOG_ERR(getName() << ": Bad socket while sending binary frame of " 
<< length << " bytes.");
 return false;
 }
 
@@ -128,9 +127,8 @@ bool LOOLSession::sendBinaryFrame(const char *buffer, int 
length)
 }
 catch (const Exception& exc)
 {
-Log::error() << "LOOLSession::sendBinaryFrame: "
- << "Exception: " << exc.displayText()
- << (exc.nested() ? "( " + exc.nested()->displayText() + 
")" : "");
+LOG_ERR("LOOLSession::sendBinaryFrame: Exception: " << 
exc.displayText() <<
+(exc.nested() ? "( " + exc.nested()->displayText() + ")" : 
""));
 }
 
 return false;
@@ -205,7 +203,8 @@ void LOOLSession::disconnect()
 }
 catch (const IOException& exc)
 {
-Log::error("LOOLSession::disconnect: Exception: " + exc.displayText() 
+ (exc.nested() ? " (" + exc.nested()->displayText() + ")" : ""));
+LOG_ERR("LOOLSession::disconnect: Exception: " << exc.displayText() <<
+(exc.nested() ? " (" + exc.nested()->displayText() + ")" : 
""));
 }
 }
 
@@ -220,14 +219,15 @@ void LOOLSession::shutdown(Poco::UInt16 statusCode)
 {
 if (_ws)
 {
-try {
-Log::trace("Shutting down WS [" + getName() + "].");
+try
+{
+LOG_TRC("Shutting down WS [" << getName() << "].");
 _ws->shutdown(statusCode);
 }
 catch (const Poco::Exception &exc)
 {
-Log::warn("LOOLSession::shutdown WebSocket: Exception: " +
-  exc.displayText() + (exc.nested() ? " (" + 
exc.nested()->displayText() + ")" : ""));
+LOG_WRN("LOOLSession::shutdown WebSocket: Exception: " <<
+exc.displayText() << (exc.nested() ? " (" + 
exc.nested()->displayText() + ")" : ""));
 }
 }
 }
@@ -239,25 +239,23 @@ bool LOOLSession::handleInput(const char *buffer, int 
length)
 const auto summary = getAbbreviatedMessage(buffer, length);
 try
 {
-Log::trace(getName() + ": Recv: " + summary);
+LOG_TRC(getName() << ": Recv: " << summary);
 if (TerminationFlag)
 {
-Log::warn("Input while terminating: [" + summary + "].");
+LOG_WRN("Input while terminating: [" << summary << "].");
 }
 
 return _handleInput(buffer, length);
 }
 catch (const Exception& exc)
 {
-Log::error() << "LOOLSession::hand

[Libreoffice-commits] online.git: loolwsd/Log.hpp

[Ashod Nakashian]

 loolwsd/Log.hpp |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 04022563905df0cb0cf81b52babe277fc9381853
Author: Ashod Nakashian 
Date:   Mon Oct 31 21:39:51 2016 -0400

Log file and line number using the LOG_XXX macro

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

diff --git a/loolwsd/Log.hpp b/loolwsd/Log.hpp
index 7fe521d..64634c7 100644
--- a/loolwsd/Log.hpp
+++ b/loolwsd/Log.hpp
@@ -170,12 +170,13 @@ namespace Log
 }
 }
 
-#define LOG_TRC(X) if (Log::traceEnabled()) { std::ostringstream oss; oss << 
Log::prefix("TRC") << X; Log::logger().trace(oss.str()); }
-#define LOG_DBG(X) if (Log::debugEnabled()) { std::ostringstream oss; oss << 
Log::prefix("DBG") << X; Log::logger().debug(oss.str()); }
-#define LOG_INF(X) if (Log::infoEnabled()) { std::ostringstream oss; oss << 
Log::prefix("INF") << X; Log::logger().information(oss.str()); }
-#define LOG_WRN(X) if (Log::warnEnabled()) { std::ostringstream oss; oss << 
Log::prefix("WRN") << X; Log::logger().warning(oss.str()); }
-#define LOG_ERR(X) if (Log::errorEnabled()) { std::ostringstream oss; oss << 
Log::prefix("ERR") << X; Log::logger().error(oss.str()); }
-#define LOG_FTL(X) if (Log::fatalEnabled()) { std::ostringstream oss; oss << 
Log::prefix("FTL") << X; Log::logger().fatal(oss.str()); }
+#define LOG_BODY(LVL, X) std::ostringstream oss; oss << Log::prefix("TRC") << 
X << "| " << __FILE__ << ':' << __LINE__
+#define LOG_TRC(X) if (Log::traceEnabled()) { LOG_BODY("TRC", X); 
Log::logger().trace(oss.str()); }
+#define LOG_DBG(X) if (Log::debugEnabled()) { LOG_BODY("DBG", X); 
Log::logger().debug(oss.str()); }
+#define LOG_INF(X) if (Log::infoEnabled()) { LOG_BODY("INF", X); 
Log::logger().information(oss.str()); }
+#define LOG_WRN(X) if (Log::warnEnabled()) { LOG_BODY("WRN", X); 
Log::logger().warning(oss.str()); }
+#define LOG_ERR(X) if (Log::errorEnabled()) { LOG_BODY("ERR", X); 
Log::logger().error(oss.str()); }
+#define LOG_FTL(X) if (Log::fatalEnabled()) { LOG_BODY("FTL", X); 
Log::logger().fatal(oss.str()); }
 
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/IoUtil.cpp loolwsd/LOOLKit.cpp loolwsd/LOOLSession.cpp

[Ashod Nakashian]

 loolwsd/IoUtil.cpp  |2 ++
 loolwsd/LOOLKit.cpp |1 +
 loolwsd/LOOLSession.cpp |1 +
 3 files changed, 4 insertions(+)

New commits:
commit 74ad4fb529e6ecb57a1a87d1db02a71e38cc44ba
Author: Ashod Nakashian 
Date:   Mon Oct 31 21:38:52 2016 -0400

loolwsd: log large message transmission

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

diff --git a/loolwsd/IoUtil.cpp b/loolwsd/IoUtil.cpp
index a6019b8..90483ac 100644
--- a/loolwsd/IoUtil.cpp
+++ b/loolwsd/IoUtil.cpp
@@ -148,6 +148,8 @@ void SocketProcessor(const std::shared_ptr& ws,
 if (tokens.count() == 2 &&
 tokens[0] == "nextmessage:" && 
LOOLProtocol::getTokenInteger(tokens[1], "size", size) && size > 0)
 {
+LOG_TRC("Getting large message of " << tokens[1] << " 
bytes.");
+
 // Check if it is a "nextmessage:" and in that case read 
the large
 // follow-up message separately, and handle that only.
 payload.resize(size);
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index e08c29b..66319c3 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -637,6 +637,7 @@ public:
 if (length > SMALL_MESSAGE_SIZE)
 {
 const std::string nextmessage = "nextmessage: size=" + 
std::to_string(length);
+LOG_TRC("Sending large message [" << nextmessage << "].");
 _ws->sendFrame(nextmessage.data(), nextmessage.size());
 }
 
diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index 0311c72..6c3b5a4 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -87,6 +87,7 @@ bool LOOLSession::sendTextFrame(const char* buffer, const int 
length)
 if (length > SMALL_MESSAGE_SIZE)
 {
 const std::string nextmessage = "nextmessage: size=" + 
std::to_string(length);
+LOG_TRC("Sending large message [" << nextmessage << "].");
 _ws->sendFrame(nextmessage.data(), nextmessage.size());
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/DocumentBroker.cpp

[Ashod Nakashian]

 loolwsd/DocumentBroker.cpp |   19 ---
 1 file changed, 16 insertions(+), 3 deletions(-)

New commits:
commit 05d4234208df0777ea8d8da9dceda200222d5a58
Author: Ashod Nakashian 
Date:   Mon Oct 31 21:25:19 2016 -0400

loolwsd: more efficient client message forwarding

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

diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp
index 5f417f1..a332af6 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -851,8 +851,21 @@ bool DocumentBroker::forwardToChild(const std::string& 
viewId, const std::string
 
 bool DocumentBroker::forwardToClient(const std::string& prefix, const 
std::vector& payload)
 {
-std::string message(payload.data() + prefix.size(), payload.size() - 
prefix.size());
-Util::ltrim(message);
+assert(payload.size() > prefix.size());
+
+// Remove the prefix and trim.
+size_t index = prefix.size();
+for ( ; index < payload.size(); ++index)
+{
+if (payload[index] != ' ')
+{
+break;
+}
+}
+
+auto data = payload.data() + index;
+auto size = payload.size() - index;
+const auto message = getAbbreviatedMessage(data, size);
 Log::trace("Forwarding payload to " + prefix + ' ' + message);
 
 std::string name;
@@ -865,7 +878,7 @@ bool DocumentBroker::forwardToClient(const std::string& 
prefix, const std::vecto
 const auto peer = it->second->getPeer();
 if (peer)
 {
-return peer->handleInput(message.data(), message.size());
+return peer->handleInput(data, size);
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/PrisonerSession.cpp

[Ashod Nakashian]

 loolwsd/PrisonerSession.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 254005af7477793864aa0b34826c5f72d0d50a33
Author: Ashod Nakashian 
Date:   Mon Oct 31 21:23:27 2016 -0400

loolwsd: log only abbreviated messages

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

diff --git a/loolwsd/PrisonerSession.cpp b/loolwsd/PrisonerSession.cpp
index 30b76fa..06bd90e 100644
--- a/loolwsd/PrisonerSession.cpp
+++ b/loolwsd/PrisonerSession.cpp
@@ -49,9 +49,9 @@ PrisonerSession::~PrisonerSession()
 
 bool PrisonerSession::_handleInput(const char *buffer, int length)
 {
+Log::trace(getName() + ": handling [" + getAbbreviatedMessage(buffer, 
length)+ "].");
 const std::string firstLine = getFirstLine(buffer, length);
 StringTokenizer tokens(firstLine, " ", StringTokenizer::TOK_IGNORE_EMPTY | 
StringTokenizer::TOK_TRIM);
-Log::trace(getName() + ": handling [" + firstLine + "].");
 
 LOOLWSD::dumpOutgoingTrace(_docBroker->getJailId(), getId(), firstLine);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/LOOLProtocol.hpp

[Ashod Nakashian]

 loolwsd/LOOLProtocol.hpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5656c1271316d6067b383f986d718a5234c9b832
Author: Ashod Nakashian 
Date:   Mon Oct 31 21:22:49 2016 -0400

loolwsd: cap abbraviated message length

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

diff --git a/loolwsd/LOOLProtocol.hpp b/loolwsd/LOOLProtocol.hpp
index 855ca94..fe11f2e 100644
--- a/loolwsd/LOOLProtocol.hpp
+++ b/loolwsd/LOOLProtocol.hpp
@@ -172,7 +172,7 @@ namespace LOOLProtocol
 return "";
 }
 
-const auto firstLine = getFirstLine(message, length);
+const auto firstLine = getFirstLine(message, std::min(length, 120));
 
 // If first line is less than the length (minus newline), add ellipsis.
 if (firstLine.size() < static_cast(length) - 1)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Khaled Hosny]

 vcl/source/gdi/CommonSalLayout.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 1260bf28fc82616acfc3d0308eb2056ff6572cf2
Author: Khaled Hosny 
Date:   Wed Nov 2 15:12:59 2016 +0200

Add a comment here

Change-Id: I07f2fe400f20d8f52588db326851f310245b7d8d

diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index 6ba8cb6..5e25186 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -190,6 +190,9 @@ CommonSalLayout::CommonSalLayout(const CoreTextStyle& 
rCoreTextStyle)
 mpHbFont = rCoreTextStyle.GetHbFont();
 if (!mpHbFont)
 {
+// On macOS we use HarfBuzz for AAT shaping, but HarfBuzz will then
+// need a CGFont (as it offloads the actual AAT shaping to Core Text),
+// if we have one we use it to create the hb_face_t.
 hb_face_t* pHbFace;
 CTFontRef pCTFont = 
static_cast(CFDictionaryGetValue(rCoreTextStyle.GetStyleDict(), 
kCTFontAttributeName));
 CGFontRef pCGFont = CTFontCopyGraphicsFont(pCTFont, nullptr);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basic/source editeng/source include/vcl lotuswordpro/source mysqlc/source sc/source sdext/source sd/source sfx2/source sw/inc sw/source vcl/inc vcl/source vcl/unx

[Noel Grandin]

 basic/source/comp/exprtree.cxx  |2 
 basic/source/comp/io.cxx|2 
 basic/source/inc/expr.hxx   |3 
 editeng/source/outliner/outliner.cxx|2 
 editeng/source/outliner/outlundo.cxx|   25 +--
 editeng/source/outliner/outlundo.hxx|1 
 include/vcl/longcurr.hxx|3 
 include/vcl/morebtn.hxx |1 
 include/vcl/svapp.hxx   |7 --
 lotuswordpro/source/filter/xfilter/xfimagestyle.cxx |4 -
 lotuswordpro/source/filter/xfilter/xfimagestyle.hxx |1 
 mysqlc/source/mysqlc_connection.cxx |1 
 mysqlc/source/mysqlc_connection.hxx |3 
 mysqlc/source/mysqlc_databasemetadata.cxx   |9 --
 sc/source/filter/inc/biffinputstream.hxx|3 
 sc/source/filter/inc/pivotcachebuffer.hxx   |2 
 sc/source/filter/oox/biffinputstream.cxx|6 -
 sc/source/filter/oox/pivotcachebuffer.cxx   |8 --
 sc/source/filter/oox/workbookhelper.cxx |2 
 sd/source/ui/dlg/TemplateScanner.cxx|3 
 sd/source/ui/dlg/docprev.cxx|   70 
 sd/source/ui/inc/TemplateScanner.hxx|6 -
 sd/source/ui/inc/docprev.hxx|2 
 sdext/source/presenter/PresenterPaneBase.cxx|   12 ---
 sdext/source/presenter/PresenterPaneBase.hxx|1 
 sfx2/source/appl/appinit.cxx|2 
 sw/inc/txatritr.hxx |1 
 sw/source/core/txtnode/txatritr.cxx |9 +-
 vcl/inc/svdata.hxx  |1 
 vcl/inc/unx/i18n_ic.hxx |1 
 vcl/source/app/svapp.cxx|5 -
 vcl/source/control/longcurr.cxx |3 
 vcl/source/control/morebtn.cxx  |3 
 vcl/unx/generic/app/i18n_ic.cxx |   15 ++--
 34 files changed, 35 insertions(+), 184 deletions(-)

New commits:
commit b1f8cf37828d5f37527e54774aa4935610aa6325
Author: Noel Grandin 
Date:   Wed Nov 2 10:57:21 2016 +0200

loplugin:singlevalfields

Change-Id: I65f96d9cd24572c8d0946acf4d2d45eb3db83a76
Reviewed-on: https://gerrit.libreoffice.org/30476
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index 179aaf3..e7a2210 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -192,7 +192,7 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* 
pKeywordSymbolInfo )
 return pNd;
 }
 
-SbiToken eTok = (pKeywordSymbolInfo == nullptr) ? pParser->Next() : 
pKeywordSymbolInfo->m_eTok;
+SbiToken eTok = (pKeywordSymbolInfo == nullptr) ? pParser->Next() : SYMBOL;
 // memorize the parsing's begin
 pParser->LockColumn();
 OUString aSym( (pKeywordSymbolInfo == nullptr) ? pParser->GetSym() : 
pKeywordSymbolInfo->m_aKeywordSymbol );
diff --git a/basic/source/comp/io.cxx b/basic/source/comp/io.cxx
index 6e1c161..5314874 100644
--- a/basic/source/comp/io.cxx
+++ b/basic/source/comp/io.cxx
@@ -118,7 +118,6 @@ void SbiParser::Line()
 KeywordSymbolInfo aInfo;
 aInfo.m_aKeywordSymbol = "line";
 aInfo.m_eSbxDataType = GetType();
-aInfo.m_eTok = SYMBOL;
 
 Symbol( &aInfo );
 }
@@ -282,7 +281,6 @@ void SbiParser::Name()
 KeywordSymbolInfo aInfo;
 aInfo.m_aKeywordSymbol = "name";
 aInfo.m_eSbxDataType = GetType();
-aInfo.m_eTok = SYMBOL;
 
 Symbol( &aInfo );
 return;
diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx
index 68a7bf9..a43f454 100644
--- a/basic/source/inc/expr.hxx
+++ b/basic/source/inc/expr.hxx
@@ -24,6 +24,7 @@
 
 #include "opcodes.hxx"
 #include "token.hxx"
+#include 
 
 class SbiExprNode;
 class SbiExpression;
@@ -34,7 +35,6 @@ class SbiSymDef;
 class SbiProcDef;
 
 
-#include 
 typedef ::std::unique_ptr SbiExprListPtr;
 typedef ::std::vector SbiExprListVector;
 
@@ -49,7 +49,6 @@ struct KeywordSymbolInfo
 {
 OUString m_aKeywordSymbol;
 SbxDataType m_eSbxDataType;
-SbiTokenm_eTok;
 };
 
 enum SbiExprType {  // expression types:
diff --git a/editeng/source/outliner/outliner.cxx 
b/editeng/source/outliner/outliner.cxx
index 3bf1486..e9ff45b 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -768,7 +768,6 @@ bool Outliner::Expand( Paragraph* pPara )
 {
 UndoActionStart( OLUNDO_EXPAND );
 pUndo = new OLUndoExpand( this, OLUNDO_EXPAND );
-pUndo->pParas = nullptr;
 pUndo->nCount = pParaList->GetAbsPos( pPara );
 }
 pParaList->Expand( pPara );
@@ -796,7 +795

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

[Gabor Kelemen]

 source/text/shared/01/0506.xhp |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit be1c45a0094513b93bbe9747398be1cab6a0abe0
Author: Gabor Kelemen 
Date:   Wed Nov 2 09:47:35 2016 +0100

Fix the Styles button reference

It has been renamed. Also Styles and Formatting is no
longer a window but a sidebar deck.

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

diff --git a/source/text/shared/01/0506.xhp 
b/source/text/shared/01/0506.xhp
index b2123a9..0795153 100644
--- a/source/text/shared/01/0506.xhp
+++ b/source/text/shared/01/0506.xhp
@@ -68,9 +68,9 @@
 Select 
where you want to place the ruby text.
 Character Style for ruby text
 Select a 
character style for the ruby text.
-Styles and 
FormattingUFI: renamed??
-Opens the 
Styles and Formatting 
window
-Styles and Formatting 
window where you can select a character style 
for the ruby text.
+Styles
+Opens the Styles and Formatting deck of 
the Sidebar
+Styles and Formatting deck of the 
Sidebar where you can select a character style 
for the ruby text.
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen]

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

New commits:
commit c3a3b876a3a2a739b266622f51a00016a81b0cdf
Author: Gabor Kelemen 
Date:   Wed Nov 2 09:47:35 2016 +0100

Updated core
Project: help  be1c45a0094513b93bbe9747398be1cab6a0abe0

Fix the Styles button reference

It has been renamed. Also Styles and Formatting is no
longer a window but a sidebar deck.

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

diff --git a/helpcontent2 b/helpcontent2
index 68f7b9d..be1c45a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 68f7b9d1c6ffed02a241645868e49bf80aa45b53
+Subproject commit be1c45a0094513b93bbe9747398be1cab6a0abe0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - jvmfwk/distributions

[Stephan Bergmann]

 jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4db3156d112fa236ec3ada11d5322b4c95a9d1ee
Author: Stephan Bergmann 
Date:   Tue Nov 1 21:17:48 2016 +0100

quickfix: Automatic selection of Oracle Java runtime on macOS

same issue as 36f637f7f21906fa3f37223e69b044db52036fb1 "tdf#103507 quickfix:
Automatic selection of Oracle Java runtime on Windows"

Change-Id: I3239bbf52263fb53bcd0ed54e8e983bda3b19182
(cherry picked from commit f537e561c7f61487253a07b76e6b8a1a87d30a27)
Reviewed-on: https://gerrit.libreoffice.org/30475
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml 
b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index ee5d093..61ab2e2 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
@@ -23,15 +23,15 @@
  2013-04-09
 
  
+ 
+  1.7.0
+ 
   
 1.5.0
   
  
   1.5.0
  
- 
-  1.7.0
- 
  
   1.6.0
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/source/filter/ww8/ww8par2.cxx |  798 +++
 1 file changed, 399 insertions(+), 399 deletions(-)

New commits:
commit 852bd9c2c8f13f9aded7528896121e993cd81e40
Author: Miklos Vajna 
Date:   Wed Nov 2 10:08:23 2016 +0100

sw: prefix members of WW8TabDesc

Change-Id: I8c6e52d40f497fb7cee3ef812e2974aa292a11a8

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index f7ddc8b..0f9f245 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -115,47 +115,47 @@ WW8TabBandDesc::~WW8TabBandDesc()
 
 class WW8TabDesc
 {
-std::vector aNumRuleNames;
+std::vector m_aNumRuleNames;
 sw::util::RedlineStack *mpOldRedlineStack;
 
-SwWW8ImplReader* pIo;
+SwWW8ImplReader* m_pIo;
 
-WW8TabBandDesc* pFirstBand;
-WW8TabBandDesc* pActBand;
+WW8TabBandDesc* m_pFirstBand;
+WW8TabBandDesc* m_pActBand;
 
-SwPosition* pTmpPos;
+SwPosition* m_pTmpPos;
 
-SwTableNode* pTableNd;// table node
-const SwTableLines* pTabLines;  // row array of node
-SwTableLine* pTabLine;  // current row
-SwTableBoxes* pTabBoxes;// boxes array in current row
-SwTableBox* pTabBox;// current cell
+SwTableNode* m_pTableNd;// table node
+const SwTableLines* m_pTabLines;  // row array of node
+SwTableLine* m_pTabLine;  // current row
+SwTableBoxes* m_pTabBoxes;// boxes array in current row
+SwTableBox* m_pTabBox;// current cell
 
 std::vector> m_MergeGroups;   // list of 
all cells to be merged
 
-WW8_TCell* pAktWWCell;
-
-short nRows;
-short nDefaultSwCols;
-short nBands;
-short nMinLeft;
-short nConvertedLeft;
-short nMaxRight;
-short nSwWidth;
-short nPreferredWidth;
-short nOrgDxaLeft;
-
-bool bOk;
-bool bClaimLineFormat;
-sal_Int16 eOri;
-bool bIsBiDi;
+WW8_TCell* m_pAktWWCell;
+
+short m_nRows;
+short m_nDefaultSwCols;
+short m_nBands;
+short m_nMinLeft;
+short m_nConvertedLeft;
+short m_nMaxRight;
+short m_nSwWidth;
+short m_nPreferredWidth;
+short m_nOrgDxaLeft;
+
+bool m_bOk;
+bool m_bClaimLineFormat;
+sal_Int16 m_eOri;
+bool m_bIsBiDi;
 // 2. common admin info
-short nAktRow;
-short nAktBandRow;  // SW: row of current band
+short m_nAktRow;
+short m_nAktBandRow;  // SW: row of current band
 // 3. admin info for writer
-short nAktCol;
+short m_nAktCol;
 
-sal_uInt16 nRowsToRepeat;
+sal_uInt16 m_nRowsToRepeat;
 
 // 4. methods
 
@@ -182,15 +182,15 @@ class WW8TabDesc
 WW8TabDesc& operator=(WW8TabDesc const&) = delete;
 
 public:
-const SwTable* pTable;  // table
-SwPosition* pParentPos;
-SwFlyFrameFormat* pFlyFormat;
-SfxItemSet aItemSet;
+const SwTable* m_pTable;  // table
+SwPosition* m_pParentPos;
+SwFlyFrameFormat* m_pFlyFormat;
+SfxItemSet m_aItemSet;
 bool IsValidCell(short nCol) const;
 bool InFirstParaInCell() const;
 
 WW8TabDesc( SwWW8ImplReader* pIoClass, WW8_CP nStartCp );
-bool Ok() const { return bOk; }
+bool Ok() const { return m_bOk; }
 void CreateSwTable(SvxULSpaceItem* pULSpaceItem);
 void UseSwTable();
 void SetSizePosition(SwFrameFormat* pFrameFormat);
@@ -199,11 +199,11 @@ public:
 void ParkPaM();
 void FinishSwTable();
 void MergeCells();
-short GetMinLeft() const { return nConvertedLeft; }
+short GetMinLeft() const { return m_nConvertedLeft; }
 ~WW8TabDesc();
 
-const WW8_TCell* GetAktWWCell() const { return pAktWWCell; }
-short GetAktCol() const { return nAktCol; }
+const WW8_TCell* GetAktWWCell() const { return m_pAktWWCell; }
+short GetAktCol() const { return m_nAktCol; }
 // find name of numrule valid for current WW-COL
 OUString GetNumRuleName() const;
 void SetNumRuleName( const OUString& rName );
@@ -1734,58 +1734,58 @@ wwTableSprm GetTableSprm(sal_uInt16 nId, 
ww::WordVersion eVer)
 
 WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP nStartCp) :
 mpOldRedlineStack(nullptr),
-pIo(pIoClass),
-pFirstBand(nullptr),
-pActBand(nullptr),
-pTmpPos(nullptr),
-pTableNd(nullptr),
-pTabLines(nullptr),
-pTabLine(nullptr),
-pTabBoxes(nullptr),
-pTabBox(nullptr),
-pAktWWCell(nullptr),
-nRows(0),
-nDefaultSwCols(0),
-nBands(0),
-nMinLeft(0),
-nConvertedLeft(0),
-nMaxRight(0),
-nSwWidth(0),
-nPreferredWidth(0),
-nOrgDxaLeft(0),
-bOk(true),
-bClaimLineFormat(false),
-eOri(text::HoriOrientation::NONE),
-bIsBiDi(false),
-nAktRow(0),
-nAktBandRow(0),
-nAktCol(0),
-nRowsToRepeat(0),
-pTable(nullptr),
-pParentPos(nullptr),
-pFlyFormat(nullptr),
-aItemSet(pIo->m_rDoc.GetAttrPool(),RES_FR

[Libreoffice-commits] online.git: loolwsd/loolwsd.spec.in

[Andras Timar]

 loolwsd/loolwsd.spec.in |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 469dc3e8ea08691c64992ea8746155e68dac5518
Author: Andras Timar 
Date:   Wed Nov 2 11:00:50 2016 +0100

%debug_package is only needed on SUSE, on CentOS it's defined already

diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 6d94158..69204c0 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -55,7 +55,9 @@ Obsoletes:  loleaflet <= 1.5.8
 
 %description
 
+%if 0%{?suse_version}
 %debug_package
+%endif
 %prep
 %setup -n loolwsd-@PACKAGE_VERSION@
 %setup -n loolwsd-@PACKAGE_VERSION@ -T -D -a 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

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

New commits:
commit 55a77ed968229c9b6ea4e3b814c93957dc022bd3
Author: Stephan Bergmann 
Date:   Wed Nov 2 10:39:00 2016 +0100

remove spurious "oh"

Change-Id: Ia214ef9c683492226ab39c1fd1061ecc9cbc264c

diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index fc68165..1cccb0a 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -1384,7 +1384,7 @@ void SfxObjectShell::ImplSign( bool bScriptingContent )
 ImplGetSignatureState(); // document signature
 if (GetMedium() && GetMedium()->GetFilter() && 
GetMedium()->GetFilter()->IsOwnFormat())
 ImplGetSignatureState( true ); // script signature
-ohbool bHasSign = ( pImpl->nScriptingSignatureState != 
SignatureState::NOSIGNATURES || pImpl->nDocumentSignatureState != 
SignatureState::NOSIGNATURES );
+bool bHasSign = ( pImpl->nScriptingSignatureState != 
SignatureState::NOSIGNATURES || pImpl->nDocumentSignatureState != 
SignatureState::NOSIGNATURES );
 
 // the target ODF version on saving
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 loleaflet/dist/toolbar/toolbar.js|4 
 loleaflet/src/control/Control.Menubar.js |7 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 4414d31eb5054137ed18b418df7de21726c0da04
Author: Andras Timar 
Date:   Mon Oct 31 14:45:04 2016 +0100

loleaflet: hide zoom controls for spreadsheets

(cherry picked from commit d589618bc1c6c73b5fa1711504ca6dcadb0cbe6b)
(cherry picked from commit 760c1e732aae9014ce89227e361830d16b3df5bc)

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 54eaf65..b9cf84f 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -734,6 +734,10 @@ map.on('doclayerinit', function () {
var statusbar = w2ui['toolbar-down'];
switch (docType) {
case 'spreadsheet':
+   statusbar.hide('zoomreset');
+   statusbar.hide('zoomout');
+   statusbar.hide('zoomin');
+   statusbar.hide('zoomlevel');
statusbar.insert('left', [
{type: 'break', id:'break1'},
{type: 'html',  id: 'StatusDocPos',
diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 9f6e806..360835b 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -128,12 +128,7 @@ L.Control.Menubar = L.Control.extend({

  {name: _('Row'), type: 'unocommand', uno: '.uno:InsertRows'},

  {name: _('Column'), type: 'unocommand', uno: 
'.uno:InsertColumns'}]
},
-   {name: _('View'), type: 'menu', menu: [{name: _('Full 
screen'), id: 'fullscreen', type: 'action'},
-   
{type: 'separator'},
-   
{name: _('Zoom in'), id: 'zoomin', type: 'action'},
-   
{name: _('Zoom out'), id: 'zoomout', type: 'action'},
-   
{name: _('Reset zoom'), id: 'zoomreset', type: 'action'}]
-   },
+   {name: _('View'), type: 'menu', menu: [{name: _('Full 
screen'), id: 'fullscreen', type: 'action'}]},
{name: _('Cells'), type: 'menu', menu: [{name: 
_('Insert row'), type: 'unocommand', uno: '.uno:InsertRows'},

 {name: _('Insert column'), type: 'unocommand', uno: 
'.uno:InsertColumns'},

 {type: 'separator'},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 cppuhelper/source/servicemanager.cxx |   10 --
 cui/source/dialogs/scriptdlg.cxx |   28 +++-
 2 files changed, 15 insertions(+), 23 deletions(-)

New commits:
commit d2615f96acf1030ea888b2f24a9c5bf4db0d9f0e
Author: Stephan Bergmann 
Date:   Wed Nov 2 10:33:49 2016 +0100

Improve some error reporting

Change-Id: Ibfdb0eeebec785438d46a0e8e6e9f4c847bfb807

diff --git a/cppuhelper/source/servicemanager.cxx 
b/cppuhelper/source/servicemanager.cxx
index a4267f9..f2c1a4c 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -812,13 +812,19 @@ void cppuhelper::ServiceManager::loadImplementation(
 if (ctor != nullptr) {
 assert(!implementation->info->environment.isEmpty());
 css::uno::Environment curEnv(css::uno::Environment::getCurrent());
+if (!curEnv.is()) {
+throw css::uno::DeploymentException(
+"cannot get current environment",
+css::uno::Reference());
+}
 css::uno::Environment env(
 cppuhelper::detail::getEnvironment(
 implementation->info->environment,
 implementation->info->name));
-if (!(curEnv.is() && env.is())) {
+if (!env.is()) {
 throw css::uno::DeploymentException(
-"cannot get environments",
+("cannot get environment "
+ + implementation->info->environment),
 css::uno::Reference());
 }
 if (curEnv.get() != env.get()) {
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index a737b9e..11ef281 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -1205,6 +1205,8 @@ void SvxScriptOrgDialog::RestorePreviousSelection()
 m_pScriptsBox->SetCurEntry( pEntry );
 }
 
+namespace {
+
 OUString ReplaceString(
 const OUString& source,
 const OUString& token,
@@ -1368,21 +1370,6 @@ OUString GetErrorMessage(
 unformatted, language, script, OUString(), OUString(), message );
 }
 
-OUString GetErrorMessage( const RuntimeException& re )
-{
-Type t = cppu::UnoType::get();
-OUString message = t.getTypeName() + re.Message;
-
-return message;
-}
-
-OUString GetErrorMessage( const Exception& e )
-{
-Type t = cppu::UnoType::get();
-OUString message = t.getTypeName() + e.Message;
-return message;
-}
-
 OUString GetErrorMessage( const css::uno::Any& aException )
 {
 if ( aException.getValueType() ==
@@ -1420,15 +1407,14 @@ OUString GetErrorMessage( const css::uno::Any& 
aException )
 
 }
 // unknown exception
+auto msg = aException.getValueTypeName();
 Exception e;
-RuntimeException rte;
-if ( aException >>= rte )
+if ( (aException >>= e) && !e.Message.isEmpty() )
 {
-return GetErrorMessage( rte );
+msg += ": " + e.Message;
 }
-
-aException >>= e;
-return GetErrorMessage( e );
+return msg;
+}
 
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'refs/tags/2.0-beta3'

[Michael Meeks]

Tag '2.0-beta3' created by Andras Timar  at 
2016-11-02 09:29 +

2.0-beta3

Changes since 2.0-beta2-53:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 sfx2/source/doc/objserv.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 1851e87627a48b826afee01f79bfb948eb5691d4
Author: Tor Lillqvist 
Date:   Wed Nov 2 11:26:27 2016 +0200

It's ODF version, not document version

Change-Id: I3e6a54dd92ebafebabf9e75b44b9f0b5f0b6aa8a

diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 5a77b77..fc68165 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -1384,7 +1384,7 @@ void SfxObjectShell::ImplSign( bool bScriptingContent )
 ImplGetSignatureState(); // document signature
 if (GetMedium() && GetMedium()->GetFilter() && 
GetMedium()->GetFilter()->IsOwnFormat())
 ImplGetSignatureState( true ); // script signature
-bool bHasSign = ( pImpl->nScriptingSignatureState != 
SignatureState::NOSIGNATURES || pImpl->nDocumentSignatureState != 
SignatureState::NOSIGNATURES );
+ohbool bHasSign = ( pImpl->nScriptingSignatureState != 
SignatureState::NOSIGNATURES || pImpl->nDocumentSignatureState != 
SignatureState::NOSIGNATURES );
 
 // the target ODF version on saving
 
@@ -1402,7 +1402,9 @@ void SfxObjectShell::ImplSign( bool bScriptingContent )
 OUString aODFVersion;
 try
 {
-// check the version of the document
+// check the ODF version of the document
+// No idea what relevance this has if the document has not been loaded 
from ODF (or is not
+// being saved to ODF)
 uno::Reference < beans::XPropertySet > xPropSet( GetStorage(), 
uno::UNO_QUERY_THROW );
 xPropSet->getPropertyValue("Version") >>= aODFVersion;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

Tag '1.9.6' created by Andras Timar  at 2016-11-02 
09:25 +

1.9.6

Changes since 2.0-beta2-53:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-9' - loolwsd/LOOLWSD.cpp

[Michael Meeks]

 loolwsd/LOOLWSD.cpp |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 60b1623e53d04dff69e7001c3b3fea3817be3dd6
Author: Michael Meeks 
Date:   Wed Nov 2 07:59:59 2016 +

Disable port re-use for internal unit-tests, so we find a free socket.

(cherry picked from commit a28b3d0d7e5f0cae2c78a6749c6600028088feeb)

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 2a74663..4d32905 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1313,14 +1313,14 @@ public:
 namespace
 {
 
-static inline ServerSocket* getServerSocket(int nClientPortNumber)
+static inline ServerSocket* getServerSocket(int nPortNumber, bool reuseDetails)
 {
 try
 {
 ServerSocket* socket = LOOLWSD::isSSLEnabled() ? new 
SecureServerSocket() : new ServerSocket();
 Poco::Net::IPAddress wildcardAddr;
-SocketAddress address(wildcardAddr, nClientPortNumber);
-socket->bind(address, true);
+SocketAddress address(wildcardAddr, nPortNumber);
+socket->bind(address, reuseDetails);
 // 64 is the default value for the backlog parameter in Poco
 // when creating a ServerSocket, so use it here, too.
 socket->listen(64);
@@ -1338,7 +1338,7 @@ static inline ServerSocket* findFreeServerPort(int& 
nClientPortNumber)
 ServerSocket* socket = nullptr;
 while (!socket)
 {
-socket = getServerSocket(nClientPortNumber);
+socket = getServerSocket(nClientPortNumber, false);
 if (!socket)
 {
 nClientPortNumber++;
@@ -1368,7 +1368,7 @@ ServerSocket* findFreeMasterPort(int &nMasterPortNumber)
 ServerSocket* socket = nullptr;
 while (!socket)
 {
-socket = getServerSocket(nMasterPortNumber);
+socket = getServerSocket(nMasterPortNumber, false);
 if (!socket)
 {
 nMasterPortNumber++;
@@ -1911,7 +1911,7 @@ int LOOLWSD::main(const std::vector& 
/*args*/)
 std::unique_ptr psvs(
 UnitWSD::isUnitTesting() ?
 findFreeServerPort(ClientPortNumber) :
-getServerSocket(ClientPortNumber));
+getServerSocket(ClientPortNumber, true));
 if (!psvs)
 return Application::EXIT_SOFTWARE;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth]

 cui/source/inc/border.hxx |1 +
 cui/source/tabpages/border.cxx|   19 +--
 include/svx/svxids.hrc|2 +-
 sw/source/uibase/shells/frmsh.cxx |4 
 4 files changed, 19 insertions(+), 7 deletions(-)

New commits:
commit f013d4a1f4073cda735befd6e446bee35f3db65c
Author: Justin Luth 
Date:   Sat Oct 29 17:26:57 2016 +0300

tdf#41542 PaddingWithoutBorders: allow UI changes if...

If the compatibility option is set, allow the border dialog for frames
to be able to adjust the spacing values without enabling the border lines.
That means it is only true for .doc and .docx right now.

Change-Id: I4004a849f7369c993089d1c7b5d856cbea4f7780
Reviewed-on: https://gerrit.libreoffice.org/28602
Tested-by: Jenkins 
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 

diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index c32dba5..9675b10 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -111,6 +111,7 @@ private:
 boolmbTLBREnabled;  ///< true = Top-left to 
bottom-right border enabled.
 boolmbBLTREnabled;  ///< true = Bottom-left to 
top-right border enabled.
 boolmbUseMarginItem;
+boolmbAllowPaddingWithoutBorders;
 boolmbSync;
 boolmbRemoveAdjacentCellBorders;
 boolbIsCalcDoc;
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 05c8914..d74ae35 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -102,6 +102,7 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, 
const SfxItemSet& rCore
 mbTLBREnabled( false ),
 mbBLTREnabled( false ),
 mbUseMarginItem( false ),
+mbAllowPaddingWithoutBorders( false ),
 mbSync(true),
 mbRemoveAdjacentCellBorders( false ),
 bIsCalcDoc( false )
@@ -180,6 +181,11 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, 
const SfxItemSet& rCore
 m_pLineWidthMF->SetValue(p->GetValue());
 }
 
+if (rCoreAttrs.HasItem(SID_ALLOW_PADDING_WITHOUT_BORDERS, &pItem))
+{
+mbAllowPaddingWithoutBorders = static_cast(pItem)->GetValue();
+}
+
 // set metric
 FieldUnit eFUnit = GetModuleFieldUnit( rCoreAttrs );
 
@@ -698,10 +704,11 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet* 
rCoreAttrs )
 if( !m_pLeftMF->GetText().isEmpty() || 
!m_pRightMF->GetText().isEmpty() ||
 !m_pTopMF->GetText().isEmpty() || 
!m_pBottomMF->GetText().isEmpty() )
 {
-if ( ((mbHorEnabled || mbVerEnabled || (nSWMode & 
SwBorderModes::TABLE)) &&
-(m_pLeftMF->IsModified()||m_pRightMF->IsModified()||
-m_pTopMF->IsModified()||m_pBottomMF->IsModified()) 
)||
- m_pFrameSel->GetFrameBorderState( 
svx::FrameBorderType::Top ) != svx::FrameBorderState::Hide
+if ( mbAllowPaddingWithoutBorders
+ || ((mbHorEnabled || mbVerEnabled || (nSWMode & 
SwBorderModes::TABLE)) &&
+ (m_pLeftMF->IsModified()||m_pRightMF->IsModified()||
+ 
m_pTopMF->IsModified()||m_pBottomMF->IsModified()) )
+ || m_pFrameSel->GetFrameBorderState( 
svx::FrameBorderType::Top ) != svx::FrameBorderState::Hide
  || m_pFrameSel->GetFrameBorderState( 
svx::FrameBorderType::Bottom ) != svx::FrameBorderState::Hide
  || m_pFrameSel->GetFrameBorderState( 
svx::FrameBorderType::Left ) != svx::FrameBorderState::Hide
  || m_pFrameSel->GetFrameBorderState( 
svx::FrameBorderType::Right ) != svx::FrameBorderState::Hide )
@@ -1156,7 +1163,7 @@ IMPL_LINK_NOARG(SvxBorderTabPage, LinesChanged_Impl, 
LinkParamNone*, void)
 m_pRightMF->SetFirst(0);
 m_pTopMF->SetFirst(0);
 m_pBottomMF->SetFirst(0);
-if(!bSpaceModified)
+if(!bSpaceModified && !mbAllowPaddingWithoutBorders)
 {
 m_pLeftMF->SetValue(0);
 m_pRightMF->SetValue(0);
@@ -1168,7 +1175,7 @@ IMPL_LINK_NOARG(SvxBorderTabPage, LinesChanged_Impl, 
LinkParamNone*, void)
 SvxBoxInfoItemValidFlags nValid = 
SvxBoxInfoItemValidFlags::TOP|SvxBoxInfoItemValidFlags::BOTTOM|SvxBoxInfoItemValidFlags::LEFT|SvxBoxInfoItemValidFlags::RIGHT;
 
 // for other objects (paragraph, page, frame, character) the edit is 
disabled, if there's no border set
-if(!(nSWMode & SwBorderModes::TABLE))
+if(!(nSWMode & SwBorderModes::TABLE) && !mbAllowPaddingWithoutBorders)
 {
 if(bLineSet)
 {
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index b3fa887..f2a301c 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -964,7 +964,7 @@
 #define FN_SVX_SET

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

[melikeyurtoglu]

 include/vcl/builderfactory.hxx   |   10 ++
 sw/source/ui/config/optload.cxx  |9 +
 sw/source/ui/dbui/mmaddressblockpage.cxx |9 +
 3 files changed, 12 insertions(+), 16 deletions(-)

New commits:
commit 9937b8daa7c6b8012d9ce4f936e239d87f34a0d1
Author: melikeyurtoglu 
Date:   Sun Oct 16 15:26:43 2016 +0300

tdf#91222 VclBuilder constructor cleanup

Change-Id: I9a82ebc57c7e246841fda0262763fa9a7fbd5970
Signed-off-by: melikeyurtoglu 
Reviewed-on: https://gerrit.libreoffice.org/29919
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/include/vcl/builderfactory.hxx b/include/vcl/builderfactory.hxx
index f2d0c4cf..4231522 100644
--- a/include/vcl/builderfactory.hxx
+++ b/include/vcl/builderfactory.hxx
@@ -31,6 +31,16 @@
 rRet = VclPtr::Create(pParent,arg1); \
 }
 
+#define VCL_BUILDER_FACTORY_CONSTRUCTOR(typeName,arg2) \
+VCL_BUILDER_DECL_FACTORY(typeName) \
+{ \
+OString sBorder = VclBuilder::extractCustomProperty(rMap); \
+WinBits wb = arg2; \
+if (!sBorder.isEmpty()) \
+wb |= WB_BORDER; \
+rRet = VclPtr::Create(pParent,wb); \
+}
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index aba9941..4953740 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -389,14 +389,7 @@ SwCaptionPreview::SwCaptionPreview(vcl::Window* pParent, 
WinBits nStyle)
 maDrawPos = Point(4, 6);
 }
 
-VCL_BUILDER_DECL_FACTORY(SwCaptionPreview)
-{
-WinBits nBits = 0;
-OString sBorder = VclBuilder::extractCustomProperty(rMap);
-if (!sBorder.isEmpty())
-   nBits |= WB_BORDER;
-rRet = VclPtr::Create(pParent, nBits);
-}
+VCL_BUILDER_FACTORY_CONSTRUCTOR(SwCaptionPreview, 0)
 
 void SwCaptionPreview::ApplySettings(vcl::RenderContext& rRenderContext)
 {
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx 
b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 105fab5..07526e0 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -1268,14 +1268,7 @@ void DDListBox::dispose()
 SvTreeListBox::dispose();
 }
 
-VCL_BUILDER_DECL_FACTORY(DDListBox)
-{
-WinBits nWinStyle = WB_TABSTOP;
-OString sBorder = VclBuilder::extractCustomProperty(rMap);
-if (!sBorder.isEmpty())
-nWinStyle |= WB_BORDER;
-rRet = VclPtr::Create(pParent, nWinStyle);
-}
+VCL_BUILDER_FACTORY_CONSTRUCTOR(DDListBox, WB_TABSTOP)
 
 void DDListBox::SetAddressDialog(SwCustomizeAddressBlockDialog *pParent)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 sfx2/source/doc/objserv.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 8e904d334cbf3c10202d486e0b6e2e58edec3f9c
Author: Tor Lillqvist 
Date:   Wed Nov 2 10:55:45 2016 +0200

Add a comment wondering about "ODF Version", further explanations welcome

Change-Id: Idc660ba71ccff02c97a018838974430c0206ace6

diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 9e1d8ef..5a77b77 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -1387,6 +1387,14 @@ void SfxObjectShell::ImplSign( bool bScriptingContent )
 bool bHasSign = ( pImpl->nScriptingSignatureState != 
SignatureState::NOSIGNATURES || pImpl->nDocumentSignatureState != 
SignatureState::NOSIGNATURES );
 
 // the target ODF version on saving
+
+// Please fix this comment if you can: Note that the talk about "ODF 
version" around here is a
+// bit silly, as there should be nothing ODF-specific in this code, right? 
What we mean, I
+// think, is "ODF version iff it is ODF that is the format the document is 
being stored as", and
+// otherwise the "ODF version" is ignored. Not sure why such 
format-specific things needs to be
+// handled here. Digital signatures then complicate matters further, as 
it's only ODF 1.2 and
+// OOXML that have digital signatures.
+
 SvtSaveOptions aSaveOpt;
 SvtSaveOptions::ODFDefaultVersion nVersion = 
aSaveOpt.GetODFDefaultVersion();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 vcl/osx/OSXTransferable.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8251b57dec1adb7f6bb76493ae446dea77651544
Author: Stephan Bergmann 
Date:   Wed Nov 2 09:25:57 2016 +0100

const-ness mismatch

(Why does that only cause a compilation failure now?
DataFlavorMapper::openOfficeToSystemFlavor always returned a const 
NSString*.
Odd.)

Change-Id: I5baa577b78d024c5e959df7ec5bf477057b91c07

diff --git a/vcl/osx/OSXTransferable.cxx b/vcl/osx/OSXTransferable.cxx
index 622b2e4..df39c42 100644
--- a/vcl/osx/OSXTransferable.cxx
+++ b/vcl/osx/OSXTransferable.cxx
@@ -105,7 +105,7 @@ Any SAL_CALL OSXTransferable::getTransferData( const 
DataFlavor& aFlavor )
 }
 
   bool bInternal(false);
-  NSString* sysFormat =
+  NSString const * sysFormat =
   (aFlavor.MimeType.startsWith("image/png"))
   ? DataFlavorMapper::openOfficeImageToSystemFlavor( mPasteboard )
   : mDataFlavorMapper->openOfficeToSystemFlavor(aFlavor, bInternal);
@@ -113,12 +113,12 @@ Any SAL_CALL OSXTransferable::getTransferData( const 
DataFlavor& aFlavor )
 
   if ([sysFormat caseInsensitiveCompare: NSFilenamesPboardType] == 
NSOrderedSame)
 {
-  NSArray* sysData = [mPasteboard propertyListForType: sysFormat];
+  NSArray* sysData = [mPasteboard propertyListForType: const_cast(sysFormat)];
   dp = DataFlavorMapper::getDataProvider(sysFormat, sysData);
 }
   else
 {
-  NSData* sysData = [mPasteboard dataForType: sysFormat];
+  NSData* sysData = [mPasteboard dataForType: const_cast(sysFormat)];
   dp = DataFlavorMapper::getDataProvider(sysFormat, sysData);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Merging feature/commonsallayout branch

[Kaganski Mike]

Hi Luke,

11/2/2016 3:54 AM, Luke Benes пишет:

Us, as in the LibreOffice, the software many of us volunteer to make as good as 
possible for everyone to enjoy.

Should the Chinese IT manager be embarrassed? Maybe, but coming from a First 
World nation, it’s hard for me to imaging supporting my family on $800/month, 
but at least I try to understand. Should my grandfather at almost 80 now be 
embarrassed? I don’t think so. Maybe I should have tried harder. I know he 
doesn’t use his Chromebook and never boots to Lubuntu.

The point is there are a lot of people out there for whatever reason still us 
XP. Despite what you keep suggesting, dropping XP won’t do anything to change 
them.



From: tlillqv...@gmail.com 
 on behalf of Tor Lillqvist 

Sent: Tuesday, November 1, 2016 2:13 PM
To: slacka
Cc: libreoffice-dev
Subject: Re: Merging feature/commonsallayout branch



 Had we already dropped support for XP, it would have been an embarrassing
demonstration and reflected badly on us.

The only ones that should be embarrassed are those still running XP. Also, who 
are these "us" you are speaking for? --tml

While I agree that no one is to judge if those who are still running XP should 
be embarrassed or not, this specific consideration doesn't matter here.

Those who chose to stay with XP chose the software branch that isn't updated 
anymore. They made their choice between fixed set of functionality that is put 
into XP and evolving set of functionality that is being expanded in later 
versions. OS being platform, this choice inherently included also choosing to 
stay with software that supports that OS. And by making that decision, you 
imply that they suddenly put extra burden on "us" those who volunteer to put 
their effort into writing LO? Just by deciding to stay with aging OS, without 
any donation to this community or someone in person, someone magically creates 
an obligation on "us" and makes it twice as difficult for someone other to 
support and develop their software?

Instead, I see it another way: they had already made a choice to stay with one 
stalled branch (XP); they also chose to stay with another (their version of 
MSO); it's just natural that they can make the same decision about yet another 
software: say v.5.2 of LO. It does support XP, and is open and free as always; 
no one ever takes the right to use that from them.

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

Re: Creating singleton UNO components in C++

[Stephan Bergmann]

On 11/02/2016 02:52 AM, Dennis Francis wrote:

Thanks a lot Stephan. Works fine now after
implementing component_getImplementationEnvironment
and component_getFactory instead of mentioning environment and
constructor in .components xml file.


Indeed, constructor attributes in .component files are an internal-only 
feature for the time being, too.  (If there's enough demand, we could 
think about making them official features, but it's always easier to 
maintain code that makes as little promises as necessary.)


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

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

[Michael Meeks]

 loolwsd/LOOLWSD.cpp |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit a28b3d0d7e5f0cae2c78a6749c6600028088feeb
Author: Michael Meeks 
Date:   Wed Nov 2 07:59:59 2016 +

Disable port re-use for internal unit-tests, so we find a free socket.

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 2a74663..4d32905 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1313,14 +1313,14 @@ public:
 namespace
 {
 
-static inline ServerSocket* getServerSocket(int nClientPortNumber)
+static inline ServerSocket* getServerSocket(int nPortNumber, bool reuseDetails)
 {
 try
 {
 ServerSocket* socket = LOOLWSD::isSSLEnabled() ? new 
SecureServerSocket() : new ServerSocket();
 Poco::Net::IPAddress wildcardAddr;
-SocketAddress address(wildcardAddr, nClientPortNumber);
-socket->bind(address, true);
+SocketAddress address(wildcardAddr, nPortNumber);
+socket->bind(address, reuseDetails);
 // 64 is the default value for the backlog parameter in Poco
 // when creating a ServerSocket, so use it here, too.
 socket->listen(64);
@@ -1338,7 +1338,7 @@ static inline ServerSocket* findFreeServerPort(int& 
nClientPortNumber)
 ServerSocket* socket = nullptr;
 while (!socket)
 {
-socket = getServerSocket(nClientPortNumber);
+socket = getServerSocket(nClientPortNumber, false);
 if (!socket)
 {
 nClientPortNumber++;
@@ -1368,7 +1368,7 @@ ServerSocket* findFreeMasterPort(int &nMasterPortNumber)
 ServerSocket* socket = nullptr;
 while (!socket)
 {
-socket = getServerSocket(nMasterPortNumber);
+socket = getServerSocket(nMasterPortNumber, false);
 if (!socket)
 {
 nMasterPortNumber++;
@@ -1911,7 +1911,7 @@ int LOOLWSD::main(const std::vector& 
/*args*/)
 std::unique_ptr psvs(
 UnitWSD::isUnitTesting() ?
 findFreeServerPort(ClientPortNumber) :
-getServerSocket(ClientPortNumber));
+getServerSocket(ClientPortNumber, true));
 if (!psvs)
 return Application::EXIT_SOFTWARE;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang dbaccess/source include/oox include/svx sal/osl sd/source svx/source vcl/source

[Noel Grandin]

 compilerplugins/clang/unusedfields.py  |6 +++---
 dbaccess/source/core/recovery/storagexmlstream.cxx |6 --
 include/oox/dump/xlsbdumper.hxx|6 --
 include/svx/dlgctrl.hxx|7 ---
 include/svx/fmsrcimp.hxx   |1 -
 include/svx/nbdtmg.hxx |   11 ---
 include/svx/sidebar/AreaPropertyPanelBase.hxx  |2 --
 sal/osl/unx/system.hxx |7 ---
 sal/osl/w32/system.h   |7 ---
 sd/source/ui/dlg/dlgctrls.cxx  |7 ---
 svx/source/dialog/SafeModeUI.cxx   |   13 -
 svx/source/dialog/dlgctrl.cxx  |   10 +++---
 svx/source/sidebar/area/AreaPropertyPanelBase.cxx  |3 +--
 svx/source/sidebar/nbdtmg.cxx  |2 +-
 svx/source/xml/xmlxtexp.cxx|3 ---
 vcl/source/filter/jpeg/JpegReader.hxx  |1 -
 16 files changed, 16 insertions(+), 76 deletions(-)

New commits:
commit 3fea7ac94b986ba5e3632d1bbb383c65ced79f1a
Author: Noel Grandin 
Date:   Wed Nov 2 09:08:58 2016 +0200

loplugin:unusedfields

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

diff --git a/compilerplugins/clang/unusedfields.py 
b/compilerplugins/clang/unusedfields.py
index be5a5ca..785b7a9 100755
--- a/compilerplugins/clang/unusedfields.py
+++ b/compilerplugins/clang/unusedfields.py
@@ -52,7 +52,7 @@ for k, definitions in 
sourceLocationToDefinitionMap.iteritems():
 if len(definitions) > 1:
 for d in definitions:
 definitionSet.remove(d)
-
+
 untouchedSet = set()
 for d in definitionSet:
 if d in callSet:
@@ -87,7 +87,7 @@ for d in definitionSet:
 or srcLoc.startswith("lotuswordpro/source/filter/lwpsdwdrawheader.hxx")
 or srcLoc.startswith("hwpfilter/")
 or srcLoc.startswith("embeddedobj/source/inc/")
-or srcLoc.startswith("svtools/source/dialogs/insdlg.cxx")):
+or srcLoc.startswith("svtools/source/dialogs/insdlg.cxx")
 or srcLoc.startswith("bridges/")):
 continue
 if d[0] in set([ "AtkObjectWrapperClass", "AtkObjectWrapper", "GLOMenu", 
"GLOAction", "_XRegion", "SalMenuButtonItem", "Vertex",
@@ -95,7 +95,7 @@ for d in definitionSet:
 "ImplPPTParaPropSet", "DataNode"]):
 continue
 # unit testing code
-if (srcLoc.startswith("cppu/source/uno/check.cxx"):
+if srcLoc.startswith("cppu/source/uno/check.cxx"):
 continue
 fieldType = definitionToTypeMap[d]
 if fieldType in set([ "class rptui::OModuleClient" ]):
diff --git a/dbaccess/source/core/recovery/storagexmlstream.cxx 
b/dbaccess/source/core/recovery/storagexmlstream.cxx
index e47db02..39ddf6f 100644
--- a/dbaccess/source/core/recovery/storagexmlstream.cxx
+++ b/dbaccess/source/core/recovery/storagexmlstream.cxx
@@ -119,12 +119,6 @@ namespace dbaccess
 m_pData->xHandler->characters( i_rCharacters );
 }
 
-// StorageXMLInputStream_Data
-struct StorageXMLInputStream_Data
-{
-Reference< XParser >xParser;
-};
-
 // StorageXMLInputStream
 StorageXMLInputStream::StorageXMLInputStream( const 
Reference& i_rContext,
   const Reference< XStorage >& 
i_rParentStorage,
diff --git a/include/oox/dump/xlsbdumper.hxx b/include/oox/dump/xlsbdumper.hxx
index ad692ef..ea553ab 100644
--- a/include/oox/dump/xlsbdumper.hxx
+++ b/include/oox/dump/xlsbdumper.hxx
@@ -55,12 +55,6 @@ protected:
 using   SequenceRecordObjectBase::construct;
 
 virtual boolimplReadRecordHeader( BinaryInputStream& rBaseStrm, 
sal_Int64& ornRecId, sal_Int64& ornRecSize ) override;
-
-private:
-typedef std::shared_ptr< SequenceInputStream > SequenceInputStreamRef;
-
-SequenceInputStreamRef mxBiffStrm;
-NameListRef mxErrCodes;
 };
 
 
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index 2bcdfc1..fbf9369 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -223,7 +223,6 @@ public:
 
 class SAL_WARN_UNUSED SVX_DLLPUBLIC HatchingLB : public ListBox
 {
-XHatchListRef mpList;
 public:
 explicit HatchingLB(vcl::Window* pParent, WinBits aWB);
 };
@@ -232,7 +231,6 @@ public:
 
 class SAL_WARN_UNUSED SVX_DLLPUBLIC GradientLB : public ListBox
 {
-XGradientListRef mpList;
 public:
 explicit GradientLB(vcl::Window* pParent, WinBits aWB);
 };
@@ -243,11 +241,6 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC BitmapLB : public 
ListBox
 {
 public:
 explicit BitmapLB(vcl::Window* pParent, WinBits aWB);
-
-private:
-BitmapExmaBitmapEx;
-
-XBitmapListRef  mpList;
 };
 
 //
diff --git a/incl

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

[Noel Grandin]

 avmedia/source/viewer/mediawindow_impl.cxx |   67 +
 avmedia/source/viewer/mediawindow_impl.hxx |   12 -
 2 files changed, 12 insertions(+), 67 deletions(-)

New commits:
commit 2db81e733610331bc0f84d72f7e49db9af92949c
Author: Noel Grandin 
Date:   Tue Nov 1 16:45:26 2016 +0200

loplugin:expandablemethods in avmedia

Change-Id: I215230d3b7e3649146083f00e7c10c03a4d3154e
Reviewed-on: https://gerrit.libreoffice.org/30470
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/avmedia/source/viewer/mediawindow_impl.cxx 
b/avmedia/source/viewer/mediawindow_impl.cxx
index 1bd55af..d002801 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -334,10 +334,10 @@ void MediaWindowImpl::updateMediaItem( MediaItem& rItem ) 
const
 
 rItem.setDuration( getDuration() );
 rItem.setTime( getMediaTime() );
-rItem.setLoop( isPlaybackLoop() );
-rItem.setMute( isMute() );
-rItem.setVolumeDB( getVolumeDB() );
-rItem.setZoom( getZoom() );
+rItem.setLoop( mxPlayer.is() && mxPlayer->isPlaybackLoop() );
+rItem.setMute( mxPlayer.is() && mxPlayer->isMute() );
+rItem.setVolumeDB( mxPlayer.is() ? mxPlayer->getVolumeDB() : 0 );
+rItem.setZoom( mxPlayerWindow.is() ? mxPlayerWindow->getZoomLevel() : 
media::ZoomLevel_NOT_AVAILABLE );
 rItem.setURL( getURL(), mTempFileURL, maReferer );
 }
 
@@ -356,17 +356,17 @@ void MediaWindowImpl::executeMediaItem( const MediaItem& 
rItem )
 if (nMaskSet & AVMediaSetMask::TIME)
 setMediaTime(std::min(rItem.getTime(), getDuration()));
 
-if (nMaskSet & AVMediaSetMask::LOOP)
-setPlaybackLoop(rItem.isLoop());
+if (nMaskSet & AVMediaSetMask::LOOP && mxPlayer.is() )
+mxPlayer->setPlaybackLoop( rItem.isLoop() );
 
-if (nMaskSet & AVMediaSetMask::MUTE)
-setMute(rItem.isMute());
+if (nMaskSet & AVMediaSetMask::MUTE && mxPlayer.is() )
+mxPlayer->setMute( rItem.isMute() );
 
-if (nMaskSet & AVMediaSetMask::VOLUMEDB)
-setVolumeDB(rItem.getVolumeDB());
+if (nMaskSet & AVMediaSetMask::VOLUMEDB && mxPlayer.is() )
+mxPlayer->setVolumeDB( rItem.getVolumeDB() );
 
-if (nMaskSet & AVMediaSetMask::ZOOM)
-setZoom(rItem.getZoom());
+if (nMaskSet & AVMediaSetMask::ZOOM && mxPlayerWindow.is() )
+mxPlayerWindow->setZoomLevel( rItem.getZoom() );
 
 // set play state at last
 if (nMaskSet & AVMediaSetMask::STATE)
@@ -401,16 +401,6 @@ void MediaWindowImpl::executeMediaItem( const MediaItem& 
rItem )
 }
 }
 
-bool MediaWindowImpl::setZoom(css::media::ZoomLevel eLevel)
-{
-return mxPlayerWindow.is() && mxPlayerWindow->setZoomLevel( eLevel );
-}
-
-css::media::ZoomLevel MediaWindowImpl::getZoom() const
-{
-return( mxPlayerWindow.is() ? mxPlayerWindow->getZoomLevel() : 
media::ZoomLevel_NOT_AVAILABLE );
-}
-
 void MediaWindowImpl::stop()
 {
 if( mxPlayer.is() )
@@ -438,39 +428,6 @@ double MediaWindowImpl::getMediaTime() const
 return( mxPlayer.is() ? mxPlayer->getMediaTime() : 0.0 );
 }
 
-void MediaWindowImpl::setPlaybackLoop( bool bSet )
-{
-if( mxPlayer.is() )
-mxPlayer->setPlaybackLoop( bSet );
-}
-
-bool MediaWindowImpl::isPlaybackLoop() const
-{
-return mxPlayer.is() && mxPlayer->isPlaybackLoop();
-}
-
-void MediaWindowImpl::setMute( bool bSet )
-{
-if( mxPlayer.is() )
-mxPlayer->setMute( bSet );
-}
-
-bool MediaWindowImpl::isMute() const
-{
-return mxPlayer.is() && mxPlayer->isMute();
-}
-
-void MediaWindowImpl::setVolumeDB( sal_Int16 nVolumeDB )
-{
-if( mxPlayer.is() )
-mxPlayer->setVolumeDB( nVolumeDB );
-}
-
-sal_Int16 MediaWindowImpl::getVolumeDB() const
-{
-return (mxPlayer.is() ? mxPlayer->getVolumeDB() : 0);
-}
-
 void MediaWindowImpl::stopPlayingInternal(bool bStop)
 {
 if (isPlaying())
diff --git a/avmedia/source/viewer/mediawindow_impl.hxx 
b/avmedia/source/viewer/mediawindow_impl.hxx
index 5438071..649a998 100644
--- a/avmedia/source/viewer/mediawindow_impl.hxx
+++ b/avmedia/source/viewer/mediawindow_impl.hxx
@@ -123,9 +123,6 @@ private:
 // DragSourceHelper
 virtual voidStartDrag( sal_Int8 nAction, const Point& rPosPixel ) 
override;
 
-bool setZoom(css::media::ZoomLevel eLevel);
-css::media::ZoomLevel getZoom() const;
-
 void stop();
 
 bool isPlaying() const;
@@ -135,15 +132,6 @@ private:
 void setMediaTime( double fTime );
 double getMediaTime() const;
 
-void setPlaybackLoop( bool bSet );
-bool isPlaybackLoop() const;
-
-void setMute( bool bSet );
-bool isMute() const;
-
-void setVolumeDB( sal_Int16 nVolumeDB );
-sal_Int16 getVolumeDB() const;
-
 void stopPlayingInternal( bool );
 
 void onURLChanged();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcompiler/source idlc/source linguistic/source oox/source reportdesign/source

[Noel Grandin]

 helpcompiler/source/HelpSearch.cxx  |4 ---
 idlc/source/idlccompile.cxx |6 +---
 linguistic/source/dicimp.cxx|4 ---
 linguistic/source/dlistimp.cxx  |7 +
 oox/source/drawingml/texteffectscontext.cxx |4 ---
 oox/source/ole/axcontrol.cxx|7 +
 reportdesign/source/core/api/ReportEngineJFree.cxx  |6 +---
 reportdesign/source/filter/xml/xmlExport.cxx|   15 
 reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx |   12 +++--
 reportdesign/source/filter/xml/xmlFormattedField.cxx|8 +-
 reportdesign/source/filter/xml/xmlGroup.cxx |3 --
 11 files changed, 23 insertions(+), 53 deletions(-)

New commits:
commit a7369d98991eb41e0e6bb008ef0305c17859540e
Author: Noel Grandin 
Date:   Tue Nov 1 14:37:24 2016 +0200

loplugin:oncevar in helpcompiler..reportdesign

Change-Id: I2dc57931fb230953c285aeb18f57c0a41fedafcb
Reviewed-on: https://gerrit.libreoffice.org/30463
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/helpcompiler/source/HelpSearch.cxx 
b/helpcompiler/source/HelpSearch.cxx
index 96f1219..6f0fa2e 100644
--- a/helpcompiler/source/HelpSearch.cxx
+++ b/helpcompiler/source/HelpSearch.cxx
@@ -26,9 +26,7 @@ void HelpSearch::query(OUString const &queryStr, bool 
captionOnly,
 lucene::index::IndexReader *reader = 
lucene::index::IndexReader::open(d_indexDir.getStr());
 lucene::search::IndexSearcher searcher(reader);
 
-TCHAR captionField[] = L"caption";
-TCHAR contentField[] = L"content";
-TCHAR *field = captionOnly ? captionField : contentField;
+const TCHAR* field = captionOnly ? L"caption" : L"content";
 
 bool isWildcard = queryStr[queryStr.getLength() - 1] == L'*';
 std::vector aQueryStr(OUStringToTCHARVec(queryStr));
diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx
index 1cc5fac..1f62871 100644
--- a/idlc/source/idlccompile.cxx
+++ b/idlc/source/idlccompile.cxx
@@ -51,8 +51,6 @@ extern int yydebug;
 sal_Int32 lineNumber = 1;
 
 
-static const char TMP[] = "TMP";
-static const char TEMP[] = "TEMP";
 static sal_Char tmpFilePattern[512];
 
 bool isFileUrl(const OString& fileName)
@@ -123,9 +121,9 @@ OString makeTempName(const OString& prefix)
 OUString uTmpPath;
 OString tmpPath;
 
-if ( osl_getEnvironment(OUString(TMP).pData, &uTmpPath.pData) != 
osl_Process_E_None )
+if ( osl_getEnvironment(OUString("TMP").pData, &uTmpPath.pData) != 
osl_Process_E_None )
 {
-if ( osl_getEnvironment(OUString(TEMP).pData, &uTmpPath.pData) != 
osl_Process_E_None )
+if ( osl_getEnvironment(OUString("TEMP").pData, &uTmpPath.pData) != 
osl_Process_E_None )
 {
 #if defined(SAL_W32)
 tmpPath = OString("c:\\temp");
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index 3e7ff05..5efe94f 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -1018,9 +1018,7 @@ void DicEntry::splitDicFileWord(const OUString 
&rDicFileWord,
 {
 MutexGuard  aGuard( GetLinguMutex() );
 
-static const char aDelim[] = "==";
-
-sal_Int32 nDelimPos = rDicFileWord.indexOf( aDelim );
+sal_Int32 nDelimPos = rDicFileWord.indexOf( "==" );
 if (-1 != nDelimPos)
 {
 sal_Int32 nTriplePos = nDelimPos + 2;
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index f4506ee..6b2a43b 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -790,16 +790,13 @@ static void AddInternal(
 if (rDic.is())
 {
 //! TL TODO: word iterator should be used to break up the text
-static const char aDefWordDelim[] =
-"!\"#$%&'()*+,-/:;<=>?[]\\_^`{|}~\t \n";
-OUString aDelim(aDefWordDelim);
+OUString aDelim("!\"#$%&'()*+,-/:;<=>?[]\\_^`{|}~\t \n");
 OSL_ENSURE(aDelim.indexOf(static_cast('.')) == -1,
 "ensure no '.'");
 
 OUString  aToken;
 sal_Int32 nPos = 0;
-while (-1 !=
-(nPos = lcl_GetToken( aToken, rNew, nPos, aDelim )))
+while (-1 != (nPos = lcl_GetToken( aToken, rNew, nPos, aDelim )))
 {
 if( !aToken.isEmpty()  &&  !IsNumeric( aToken ) )
 {
diff --git a/oox/source/drawingml/texteffectscontext.cxx 
b/oox/source/drawingml/texteffectscontext.cxx
index 7b7f32e..52abd95 100644
--- a/oox/source/drawingml/texteffectscontext.cxx
+++ b/oox/source/drawingml/texteffectscontext.cxx
@@ -98,8 +98,6 @@ OUString lclGetGrabBagName(sal_uInt32 aId)
 return aGrabBagNameMap[aId];
 }
 
-const char constAttributesSequenceName[] = "attributes";
-
 }
 
 using namespace oox::core;
@@ -131,7 +129,7 @@ void TextEffectsContext::pushAttributeToGrabBag (sal_Int32 
aAttributeId, const O
 
 void TextEffe

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-5.1-11'

[jan Iversen]

Tag 'cp-5.1-11' created by Andras Timar  at 
2016-11-02 07:11 +

cp-5.1-11

Changes since cp-5.1-9-2:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-5.1-11'

[Miklos Vajna]

Tag 'cp-5.1-11' created by Andras Timar  at 
2016-11-02 07:11 +

cp-5.1-11

Changes since libreoffice-5-1-branch-point-11:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-5.1-11'

[Andras Timar]

Tag 'cp-5.1-11' created by Andras Timar  at 
2016-11-02 07:11 +

cp-5.1-11

Changes since cp-5.1-9:
Andras Timar (1):
  Update pt_PT dictionary to version 16.10.1.2

---
 pt_PT/README_th_pt_PT_v2.txt |  123 
 pt_PT/description.xml|2 
 pt_PT/pt_PT.dic  |   19 
 pt_PT/th_pt_PT_v2.dat|107769 
---
 4 files changed, 91971 insertions(+), 15942 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-5.1-11'

[Caolán McNamara]

Tag 'cp-5.1-11' created by Andras Timar  at 
2016-11-02 07:11 +

cp-5.1-11

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

Re: Merging feature/commonsallayout branch

[Tor Lillqvist]

> The point is there are a lot of people out there for whatever reason still
> us XP. Despite what you keep suggesting, dropping XP won’t do anything to
> change them.
>

Dropping XP support in future LO versions won't do anything to existing LO
versions that will continue to work nicely for them.

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