date:20171103

[Libreoffice-commits] core.git: basctl/source basic/source chart2/source drawinglayer/source editeng/source extensions/source include/drawinglayer include/editeng linguistic/source oox/source package/

2017-11-03 Thread Noel Grandin

 basctl/source/basicide/brkdlg.cxx   |4 ++--
 basctl/source/basicide/brkdlg.hxx   |4 ++--
 basic/source/classes/sbunoobj.cxx   |4 ++--
 basic/source/inc/namecont.hxx   |2 +-
 basic/source/inc/runtime.hxx|2 +-
 basic/source/runtime/runtime.cxx|2 +-
 basic/source/uno/namecont.cxx   |2 +-
 chart2/source/view/axes/VPolarAngleAxis.cxx |2 +-
 chart2/source/view/axes/VPolarAngleAxis.hxx |2 +-
 chart2/source/view/inc/GL3DRenderer.hxx |2 +-
 chart2/source/view/main/GL3DRenderer.cxx|2 +-
 drawinglayer/source/texture/texture3d.cxx   |2 +-
 editeng/source/uno/unoedhlp.cxx |2 +-
 editeng/source/uno/unofield.cxx |2 +-
 extensions/source/scanner/sane.cxx  |2 +-
 extensions/source/scanner/sane.hxx  |2 +-
 include/drawinglayer/texture/texture3d.hxx  |2 +-
 include/editeng/unoedhlp.hxx|2 +-
 linguistic/source/lngsvcmgr.cxx |2 +-
 oox/source/helper/propertymap.cxx   |2 +-
 oox/source/ole/vbaexport.cxx|2 +-
 package/inc/ZipFile.hxx |4 ++--
 package/source/zipapi/XUnbufferedStream.cxx |2 +-
 package/source/zipapi/XUnbufferedStream.hxx |2 +-
 package/source/zipapi/ZipFile.cxx   |4 ++--
 xmloff/source/text/txtimppr.cxx |4 ++--
 26 files changed, 32 insertions(+), 32 deletions(-)

New commits:
commit 3dde9d988f0c9a432429389359c3531f10a4ff10
Author: Noel Grandin 
Date:   Thu Nov 2 12:09:52 2017 +0200

loplugin:constparams in various(1)

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

diff --git a/basctl/source/basicide/brkdlg.cxx 
b/basctl/source/basicide/brkdlg.cxx
index 6bcb23d5eb37..27fc322e5805 100644
--- a/basctl/source/basicide/brkdlg.cxx
+++ b/basctl/source/basicide/brkdlg.cxx
@@ -121,7 +121,7 @@ void BreakPointDialog::dispose()
 ModalDialog::dispose();
 }
 
-void BreakPointDialog::SetCurrentBreakPoint( BreakPoint* pBrk )
+void BreakPointDialog::SetCurrentBreakPoint( BreakPoint const * pBrk )
 {
 OUString aStr( "# " + OUString::number(pBrk->nLine) );
 m_pComboBox->SetText( aStr );
@@ -233,7 +233,7 @@ IMPL_LINK( BreakPointDialog, ButtonHdl, Button *, pButton, 
void )
 }
 
 
-void BreakPointDialog::UpdateFields( BreakPoint* pBrk )
+void BreakPointDialog::UpdateFields( BreakPoint const * pBrk )
 {
 if ( pBrk )
 {
diff --git a/basctl/source/basicide/brkdlg.hxx 
b/basctl/source/basicide/brkdlg.hxx
index 2a93ef2131e7..1a2ea84e01bd 100644
--- a/basctl/source/basicide/brkdlg.hxx
+++ b/basctl/source/basicide/brkdlg.hxx
@@ -47,7 +47,7 @@ protected:
 DECL_LINK( ComboBoxHighlightHdl, ComboBox&, void );
 DECL_LINK( EditModifyHdl, Edit&, void );
 DECL_LINK( ButtonHdl, Button*, void );
-voidUpdateFields( BreakPoint* pBrk );
+voidUpdateFields( BreakPoint const * pBrk );
 BreakPoint* GetSelectedBreakPoint();
 
 
@@ -56,7 +56,7 @@ public:
 virtual ~BreakPointDialog() override;
 virtual void dispose() override;
 
-voidSetCurrentBreakPoint( BreakPoint* pBrk );
+voidSetCurrentBreakPoint( BreakPoint const * pBrk );
 };
 
 } // namespace basctl
diff --git a/basic/source/classes/sbunoobj.cxx 
b/basic/source/classes/sbunoobj.cxx
index d6e8210340a1..3c223f3010e7 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -362,7 +362,7 @@ OUString implGetExceptionMsg( const EXCEPTION& e )
 return implGetExceptionMsg( e, 
cppu::UnoType::get().getTypeName() );
 }
 
-void implHandleBasicErrorException( BasicErrorException& e )
+void implHandleBasicErrorException( BasicErrorException const & e )
 {
 ErrCode nError = StarBASIC::GetSfxFromVBError( (sal_uInt16)e.ErrorCode );
 StarBASIC::Error( nError, e.ErrorMessageArgument );
@@ -521,7 +521,7 @@ SbxDataType unoToSbxType( const Reference< XIdlClass >& 
xIdlClass )
 return eRetType;
 }
 
-static void implSequenceToMultiDimArray( SbxDimArray*& pArray, Sequence< 
sal_Int32 >& indices, Sequence< sal_Int32 >& sizes, const Any& aValue, 
sal_Int32& dimension, bool bIsZeroIndex, Type const * pType )
+static void implSequenceToMultiDimArray( SbxDimArray*& pArray, Sequence< 
sal_Int32 >& indices, Sequence< sal_Int32 >& sizes, const Any& aValue, 
sal_Int32 dimension, bool bIsZeroIndex, Type const * pType )
 {
 const Type& aType = aValue.getValueType();
 TypeClass eTypeClass = aType.getTypeClass();
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 875e15a60897..72016292713f 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -255,7 +255,7 @@ protected:
 const css::uno::Reference< 
css::embed::XStorage >& xStorage,

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

2017-11-03 Thread Noel Grandin

 filter/source/graphicfilter/icgm/actimpr.cxx |2 +-
 filter/source/graphicfilter/icgm/bitmap.cxx  |2 +-
 filter/source/graphicfilter/icgm/bitmap.hxx  |2 +-
 filter/source/graphicfilter/icgm/outact.hxx  |2 +-
 filter/source/msfilter/msdffimp.cxx  |4 ++--
 filter/source/msfilter/svdfppt.cxx   |4 ++--
 include/filter/msfilter/msdffimp.hxx |4 ++--
 include/filter/msfilter/svdfppt.hxx  |4 ++--
 8 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit da90193c8c0ab1f5403d37902f0037b51659b6d9
Author: Noel Grandin 
Date:   Thu Nov 2 12:09:27 2017 +0200

loplugin:constparams in filter

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

diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx 
b/filter/source/graphicfilter/icgm/actimpr.cxx
index 155ad22208d9..9a0762905bab 100644
--- a/filter/source/graphicfilter/icgm/actimpr.cxx
+++ b/filter/source/graphicfilter/icgm/actimpr.cxx
@@ -706,7 +706,7 @@ void CGMImpressOutAct::DrawPolyPolygon( tools::PolyPolygon 
const & rPolyPolygon
 }
 }
 
-void CGMImpressOutAct::DrawText( awt::Point const & rTextPos, awt::Size& 
rTextSize, char const * pString, FinalFlag eFlag )
+void CGMImpressOutAct::DrawText( awt::Point const & rTextPos, awt::Size const 
& rTextSize, char const * pString, FinalFlag eFlag )
 {
 if ( ImplCreateShape( "com.sun.star.drawing.TextShape" ) )
 {
diff --git a/filter/source/graphicfilter/icgm/bitmap.cxx 
b/filter/source/graphicfilter/icgm/bitmap.cxx
index 72099a3eb076..3dc9d98dc668 100644
--- a/filter/source/graphicfilter/icgm/bitmap.cxx
+++ b/filter/source/graphicfilter/icgm/bitmap.cxx
@@ -335,7 +335,7 @@ bool CGMBitmap::ImplGetDimensions( CGMBitmapDescriptor& 
rDesc )
 }
 
 
-void CGMBitmap::ImplInsert( CGMBitmapDescriptor& rSource, CGMBitmapDescriptor& 
rDest )
+void CGMBitmap::ImplInsert( CGMBitmapDescriptor const & rSource, 
CGMBitmapDescriptor& rDest )
 {
 if ( ( rSource.mnR.Y == rDest.mnQ.Y ) && ( rSource.mnR.X == rDest.mnQ.X ) )
 {   // Insert on Bottom
diff --git a/filter/source/graphicfilter/icgm/bitmap.hxx 
b/filter/source/graphicfilter/icgm/bitmap.hxx
index ccf0f043cf45..e05ef169a676 100644
--- a/filter/source/graphicfilter/icgm/bitmap.hxx
+++ b/filter/source/graphicfilter/icgm/bitmap.hxx
@@ -78,7 +78,7 @@ class CGMBitmap
 boolImplGetDimensions( CGMBitmapDescriptor& );
 voidImplSetCurrentPalette( CGMBitmapDescriptor& );
 voidImplGetBitmap( CGMBitmapDescriptor& );
-voidImplInsert( CGMBitmapDescriptor& rSource, 
CGMBitmapDescriptor& rDest );
+voidImplInsert( CGMBitmapDescriptor const & rSource, 
CGMBitmapDescriptor& rDest );
 public:
 explicit CGMBitmap( CGM& rCGM );
 ~CGMBitmap();
diff --git a/filter/source/graphicfilter/icgm/outact.hxx 
b/filter/source/graphicfilter/icgm/outact.hxx
index 113156ce4fc0..98f02a6e124f 100644
--- a/filter/source/graphicfilter/icgm/outact.hxx
+++ b/filter/source/graphicfilter/icgm/outact.hxx
@@ -89,7 +89,7 @@ public:
 voidDrawPolyLine( tools::Polygon& );
 voidDrawPolybezier( tools::Polygon& );
 voidDrawPolyPolygon( tools::PolyPolygon const & );
-voidDrawText( css::awt::Point const & TextRectPos, 
css::awt::Size& TextRectSize, char const * String, FinalFlag );
+voidDrawText( css::awt::Point const & TextRectPos, 
css::awt::Size const & TextRectSize, char const * String, FinalFlag );
 voidAppendText( const char* String );
 
 voidFirstOutPut() { mpCGM->mbFirstOutPut = false; 
} ;
diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index b2208e978059..fdc3f1e3a5dd 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2564,7 +2564,7 @@ void DffPropertyReader::ApplyAttributes( SvStream& rIn, 
SfxItemSet& rSet ) const
 ApplyAttributes( rIn, rSet, aDffObjTemp );
 }
 
-void DffPropertyReader::ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, 
DffObjData& rObjData ) const
+void DffPropertyReader::ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, 
DffObjData const & rObjData ) const
 {
 bool bHasShadow = false;
 bool bNonZeroShadowOffset = false;
@@ -2692,7 +2692,7 @@ void DffPropertyReader::ApplyAttributes( SvStream& rIn, 
SfxItemSet& rSet, DffObj
 }
 }
 
-void DffPropertyReader::CheckAndCorrectExcelTextRotation( SvStream& rIn, 
SfxItemSet& rSet, DffObjData& rObjData ) const
+void DffPropertyReader::CheckAndCorrectExcelTextRotation( SvStream& rIn, 
SfxItemSet& rSet, DffObjData const & rObjData ) const
 {
 bool bRotateTextWithShape = rObjData.bRotateTextWithShape;
 if ( rObjData.bOpt2 )/

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

2017-11-03 Thread Noel Grandin

 include/svx/contdlg.hxx   |2 +-
 include/svx/galtheme.hxx  |2 +-
 include/svx/imapdlg.hxx   |2 +-
 include/svx/rubydialog.hxx|2 +-
 svx/source/dialog/_contdlg.cxx|2 +-
 svx/source/dialog/imapdlg.cxx |2 +-
 svx/source/dialog/rubydialog.cxx  |2 +-
 svx/source/gallery2/galtheme.cxx  |2 +-
 svx/source/unodraw/UnoGraphicExporter.cxx |4 ++--
 svx/source/unogallery/unogalitem.cxx  |2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 7f81b9b9636b5f2333d1bc7eb0f2873aeb83ab07
Author: Noel Grandin 
Date:   Thu Nov 2 12:09:03 2017 +0200

loplugin:constparams in svx

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

diff --git a/include/svx/contdlg.hxx b/include/svx/contdlg.hxx
index 10a976cd5991..fdd59977101d 100644
--- a/include/svx/contdlg.hxx
+++ b/include/svx/contdlg.hxx
@@ -44,7 +44,7 @@ class Graphic;
 class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxContourDlgChildWindow : public 
SfxChildWindow
 {
 public:
-SvxContourDlgChildWindow( vcl::Window*, sal_uInt16, SfxBindings*, 
SfxChildWinInfo* );
+SvxContourDlgChildWindow( vcl::Window*, sal_uInt16, SfxBindings*, 
SfxChildWinInfo const * );
 
 SFX_DECL_CHILDWINDOW_WITHID( SvxContourDlgChildWindow );
 };
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index ecdaea3a45ea..cf021b7758fe 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -90,7 +90,7 @@ private:
 boolbAbortActualize;
 
 SAL_DLLPRIVATE void ImplCreateSvDrawStorage();
-SgaObject*  ImplReadSgaObject( GalleryObject* pEntry );
+SgaObject*  ImplReadSgaObject( GalleryObject const * 
pEntry );
 SAL_DLLPRIVATE bool ImplWriteSgaObject( const SgaObject& rObj, 
size_t nPos, GalleryObject* pExistentEntry );
 SAL_DLLPRIVATE void ImplWrite();
 SAL_DLLPRIVATE const GalleryObject* ImplGetGalleryObject( size_t nPos ) 
const
diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx
index e328ab8b1e78..4c337ec59411 100644
--- a/include/svx/imapdlg.hxx
+++ b/include/svx/imapdlg.hxx
@@ -47,7 +47,7 @@ class SVX_DLLPUBLIC SvxIMapDlgChildWindow : public 
SfxChildWindow
 {
  public:
 
-SvxIMapDlgChildWindow( vcl::Window*, sal_uInt16, SfxBindings*, 
SfxChildWinInfo* );
+SvxIMapDlgChildWindow( vcl::Window*, sal_uInt16, SfxBindings*, 
SfxChildWinInfo const * );
 
 SFX_DECL_CHILDWINDOW_WITHID( SvxIMapDlgChildWindow );
 
diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx
index 3b546f655313..2f093426045f 100644
--- a/include/svx/rubydialog.hxx
+++ b/include/svx/rubydialog.hxx
@@ -54,7 +54,7 @@ class SVX_DLLPUBLIC SvxRubyChildWindow : public SfxChildWindow
 {
  public:
 
-SvxRubyChildWindow( vcl::Window*, sal_uInt16, SfxBindings*, 
SfxChildWinInfo* );
+SvxRubyChildWindow( vcl::Window*, sal_uInt16, SfxBindings*, 
SfxChildWinInfo const * );
 
 SFX_DECL_CHILDWINDOW( SvxRubyChildWindow );
 
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 52ff542f264d..ee3f962d63c7 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -66,7 +66,7 @@ void SvxContourDlgItem::StateChanged( sal_uInt16 nSID, 
SfxItemState /*eState*/,
 }
 
 SvxContourDlgChildWindow::SvxContourDlgChildWindow( vcl::Window* _pParent, 
sal_uInt16 nId,
-SfxBindings* pBindings, 
SfxChildWinInfo* pInfo ) :
+SfxBindings* pBindings, 
SfxChildWinInfo const * pInfo ) :
 SfxChildWindow( _pParent, nId )
 {
 VclPtr pDlg = 
VclPtr::Create(pBindings, this, _pParent);
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 8182bb8b692d..a8792b246d04 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -92,7 +92,7 @@ void SvxIMapDlgItem::StateChanged( sal_uInt16 nSID, 
SfxItemState /*eState*/,
 
 SvxIMapDlgChildWindow::SvxIMapDlgChildWindow( vcl::Window* _pParent, 
sal_uInt16 nId,
   SfxBindings* pBindings,
-  SfxChildWinInfo* pInfo ) :
+  SfxChildWinInfo const * pInfo ) :
 SfxChildWindow( _pParent, nId )
 {
 SetWindow(VclPtr::Create( pBindings, this, _pParent ));
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index f66d635f0db9..7776fcafa6b3 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -67,7 +67,7 @@ static const sal_Char cRubyCharStyleName[] = 
"RubyCharStyleName";
 
 } // end anonymous namespace
 
-SvxRubyChildWindow::SvxRubyChildWindow(vcl::Window* _pPa

Re: minutes of ESC call ...

2017-11-03 Thread Kaganski Mike

On 11/2/2017 8:10 PM, Michael Meeks wrote:
> * Completed Action Items:
>  + ship the horror win / VC runtime DLLs with the installer (Cloph)
>  [ patch appears to work, but we already have them in the installer
>if you do an admin-install they are already installed.
>we ship them twice – once as LibreOffice, but once as a run-time 
> module
>not entirely elegant.
>for 5.4 – merge it as-is, for 6.0 do something clever.
> http://dev-builds.libreoffice.org/daily/libreoffice-5-4/Win-x86@62-TDF/tdf_108580/
>  ]

1. For 6.0, we would not need to ship the merge module - because that 
module is only working for WinXP. So that leaves us with just one copy.

2. Still, having app-local DLLs is worse than system-updateable (at 
least security-wise: if we bundle app-local DLLs, then we would have to 
put their advisories to our site? so that users using not-up-to-date LO 
versions could know that they might be vulnerable, despite having 
updated their systems). So, we could try to include MSUs from KB2999226 
[1]. There are 3 different packages for each bitness that cover all 
supported platforms requiring the update (Win7, Win8, Win8.1):
- for x86:
   Windows6.1-KB2999226-x86.msu
   Windows8-RT-KB2999226-x86.msu
   Windows8.1-KB2999226-x86.msu
- for x64:
   Windows6.1-KB2999226-x64.msu
   Windows8-RT-KB2999226-x86.msu
   Windows8.1-KB2999226-x64.msu

The size of all three x86 packages is 1.77 MB total; three x64 packages 
are 3.24 MB total.

The MSUs are installable using Windows Update Standalone Installer [2] 
(system component in all those Windows versions). Custom actions would 
need to be created, with relevant conditions (VersionNT; [3]).

The drawbacks (besides extra size):
1. We need to also check for pre-conditions: if the KB2999226 is already 
installed; if required pre-requisite KBs are present (see [1]; 
prerequisites exist for Win7 and Win8.1 - curiously no preconditions for 
Win8). For Win7, the prerequisite is SP1, so may just state this version 
as system requirement? For Win8.1, the prerequisite is [4], which is 
several hundred MB...
2. We somehow need to get the packages to dev environment when building 
the installer - should we put the blobs to our server to fetch as 
external package on build? (I don't know if there's a static URL for 
those files on MS site.)

[1] https://support.microsoft.com/en-us/help/2999226
[2] https://support.microsoft.com/en-us/help/934307
[3] https://msdn.microsoft.com/en-us/library/aa370556
[4] https://support.microsoft.com/en-us/help/2919355

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

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

2017-11-03 Thread Jens Carl

 include/test/cppunitasserthelper.hxx   |   72 +
 test/source/sheet/databaserange.cxx|   21 ---
 test/source/sheet/xarealink.cxx|   21 ---
 test/source/sheet/xcelladdressable.cxx |   20 --
 test/source/sheet/xsheetcellrangecontainer.cxx |   21 ---
 5 files changed, 76 insertions(+), 79 deletions(-)

New commits:
commit afc5d7aedf4d115bfaa539301b155db37be87054
Author: Jens Carl 
Date:   Fri Nov 3 22:56:02 2017 +

Create CppUnit::assertion_traits helper file

Place the CppUnit:assertion_traits for ::table::CellAddress and
::table::CellRangeAddress into a file, so that they can be used/shared
from several locations. Avoid copy/paste action.

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

diff --git a/include/test/cppunitasserthelper.hxx 
b/include/test/cppunitasserthelper.hxx
new file mode 100644
index ..0b26a228ba31
--- /dev/null
+++ b/include/test/cppunitasserthelper.hxx
@@ -0,0 +1,72 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_CPPUNITASSERTHELPER_HXX
+#define INCLUDED_TEST_CPPUNITASSERTHELPER_HXX
+
+#include 
+
+#include 
+#include 
+
+#include 
+
+using namespace com::sun::star;
+using namespace com::sun::star::uno;
+
+CPPUNIT_NS_BEGIN
+
+/** @brief Trait used by CPPUNIT_ASSERT* macros to compare 
com::sun::star::table::CellAddress.
+ *
+ * This specialization from @c struct @c assertion_traits<> helps to compare
+ * @see com::sun::star::table::CellAddress.
+ */
+template<>
+struct assertion_traits
+{
+static bool equal(const table::CellAddress& x, const table::CellAddress& y)
+{
+return x == y;
+}
+
+static std::string toString( const table::CellAddress& x )
+{
+OStringStream ost;
+ost << "Sheet: " << x.Sheet << " Column: " << x.Column << " Row: " << 
x.Row;
+return ost.str();
+}
+};
+
+/** @brief Trait used by CPPUNIT_ASSERT* macros to compare 
com::sun::star::table::CellRangeAddress.
+ *
+ * This specialization from @c struct @c assertion_traits<> helps to compare
+ * @see com::sun::star::table::CellRangeAddress.
+ */
+template<>
+struct assertion_traits
+{
+static bool equal(const table::CellRangeAddress& x, const 
table::CellRangeAddress& y)
+{
+return x == y;
+}
+
+static std::string toString( const table::CellRangeAddress& x )
+{
+OStringStream ost;
+ost << "Sheet: " << x.Sheet << " StartColumn: " << x.StartColumn << " 
StartRow: " << x.StartRow
+<< " EndColumn: " << x.EndColumn << " EndRow: " << x.EndRow;
+return ost.str();
+}
+};
+
+CPPUNIT_NS_END
+
+#endif // INCLUDED_TEST_CPPUNITASSERTHELPER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/source/sheet/databaserange.cxx 
b/test/source/sheet/databaserange.cxx
index 8e6f56cb1ed1..91ee88184863 100644
--- a/test/source/sheet/databaserange.cxx
+++ b/test/source/sheet/databaserange.cxx
@@ -8,6 +8,7 @@
  */
 
 #include 
+#include 
 
 #include 
 #include 
@@ -19,26 +20,6 @@
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
 
-CPPUNIT_NS_BEGIN
-
-template<> struct assertion_traits
-{
-static bool equal(const table::CellRangeAddress& x, const 
table::CellRangeAddress& y)
-{
-return x == y;
-}
-
-static std::string toString( const table::CellRangeAddress& x )
-{
-OStringStream ost;
-ost << "Sheet: " << x.Sheet << " StartColumn: " << x.StartColumn << " 
StartRow: " << x.StartRow
-<< " EndColumn: " << x.EndColumn << " EndRow: " << x.EndRow;
-return ost.str();
-}
-};
-
-CPPUNIT_NS_END
-
 namespace apitest {
 
 void DatabaseRange::testMoveCells()
diff --git a/test/source/sheet/xarealink.cxx b/test/source/sheet/xarealink.cxx
index 89704052da45..ec7ce49a01f8 100644
--- a/test/source/sheet/xarealink.cxx
+++ b/test/source/sheet/xarealink.cxx
@@ -8,6 +8,7 @@
  */
 
 #include 
+#include 
 
 #include 
 #include 
@@ -18,26 +19,6 @@
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
 
-CPPUNIT_NS_BEGIN
-
-template<> struct assertion_traits
-{
-static bool equal(const table::CellRangeAddress& x, const 
table::CellRangeAddress& y)
-{
-return x == y;
-}
-
-static std::string toString( const table::CellRangeAddress& x )
-{
-OStringStream ost;
-ost << "Sheet: " << x.Sheet << " StartColumn: " << x.StartColumn << " 
StartRow: " << x.StartRow
-<< " EndColumn: " << x.EndColumn << " EndRow: " << x.EndRow

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

2017-11-03 Thread Julien Nabet

 desktop/source/deployment/registry/component/dp_component.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e7be51491c2295e546549b750d9723753731725a
Author: Julien Nabet 
Date:   Fri Nov 3 17:59:31 2017 +0100

Following 42bfbc216474b4f60d5a5e52a88d95baded5191c

as suggested by Stephan in comment of 
https://gerrit.libreoffice.org/#/c/44233/

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

diff --git a/desktop/source/deployment/registry/component/dp_component.cxx 
b/desktop/source/deployment/registry/component/dp_component.cxx
index a41c68d1de5e..26c624e98dc0 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -991,7 +991,7 @@ void BackendImpl::removeFromUnoRc(
 const OUString rcterm( dp_misc::makeRcTerm(url_) );
 const ::osl::MutexGuard guard( getMutex() );
 unorc_verify_init( xCmdEnv );
-t_stringlist aRcItemList = getRcItemList(kind);
+t_stringlist & aRcItemList = getRcItemList(kind);
 aRcItemList.erase(std::remove(aRcItemList.begin(), aRcItemList.end(), 
rcterm), aRcItemList.end());
 // write immediately:
 m_unorc_modified = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Justin Luth

 sw/qa/extras/ooxmlexport/data/tdf46938_clearTabStop.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx   |6 
 sw/source/filter/ww8/docxattributeoutput.cxx |   20 +++
 3 files changed, 26 insertions(+)

New commits:
commit b41d698fa121f3a4d1afdde56f88a135fc71b48a
Author: Justin Luth 
Date:   Thu Nov 2 11:16:13 2017 +0300

tdf#46938 ooxmlexport: override style tabstops when tabs removed

Having no tabs defined is the default value, so nothing generally
needs to be written. But if the paragraph style defines tabstops,
but the current paragraph doesn't have any, then those style
tabstops need to be cleared.

Change-Id: I7a818c658403cc683b0c5b7452b6c88ea00f771d
Reviewed-on: https://gerrit.libreoffice.org/44244
Tested-by: Jenkins 
Reviewed-by: Justin Luth 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf46938_clearTabStop.docx 
b/sw/qa/extras/ooxmlexport/data/tdf46938_clearTabStop.docx
new file mode 100644
index ..8dea12fcb5c8
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf46938_clearTabStop.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 1375a2edef89..e3d18b3fb7e9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -46,6 +46,12 @@ DECLARE_OOXMLEXPORT_TEST(testTdf92524_autoColor, 
"tdf92524_autoColor.doc")
 CPPUNIT_ASSERT_EQUAL(COL_AUTO, getProperty(getParagraph(1), 
"ParaBackColor"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf46938_clearTabStop, 
"tdf46938_clearTabStop.docx")
+{
+// Number of tabstops should be zero, overriding the one in the style
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty< 
uno::Sequence >(getParagraph(1), "ParaTabStops").getLength());
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf82065_Ind_start_strict, 
"tdf82065_Ind_start_strict.docx")
 {
 uno::Reference 
xPropertySet(getStyles("NumberingStyles")->getByName("WWNum1"), uno::UNO_QUERY);
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 146b7b9e3a5f..57e182dc34ac 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -7610,7 +7610,27 @@ void DocxAttributeOutput::ParaTabStop( const 
SvxTabStopItem& rTabStop )
 
 //  must contain at least one , so don't write it empty
 if( nCount == 0 )
+{
+// clear style tabs - otherwise style will override...
+if( GetExport().m_pStyAttr )
+{
+const SvxTabStopItem* pStyleTabs = 
GetExport().m_pStyAttr->GetItem(RES_PARATR_TABSTOP);
+if( pStyleTabs && pStyleTabs->Count() )
+{
+m_pSerializer->startElementNS( XML_w, XML_tabs, FSEND );
+for( int i = 0; i < pStyleTabs->Count(); ++i )
+{
+m_pSerializer->singleElementNS( XML_w, XML_tab,
+FSNS( XML_w, XML_val ), OString("clear"),
+FSNS( XML_w, XML_pos ), 
OString::number(pStyleTabs->At(i).GetTabPos()),
+FSEND );
+}
+m_pSerializer->endElementNS( XML_w, XML_tabs );
+}
+}
+
 return;
+}
 if( nCount == 1 && rTabStop[ 0 ].GetAdjustment() == SvxTabAdjust::Default )
 {
 GetExport().setDefaultTabStop( rTabStop[ 0 ].GetTabPos());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Writer] Macro for "Edit->Links->[Select All]->Break Link

2017-11-03 Thread Jambunathan K

Hello

Could someone help me with a Basic Macro that does

   "Writer Menu->Edit->Links->[Select All]->Break Link"

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

[Writer] Macro for "Edit->Links->[Select All]->Remove Links

2017-11-03 Thread Jambunathan K

Hello

Could someone help me with a Basic Macro that does

   "Edit->Links->[Select All]->Remove Links"

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

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

2017-11-03 Thread Tomaž Vajngerl

 officecfg/registry/data/org/openoffice/Office/Common.xcu   |4 ++--
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |6 +++---
 svx/source/dialog/ClassificationDialog.cxx |4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit bcdc5f56f064e875f58a2f22872393d1fef31839
Author: TomaÅ¾ Vajngerl 
Date:   Sat Nov 4 02:37:07 2017 +0900

TSCP: make the configuration key names shorter

Change-Id: If28e283666f4e1f87758c401b2d4fb5986eb6d8c
Reviewed-on: https://gerrit.libreoffice.org/44281
Tested-by: Jenkins 
Reviewed-by: TomaÅ¾ Vajngerl 

diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 33c1db97f618..c7d198e38cd4 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -539,9 +539,9 @@
   
   
   
-  
+  
   
-  
+  
   
   
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 22c92a7124fa..8eeced165011 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -6393,15 +6393,15 @@
 
 3
   
-  
+  
 
Specifies if the intellectual property section in the 
advanced classification dialog should be expanded when the dialog is 
open.
 
 true
   
-  
+  
 
-   Specifies if the intellectual property text is free-form or 
limited to ';', '/' and ' ' characters.
+   Specifies if the intellectual property text in the advanced 
classification is free-form or limited to ';', '/' and ' ' (space) and delete 
key.
 
 true
   
diff --git a/svx/source/dialog/ClassificationDialog.cxx 
b/svx/source/dialog/ClassificationDialog.cxx
index 6c70d97dd83f..3210d1a2f761 100644
--- a/svx/source/dialog/ClassificationDialog.cxx
+++ b/svx/source/dialog/ClassificationDialog.cxx
@@ -41,7 +41,7 @@ VCL_BUILDER_FACTORY(IntellectualPropertyPartEdit)
 
 void IntellectualPropertyPartEdit::KeyInput(const KeyEvent& rKeyEvent)
 {
-bool bTextIsFreeForm = 
officecfg::Office::Common::Classification::AdvancedClassificationDialogIntellectualPropertyTextInputIsFreeForm::get();
+bool bTextIsFreeForm = 
officecfg::Office::Common::Classification::IntellectualPropertyTextInputIsFreeForm::get();
 
 if (bTextIsFreeForm)
 {
@@ -230,7 +230,7 @@ ClassificationDialog::ClassificationDialog(vcl::Window* 
pParent, const bool bPer
 
 m_pRecentlyUsedListBox->SetSelectHdl(LINK(this, ClassificationDialog, 
SelectRecentlyUsedHdl));
 
-bool bExpand = 
officecfg::Office::Common::Classification::AdvancedClassificationDialogIntellectualPropertySectionExpanded::get();
+bool bExpand = 
officecfg::Office::Common::Classification::IntellectualPropertySectionExpanded::get();
 m_pIntellectualPropertyExpander->set_expanded(bExpand);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extras/source include/svx officecfg/registry svx/source svx/uiconfig

2017-11-03 Thread Tomaž Vajngerl

 extras/source/glade/libreoffice-catalog.xml.in |8 +-
 include/svx/ClassificationDialog.hxx   |   11 ++
 officecfg/registry/data/org/openoffice/Office/Common.xcu   |2 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |6 +
 svx/source/dialog/ClassificationDialog.cxx |   50 -
 svx/uiconfig/ui/classificationdialog.ui|2 
 6 files changed, 72 insertions(+), 7 deletions(-)

New commits:
commit 49d53fa8a4d0c69a58000d05b903e757e30e6930
Author: TomaÅ¾ Vajngerl 
Date:   Sat Nov 4 02:29:33 2017 +0900

TSCP: limit the input to the IPPart entry field

Limit the input keys to the IPPart entry field. The limit is by
default set to free-form with the configuration key. When the
limitation is activated it is only possible to input chars '/',
';', ' ' (space) and delete.

Change-Id: Id3eb7e0198fb60e07894d6ff22a32351cca9d589
Reviewed-on: https://gerrit.libreoffice.org/44280
Tested-by: Jenkins 
Reviewed-by: TomaÅ¾ Vajngerl 

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 8fb5d4c803c7..85a65eaf3df1 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -677,8 +677,12 @@
 generic-name="Text View" parent="GtkTextView"
 icon-name="widget-gtk-textentry"/>
 
-
+
+
 
  m_pIntellectualPropertyPartListBox;
 VclPtr m_pIntellectualPropertyPartNumberListBox;
 VclPtr m_pIntellectualPropertyPartAddButton;
-VclPtr m_pIntellectualPropertyPartEdit;
+VclPtr m_pIntellectualPropertyPartEdit;
 VclPtr m_pIntellectualPropertyExpander;
 
 SfxClassificationHelper maHelper;
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index c6bbd2d46058..33c1db97f618 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -541,5 +541,7 @@
   
   
   
+  
+  
   
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index fe7f8e806a7b..22c92a7124fa 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -6399,6 +6399,12 @@
 
 true
   
+  
+
+   Specifies if the intellectual property text is free-form or 
limited to ';', '/' and ' ' characters.
+
+true
+  
 
   
 
diff --git a/svx/source/dialog/ClassificationDialog.cxx 
b/svx/source/dialog/ClassificationDialog.cxx
index 2e8b0c4ad8fc..6c70d97dd83f 100644
--- a/svx/source/dialog/ClassificationDialog.cxx
+++ b/svx/source/dialog/ClassificationDialog.cxx
@@ -25,11 +25,55 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
 namespace svx {
 
+
+IntellectualPropertyPartEdit::IntellectualPropertyPartEdit(vcl::Window* 
pParent)
+: Edit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK|WB_TABSTOP)
+{
+}
+
+VCL_BUILDER_FACTORY(IntellectualPropertyPartEdit)
+
+void IntellectualPropertyPartEdit::KeyInput(const KeyEvent& rKeyEvent)
+{
+bool bTextIsFreeForm = 
officecfg::Office::Common::Classification::AdvancedClassificationDialogIntellectualPropertyTextInputIsFreeForm::get();
+
+if (bTextIsFreeForm)
+{
+Edit::KeyInput(rKeyEvent);
+}
+else
+{
+// Ignore key combination with modifier keys
+if (rKeyEvent.GetKeyCode().IsMod3()
+ || rKeyEvent.GetKeyCode().IsMod2()
+ || rKeyEvent.GetKeyCode().IsMod1())
+{
+return;
+}
+
+switch (rKeyEvent.GetKeyCode().GetCode())
+{
+// Allowed characters
+case KEY_BACKSPACE:
+case KEY_DELETE:
+case KEY_DIVIDE:
+case KEY_SEMICOLON:
+case KEY_SPACE:
+Edit::KeyInput(rKeyEvent);
+return;
+// Anything else is ignored
+default:
+break;
+}
+}
+}
+
 namespace {
 
 constexpr size_t RECENTLY_USED_LIMIT = 5;
@@ -51,7 +95,7 @@ bool fileExists(OUString const & sFilename)
 return osl::FileBase::E_None == eRC;
 }
 
-bool stringToclassificationType(OString const & rsType, 
svx::ClassificationType & reType)
+bool stringToClassificationType(OString const & rsType, 
svx::ClassificationType & reType)
 {
 if (rsType == "CATEGORY")
 reType = svx::ClassificationType::CATEGORY;
@@ -296,7 +340,7 @@ void ClassificationDialog::readRecentlyUsed()
 
 // Convert string to classification type, but continue 
only if
 // conversion was successful.
-if 
(stringToclassificationType(aWalker.attribute("type"), eType))
+

[Libreoffice-commits] core.git: include/sfx2 include/svx sd/source svx/Library_svx.mk svx/source sw/source

2017-11-03 Thread Tomaž Vajngerl

 include/sfx2/classificationhelper.hxx  |5 +
 include/svx/ClassificationCommon.hxx   |   37 +
 sd/source/ui/view/drviews2.cxx |6 ++
 svx/Library_svx.mk |1 
 svx/source/dialog/ClassificationCommon.cxx |   79 +
 sw/source/core/edit/edfcol.cxx |9 ++-
 6 files changed, 134 insertions(+), 3 deletions(-)

New commits:
commit 40918d0321f9e9a958fa80f309213e199cf21bce
Author: TomaÅ¾ Vajngerl 
Date:   Fri Nov 3 21:57:18 2017 +0900

TSCP: add a full text. value of the header/footer as doc. property

Change-Id: I4742066c34802017790c1c21ec04a7760d4fe1f7
Reviewed-on: https://gerrit.libreoffice.org/44279
Reviewed-by: TomaÅ¾ Vajngerl 
Tested-by: TomaÅ¾ Vajngerl 

diff --git a/include/sfx2/classificationhelper.hxx 
b/include/sfx2/classificationhelper.hxx
index 6467976c952b..0ea432ffbe99 100644
--- a/include/sfx2/classificationhelper.hxx
+++ b/include/sfx2/classificationhelper.hxx
@@ -182,6 +182,11 @@ public:
 {
 return aKey.startsWith(makeIntellectualPropertyPartKey());
 }
+
+OUString makeFullTextualRepresentationKey() const
+{
+return getPolicyKey() + "FullTexturalRepresentation";
+}
 };
 
 }
diff --git a/include/svx/ClassificationCommon.hxx 
b/include/svx/ClassificationCommon.hxx
new file mode 100644
index ..04e0494cc7ad
--- /dev/null
+++ b/include/svx/ClassificationCommon.hxx
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#ifndef INCLUDED_SVX_CLASSIFICATIONCOMMON_HXX
+#define INCLUDED_SVX_CLASSIFICATIONCOMMON_HXX
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+namespace svx {
+namespace classification {
+
+SVX_DLLPUBLIC OUString 
convertClassificationResultToString(std::vector 
const & rResults);
+
+SVX_DLLPUBLIC bool 
addOrInsertDocumentProperty(css::uno::Reference 
const & rxPropertyContainer,
+   OUString const & rsKey, 
OUString const & rsValue);
+
+SVX_DLLPUBLIC void 
insertFullTextualRepresentationAsDocumentProperty(css::uno::Reference
 const & rxPropertyContainer,
+ 
sfx::ClassificationKeyCreator const & rKeyCreator,
+ 
std::vector const & rResults);
+
+}} // end svx::classification namespace
+
+#endif // INCLUDED_SVX_CLASSIFICATIONCOMMON_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index d01957dcf10c..8a0c20a41889 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -59,6 +59,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -473,8 +474,13 @@ public:
 aHelper.SetBACName(rResult.msName, 
SfxClassificationHelper::getPolicyType());
 }
 
+// Initialize key creator
 sfx::ClassificationKeyCreator 
aKeyCreator(SfxClassificationHelper::getPolicyType());
 
+// Insert full text as document property
+
svx::classification::insertFullTextualRepresentationAsDocumentProperty(xPropertyContainer,
 aKeyCreator, rResults);
+
+// Insert Object into master page
 Outliner* pOutliner = m_rDrawViewShell.GetDoc()->GetInternalOutliner();
 OutlinerMode eOutlinerMode = pOutliner->GetMode();
 pOutliner->Init(OutlinerMode::TextObject);
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index c04dfc8e6dc4..6bdbadaf2e3b 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -117,6 +117,7 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/dialog/crashreportdlg \
svx/source/dialog/crashreportui) \
 svx/source/dialog/ctredlin \
+svx/source/dialog/ClassificationCommon \
 svx/source/dialog/ClassificationDialog \
 svx/source/dialog/ClassificationEditView \
 svx/source/dialog/databaseregistrationui \
diff --git a/svx/source/dialog/ClassificationCommon.cxx 
b/svx/source/dialog/ClassificationCommon.cxx
new file mode 100644
index ..60cfcf520ab4
--- /dev/null
+++ b/svx/source/dialog/ClassificationCommon.cxx
@@ -0,0 +1,79 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#include 
+
+#include 
+
+using namespace css;
+
+namespa

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

2017-11-03 Thread Tomaž Vajngerl

 include/svx/ClassificationDialog.hxx   |2 +
 include/svx/strings.hrc|3 +
 svx/source/dialog/ClassificationDialog.cxx |   45 +++--
 3 files changed, 41 insertions(+), 9 deletions(-)

New commits:
commit 8f1f4d5a6f4b376975e9e2f318e8c92d4bade90a
Author: TomaÅ¾ Vajngerl 
Date:   Fri Nov 3 21:04:32 2017 +0900

TSCP: Ask if it is OK to change the classification category

Change-Id: I30ccdfb9d0584d8ee9b12666b1f96eb9ba8676ee
Reviewed-on: https://gerrit.libreoffice.org/44278
Tested-by: Jenkins 
Reviewed-by: TomaÅ¾ Vajngerl 

diff --git a/include/svx/ClassificationDialog.hxx 
b/include/svx/ClassificationDialog.hxx
index 85a70eb95f95..59502eca4286 100644
--- a/include/svx/ClassificationDialog.hxx
+++ b/include/svx/ClassificationDialog.hxx
@@ -48,6 +48,8 @@ private:
 const bool m_bPerParagraph;
 const std::function m_aParagraphSignHandler;
 
+sal_Int32 m_nCurrentSelectedCategory;
+
 DECL_LINK(ButtonClicked, Button*, void);
 DECL_LINK(SelectClassificationHdl, ListBox&, void);
 DECL_LINK(SelectMarkingHdl, ListBox&, void);
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 208ba1bc7e49..bed776d4ce1a 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1646,6 +1646,9 @@
 #define RID_SUBSETSTR_TANGUT
NC_("RID_SUBSETMAP", "Tangut")
 #define RID_SUBSETSTR_TANGUT_COMPONENTS 
NC_("RID_SUBSETMAP", "Tangut Components")
 
+// TSCP Classification
+#define RID_CLASSIFICATION_CHANGE_CATEGORY  
NC_("RID_CLASSIFICATION_CHANGE_CATEGORY", "Do you really want to change the 
classification category?")
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/ClassificationDialog.cxx 
b/svx/source/dialog/ClassificationDialog.cxx
index 30f6c796240f..2e8b0c4ad8fc 100644
--- a/svx/source/dialog/ClassificationDialog.cxx
+++ b/svx/source/dialog/ClassificationDialog.cxx
@@ -9,13 +9,16 @@
  */
 
 #include 
+#include 
+#include 
+
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
-
+#include 
 #include 
 #include 
 #include 
@@ -371,9 +374,9 @@ void 
ClassificationDialog::readIn(std::vector const & rInp
 sal_Int32 nParagraph = -1;
 for (ClassificationResult const & rClassificationResult : rInput)
 {
-OUString msAbbreviatedName = rClassificationResult.msAbbreviatedName;
-if (msAbbreviatedName.isEmpty())
-msAbbreviatedName = 
maHelper.GetAbbreviatedBACName(rClassificationResult.msName);
+OUString sAbbreviatedName = rClassificationResult.msAbbreviatedName;
+if (sAbbreviatedName.isEmpty())
+sAbbreviatedName = 
maHelper.GetAbbreviatedBACName(rClassificationResult.msName);
 
 switch (rClassificationResult.meType)
 {
@@ -386,21 +389,23 @@ void 
ClassificationDialog::readIn(std::vector const & rInp
 case svx::ClassificationType::CATEGORY:
 {
 
m_pClassificationListBox->SelectEntry(rClassificationResult.msName);
+m_nCurrentSelectedCategory = 
m_pClassificationListBox->GetSelectedEntryPos();
 
m_pInternationalClassificationListBox->SelectEntryPos(m_pClassificationListBox->GetSelectedEntryPos());
-insertField(rClassificationResult.meType, msAbbreviatedName, 
rClassificationResult.msName, rClassificationResult.msIdentifier);
+
+insertField(rClassificationResult.meType, sAbbreviatedName, 
rClassificationResult.msName, rClassificationResult.msIdentifier);
 }
 break;
 
 case svx::ClassificationType::MARKING:
 {
 m_pMarkingListBox->SelectEntry(rClassificationResult.msName);
-insertField(rClassificationResult.meType, msAbbreviatedName, 
rClassificationResult.msName, rClassificationResult.msIdentifier);
+insertField(rClassificationResult.meType, sAbbreviatedName, 
rClassificationResult.msName, rClassificationResult.msIdentifier);
 }
 break;
 
 case svx::ClassificationType::INTELLECTUAL_PROPERTY_PART:
 {
-insertField(rClassificationResult.meType, msAbbreviatedName, 
rClassificationResult.msName, rClassificationResult.msIdentifier);
+insertField(rClassificationResult.meType, sAbbreviatedName, 
rClassificationResult.msName, rClassificationResult.msIdentifier);
 }
 break;
 
@@ -485,12 +490,17 @@ std::vector 
ClassificationDialog::getResult()
 IMPL_LINK(ClassificationDialog, SelectClassificationHdl, ListBox&, rBox, void)
 {
 const sal_Int32 nSelected = rBox.GetSelectedEntryPos();
-if (nSelected >= 0)
+if (nSelected >= 0 && m_nCurrentSelectedCategory != nSelected)
 {
 std::unique_ptr 
pEditText(m_pEditWindow->pEdEngine->CreateTextObject());
 std::vector aSections;
 pEditText->GetAllSections(aS

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

2017-11-03 Thread Tomaž Vajngerl

 officecfg/registry/data/org/openoffice/Office/Common.xcu |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 5c5ccedcb7f79ad9c5319751c246b3ebfb93523c
Author: TomaÅ¾ Vajngerl 
Date:   Fri Nov 3 13:55:07 2017 +0900

setting the default values not needed in xcu

Change-Id: I9bb60f1e7c58bbb63e8933578b83b77a178f325b
Reviewed-on: https://gerrit.libreoffice.org/44277
Reviewed-by: TomaÅ¾ Vajngerl 
Tested-by: TomaÅ¾ Vajngerl 

diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 2d98eec21da9..c6bbd2d46058 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -538,10 +538,8 @@
   
   
   
-3
   
   
-true
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Caolán McNamara

 sd/source/ui/slidesorter/controller/SlideSorterController.cxx |   15 +++---
 1 file changed, 5 insertions(+), 10 deletions(-)

New commits:
commit d8f0e4144d51ff5709d005d289d71aa32f323913
Author: CaolÃ¡n McNamara 
Date:   Fri Nov 3 16:24:14 2017 +

Resolves: rtl: tdf#60315 slide pane context menu misplaced

so use same (slighty crazed) logic as DrawViewShell::Command

to get the right place when rtl is enabled

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

diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx 
b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index 9107111302e4..63056255ed1d 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -353,15 +353,7 @@ bool SlideSorterController::Command (
 pWindow->ReleaseMouse();
 
 Point aMenuLocation (0,0);
-if (rEvent.IsMouseEvent())
-{
-// We have to explicitly specify the location of the menu
-// when the slide sorter is placed in an undocked child
-// menu.  But when it is docked it does not hurt, so we
-// specify the location always.
-aMenuLocation = rEvent.GetMousePosPixel();
-}
-else
+if (!rEvent.IsMouseEvent())
 {
 // The event is not a mouse event.  Use the center of the
 // focused page as top left position of the context menu.
@@ -384,7 +376,10 @@ bool SlideSorterController::Command (
 if (pDispatcher != nullptr)
 {
 mbContextMenuOpen = true;
-pDispatcher->ExecutePopup( aPopupId, pWindow, 
&aMenuLocation );
+if (!rEvent.IsMouseEvent())
+pDispatcher->ExecutePopup(aPopupId, pWindow, 
&aMenuLocation);
+else
+pDispatcher->ExecutePopup(aPopupId);
 mbContextMenuOpen = false;
 mrSlideSorter.GetView().UpdatePageUnderMouse();
 ::rtl::Reference 
pFunction(GetCurrentSelectionFunction());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Caolán McNamara

 vcl/unx/gtk3/gtk3gtkframe.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 5228db64eb9f55c945f1b460f2955fc3edfad791
Author: CaolÃ¡n McNamara 
Date:   Fri Nov 3 15:53:22 2017 +

gtk3: fix popover placement in RTL

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

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index d24bef907c00..0659d0740533 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -2454,7 +2454,7 @@ bool GtkSalFrame::ShowTooltip(const OUString& rHelpText, 
const tools::Rectangle&
 #if GTK_CHECK_VERSION(3,12,0)
 namespace
 {
-void set_pointing_to(GtkPopover *pPopOver, const tools::Rectangle& 
rHelpArea)
+void set_pointing_to(GtkPopover *pPopOver, const tools::Rectangle& 
rHelpArea, const SalFrameGeometry& rGeometry)
 {
 GdkRectangle aRect;
 aRect.x = rHelpArea.Left();
@@ -2475,6 +2475,9 @@ namespace
 break;
 }
 
+if (AllSettings::GetLayoutRTL())
+aRect.x = rGeometry.nWidth-aRect.width-1-aRect.x;
+
 gtk_popover_set_pointing_to(pPopOver, &aRect);
 }
 }
@@ -2497,7 +2500,7 @@ sal_uIntPtr GtkSalFrame::ShowPopover(const OUString& 
rHelpText, const tools::Rec
 else if (nFlags & QuickHelpFlags::Right)
 gtk_popover_set_position(GTK_POPOVER(pWidget), GTK_POS_LEFT);
 
-set_pointing_to(GTK_POPOVER(pWidget), rHelpArea);
+set_pointing_to(GTK_POPOVER(pWidget), rHelpArea, maGeometry);
 
 gtk_popover_set_modal(GTK_POPOVER(pWidget), false);
 
@@ -2517,7 +2520,7 @@ bool GtkSalFrame::UpdatePopover(sal_uIntPtr nId, const 
OUString& rHelpText, cons
 #if GTK_CHECK_VERSION(3,12,0)
 GtkWidget *pWidget = reinterpret_cast(nId);
 
-set_pointing_to(GTK_POPOVER(pWidget), rHelpArea);
+set_pointing_to(GTK_POPOVER(pWidget), rHelpArea, maGeometry);
 
 GtkWidget *pLabel = gtk_bin_get_child(GTK_BIN(pWidget));
 OString sUTF = OUStringToOString(rHelpText, RTL_TEXTENCODING_UTF8);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Crash test update

2017-11-03 Thread Crashtest VM

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/9a236714e539c772cad7b56caf21dc12b79e77df/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


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

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

2017-11-03 Thread Takeshi Abe

 include/sfx2/frmdescr.hxx|2 +-
 sfx2/source/doc/frmdescr.cxx |   20 ++--
 2 files changed, 7 insertions(+), 15 deletions(-)

New commits:
commit 8ce49eab696d830d420fbf48b22ac151167bbd62
Author: Takeshi Abe 
Date:   Fri Nov 3 20:48:38 2017 +0900

sfx2: Omit unnecessary indirection of SfxFrameDescriptor_Impl

Change-Id: I43c9df757d78420bd119a06e7f7224e40690b753
Reviewed-on: https://gerrit.libreoffice.org/44255
Reviewed-by: Noel Grandin 
Reviewed-by: Takeshi Abe 
Tested-by: Takeshi Abe 

diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx
index 8433afa93887..cd0184c1f2e4 100644
--- a/include/sfx2/frmdescr.hxx
+++ b/include/sfx2/frmdescr.hxx
@@ -66,7 +66,7 @@ class SFX2_DLLPUBLIC SfxFrameDescriptor
 ScrollingMode   eScroll;
 boolbHasBorder;
 boolbHasBorderSet;
-std::unique_ptr< SfxFrameDescriptor_Impl > pImpl;
+std::unique_ptr m_pArgs;
 
 public:
 SfxFrameDescriptor();
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index 143c8742b2f4..2912b57c529e 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -25,19 +25,11 @@
 #include 
 #include 
 
-struct SfxFrameDescriptor_Impl
-{
-std::unique_ptr pArgs;
-
-SfxFrameDescriptor_Impl() {}
-};
-
 SfxFrameDescriptor::SfxFrameDescriptor() :
 aMargin( -1, -1 ),
 eScroll( ScrollingMode::Auto ),
 bHasBorder( true ),
-bHasBorderSet( false ),
-pImpl( new SfxFrameDescriptor_Impl )
+bHasBorderSet( false )
 {
 }
 
@@ -47,9 +39,9 @@ SfxFrameDescriptor::~SfxFrameDescriptor()
 
 SfxItemSet* SfxFrameDescriptor::GetArgs()
 {
-if( !pImpl->pArgs )
-pImpl->pArgs.reset( new SfxAllItemSet( SfxGetpApp()->GetPool() ) );
-return pImpl->pArgs.get();
+if( !m_pArgs )
+m_pArgs.reset( new SfxAllItemSet( SfxGetpApp()->GetPool() ) );
+return m_pArgs.get();
 }
 
 void SfxFrameDescriptor::SetURL( const OUString& rURL )
@@ -61,8 +53,8 @@ void SfxFrameDescriptor::SetURL( const OUString& rURL )
 void SfxFrameDescriptor::SetActualURL( const OUString& rURL )
 {
 aActualURL = INetURLObject(rURL);
-if ( pImpl->pArgs )
-pImpl->pArgs->ClearItem();
+if ( m_pArgs )
+m_pArgs->ClearItem();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Stephan Bergmann

 external/libstaroffice/Library_staroffice.mk |1 +
 external/redland/Library_raptor.mk   |5 +
 external/redland/Library_rdf.mk  |5 +
 solenv/gbuild/platform/com_MSC_class.mk  |2 --
 4 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit f218f8f6c8c587d2d78679f935093329f145fede
Author: Stephan Bergmann 
Date:   Fri Nov 3 16:41:53 2017 +0100

-I$(dir $(3)) in gb_CObject__command_pattern is no longer needed

...in com_MSC_class.mk now, similar to 
ecbaf980625a9e7b06abe91c7c70e78f6ad469a7
for com_GCC_class.mk.  Three libraries built from external sources (for 
Windows
only) needed adjustment.

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

diff --git a/external/libstaroffice/Library_staroffice.mk 
b/external/libstaroffice/Library_staroffice.mk
index 23d805d3a8e0..afa8a032518f 100644
--- a/external/libstaroffice/Library_staroffice.mk
+++ b/external/libstaroffice/Library_staroffice.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_Library_set_warnings_not_errors,staroffice))
 
 $(eval $(call gb_Library_set_include,staroffice,\
 -I$(call gb_UnpackedTarball_get_dir,libstaroffice)/inc \
+-I$(call gb_UnpackedTarball_get_dir,libstaroffice)/src/lib \
 $$(INCLUDE) \
 ))
 
diff --git a/external/redland/Library_raptor.mk 
b/external/redland/Library_raptor.mk
index 333c2947fef0..1f171c1bc752 100644
--- a/external/redland/Library_raptor.mk
+++ b/external/redland/Library_raptor.mk
@@ -9,6 +9,11 @@
 
 $(eval $(call gb_Library_Library,raptor2))
 
+$(eval $(call gb_Library_set_include,raptor2, \
+-I$(call gb_UnpackedTarball_get_dir,raptor)/src \
+$$(INCLUDE) \
+))
+
 $(eval $(call gb_Library_use_unpacked,raptor2,raptor))
 
 $(eval $(call gb_Library_use_externals,raptor2,\
diff --git a/external/redland/Library_rdf.mk b/external/redland/Library_rdf.mk
index 6ce13e38d351..9e2f7279fa55 100644
--- a/external/redland/Library_rdf.mk
+++ b/external/redland/Library_rdf.mk
@@ -9,6 +9,11 @@
 
 $(eval $(call gb_Library_Library,rdf))
 
+$(eval $(call gb_Library_set_include,rdf, \
+-I$(call gb_UnpackedTarball_get_dir,redland)/src \
+$$(INCLUDE) \
+))
+
 $(eval $(call gb_Library_use_unpacked,rdf,redland))
 
 $(eval $(call gb_Library_set_warnings_not_errors,rdf))
diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 3bc5e3235420..b00741184d27 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -55,7 +55,6 @@ $(call gb_Helper_abbreviate_dirs,\
-Fd$(PDBFILE) \
$(PCHFLAGS) \
$(if $(COMPILER_TEST),,$(gb_COMPILERDEPFLAGS)) \
-   -I$(dir $(3)) \
$(INCLUDE) \
$(if $(filter YES,$(CXXOBJECT_X64)), -U_X86_ -D_AMD64_,) \
-c $(3) \
@@ -83,7 +82,6 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(EXTERNAL_CODE),$(if 
$(COM_IS_CLANG),-Wno-undef),$(gb_DEFS_INTERNAL)) \
$(gb_LTOFLAGS) \
$(gb_COMPILERDEPFLAGS) \
-   -I$(dir $(3)) \
$(6) \
-c $(3) \
-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj) 
$(call gb_create_deps,$(call 
gb_PrecompiledHeader_get_dep_target_tmp,$(2)),$(1),$(3))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Eike Rathke

 sc/source/ui/docshell/docsh.cxx |   14 ++
 sc/source/ui/docshell/impex.cxx |   27 ---
 2 files changed, 38 insertions(+), 3 deletions(-)

New commits:
commit 12f09377b91b6d70efb3448d098f4dbd677a67d1
Author: Eike Rathke 
Date:   Fri Nov 3 23:10:01 2017 +0100

SYLK import: set and evaluate col/row overflow to display dialog

Change-Id: Id997aac2fd90f53652c81884c51833c92494e32f

diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index a9faf61da2b6..f9d2cc684d91 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -1345,6 +1345,8 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
 else if (aFltName == pFilterSylk)
 {
 ErrCode eError = SCERR_IMPORT_UNKNOWN;
+bool bOverflowRow, bOverflowCol, bOverflowCell;
+bOverflowRow = bOverflowCol = bOverflowCell = false;
 if( !rMedium.IsStorage() )
 {
 ScImportExport aImpEx( &aDocument );
@@ -1358,6 +1360,10 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
 aDocument.StartAllListeners();
 sc::SetFormulaDirtyContext aCxt;
 aDocument.SetAllFormulasDirty(aCxt);
+
+bOverflowRow = aImpEx.IsOverflowRow();
+bOverflowCol = aImpEx.IsOverflowCol();
+bOverflowCell = aImpEx.IsOverflowCell();
 }
 else
 {
@@ -1367,6 +1373,14 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
 
 if ( eError != ERRCODE_NONE && !GetError() )
 SetError(eError);
+else if (!GetError() && (bOverflowRow || bOverflowCol || 
bOverflowCell))
+{
+// precedence: row, column, cell
+ErrCode nWarn = (bOverflowRow ? SCWARN_IMPORT_ROW_OVERFLOW :
+(bOverflowCol ? SCWARN_IMPORT_COLUMN_OVERFLOW :
+ SCWARN_IMPORT_CELL_OVERFLOW));
+SetError(nWarn);
+}
 bSetColWidths = true;
 bSetSimpleTextColWidths = true;
 bSetRowHeights = true;
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 911c8ea584b0..953956213faa 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -1764,7 +1764,7 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm )
 {
 SAL_WARN("sc.ui","ScImportExport::Sylk2Doc - 
;X invalid nCol=" << nCol);
 nCol = std::max(0, 
std::min(nCol, MAXCOL));
-bInvalidCol = true;
+bInvalidCol = bOverflowCol = true;
 }
 break;
 }
@@ -1776,7 +1776,7 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm )
 {
 SAL_WARN("sc.ui","ScImportExport::Sylk2Doc - 
;Y invalid nRow=" << nRow);
 nRow = std::max(0, 
std::min(nRow, MAXROW));
-bInvalidRow = true;
+bInvalidRow = bOverflowRow = true;
 }
 break;
 }
@@ -1788,7 +1788,7 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm )
 {
 SAL_WARN("sc.ui","ScImportExport::Sylk2Doc - 
;C invalid nRefCol=" << nRefCol);
 nRefCol = std::max(0, 
std::min(nRefCol, MAXCOL));
-bInvalidRefCol = true;
+bInvalidRefCol = bOverflowCol = true;
 }
 break;
 }
@@ -1800,7 +1800,7 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm )
 {
 SAL_WARN("sc.ui","ScImportExport::Sylk2Doc - 
;R invalid nRefRow=" << nRefRow);
 nRefRow = std::max(0, 
std::min(nRefRow, MAXROW));
-bInvalidRefRow = true;
+bInvalidRefRow = bOverflowRow = true;
 }
 break;
 }
@@ -1925,7 +1925,7 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm )
 {
 SAL_WARN("sc.ui","ScImportExport::Sylk2Doc - 
;X invalid nCol=" << nCol);
 nCol = std::max(0, 
std::min(nCol, MAXCOL));
-bInvalidCol = true;
+bInvalidCol = bOverflowCol = true;
 }
 break;
 }
@@ -1937,7 +1937,7 @@ bool ScImportExport::S

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

2017-11-03 Thread Eike Rathke

 sc/source/core/data/column.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 76c54edc8ee972c63da8ed1f5d6ab75ea552da46
Author: Eike Rathke 
Date:   Thu Nov 2 12:53:14 2017 +0100

Resolves: tdf#111428 swap ScColumn::mnBlkCountFormula

 This is a combination of 2 commits.

(cherry picked from commit 423df1fa929784c14e3a133c06468589fe9269cd)
(cherry picked from commit 911e2aff3cc37cb7410292728ffea05fffbfb0b3)

CellStoreEvent remembered the original ScColumn::mnBlkCountFormula,
hence after inserting a column to the left the quick check of
ScColumn::HasFormulaCell() whether there are any formula cells worked on
the swapped in count (originally the one to the right) that happens to
be empty in the scenario. Things worked correctly by accident if the
next column to the right already contained a formula cell.

c44fed96c49bea7365bf1200e06788860966795c

Change-Id: If993856ceee657736f516a81c293506041a6b7eb
Reviewed-on: https://gerrit.libreoffice.org/44210
Reviewed-by: Markus Mohrhard 
Tested-by: Eike Rathke 

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 45f211cbedd1..5a817c2f747e 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1899,6 +1899,9 @@ void ScColumn::SwapCol(ScColumn& rCol)
 maCellTextAttrs.swap(rCol.maCellTextAttrs);
 maCellNotes.swap(rCol.maCellNotes);
 
+// Swap all CellStoreEvent mdds event_func related.
+std::swap( mnBlkCountFormula, rCol.mnBlkCountFormula);
+
 // notes update caption
 UpdateNoteCaptions(0, MAXROW);
 rCol.UpdateNoteCaptions(0, MAXROW);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Michael Stahl

 sw/qa/extras/odfimport/odfimport.cxx |3 +++
 sw/source/core/doc/docnew.cxx|3 +++
 2 files changed, 6 insertions(+)

New commits:
commit 2e39e519767d58a20829baca2fb0a2418b70f772
Author: Michael Stahl 
Date:   Fri Nov 3 21:48:37 2017 +0100

sw: ODF import: prevent shapes from inheriting paragraph default margins

The problem is that even with the vertical-pos default fix,
we don't render ShapesWithWrapping.odt the same as Word does:

https://beta.opendocumentformat.org/rendercompare/upload/223/86/191/1

The shape still has a spurious bottom margin, which should not exist.

This has a surprising cause: the default-style family="paragraph"
has the attribute fo:margin-bottom="0.1388in" on paragraph-properties,
which gets imported as the pool's default item of RES_UL_SPACE;
there is nothing that prevents the shape from using this pool default
item if it doesn't have a margin set on itself.

Prevent that by overriding the pool default in
SwDoc::mpDfltFrameFormat, which already carries a XFillStyleItem
for similar reasons.

The mpDfltFrameFormat is used by a lot more than just shapes,
but none of that stuff should inherit paragraph defaults.

As an aside the fo:margin-* properties are also allowed on
style:graphic-properties, but it turns out that the implementation
of the default-style family="graphic", in
SvxUnoDrawPool/SwSvxUnoDrawPool, does not have the corresponding
properties, hence cannot import these.

Not sure if it would be better to have multiple SvxULSpace items
with different IDs, so the paragraphs and shapes and etc. can have
separate defaults.

Change-Id: Ie6a196db567beb7a48b4176f383c88490dcfb8e7

diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index 365c01c21949..032a4a5da574 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -798,6 +798,9 @@ DECLARE_ODFIMPORT_TEST(testWordAsCharShape, 
"Word2010AsCharShape.odt")
 uno::Reference const xShape(getShape(1));
 CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AS_CHARACTER, 
getProperty(xShape, "AnchorType"));
 CPPUNIT_ASSERT_EQUAL(text::VertOrientation::TOP, 
getProperty(xShape, "VertOrient"));
+// also, the paragraph default fo:bottom-margin was wrongly applied to
+// the shape
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(xShape, 
"BottomMargin"));
 }
 
 DECLARE_ODFIMPORT_TEST(testTdf100033_2, "tdf100033_2.odt")
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 24ad79bd6210..2fae0c3597d4 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -294,6 +294,9 @@ SwDoc::SwDoc()
 // it is possible to set this attribute here. It will be not reset when 
importing.
 
mpDfltTextFormatColl->SetFormatAttr(XFillStyleItem(drawing::FillStyle_NONE));
 mpDfltFrameFormat->SetFormatAttr(XFillStyleItem(drawing::FillStyle_NONE));
+// prevent paragraph default margins being applied to everything
+mpDfltFrameFormat->SetFormatAttr(SvxULSpaceItem(RES_UL_SPACE));
+mpDfltFrameFormat->SetFormatAttr(SvxLRSpaceItem(RES_LR_SPACE));
 
 /*
  * DefaultFormats and DefaultFormatCollections (FormatColl)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Caolán McNamara

 framework/source/dispatch/closedispatcher.cxx |9 ---
 framework/source/loadenv/loadenv.cxx  |4 ---
 include/vcl/dialog.hxx|8 +-
 include/vcl/msgbox.hxx|5 +--
 include/vcl/svapp.hxx |6 
 uui/source/iahndl.cxx |   33 +++---
 vcl/source/app/svapp.cxx  |   16 
 vcl/source/window/dialog.cxx  |   10 ---
 vcl/source/window/msgbox.cxx  |6 ++--
 9 files changed, 12 insertions(+), 85 deletions(-)

New commits:
commit fdcd11ff68fcd9e46aad6efc20779a063f4f6182
Author: CaolÃ¡n McNamara 
Date:   Thu Nov 2 17:23:00 2017 +

Resolves: tdf#113160 changing all warning dialogs to non-modal is unsafe

existing code doesn't expect that so stuff crashes

partial revert of...

commit db6b703d391838c481fd090065f6d329edcd4efa
Date:   Thu Aug 24 18:32:38 2017 +0200

Allow non-modal Dialogs during FileImport/Load

Change-Id: I152feb849186cf035664a700d3f94ee049cdf6d3
Reviewed-on: https://gerrit.libreoffice.org/44227
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/framework/source/dispatch/closedispatcher.cxx 
b/framework/source/dispatch/closedispatcher.cxx
index 2055cdc5d517..70d40f58f1cc 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -38,7 +38,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
@@ -367,14 +366,6 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback, 
LinkParamNone*, void)
 }
 }
 
-// if we still have dialogs open, temporary suppress termination
-if (bTerminateApp && Dialog::AreDialogsOpen())
-{
-Application::SetShutdownDelayed();
-bCloseFrame = true;
-bTerminateApp = false;
-}
-
 // Do it now ...
 bool bSuccess = false;
 if (bCloseFrame)
diff --git a/framework/source/loadenv/loadenv.cxx 
b/framework/source/loadenv/loadenv.cxx
index 3d6da4e3e003..3bfd87e3244c 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -371,10 +371,6 @@ void LoadEnv::startLoading()
 if (!bStarted)
 bStarted = impl_loadContent();
 
-// This may have triggered Dialogs (error cases) that may have
-// delayed the shutdown, so give delayed shutdown a chance
-Application::TriggerShutdownDelayed();
-
 // not started => general error
 // We can't say - what was the reason for.
 if (!bStarted)
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index d7d7ce292cf6..d28ff0ac6d64 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -39,11 +39,8 @@ public:
 /** Use given parent or get a default one using GetDefaultParent(...) 
*/
 Default,
 
-/** Suppress Parent so that Parent is not blocked (kind of modal mode) 
*/
-NoParent,
-
-/** Suppress Parent (no modal, see above) and additionally center on 
default parent */
-NoParentCentered
+/** No Parent */
+NoParent
 };
 
 private:
@@ -168,7 +165,6 @@ public:
 
 voidEndDialog( long nResult = 0 );
 static void EndAllDialogs( vcl::Window const * pParent );
-static bool AreDialogsOpen();
 
 voidGetDrawWindowBorder( sal_Int32& rLeftBorder, sal_Int32& 
rTopBorder,
  sal_Int32& rRightBorder, sal_Int32& 
rBottomBorder ) const;
diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx
index 7c377170566c..18b869318b90 100644
--- a/include/vcl/msgbox.hxx
+++ b/include/vcl/msgbox.hxx
@@ -69,9 +69,8 @@ protected:
 SAL_DLLPRIVATE void ImplPosControls();
 
 public:
-MessBox( vcl::Window* pParent, MessBoxStyle 
nMessBoxStyle, WinBits n,
-const OUString& rTitle, const OUString& rMessage,
-Dialog::InitFlag eInitFlag = 
Dialog::InitFlag::NoParentCentered);
+MessBox(vcl::Window* pParent, MessBoxStyle 
nMessBoxStyle, WinBits n,
+const OUString& rTitle, const OUString& 
rMessage);
 virtual ~MessBox() override;
 virtual voiddispose() override;
 
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index e895dde09a7d..dd10349a41b2 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -1384,12 +1384,6 @@ public:
 // For vclbootstrapprotector:
 static void setDeInitHook(Link const & hook);
 
-// for delayed shutdown: set using SetShutdownDelayed, then
-// trigger using TriggerShutdownDelayed which may actually shutdown
-// when SetShutdownDelayed is set
-static void SetShutdownDelayed();
-static void TriggerShutdownDelayed();
-
 private:
 DECL_STATIC_LINK( Application, PostEventHandler, void*, void

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

2017-11-03 Thread Andras Timar

Tag '2.1.5-rc2' created by Andras Timar  at 
2017-11-03 20:50 +

2.1.5-rc2

Changes since 2.1.5-rc1-6:
---
 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-2-1' - debian/changelog loolwsd.spec.in

2017-11-03 Thread Andras Timar

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

New commits:
commit e424147870761cdc6e43a670c9608c759a307d2c
Author: Andras Timar 
Date:   Fri Nov 3 21:50:24 2017 +0100

Bumo version for packages 2.1.5-2

Change-Id: I82f94e5273e8996e09179dc5005b011fd195c14a

diff --git a/debian/changelog b/debian/changelog
index ada4761d..ccef62ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (2.1.5-2) unstable; urgency=medium
+
+  * see the git log: http://col.la/cool21
+
+ -- Andras Timar   Fri, 03 Nov 2017 21:10:00 +0100
+
 loolwsd (2.1.5-1) unstable; urgency=medium
 
   * see the git log: http://col.la/cool21
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index ef545acf..baf4c9e8 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:   loolwsd%{name_suffix}
 Name:   loolwsd
 %endif
 Version:@PACKAGE_VERSION@
-Release:1%{?dist}
+Release:2%{?dist}
 %if 0%{?suse_version} == 1110
 Group:  Productivity/Office/Suite
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loleaflet/po

2017-11-03 Thread Andras Timar

 loleaflet/po/help-kn.po  |   60 ++---
 loleaflet/po/ui-am.po|   14 
 loleaflet/po/ui-ca.po|   52 +---
 loleaflet/po/ui-cs.po|   54 +
 loleaflet/po/ui-cy.po|   30 --
 loleaflet/po/ui-da.po|9 ++---
 loleaflet/po/ui-de.po|6 +--
 loleaflet/po/ui-es.po|   29 -
 loleaflet/po/ui-gl.po|   67 +++--
 loleaflet/po/ui-it.po|   76 ++-
 loleaflet/po/ui-nl.po|   32 ---
 loleaflet/po/ui-pt_BR.po |4 +-
 loleaflet/po/ui-tr.po|   54 +
 13 files changed, 250 insertions(+), 237 deletions(-)

New commits:
commit ab1078ddbf708c8de7f892c1bfd0547b05e8bc78
Author: Andras Timar 
Date:   Fri Nov 3 12:09:00 2017 +0100

Updated translations from Pootle

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

diff --git a/loleaflet/po/help-kn.po b/loleaflet/po/help-kn.po
index d8c9bd6c..5da870db 100644
--- a/loleaflet/po/help-kn.po
+++ b/loleaflet/po/help-kn.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-05 08:01+\n"
+"POT-Creation-Date: 2017-11-03 09:01+\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 2.2.3\n"
 "X-Pootle-Path: /kn/libo_online/loleaflet-help-kn.po\n"
-"X-Pootle-Revision: 2780598\n"
+"X-Pootle-Revision: 2846269\n"
 
 #: dist%2Floleaflet-help.html+div.h1%3A25
 msgid "Keyboard Shortcuts"
@@ -139,20 +139,18 @@ msgstr ""
 
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A45
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A166
-#, fuzzy
 msgid "Ctrl + Shift + P"
-msgstr "Ctrl + Shift + ?"
+msgstr "Ctrl + Shift + P"
 
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A46
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A167
 msgid "Subscript"
-msgstr ""
+msgstr "à²à²¡à²¿à²²à³à²"
 
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A46
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A167
-#, fuzzy
 msgid "Ctrl + Shift + B"
-msgstr "Ctrl + Shift + ?"
+msgstr "Ctrl + Shift + B"
 
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A47
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A141
@@ -161,9 +159,8 @@ msgstr ""
 
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A47
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A141
-#, fuzzy
 msgid "Ctrl + M"
-msgstr "Ctrl + Z"
+msgstr "Ctrl + M"
 
 #: dist%2Floleaflet-help.html+div.div.h2%3A49
 #: dist%2Floleaflet-help.html+div.div.h2%3A170
@@ -179,75 +176,68 @@ msgstr ""
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A51
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A146
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A172
-#, fuzzy
 msgid "Ctrl + E"
-msgstr "Ctrl + Z"
+msgstr "Ctrl + E"
 
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A52
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A147
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A173
 msgid "Align Left"
-msgstr ""
+msgstr "à²à²¡à²à³à²à³ à²¹à³à²à²¦à²¿à²¸à³"
 
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A52
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A147
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A173
-#, fuzzy
 msgid "Ctrl + L"
-msgstr "Ctrl + Z"
+msgstr "Ctrl + L"
 
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A53
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A148
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A174
 msgid "Align Right"
-msgstr ""
+msgstr "à²¬à²²à²à³à²à³ à²¹à³à²à²¦à²¿à²¸à³"
 
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A53
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A148
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A174
-#, fuzzy
 msgid "Ctrl + R"
-msgstr "Ctrl + Z"
+msgstr "Ctrl + R"
 
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A54
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A149
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A175
 msgid "Justify"
-msgstr ""
+msgstr "à²¸à²°à²¿à²¹à³à²à²¦à²¿à²¸à³"
 
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A54
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A149
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A175
-#, fuzzy
 msgid "Ctrl + J"
-msgstr "Ctrl + Z"
+msgstr "Ctrl + J"
 
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A55
 msgid "Apply Default paragraph style"
 msgstr ""
 
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A55
-#, fuzzy
 msgid "Ctrl + 0"
-msgstr "Ctrl + Z"
+msgstr "Ctrl + 0"
 
 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A56
 msgid "Apply Heading 1 paragraph style"
 msgstr

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loolwsd-systemplate-setup

2017-11-03 Thread Andras Timar

 loolwsd-systemplate-setup |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 84c8b20b6800701e8ab7c8347ad4c112ad8810d7
Author: Andras Timar 
Date:   Mon Oct 30 11:01:14 2017 +0100

copy system hyphenation dictionaries to systemplate

Change-Id: Ie7e5a2644436d5de61f65b2d8ec5201471100787
(cherry picked from commit 61a2d94f2b34392f83eb4d62d8ced459eed58bab)
Reviewed-on: https://gerrit.libreoffice.org/44051
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loolwsd-systemplate-setup b/loolwsd-systemplate-setup
index 790bbb38..be94a154 100755
--- a/loolwsd-systemplate-setup
+++ b/loolwsd-systemplate-setup
@@ -36,6 +36,7 @@ find etc/passwd etc/group etc/hosts \
  usr/lib/locale/locale_archive \
  usr/share/zoneinfo/* \
  usr/share/liblangtag \
+ usr/share/hyphen \
  usr/lib/libpng* usr/lib64/libpng* lib/*-linux-gnu/libpng* \
 -type f
 
___
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-2-1' - loleaflet/dist loleaflet/src wsd/DocumentBroker.cpp

2017-11-03 Thread Jan Holesovsky

 loleaflet/dist/loleaflet.html |2 +
 loleaflet/dist/toolbar.css|   25 ++
 loleaflet/dist/toolbar/toolbar.js |   37 ++
 loleaflet/src/map/handler/Map.WOPI.js |2 +
 wsd/DocumentBroker.cpp|1 
 5 files changed, 67 insertions(+)

New commits:
commit 41dfc1ab2c4006c5c38dfa10550e218442154e54
Author: Jan Holesovsky 
Date:   Tue Oct 31 17:58:58 2017 +0100

Save As: UI for changing the document name.

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

diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index 13e60e54..5d3ccd8a 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -53,6 +53,8 @@
   
 
 
+
+
 
   
 
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 0b65e88f..6564ae95 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -72,6 +72,31 @@
 width: 700px;
 }
 
+#document-name-input {
+position: fixed;
+z-index: 1050;
+right: 35px;
+top: 2px;
+width: 200px;
+font-size: 16px;
+//font-weight: bold;
+border: 1px solid transparent;
+background-color: transparent;
+}
+
+#document-name-input.editable:focus {
+border: 1px solid #bb;
+background-color: white;
+}
+
+#document-name-input.editable:hover {
+border: 1px solid #bb;
+background-color: white;
+background-image: url('../images/lc_editdoc.svg');
+background-position: right;
+background-repeat: no-repeat;
+}
+
 #closebuttonwrapper {
 position: fixed;
 z-index: 1050;
diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index ea7e567b..1e1a89f5 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -774,6 +774,27 @@ function onSearchKeyPress(e) {
}
 }
 
+function documentNameConfirm() {
+   var value = $('#document-name-input').val();
+   if (value !== null && value != '') {
+   map.saveAs(value);
+   }
+   map._onGotFocus();
+}
+
+function documentNameCancel() {
+   $('#document-name-input').val(map['wopi'].BaseFileName);
+   map._onGotFocus();
+}
+
+function onDocumentNameKeyPress(e) {
+   if (e.keyCode === 13) { // Enter key
+   documentNameConfirm();
+   } else if (e.keyCode === 27) { // Escape key
+   documentNameCancel();
+   }
+}
+
 function sortFontSizes() {
var oldVal = $('.fontsizes-select').val();
var selectList = $('.fontsizes-select option');
@@ -963,6 +984,22 @@ map.on('wopiprops', function(e) {
evt.preventDefault();
});
}
+   if (e.BaseFileName !== null) {
+   // set the document name into the name field
+   $('#document-name-input').val(e.BaseFileName);
+   }
+   if (e.UserCanNotWriteRelative === false) {
+   // Save As allowed
+   $('#document-name-input').prop('disabled', false);
+   $('#document-name-input').addClass('editable');
+   $('#document-name-input').on('keypress', 
onDocumentNameKeyPress);
+   $('#document-name-input').on('focus', function() { 
map._onLostFocus(); /* hide the caret in the main document */ });
+   $('#document-name-input').on('blur', documentNameCancel);
+   } else {
+   $('#document-name-input').prop('disabled', true);
+   $('#document-name-input').removeClass('editable');
+   $('#document-name-input').off('keypress', 
onDocumentNameKeyPress);
+   }
 });
 
 map.on('doclayerinit', function () {
diff --git a/loleaflet/src/map/handler/Map.WOPI.js 
b/loleaflet/src/map/handler/Map.WOPI.js
index e2a3840d..f06e30fc 100644
--- a/loleaflet/src/map/handler/Map.WOPI.js
+++ b/loleaflet/src/map/handler/Map.WOPI.js
@@ -8,6 +8,7 @@ L.Map.WOPI = L.Handler.extend({
// So use '*' because we still needs to send 'close' message to the 
parent frame which
// wouldn't be possible otherwise.
PostMessageOrigin: '*',
+   BaseFileName: '',
DocumentLoadedTime: false,
HidePrintOption: false,
HideSaveOption: false,
@@ -61,6 +62,7 @@ L.Map.WOPI = L.Handler.extend({
this.PostMessageOrigin = wopiInfo['PostMessageOrigin'];
}
 
+   this.BaseFileName = wopiInfo['BaseFileName'];
this.HidePrintOption = !!wopiInfo['HidePrintOption'];
this.HideSaveOption = !!wopiInfo['HideSaveOption'];
this.HideExportOption = !!wopiInfo['HideExportOption'];
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 966c3184..a6a91c1a 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -438,6 +438,7 @@ bool Docume

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

2017-11-03 Thread Jan Holesovsky

 loleaflet/src/control/Toolbar.js  |5 -
 loleaflet/src/core/Socket.js  |   31 +--
 loleaflet/src/map/handler/Map.WOPI.js |2 +-
 3 files changed, 34 insertions(+), 4 deletions(-)

New commits:
commit dd2c950185e3622441929167672df39b9bd40f07
Author: Jan Holesovsky 
Date:   Fri Nov 3 19:00:58 2017 +0100

Save As: Reload the newly created document after the Save As.

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

diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index c47e523d..337188a0 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -85,6 +85,9 @@ L.Map.include({
},
 
saveAs: function (url, format, options) {
+   if (url === undefined || url == null) {
+   return;
+   }
if (format === undefined || format === null) {
format = '';
}
@@ -94,7 +97,7 @@ L.Map.include({
 
this.showBusy(_('Saving...'), false);
this._socket.sendMessage('saveas ' +
-   'url=' + url + ' ' +
+   'url=wopi:' + encodeURIComponent(url) + ' ' +
'format=' + format + ' ' +
'options=' + options);
},
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index e5028b69..cc7e8d6c 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -119,6 +119,12 @@ L.Socket = L.Class.extend({
this.socket.send(msg);
},
 
+   _getParameterByName: function(url, name) {
+   name = name.replace(/[\[]/, '\\[').replace(/[\]]/, '\\]');
+   var regex = new RegExp('[\\?&]' + name + '=([^&#]*)'), results 
= regex.exec(url);
+   return results === null ? '' : results[1].replace(/\+/g, ' ');
+   },
+
_onSocketOpen: function () {
console.debug('_onSocketOpen:');
this._map._serverRecycling = false;
@@ -560,8 +566,29 @@ L.Socket = L.Class.extend({
}
else if (textMsg.startsWith('saveas:')) {
this._map.hideBusy();
-   // var url = command.url; // WOPI url - if needed at 
some stage
-   // var name = command.name; TODO dialog that the file 
was saved as "name"
+   if (command !== undefined && command.url !== undefined 
&& command.url !== '') {
+   this.close();
+   var url = command.url;
+   var accessToken = this._getParameterByName(url, 
'access_token');
+   var accessTokenTtl = 
this._getParameterByName(url, 'access_token_ttl');
+
+   if (accessToken !== undefined) {
+   if (accessTokenTtl === undefined) {
+   accessTokenTtl = 0;
+   }
+   this._map.options.docParams = { 
'access_token': accessToken, 'access_token_ttl': accessTokenTtl };
+   }
+   else {
+   this._map.options.docParams = {};
+   }
+
+   // setup for loading the new document, and 
trigger the load
+   var docUrl = url.split('?')[0];
+   this._map.options.doc = docUrl;
+   this._map.options.wopiSrc = 
encodeURIComponent(docUrl);
+   this._map.loadDocument();
+   }
+   // var name = command.name; - ignored, we get the new 
name via the wopi's BaseFileName
}
else if (textMsg.startsWith('statusindicator:')) {
//FIXME: We should get statusindicator when saving too, 
no?
diff --git a/loleaflet/src/map/handler/Map.WOPI.js 
b/loleaflet/src/map/handler/Map.WOPI.js
index f06e30fc..0201e1d0 100644
--- a/loleaflet/src/map/handler/Map.WOPI.js
+++ b/loleaflet/src/map/handler/Map.WOPI.js
@@ -216,7 +216,7 @@ L.Map.WOPI = L.Handler.extend({
if (msg.Values) {
if (msg.Values.Filename !== null && 
msg.Values.Filename !== undefined) {
this._map.showBusy(_('Creating 
copy...'), false);
-   map.saveAs('wopi:' + 
msg.Values.Filename);
+   map.saveAs(msg.Values.Filename);
}
}
}
_

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

2017-11-03 Thread Mike Kaganski

 vcl/win/gdi/winlayout.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit de811bb2359757b90a0a9851963bd8702b97dab0
Author: Mike Kaganski 
Date:   Fri Nov 3 13:19:10 2017 +0200

Related: tdf#113347: properly check HRESULT value

HRESULT's "success" value S_OK is 0; they are failed when their values are
negative. So, the incorrect check resulted in false failures.

Change-Id: I56560ced73e335af49c66d58201d5455e555e431
Reviewed-on: https://gerrit.libreoffice.org/44180
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 
(cherry picked from commit 11459949e920fab6074bab85e3e1a748e9aee1ee)
Reviewed-on: https://gerrit.libreoffice.org/44253
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 47eda10aedf3..f9d1c2812066 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -562,7 +562,7 @@ bool D2DWriteTextOutRenderer::BindFont(HDC hDC)
 
 // Initially bind to an empty rectangle to get access to the font face,
 //  we'll update it once we've calculated a bounding rect in DrawGlyphs
-if (!BindDC(mhDC = hDC))
+if (FAILED(BindDC(mhDC = hDC)))
 return false;
 
 mlfEmHeight = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Fyodor Yemelyanenko

 sw/source/core/undo/untblk.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 39285d3621674097c415808084178faff6691664
Author: Fyodor Yemelyanenko 
Date:   Thu Oct 26 11:12:39 2017 +1000

tdf#108124 fix: crash during redo, when document contains images
Redo action fixed to reinsert images to document correctly.

For details, pls see 
https://bugs.documentfoundation.org/show_bug.cgi?id=108124

Change-Id: Ie20dfcc8b9bfd5096c3c9459446c2a972129f3bf
Reviewed-on: https://gerrit.libreoffice.org/43862
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 
(cherry picked from commit c263c25052ca7812ec8789b8825bca11da845054)
Reviewed-on: https://gerrit.libreoffice.org/44264
Tested-by: Jenkins 

diff --git a/sw/source/core/undo/untblk.cxx b/sw/source/core/undo/untblk.cxx
index 9c5ac1eb8ec0..9b44e00522ea 100644
--- a/sw/source/core/undo/untblk.cxx
+++ b/sw/source/core/undo/untblk.cxx
@@ -285,9 +285,17 @@ void SwUndoInserts::RedoImpl(::sw::UndoRedoContext & 
rContext)
 pTextNd->ChgFormatColl( pLastNdColl );
 }
 
-for (size_t n = m_FlyUndos.size(); 0 < n; --n)
+// tdf#108124 (10/25/2017)
+// During UNDO we call SwUndoInsLayFormat::UndoImpl in reverse order,
+//  firstly for m_FlyUndos[ m_FlyUndos.size()-1 ], etc.
+// As absolute node index of fly stored in SwUndoFlyBase::nNdPgPos we
+//  should recover from Undo in direct order (last should be recovered 
first)
+// During REDO we should recover Flys (Images) in direct order,
+//  firstly m_FlyUndos[0], then with m_FlyUndos[1] index, etc.
+
+for (size_t n = 0; m_FlyUndos.size() > n; ++n)
 {
-m_FlyUndos[ n-1 ]->RedoImpl(rContext);
+m_FlyUndos[n]->RedoImpl(rContext);
 }
 
 pHistory->Rollback( pDoc, nSetPos );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Caolán McNamara

 sw/source/filter/xml/xmlmeta.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 7cca1dc560aeceb430ef6a0db2f7823e717ee585
Author: CaolÃ¡n McNamara 
Date:   Fri Nov 3 13:58:52 2017 +

ofz#4042 Integer-overflow

Change-Id: Iccd150e8d704e065b8a3e060a1c9a2b6310e3641
Reviewed-on: https://gerrit.libreoffice.org/44265
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx
index 0d75cfc9b606..b4d5d8189b9d 100644
--- a/sw/source/filter/xml/xmlmeta.cxx
+++ b/sw/source/filter/xml/xmlmeta.cxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -148,7 +149,7 @@ void SwXMLImport::SetStatistics(
 if( nTokens & XML_TOK_META_STAT_PARA )
 nProgressReference = (sal_Int32)aDocStat.nPara;
 else if ( nTokens & XML_TOK_META_STAT_PAGE )
-nProgressReference = 10 * (sal_Int32)aDocStat.nPage;
+o3tl::checked_multiply(aDocStat.nPage, 10, 
nProgressReference);
 ProgressBarHelper* pProgress = GetProgressBarHelper();
 pProgress->SetReference( nProgressReference + 3*PROGRESS_BAR_STEP );
 pProgress->SetValue( 0 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Caolán McNamara

 sc/source/filter/excel/xichart.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bd74993aef9b30ca42810543d8b8bf13490ee9ce
Author: CaolÃ¡n McNamara 
Date:   Fri Nov 3 14:11:46 2017 +

ofz#4043 Null-deference READ

Change-Id: I2af7adc55c5b219086aad3157ccac1ce88a8ba97
Reviewed-on: https://gerrit.libreoffice.org/44266
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sc/source/filter/excel/xichart.cxx 
b/sc/source/filter/excel/xichart.cxx
index 49aa0c9ac3c9..627c8f998521 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -1233,9 +1233,9 @@ namespace {
 
 void lclUpdateText( XclImpChTextRef& rxText, const XclImpChText* xDefText )
 {
-if( rxText )
+if (rxText)
 rxText->UpdateText( xDefText );
-else
+else if (xDefText)
 {
 XclImpChTextRef xNew(new XclImpChText(*xDefText));
 rxText = xNew;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Stephan Bergmann

 sc/CppunitTest_sc_cellrangeobj.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit be7d7d0f5b8657f4981b7622e8ce874a7cb25d2d
Author: Stephan Bergmann 
Date:   Fri Nov 3 20:32:41 2017 +0100

Missing dependency

At least on macOS, CppunitTest_sc_cellrangeobj failed for me with the try-
catch(...)-abort block in Scheduler::ProcessTaskScheduling
(vcl/source/app/scheduler.cxx) due to a com.sun.star.uno.DeploymentException
"component context fails to supply service
com.sun.star.linguistic2.LinguServiceManager of type
com.sun.star.linguistic2.XLinguServiceManager2".

Change-Id: I5b3c0f6cbd2f56bc86c62e048c87ad6ef5f83876

diff --git a/sc/CppunitTest_sc_cellrangeobj.mk 
b/sc/CppunitTest_sc_cellrangeobj.mk
index 16fd329ae6fe..1ac628931f28 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -74,6 +74,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_cellrangeobj,\
 framework/util/fwk \
 i18npool/source/search/i18nsearch \
 i18npool/util/i18npool \
+linguistic/source/lng \
 oox/util/oox \
 package/source/xstor/xstor \
 package/util/package2 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Julien Nabet

 sd/source/core/drawdoc.cxx |5 -
 sd/source/core/sdpage.cxx  |9 ++---
 sd/source/ui/view/drviews1.cxx |9 ++---
 3 files changed, 16 insertions(+), 7 deletions(-)

New commits:
commit 127b828766b31cf7f69acd8eb80e0a3cbb4f7ca6
Author: Julien Nabet 
Date:   Fri Nov 3 19:18:20 2017 +0100

Revert "A first step to refactor ShapeList (sd)"

This reverts commit c5857a0371dcc7977e68d48f08f2a3ecefb67b89.

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

diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 393bc68c2e3e..948bba6dc85d 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -732,9 +732,12 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, 
SdStyleSheetPool* pSPool
 
 SfxStyleSheet* pTitleSheet = 
static_cast(pSPool->GetTitleSheet(aName));
 
+SdrObject* pObj = nullptr;
+rPresentationShapes.seekShape(0);
+
 // Now look for title and outline text objects, then make those objects
 // listeners.
-for (auto const& pObj : rPresentationShapes.getList())
+while( (pObj = rPresentationShapes.getNextShape()) )
 {
 if (pObj->GetObjInventor() == SdrInventor::Default)
 {
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 3ac3b29568de..6d7358947ca6 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -199,9 +199,12 @@ SdrObject* SdPage::GetPresObj(PresObjKind eObjKind, int 
nIndex, bool bFuzzySearc
 // first sort all matching shapes with z-order
 std::vector< SdrObject* > aMatches;
 
-for (auto const& shape : maPresentationShapeList.getList())
+SdrObject* pObj = nullptr;
+maPresentationShapeList.seekShape(0);
+
+while( (pObj = maPresentationShapeList.getNextShape()) )
 {
-SdAnimationInfo* pInfo = SdDrawDocument::GetShapeUserData(*shape);
+SdAnimationInfo* pInfo = SdDrawDocument::GetShapeUserData(*pObj);
 if( pInfo )
 {
 bool bFound = false;
@@ -228,7 +231,7 @@ SdrObject* SdPage::GetPresObj(PresObjKind eObjKind, int 
nIndex, bool bFuzzySearc
 }
 if( bFound )
 {
-aMatches.push_back( shape );
+aMatches.push_back( pObj );
 }
 }
 }
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 8c322a76ff99..976d8dd1cb7b 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -1063,13 +1063,16 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
 {
 // set pages for all available handout presentation objects
 sd::ShapeList& rShapeList = 
pMaster->GetPresentationShapeList();
-for (auto const& shape : rShapeList.getList())
+SdrObject* pObj = nullptr;
+rShapeList.seekShape(0);
+
+while( (pObj = rShapeList.getNextShape()) )
 {
-if( pMaster->GetPresObjKind(shape) == PRESOBJ_HANDOUT )
+if( pMaster->GetPresObjKind(pObj) == PRESOBJ_HANDOUT )
 {
 // #i105146# We want no content to be displayed for 
PageKind::Handout,
 // so just never set a page as content
-
static_cast(shape)->SetReferencedPage(nullptr);
+
static_cast(pObj)->SetReferencedPage(nullptr);
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Jens Carl

 include/test/sheet/xsheetcellrangecontainer.hxx |   40 ++
 qadevOOo/Jar_OOoRunner.mk   |1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangesObj.csv |4 
 qadevOOo/tests/java/ifc/sheet/_XSheetCellRangeContainer.java|  198 
--
 sc/qa/extras/sccellrangesobj.cxx|   10 
 test/Library_subsequenttest.mk  |1 
 test/source/sheet/xsheetcellrangecontainer.cxx  |  121 ++
 7 files changed, 170 insertions(+), 205 deletions(-)

New commits:
commit 6f29841acb201b118bbf5815163fb50d83929e9f
Author: Jens Carl 
Date:   Fri Nov 3 07:15:10 2017 +

tdf#45904 Move Java _XSheetCellRangeContainer test to C++

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

diff --git a/include/test/sheet/xsheetcellrangecontainer.hxx 
b/include/test/sheet/xsheetcellrangecontainer.hxx
new file mode 100644
index ..f0b0c7355420
--- /dev/null
+++ b/include/test/sheet/xsheetcellrangecontainer.hxx
@@ -0,0 +1,40 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_SHEET_XSHEETCELLRANGECONTAINER_HXX
+#define INCLUDED_TEST_SHEET_XSHEETCELLRANGECONTAINER_HXX
+
+#include 
+
+#include 
+#include 
+#include 
+
+#include 
+
+namespace apitest {
+
+class OOO_DLLPUBLIC_TEST XSheetCellRangeContainer
+{
+public:
+virtual css::uno::Reference< css::uno::XInterface > init() =0;
+
+void testAddRemoveRangeAddress();
+void testAddRemoveRangeAddresses();
+
+protected:
+~XSheetCellRangeContainer() {}
+css::uno::Sequence< com::sun::star::table::CellRangeAddress > 
createCellRangeAddresses();
+};
+
+}
+
+#endif // INCLUDED_TEST_SHEET_XSHEETCELLRANGECONTAINER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 16ebecb84344..7faba4235a32 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -618,7 +618,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationsSupplier \
 qadevOOo/tests/java/ifc/sheet/_XSheetAuditing \
 qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor \
-qadevOOo/tests/java/ifc/sheet/_XSheetCellRangeContainer \
 qadevOOo/tests/java/ifc/sheet/_XSheetFilterableEx \
 qadevOOo/tests/java/ifc/sheet/_XSpreadsheetView \
 qadevOOo/tests/java/ifc/style/_CharacterProperties \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangesObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangesObj.csv
index a17fa72c561f..bedb81212c36 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangesObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangesObj.csv
@@ -113,10 +113,6 @@
 
"ScCellRangesObj";"com::sun::star::style::CharacterPropertiesComplex";"CharFontPitchComplex"
 
"ScCellRangesObj";"com::sun::star::style::CharacterPropertiesComplex";"CharPostureComplex"
 
"ScCellRangesObj";"com::sun::star::style::CharacterPropertiesComplex";"CharLocaleComplex"
-"ScCellRangesObj";"com::sun::star::sheet::XSheetCellRangeContainer";"addRangeAddress()"
-"ScCellRangesObj";"com::sun::star::sheet::XSheetCellRangeContainer";"removeRangeAddress()"
-"ScCellRangesObj";"com::sun::star::sheet::XSheetCellRangeContainer";"addRangeAddresses()"
-"ScCellRangesObj";"com::sun::star::sheet::XSheetCellRangeContainer";"removeRangeAddresses()"
 "ScCellRangesObj";"com::sun::star::sheet::XFormulaQuery";"queryDependents()"
 "ScCellRangesObj";"com::sun::star::sheet::XFormulaQuery";"queryPrecedents()"
 "ScCellRangesObj";"com::sun::star::sheet::SheetCellRanges";"ConditionalFormat"
diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetCellRangeContainer.java 
b/qadevOOo/tests/java/ifc/sheet/_XSheetCellRangeContainer.java
deleted file mode 100644
index ee5fbcc68467..
--- a/qadevOOo/tests/java/ifc/sheet/_XSheetCellRangeContainer.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the 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 un

[Libreoffice-commits] core.git: Branch 'feature/qt5' - vcl/CustomTarget_kf5_moc.mk vcl/inc vcl/source vcl/unx

2017-11-03 Thread Jan-Marek Glogowski

 vcl/CustomTarget_kf5_moc.mk|   22 
 vcl/inc/CommonSalLayout.hxx|   19 --
 vcl/inc/jobset.h   |2 -
 vcl/inc/salgdi.hxx |2 -
 vcl/inc/unx/glyphcache.hxx |2 -
 vcl/source/gdi/CommonSalLayout.cxx |   45 +
 vcl/unx/generic/glyphs/freetype_glyphcache.cxx |2 -
 7 files changed, 37 insertions(+), 57 deletions(-)

New commits:
commit 868d27410d3aae8cd0a8aae70be201b671df091b
Author: Jan-Marek Glogowski 
Date:   Fri Nov 3 18:43:30 2017 +0100

Fix multiple problems

1. Linking problem on Windows due to Windows macros via
include
2. Drop the custom MOC target for the old KF5 plugin
3. Correctly handle QT5 build without using QFont
4. ImplJobSetup is in the VL library, not the gen plugin

Change-Id: Iad97b1b9b57a8c356aaa88178aff03d0c14558c7

diff --git a/vcl/CustomTarget_kf5_moc.mk b/vcl/CustomTarget_kf5_moc.mk
deleted file mode 100644
index f636ef5d125c..
--- a/vcl/CustomTarget_kf5_moc.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kf5))
-
-$(call gb_CustomTarget_get_target,vcl/unx/kf5) : \
-   $(call gb_CustomTarget_get_workdir,vcl/unx/kf5)/Kf5Timer.moc \
-   $(call gb_CustomTarget_get_workdir,vcl/unx/kf5)/Kf5Widget.moc \
-
-$(call gb_CustomTarget_get_workdir,vcl/unx/kf5)/%.moc : \
-   $(SRCDIR)/vcl/unx/kf5/%.hxx \
-   | $(call gb_CustomTarget_get_workdir,vcl/unx/kf5)/.dir
-   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1)
-   $(MOC5) $< -o $@
-
-# vim: set noet sw=4:
diff --git a/vcl/inc/CommonSalLayout.hxx b/vcl/inc/CommonSalLayout.hxx
index a44fee5cfe10..a8808bac8414 100644
--- a/vcl/inc/CommonSalLayout.hxx
+++ b/vcl/inc/CommonSalLayout.hxx
@@ -45,13 +45,6 @@ class Qt5Font;
 
 class VCL_DLLPUBLIC CommonSalLayout : public GenericSalLayout
 {
-#if ENABLE_QT5
-friend hb_blob_t*   getFontTable(hb_face_t*, hb_tag_t, void*);
-explicitCommonSalLayout(const FontSelectPattern &rFSP,
-FreetypeFont *pFreetypeFont,
-Qt5Font *pFont, bool bUseQt5);
-#endif
-
 hb_font_t*  mpHbFont;
 const FontSelectPattern& mrFontSelData;
 css::uno::Reference mxBreak;
@@ -84,19 +77,23 @@ class VCL_DLLPUBLIC CommonSalLayout : public 
GenericSalLayout
 public:
 #if defined(_WIN32)
 explicitCommonSalLayout(HDC, WinFontInstance&, const 
WinFontFace&);
-const FontSelectPattern& getFontSelData() const { return mrFontSelData; };
+const FontSelectPattern& getFontSelData() const { return mrFontSelData; }
 HFONT   getHFONT() const { return mhFont; }
 WinFontInstance&getWinFontInstance() const { return 
mrWinFontInstance; }
 boolhasHScale() const;
 #elif defined(MACOSX) || defined(IOS)
 explicitCommonSalLayout(const CoreTextStyle&);
-const CoreTextStyle&getFontData() const { return mrCoreTextStyle; };
+const CoreTextStyle&getFontData() const { return mrCoreTextStyle; }
 #else
 explicitCommonSalLayout(FreetypeFont&);
-const FreetypeFont* getFreetypeFont() const { return mpFreetypeFont; };
+const FreetypeFont* getFreetypeFont() const { return mpFreetypeFont; }
 #if ENABLE_QT5
+explicitCommonSalLayout(const FontSelectPattern &rFSP,
+FreetypeFont *pFreetypeFont,
+Qt5Font *pFont, bool bUseQt5);
 explicitCommonSalLayout(Qt5Font&);
-const Qt5Font*  getQt5Font() const { return mpQFont; };
+const Qt5Font*  getQt5Font() const { return mpQFont; }
+booluseQt5() const { return mbUseQt5; }
 #endif
 #endif
 
diff --git a/vcl/inc/jobset.h b/vcl/inc/jobset.h
index dc04e9a54bd1..5ff4c38e9a24 100644
--- a/vcl/inc/jobset.h
+++ b/vcl/inc/jobset.h
@@ -29,7 +29,7 @@
 #define JOBSETUP_SYSTEM_UNIX3
 #define JOBSETUP_SYSTEM_MAC 4
 
-class VCL_PLUGIN_PUBLIC ImplJobSetup
+class VCL_DLLPUBLIC ImplJobSetup
 {
 private:
 sal_uInt16  mnSystem;   //< System - JOBSETUP_SYSTEM_
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index a368630ebd74..1a9157ca9747 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_VCL_INC_SALGDI_HXX
 
 #include 
-#include 
 
 #include "impfontmetricdata.hxx"
 #inclu

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

2017-11-03 Thread Stephan Bergmann

 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit a5c4b406a8ff80aaa2df96ce455d3b080b77a9a4
Author: Stephan Bergmann 
Date:   Fri Nov 3 18:42:44 2017 +0100

Only downcast to OOXMLFastContextHandlerShape when actually necessary

After bd3c5c4c234e3dc6b89cd235321945a41a08d562 "[API CHANGE] tdf#65393 
Import
signature line images from ooxml", UBSan CppunitTest_chart2_export had 
started
to fail with

> writerfilter/source/ooxml/OOXMLFastContextHandler.cxx:1898:25: runtime 
error: downcast of address 0x61200070a440 which does not point to an object of 
type 'writerfilter::ooxml::OOXMLFastContextHandlerShape'
> 0x61200070a440: note: object is of type 
'writerfilter::ooxml::OOXMLFastContextHandlerWrapper'
>  0e 10 00 20  50 86 4a 00 a2 7f 00 00  01 00 00 00 be be be be  00 00 00 
00 00 00 00 00  00 00 00 00
>   ^~~
>   vptr for 
'writerfilter::ooxml::OOXMLFastContextHandlerWrapper'

Change-Id: I028ef619766466e8cd9bb0ca09174b926fc6d23c

diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index e25e7bc40fae..138954023f89 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1895,11 +1895,10 @@ 
OOXMLFastContextHandlerWrapper::lcl_createFastChildContext
 // here until we need a more generic solution.
 bool bIsWrap = Element == static_cast(NMSP_vmlWord | XML_wrap);
 bool bIsSignatureLine = Element == static_cast(NMSP_vmlOffice | 
XML_signatureline);
-bool bIsShapeSent = 
static_cast(mpParent)->isShapeSent();
 bool bSkipImages = getDocument()->IsSkipImages() && 
oox::getNamespace(Element) == static_cast(NMSP_dml) &&
 !((oox::getBaseToken(Element) == XML_linkedTxbx) || 
(oox::getBaseToken(Element) == XML_txbx));
 
-if ( bInNamespaces && ((!bIsWrap && !bIsSignatureLine) || bIsShapeSent) )
+if ( bInNamespaces && ((!bIsWrap && !bIsSignatureLine) || 
static_cast(mpParent)->isShapeSent()) )
 xResult.set(OOXMLFactory::createFastChildContextFromStart(this, 
Element));
 else if (mxContext.is()  && !bSkipImages)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

grammar check: How to get TextRange of processed paragraph

2017-11-03 Thread Fred Kruse


Hi,

I'm working on LanguageTool an international grammar checker (java based 
extension for LibreOffice). Till now the environment of a sentences is 
checked only for the surrounding paragraph. But some rules need to check 
the whole text. To implement such a check I need to know which paragraph 
is currently checked (TextRange).


Is there a possibility to get the TextRange for the checked paragraph 
while doProofreading is processed?


Thanks

Fred

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

Problems inserting objects in a write

2017-11-03 Thread acaba


When opening a file write and do: insert ole object, if I look for it in a
network unit the program hangs. It also does not show network folders. I
have version 5.2 of Libre Office and Windows 7 Pro Operating System. We have
tested with version 5.4 and these errors are not appreciated, but I need
information about the error that exists with version 5.2. If it is a bug. If
it is an error that technical number is assigned. 

Thank you very much for your attention.

 

Ainhoa Caba Martínez 

Tfno.  +34 976 106 620 Ext 447

 

   
 

Edificio Dinamiza, Expo Zaragoza

Avenida Ranillas, 1-D · 1ª Planta  Oficina F

50018 · Zaragoza (ESPAÑA)

  www.hiberus.com

 



Este mensaje y los documentos que, en su caso, lleve anexos, son privados y
confidenciales y van dirigidos exclusivamente a su destinatario. Si recibe
este correo sin ser el destinatario del mismo, le rogamos proceda a su
eliminación y lo ponga en conocimiento del emisor vía  respuesta a este
e-mail. No se autoriza la utilización de la cuenta de correo electrónico del
emisor de este correo con fines comerciales o para su incorporación a
ficheros automatizados, excepto si se obtiene consentimiento explícito.

En cumplimiento de lo establecido en la normativa española y europea de
Protección de Datos de Carácter Personal y Servicios de Sociedad de la
Información y de Comercio Electrónico, le informamos que sus datos de
contacto para la recepción de esta comunicación han sido suministrados por
Ud explícitamente a Hiberus Tecnologías de la Información, SL en base a una
relación contractual y/o comercial.  Sus datos forman parte de un fichero
titularidad de Hiberus Tecnologías de la Información, SL, con la finalidad
de enviarle comunicaciones electrónicas comerciales y/o relativas a las
actividades, productos y servicios de Hiberus. Conforme a nuestra
 política de privacidad,
Hiberus se compromete a cumplir las obligaciones técnicas y organizativas
establecidas en la legislación vigente para salvaguardar su privacidad. 

 

Si Ud. no quiere figurar en nuestra base de datos, no desea recibir nuestra
información o comunicaciones comerciales o desea ejercitar sus derechos de
acceso, rectificación, supresión, portabilidad de sus datos y limitación u
oposición a su tratamiento dirigiéndose a nuestro domicilio postal sito en y
domicilio en Zaragoza (España), Parque Empresarial PLAZA, calle Bari núm. 25
dup, Edificio Expoinnova o mandando un mail a la siguiente dirección de
correo electrónico   i...@hiberus.com, adjuntando
fotocopia de su DNI o documento identificativo sustitutorio.

P Por favor tenga en cuenta la conservación del medioambiente antes de
imprimir este e-mail. EL MEDIO AMBIENTE ES COSA DE TODOS.*

 

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

[Libreoffice-commits] core.git: Branch 'private/jmux/qt5' - 10 commits - config_host/config_qt5.h.in vcl/inc vcl/Library_vcl.mk vcl/Library_vclplug_qt5.mk vcl/qt5 vcl/source vcl/unx

2017-11-03 Thread Jan-Marek Glogowski

Rebased ref, commits from common ancestor:
commit 390090dc2ac20827f3f0ba8e39fd447dfcb2331e
Author: Jan-Marek Glogowski 
Date:   Mon Oct 30 16:11:09 2017 +0100

QT5 implement Graphics damage tracking

Since we implement SalGraphics handling like the gtk3 backend, we
need damage tracking to queue updates.

Since there is no native damage tracking in Qt5, we have to log
the damage in our subclassed QPainter, which will queue an update
on destruction.

Change-Id: Ife17770750a5be9959c2fc2633b422908d196869

diff --git a/vcl/Library_vclplug_qt5.mk b/vcl/Library_vclplug_qt5.mk
index d82b7d2fcd31..fba78d738883 100644
--- a/vcl/Library_vclplug_qt5.mk
+++ b/vcl/Library_vclplug_qt5.mk
@@ -91,6 +91,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_qt5,\
 vcl/qt5/Qt5Instance \
 vcl/qt5/Qt5Instance_Print \
 vcl/qt5/Qt5Object \
+vcl/qt5/Qt5Painter \
 vcl/qt5/Qt5Printer \
 vcl/qt5/Qt5Timer \
 vcl/qt5/Qt5Tools \
diff --git a/vcl/qt5/Qt5Graphics.cxx b/vcl/qt5/Qt5Graphics.cxx
index 676e9e54664e..eae47c5f21e9 100644
--- a/vcl/qt5/Qt5Graphics.cxx
+++ b/vcl/qt5/Qt5Graphics.cxx
@@ -18,7 +18,11 @@
  */
 
 #include "Qt5Graphics.hxx"
+
 #include "Qt5Frame.hxx"
+#include "Qt5Painter.hxx"
+
+#include 
 
 #include 
 
@@ -46,30 +50,6 @@ Qt5Graphics::~Qt5Graphics()
 delete m_pTextStyle[ i ];
 }
 
-void Qt5Graphics::PreparePainter( QPainter& rPainter, sal_uInt8 nTransparency )
-{
-if ( m_pQImage )
-rPainter.begin( m_pQImage );
-else
-{
-assert( dynamic_cast< QPaintDevice* >( m_pFrame->GetQWidget() ) );
-rPainter.begin( m_pFrame->GetQWidget() );
-}
-if ( !m_aClipPath.isEmpty() )
-rPainter.setClipPath( m_aClipPath );
-else
-rPainter.setClipRegion( m_aClipRegion );
-if ( SALCOLOR_NONE != m_aLineColor )
-{
-QColor aColor = QColor::fromRgb( QRgb( m_aLineColor ) );
-aColor.setAlpha( nTransparency );
-rPainter.setPen( aColor );
-}
-else
-rPainter.setPen( Qt::NoPen );
-rPainter.setCompositionMode( m_eCompositionMode );
-}
-
 void Qt5Graphics::ChangeQImage( QImage *pQImage )
 {
 m_pQImage = pQImage;
diff --git a/vcl/qt5/Qt5Graphics.hxx b/vcl/qt5/Qt5Graphics.hxx
index 52c1c90ec5df..9ffe2c47e461 100644
--- a/vcl/qt5/Qt5Graphics.hxx
+++ b/vcl/qt5/Qt5Graphics.hxx
@@ -30,16 +30,14 @@
 class Qt5Font;
 class Qt5FontFace;
 class Qt5Frame;
+class Qt5Painter;
 class PhysicalFontCollection;
 class QImage;
 
-#define PREPARE_PAINTER \
-QPainter aPainter; \
-PreparePainter( aPainter );
-
 class Qt5Graphics : public SalGraphics
 {
 friend class Qt5Bitmap;
+friend class Qt5Painter;
 
 Qt5Frame *m_pFrame;
 QImage   *m_pQImage;
@@ -55,7 +53,6 @@ class Qt5Graphics : public SalGraphics
 SalColor  m_aTextColor;
 
 Qt5Graphics( Qt5Frame *pFrame, QImage *pQImage );
-void PreparePainter( QPainter &rPainter, sal_uInt8 nTransparency = 0xff );
 
 public:
 Qt5Graphics( Qt5Frame *pFrame )
diff --git a/vcl/qt5/Qt5Graphics_GDI.cxx b/vcl/qt5/Qt5Graphics_GDI.cxx
index f8434bb3bc32..a1e407e088e1 100644
--- a/vcl/qt5/Qt5Graphics_GDI.cxx
+++ b/vcl/qt5/Qt5Graphics_GDI.cxx
@@ -20,8 +20,7 @@
 #include "Qt5Graphics.hxx"
 
 #include "Qt5Bitmap.hxx"
-#include "Qt5Frame.hxx"
-#include "Qt5Tools.hxx"
+#include "Qt5Painter.hxx"
 
 #include 
 #include 
@@ -164,48 +163,88 @@ void Qt5Graphics::ResetClipRegion()
 
 void Qt5Graphics::drawPixel( long nX, long nY )
 {
-PREPARE_PAINTER;
+Qt5Painter aPainter( *this );
 aPainter.drawPoint( nX, nY );
+aPainter.update( nX, nY, 1, 1 );
 }
 
 void Qt5Graphics::drawPixel( long nX, long nY, SalColor nSalColor )
 {
-PREPARE_PAINTER;
+Qt5Painter aPainter( *this );
 aPainter.setPen( QColor( QRgb( nSalColor )  ) );
 aPainter.setPen( Qt::SolidLine );
 aPainter.drawPoint( nX, nY );
+aPainter.update( nX, nY, 1, 1 );
 }
 
 void Qt5Graphics::drawLine( long nX1, long nY1, long nX2, long nY2 )
 {
-PREPARE_PAINTER;
+Qt5Painter aPainter( *this );
 aPainter.drawLine( nX1, nY1, nX2, nY2 );
+
+long tmp;
+if ( nX1 > nX2 )
+{
+tmp = nX1;
+nX1 = nX2;
+nX2 = tmp;
+}
+if ( nY1 > nY2 )
+{
+tmp = nY1;
+nY1 = nY2;
+nY2 = tmp;
+}
+aPainter.update( nX1, nY1, nX2 - nX1, nY2 - nY1 );
 }
 
 void Qt5Graphics::drawRect( long nX, long nY, long nWidth, long nHeight )
 {
-PREPARE_PAINTER;
-aPainter.drawRect( nX, nY, nWidth, nHeight );
+if (SALCOLOR_NONE == m_aFillColor && SALCOLOR_NONE == m_aLineColor )
+return;
+
+Qt5Painter aPainter( *this, true );
+if ( SALCOLOR_NONE != m_aFillColor )
+aPainter.fillRect( nX, nY, nWidth, nHeight, aPainter.brush() );
+else
+aPainter.drawRect( nX, nY, nWidth, nHeight );
+aPainter.update( nX, nY, nWidth, nHeight );
 }
 
 void Qt5Graphics::drawPolyLine( sal_uInt32 nPoints, cons

[Libreoffice-commits] core.git: Branch 'private/jmux/qt5' - 11 commits - config_host/config_qt5.h.in vcl/inc vcl/Library_vcl.mk vcl/Library_vclplug_qt5.mk vcl/qt5 vcl/source vcl/unx

2017-11-03 Thread Jan-Marek Glogowski

Rebased ref, commits from common ancestor:
commit ce9db0f397abc72f770bc72fc5b9e13797a06e26
Author: Jan-Marek Glogowski 
Date:   Mon Oct 30 16:11:09 2017 +0100

QT5 implement Graphics damage tracking

Since we implement SalGraphics handling like the gtk3 backend, we
need damage tracking to queue updates.

Since there is no native damage tracking in Qt5, we have to log
the damage in our subclassed QPainter, which will queue an update
on destruction.

Change-Id: Ife17770750a5be9959c2fc2633b422908d196869

diff --git a/vcl/Library_vclplug_qt5.mk b/vcl/Library_vclplug_qt5.mk
index d82b7d2fcd31..fba78d738883 100644
--- a/vcl/Library_vclplug_qt5.mk
+++ b/vcl/Library_vclplug_qt5.mk
@@ -91,6 +91,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_qt5,\
 vcl/qt5/Qt5Instance \
 vcl/qt5/Qt5Instance_Print \
 vcl/qt5/Qt5Object \
+vcl/qt5/Qt5Painter \
 vcl/qt5/Qt5Printer \
 vcl/qt5/Qt5Timer \
 vcl/qt5/Qt5Tools \
diff --git a/vcl/qt5/Qt5Graphics.cxx b/vcl/qt5/Qt5Graphics.cxx
index 676e9e54664e..eae47c5f21e9 100644
--- a/vcl/qt5/Qt5Graphics.cxx
+++ b/vcl/qt5/Qt5Graphics.cxx
@@ -18,7 +18,11 @@
  */
 
 #include "Qt5Graphics.hxx"
+
 #include "Qt5Frame.hxx"
+#include "Qt5Painter.hxx"
+
+#include 
 
 #include 
 
@@ -46,30 +50,6 @@ Qt5Graphics::~Qt5Graphics()
 delete m_pTextStyle[ i ];
 }
 
-void Qt5Graphics::PreparePainter( QPainter& rPainter, sal_uInt8 nTransparency )
-{
-if ( m_pQImage )
-rPainter.begin( m_pQImage );
-else
-{
-assert( dynamic_cast< QPaintDevice* >( m_pFrame->GetQWidget() ) );
-rPainter.begin( m_pFrame->GetQWidget() );
-}
-if ( !m_aClipPath.isEmpty() )
-rPainter.setClipPath( m_aClipPath );
-else
-rPainter.setClipRegion( m_aClipRegion );
-if ( SALCOLOR_NONE != m_aLineColor )
-{
-QColor aColor = QColor::fromRgb( QRgb( m_aLineColor ) );
-aColor.setAlpha( nTransparency );
-rPainter.setPen( aColor );
-}
-else
-rPainter.setPen( Qt::NoPen );
-rPainter.setCompositionMode( m_eCompositionMode );
-}
-
 void Qt5Graphics::ChangeQImage( QImage *pQImage )
 {
 m_pQImage = pQImage;
diff --git a/vcl/qt5/Qt5Graphics.hxx b/vcl/qt5/Qt5Graphics.hxx
index 52c1c90ec5df..9ffe2c47e461 100644
--- a/vcl/qt5/Qt5Graphics.hxx
+++ b/vcl/qt5/Qt5Graphics.hxx
@@ -30,16 +30,14 @@
 class Qt5Font;
 class Qt5FontFace;
 class Qt5Frame;
+class Qt5Painter;
 class PhysicalFontCollection;
 class QImage;
 
-#define PREPARE_PAINTER \
-QPainter aPainter; \
-PreparePainter( aPainter );
-
 class Qt5Graphics : public SalGraphics
 {
 friend class Qt5Bitmap;
+friend class Qt5Painter;
 
 Qt5Frame *m_pFrame;
 QImage   *m_pQImage;
@@ -55,7 +53,6 @@ class Qt5Graphics : public SalGraphics
 SalColor  m_aTextColor;
 
 Qt5Graphics( Qt5Frame *pFrame, QImage *pQImage );
-void PreparePainter( QPainter &rPainter, sal_uInt8 nTransparency = 0xff );
 
 public:
 Qt5Graphics( Qt5Frame *pFrame )
diff --git a/vcl/qt5/Qt5Graphics_GDI.cxx b/vcl/qt5/Qt5Graphics_GDI.cxx
index f8434bb3bc32..a1e407e088e1 100644
--- a/vcl/qt5/Qt5Graphics_GDI.cxx
+++ b/vcl/qt5/Qt5Graphics_GDI.cxx
@@ -20,8 +20,7 @@
 #include "Qt5Graphics.hxx"
 
 #include "Qt5Bitmap.hxx"
-#include "Qt5Frame.hxx"
-#include "Qt5Tools.hxx"
+#include "Qt5Painter.hxx"
 
 #include 
 #include 
@@ -164,48 +163,88 @@ void Qt5Graphics::ResetClipRegion()
 
 void Qt5Graphics::drawPixel( long nX, long nY )
 {
-PREPARE_PAINTER;
+Qt5Painter aPainter( *this );
 aPainter.drawPoint( nX, nY );
+aPainter.update( nX, nY, 1, 1 );
 }
 
 void Qt5Graphics::drawPixel( long nX, long nY, SalColor nSalColor )
 {
-PREPARE_PAINTER;
+Qt5Painter aPainter( *this );
 aPainter.setPen( QColor( QRgb( nSalColor )  ) );
 aPainter.setPen( Qt::SolidLine );
 aPainter.drawPoint( nX, nY );
+aPainter.update( nX, nY, 1, 1 );
 }
 
 void Qt5Graphics::drawLine( long nX1, long nY1, long nX2, long nY2 )
 {
-PREPARE_PAINTER;
+Qt5Painter aPainter( *this );
 aPainter.drawLine( nX1, nY1, nX2, nY2 );
+
+long tmp;
+if ( nX1 > nX2 )
+{
+tmp = nX1;
+nX1 = nX2;
+nX2 = tmp;
+}
+if ( nY1 > nY2 )
+{
+tmp = nY1;
+nY1 = nY2;
+nY2 = tmp;
+}
+aPainter.update( nX1, nY1, nX2 - nX1, nY2 - nY1 );
 }
 
 void Qt5Graphics::drawRect( long nX, long nY, long nWidth, long nHeight )
 {
-PREPARE_PAINTER;
-aPainter.drawRect( nX, nY, nWidth, nHeight );
+if (SALCOLOR_NONE == m_aFillColor && SALCOLOR_NONE == m_aLineColor )
+return;
+
+Qt5Painter aPainter( *this, true );
+if ( SALCOLOR_NONE != m_aFillColor )
+aPainter.fillRect( nX, nY, nWidth, nHeight, aPainter.brush() );
+else
+aPainter.drawRect( nX, nY, nWidth, nHeight );
+aPainter.update( nX, nY, nWidth, nHeight );
 }
 
 void Qt5Graphics::drawPolyLine( sal_uInt32 nPoints, cons

[Libreoffice-commits] core.git: Branch 'private/jmux/qt5' - 12 commits - config_host/config_qt5.h.in config_host.mk.in configure.ac include/sal RepositoryExternal.mk Repository.mk scp2/InstallScript_s

2017-11-03 Thread Jan-Marek Glogowski

Rebased ref, commits from common ancestor:
commit f6a5fb01674e317ede88b2d2bc98c11c5332346c
Author: Jan-Marek Glogowski 
Date:   Mon Oct 30 16:11:09 2017 +0100

QT5 implement Graphics damage tracking

Since we implement SalGraphics handling like the gtk3 backend, we
need damage tracking to queue updates.

Since there is no native damage tracking in Qt5, we have to log
the damage in our subclassed QPainter, which will queue an update
on destruction.

Change-Id: Ife17770750a5be9959c2fc2633b422908d196869

diff --git a/vcl/Library_vclplug_qt5.mk b/vcl/Library_vclplug_qt5.mk
index d82b7d2fcd31..fba78d738883 100644
--- a/vcl/Library_vclplug_qt5.mk
+++ b/vcl/Library_vclplug_qt5.mk
@@ -91,6 +91,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_qt5,\
 vcl/qt5/Qt5Instance \
 vcl/qt5/Qt5Instance_Print \
 vcl/qt5/Qt5Object \
+vcl/qt5/Qt5Painter \
 vcl/qt5/Qt5Printer \
 vcl/qt5/Qt5Timer \
 vcl/qt5/Qt5Tools \
diff --git a/vcl/qt5/Qt5Graphics.cxx b/vcl/qt5/Qt5Graphics.cxx
index 676e9e54664e..eae47c5f21e9 100644
--- a/vcl/qt5/Qt5Graphics.cxx
+++ b/vcl/qt5/Qt5Graphics.cxx
@@ -18,7 +18,11 @@
  */
 
 #include "Qt5Graphics.hxx"
+
 #include "Qt5Frame.hxx"
+#include "Qt5Painter.hxx"
+
+#include 
 
 #include 
 
@@ -46,30 +50,6 @@ Qt5Graphics::~Qt5Graphics()
 delete m_pTextStyle[ i ];
 }
 
-void Qt5Graphics::PreparePainter( QPainter& rPainter, sal_uInt8 nTransparency )
-{
-if ( m_pQImage )
-rPainter.begin( m_pQImage );
-else
-{
-assert( dynamic_cast< QPaintDevice* >( m_pFrame->GetQWidget() ) );
-rPainter.begin( m_pFrame->GetQWidget() );
-}
-if ( !m_aClipPath.isEmpty() )
-rPainter.setClipPath( m_aClipPath );
-else
-rPainter.setClipRegion( m_aClipRegion );
-if ( SALCOLOR_NONE != m_aLineColor )
-{
-QColor aColor = QColor::fromRgb( QRgb( m_aLineColor ) );
-aColor.setAlpha( nTransparency );
-rPainter.setPen( aColor );
-}
-else
-rPainter.setPen( Qt::NoPen );
-rPainter.setCompositionMode( m_eCompositionMode );
-}
-
 void Qt5Graphics::ChangeQImage( QImage *pQImage )
 {
 m_pQImage = pQImage;
diff --git a/vcl/qt5/Qt5Graphics.hxx b/vcl/qt5/Qt5Graphics.hxx
index 52c1c90ec5df..9ffe2c47e461 100644
--- a/vcl/qt5/Qt5Graphics.hxx
+++ b/vcl/qt5/Qt5Graphics.hxx
@@ -30,16 +30,14 @@
 class Qt5Font;
 class Qt5FontFace;
 class Qt5Frame;
+class Qt5Painter;
 class PhysicalFontCollection;
 class QImage;
 
-#define PREPARE_PAINTER \
-QPainter aPainter; \
-PreparePainter( aPainter );
-
 class Qt5Graphics : public SalGraphics
 {
 friend class Qt5Bitmap;
+friend class Qt5Painter;
 
 Qt5Frame *m_pFrame;
 QImage   *m_pQImage;
@@ -55,7 +53,6 @@ class Qt5Graphics : public SalGraphics
 SalColor  m_aTextColor;
 
 Qt5Graphics( Qt5Frame *pFrame, QImage *pQImage );
-void PreparePainter( QPainter &rPainter, sal_uInt8 nTransparency = 0xff );
 
 public:
 Qt5Graphics( Qt5Frame *pFrame )
diff --git a/vcl/qt5/Qt5Graphics_GDI.cxx b/vcl/qt5/Qt5Graphics_GDI.cxx
index f8434bb3bc32..a1e407e088e1 100644
--- a/vcl/qt5/Qt5Graphics_GDI.cxx
+++ b/vcl/qt5/Qt5Graphics_GDI.cxx
@@ -20,8 +20,7 @@
 #include "Qt5Graphics.hxx"
 
 #include "Qt5Bitmap.hxx"
-#include "Qt5Frame.hxx"
-#include "Qt5Tools.hxx"
+#include "Qt5Painter.hxx"
 
 #include 
 #include 
@@ -164,48 +163,88 @@ void Qt5Graphics::ResetClipRegion()
 
 void Qt5Graphics::drawPixel( long nX, long nY )
 {
-PREPARE_PAINTER;
+Qt5Painter aPainter( *this );
 aPainter.drawPoint( nX, nY );
+aPainter.update( nX, nY, 1, 1 );
 }
 
 void Qt5Graphics::drawPixel( long nX, long nY, SalColor nSalColor )
 {
-PREPARE_PAINTER;
+Qt5Painter aPainter( *this );
 aPainter.setPen( QColor( QRgb( nSalColor )  ) );
 aPainter.setPen( Qt::SolidLine );
 aPainter.drawPoint( nX, nY );
+aPainter.update( nX, nY, 1, 1 );
 }
 
 void Qt5Graphics::drawLine( long nX1, long nY1, long nX2, long nY2 )
 {
-PREPARE_PAINTER;
+Qt5Painter aPainter( *this );
 aPainter.drawLine( nX1, nY1, nX2, nY2 );
+
+long tmp;
+if ( nX1 > nX2 )
+{
+tmp = nX1;
+nX1 = nX2;
+nX2 = tmp;
+}
+if ( nY1 > nY2 )
+{
+tmp = nY1;
+nY1 = nY2;
+nY2 = tmp;
+}
+aPainter.update( nX1, nY1, nX2 - nX1, nY2 - nY1 );
 }
 
 void Qt5Graphics::drawRect( long nX, long nY, long nWidth, long nHeight )
 {
-PREPARE_PAINTER;
-aPainter.drawRect( nX, nY, nWidth, nHeight );
+if (SALCOLOR_NONE == m_aFillColor && SALCOLOR_NONE == m_aLineColor )
+return;
+
+Qt5Painter aPainter( *this, true );
+if ( SALCOLOR_NONE != m_aFillColor )
+aPainter.fillRect( nX, nY, nWidth, nHeight, aPainter.brush() );
+else
+aPainter.drawRect( nX, nY, nWidth, nHeight );
+aPainter.update( nX, nY, nWidth, nHeight );
 }
 
 void Qt5Graphics::drawPolyLine( sal_uInt32 nPoints, cons

[Libreoffice-commits] core.git: Branch 'private/jmux/qt5' - 47 commits - chart2/source config_host/config_qt5.h.in config_host.mk.in configure.ac drawinglayer/source extras/source include/oox include/

2017-11-03 Thread Jan-Marek Glogowski

Rebased ref, commits from common ancestor:
commit c1f5ab50c3971ca834e531d746c953254557542d
Author: Jan-Marek Glogowski 
Date:   Mon Oct 30 16:11:09 2017 +0100

QT5 implement Graphics damage tracking

Since we implement SalGraphics handling like the gtk3 backend, we
need damage tracking to queue updates.

Since there is no native damage tracking in Qt5, we have to log
the damage in our subclassed QPainter, which will queue an update
on destruction.

Change-Id: Ife17770750a5be9959c2fc2633b422908d196869

diff --git a/vcl/Library_vclplug_qt5.mk b/vcl/Library_vclplug_qt5.mk
index d82b7d2fcd31..fba78d738883 100644
--- a/vcl/Library_vclplug_qt5.mk
+++ b/vcl/Library_vclplug_qt5.mk
@@ -91,6 +91,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_qt5,\
 vcl/qt5/Qt5Instance \
 vcl/qt5/Qt5Instance_Print \
 vcl/qt5/Qt5Object \
+vcl/qt5/Qt5Painter \
 vcl/qt5/Qt5Printer \
 vcl/qt5/Qt5Timer \
 vcl/qt5/Qt5Tools \
diff --git a/vcl/qt5/Qt5Graphics.cxx b/vcl/qt5/Qt5Graphics.cxx
index 676e9e54664e..eae47c5f21e9 100644
--- a/vcl/qt5/Qt5Graphics.cxx
+++ b/vcl/qt5/Qt5Graphics.cxx
@@ -18,7 +18,11 @@
  */
 
 #include "Qt5Graphics.hxx"
+
 #include "Qt5Frame.hxx"
+#include "Qt5Painter.hxx"
+
+#include 
 
 #include 
 
@@ -46,30 +50,6 @@ Qt5Graphics::~Qt5Graphics()
 delete m_pTextStyle[ i ];
 }
 
-void Qt5Graphics::PreparePainter( QPainter& rPainter, sal_uInt8 nTransparency )
-{
-if ( m_pQImage )
-rPainter.begin( m_pQImage );
-else
-{
-assert( dynamic_cast< QPaintDevice* >( m_pFrame->GetQWidget() ) );
-rPainter.begin( m_pFrame->GetQWidget() );
-}
-if ( !m_aClipPath.isEmpty() )
-rPainter.setClipPath( m_aClipPath );
-else
-rPainter.setClipRegion( m_aClipRegion );
-if ( SALCOLOR_NONE != m_aLineColor )
-{
-QColor aColor = QColor::fromRgb( QRgb( m_aLineColor ) );
-aColor.setAlpha( nTransparency );
-rPainter.setPen( aColor );
-}
-else
-rPainter.setPen( Qt::NoPen );
-rPainter.setCompositionMode( m_eCompositionMode );
-}
-
 void Qt5Graphics::ChangeQImage( QImage *pQImage )
 {
 m_pQImage = pQImage;
diff --git a/vcl/qt5/Qt5Graphics.hxx b/vcl/qt5/Qt5Graphics.hxx
index 52c1c90ec5df..9ffe2c47e461 100644
--- a/vcl/qt5/Qt5Graphics.hxx
+++ b/vcl/qt5/Qt5Graphics.hxx
@@ -30,16 +30,14 @@
 class Qt5Font;
 class Qt5FontFace;
 class Qt5Frame;
+class Qt5Painter;
 class PhysicalFontCollection;
 class QImage;
 
-#define PREPARE_PAINTER \
-QPainter aPainter; \
-PreparePainter( aPainter );
-
 class Qt5Graphics : public SalGraphics
 {
 friend class Qt5Bitmap;
+friend class Qt5Painter;
 
 Qt5Frame *m_pFrame;
 QImage   *m_pQImage;
@@ -55,7 +53,6 @@ class Qt5Graphics : public SalGraphics
 SalColor  m_aTextColor;
 
 Qt5Graphics( Qt5Frame *pFrame, QImage *pQImage );
-void PreparePainter( QPainter &rPainter, sal_uInt8 nTransparency = 0xff );
 
 public:
 Qt5Graphics( Qt5Frame *pFrame )
diff --git a/vcl/qt5/Qt5Graphics_GDI.cxx b/vcl/qt5/Qt5Graphics_GDI.cxx
index f8434bb3bc32..a1e407e088e1 100644
--- a/vcl/qt5/Qt5Graphics_GDI.cxx
+++ b/vcl/qt5/Qt5Graphics_GDI.cxx
@@ -20,8 +20,7 @@
 #include "Qt5Graphics.hxx"
 
 #include "Qt5Bitmap.hxx"
-#include "Qt5Frame.hxx"
-#include "Qt5Tools.hxx"
+#include "Qt5Painter.hxx"
 
 #include 
 #include 
@@ -164,48 +163,88 @@ void Qt5Graphics::ResetClipRegion()
 
 void Qt5Graphics::drawPixel( long nX, long nY )
 {
-PREPARE_PAINTER;
+Qt5Painter aPainter( *this );
 aPainter.drawPoint( nX, nY );
+aPainter.update( nX, nY, 1, 1 );
 }
 
 void Qt5Graphics::drawPixel( long nX, long nY, SalColor nSalColor )
 {
-PREPARE_PAINTER;
+Qt5Painter aPainter( *this );
 aPainter.setPen( QColor( QRgb( nSalColor )  ) );
 aPainter.setPen( Qt::SolidLine );
 aPainter.drawPoint( nX, nY );
+aPainter.update( nX, nY, 1, 1 );
 }
 
 void Qt5Graphics::drawLine( long nX1, long nY1, long nX2, long nY2 )
 {
-PREPARE_PAINTER;
+Qt5Painter aPainter( *this );
 aPainter.drawLine( nX1, nY1, nX2, nY2 );
+
+long tmp;
+if ( nX1 > nX2 )
+{
+tmp = nX1;
+nX1 = nX2;
+nX2 = tmp;
+}
+if ( nY1 > nY2 )
+{
+tmp = nY1;
+nY1 = nY2;
+nY2 = tmp;
+}
+aPainter.update( nX1, nY1, nX2 - nX1, nY2 - nY1 );
 }
 
 void Qt5Graphics::drawRect( long nX, long nY, long nWidth, long nHeight )
 {
-PREPARE_PAINTER;
-aPainter.drawRect( nX, nY, nWidth, nHeight );
+if (SALCOLOR_NONE == m_aFillColor && SALCOLOR_NONE == m_aLineColor )
+return;
+
+Qt5Painter aPainter( *this, true );
+if ( SALCOLOR_NONE != m_aFillColor )
+aPainter.fillRect( nX, nY, nWidth, nHeight, aPainter.brush() );
+else
+aPainter.drawRect( nX, nY, nWidth, nHeight );
+aPainter.update( nX, nY, nWidth, nHeight );
 }
 
 void Qt5Graphics::drawPolyLine( sal_uInt32 nPoints, cons

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

2017-11-03 Thread Justin Luth

 sw/qa/extras/uiwriter/data/tdf103978_backgroundTextShape.docx |binary
 sw/qa/extras/uiwriter/uiwriter.cxx|   21 ++
 sw/source/core/doc/textboxhelper.cxx  |3 +
 3 files changed, 24 insertions(+)

New commits:
commit 72276f0248c8e09fad707c500e45c5d027e7efb1
Author: Justin Luth 
Date:   Thu Jul 6 14:54:27 2017 -0400

tdf#103978 textboxhelper: syncProperty OPAQUE (wrap in background)

Although the containing shape is in the background (and thus the
normal paragraph text is still visible), the shape's text
was still painting over top of the normal paragraph text because
the textbox was set as opaque and not transparent.

Setting the textbox to sync the opacity value of its containing shape.

Change-Id: I02477e2fa7def1f13590afcaa7c6564dd79d6406
Reviewed-on: https://gerrit.libreoffice.org/39672
Tested-by: Jenkins 
Reviewed-by: Justin Luth 
(cherry picked from commit cc438f60d6ad0855f754dd32da9c9a80c7cabf92)

diff --git a/sw/qa/extras/uiwriter/data/tdf103978_backgroundTextShape.docx 
b/sw/qa/extras/uiwriter/data/tdf103978_backgroundTextShape.docx
new file mode 100644
index ..b99b65e47630
Binary files /dev/null and 
b/sw/qa/extras/uiwriter/data/tdf103978_backgroundTextShape.docx differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 378c9feb2852..973c6cadb2a8 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -209,6 +209,7 @@ public:
 void testTdf87922();
 void testTdf77014();
 void testTdf92648();
+void testTdf103978_backgroundTextShape();
 void testTdf96515();
 void testTdf96943();
 void testTdf96536();
@@ -334,6 +335,7 @@ public:
 CPPUNIT_TEST(testTdf87922);
 CPPUNIT_TEST(testTdf77014);
 CPPUNIT_TEST(testTdf92648);
+CPPUNIT_TEST(testTdf103978_backgroundTextShape);
 CPPUNIT_TEST(testTdf96515);
 CPPUNIT_TEST(testTdf96943);
 CPPUNIT_TEST(testTdf96536);
@@ -3845,6 +3847,25 @@ void SwUiWriterTest::testTdf92648()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(5), nCount);
 }
 
+void SwUiWriterTest::testTdf103978_backgroundTextShape()
+{
+SwDoc* pDoc = createDoc("tdf103978_backgroundTextShape.docx");
+
+// there is only one shape. It has an attached textbox
+bool bShapeIsOpaque = getProperty(getShape(1), "Opaque");
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Shape is in the foreground", false, 
bShapeIsOpaque );
+sal_Int32 nCount = 0;
+for (const SwFrameFormat* pFormat : *pDoc->GetSpzFrameFormats())
+{
+if (!SwTextBoxHelper::isTextBox(pFormat, RES_FLYFRMFMT))
+continue;
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Textbox syncs the shape's transparency", 
bShapeIsOpaque, pFormat->GetOpaque().GetValue() );
+++nCount;
+}
+//ensure that we don't skip the for loop without an error
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Number of TextBoxes", sal_Int32(1), nCount);
+}
+
 void SwUiWriterTest::testTdf96515()
 {
 // Enable hide whitespace mode.
diff --git a/sw/source/core/doc/textboxhelper.cxx 
b/sw/source/core/doc/textboxhelper.cxx
index bfa3d3a1836d..bead3f97bd8a 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -517,6 +517,9 @@ void SwTextBoxHelper::syncProperty(SwFrameFormat* pShape, 
sal_uInt16 nWID, sal_u
 break;
 }
 break;
+case RES_OPAQUE:
+aPropertyName = UNO_NAME_OPAQUE;
+break;
 }
 
 if (!aPropertyName.isEmpty())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Caolán McNamara

 sc/source/filter/html/htmlpars.cxx |  180 +++--
 sc/source/filter/inc/eeparser.hxx  |8 -
 sc/source/filter/inc/htmlpars.hxx  |   12 +-
 sc/source/filter/rtf/eeimpars.cxx  |   16 +--
 sc/source/filter/rtf/rtfparse.cxx  |   39 +++-
 5 files changed, 111 insertions(+), 144 deletions(-)

New commits:
commit 45780815b2ae9d07a249a7d84d332c8b402317a5
Author: CaolÃ¡n McNamara 
Date:   Fri Nov 3 10:49:38 2017 +

ofz: fix leak

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

diff --git a/sc/source/filter/html/htmlpars.cxx 
b/sc/source/filter/html/htmlpars.cxx
index 054a22685345..5cbbf7a299bc 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -229,18 +229,6 @@ ScHTMLLayoutParser::~ScHTMLLayoutParser()
 {
 ScHTMLTableStackEntry* pS = aTableStack.top();
 aTableStack.pop();
-
-bool found = false;
-for (ScEEParseEntry* p : maList)
-{
-if ( pS->pCellEntry == p )
-{
-found = true;
-break;
-}
-}
-if ( !found )
-delete pS->pCellEntry;
 if ( pS->pLocalColOffset != pLocalColOffset )
 delete pS->pLocalColOffset;
 delete pS;
@@ -313,12 +301,12 @@ void ScHTMLLayoutParser::NewActEntry( ScEEParseEntry* pE )
 {
 if ( !pE->aSel.HasRange() )
 {   // Completely empty, following text ends up in the same paragraph!
-pActEntry->aSel.nStartPara = pE->aSel.nEndPara;
-pActEntry->aSel.nStartPos = pE->aSel.nEndPos;
+mxActEntry->aSel.nStartPara = pE->aSel.nEndPara;
+mxActEntry->aSel.nStartPos = pE->aSel.nEndPos;
 }
 }
-pActEntry->aSel.nEndPara = pActEntry->aSel.nStartPara;
-pActEntry->aSel.nEndPos = pActEntry->aSel.nStartPos;
+mxActEntry->aSel.nEndPara = mxActEntry->aSel.nStartPara;
+mxActEntry->aSel.nEndPos = mxActEntry->aSel.nStartPos;
 }
 
 void ScHTMLLayoutParser::EntryEnd( ScEEParseEntry* pE, const ESelection& rSel )
@@ -491,7 +479,7 @@ void ScHTMLLayoutParser::Adjust()
 SCROW nCurRow = 0;
 sal_uInt16 nPageWidth = (sal_uInt16) aPageSize.Width();
 InnerMap* pTab = nullptr;
-for (ScEEParseEntry* pE : maList)
+for (auto& pE : maList)
 {
 if ( pE->nTab < nTab )
 {   // Table finished
@@ -590,7 +578,7 @@ void ScHTMLLayoutParser::Adjust()
 // Real column
 (void)SeekOffset( &maColOffset, pE->nOffset, &pE->nCol, 
nOffsetTolerance );
 SCCOL nColBeforeSkip = pE->nCol;
-SkipLocked( pE, false );
+SkipLocked(pE.get(), false);
 if ( pE->nCol != nColBeforeSkip )
 {
 SCCOL nCount = (SCCOL)maColOffset.size();
@@ -645,7 +633,6 @@ sal_uInt16 ScHTMLLayoutParser::GetWidth( ScEEParseEntry* pE 
)
 
 void ScHTMLLayoutParser::SetWidths()
 {
-ScEEParseEntry* pE;
 SCCOL nCol;
 if ( !nTableWidth )
 nTableWidth = (sal_uInt16) aPageSize.Width();
@@ -664,7 +651,7 @@ void ScHTMLLayoutParser::SetWidths()
 nTableWidth = (sal_uInt16)(pLocalColOffset->back() - 
pLocalColOffset->front());
 for ( size_t i = nFirstTableCell, nListSize = maList.size(); i < 
nListSize; ++i )
 {
-pE = maList[ i ];
+auto& pE = maList[ i ];
 if ( pE->nTab == nTable )
 {
 pE->nOffset = (sal_uInt16) (*pLocalColOffset)[pE->nCol - 
nColCntStart];
@@ -684,7 +671,7 @@ void ScHTMLLayoutParser::SetWidths()
 pOffsets[0] = nColOffsetStart;
 for ( size_t i = nFirstTableCell, nListSize = maList.size(); i < 
nListSize; ++i )
 {
-pE = maList[ i ];
+auto& pE = maList[ i ];
 if ( pE->nTab == nTable && pE->nWidth )
 {
 nCol = pE->nCol - nColCntStart;
@@ -755,7 +742,7 @@ void ScHTMLLayoutParser::SetWidths()
 
 for ( size_t i = nFirstTableCell, nListSize = maList.size(); i < 
nListSize; ++i )
 {
-pE = maList[ i ];
+auto& pE = maList[ i ];
 if ( pE->nTab == nTable )
 {
 nCol = pE->nCol - nColCntStart;
@@ -780,12 +767,12 @@ void ScHTMLLayoutParser::SetWidths()
 }
 for ( size_t i = nFirstTableCell, nListSize = maList.size(); i < 
nListSize; ++i )
 {
-pE = maList[ i ];
+auto& pE = maList[ i ];
 if ( pE->nTab == nTable )
 {
 if ( !pE->nWidth )
 {
-pE->nWidth = GetWidth( pE );
+pE->nWidth = GetWidth(pE.get());
 OSL_ENSURE( pE->nWidth, "SetWidths: pE->nWidth == 0" );
 }
 MakeCol( &maColOffset, pE->nOffset, pE->nWidth, nOffsetTolerance, 
nOffsetTole

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

2017-11-03 Thread Stephan Bergmann

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

New commits:
commit d659b79d409b64da11b8a89a2995c97543cc42d6
Author: Stephan Bergmann 
Date:   Fri Nov 3 16:22:35 2017 +0100

Improve wording

("No ... not specified" rather looked like an accidental double negation to 
me)

Change-Id: I8f1488b7e1561f8b2167a27120b60614b72a55fd

diff --git a/configure.ac b/configure.ac
index 842e38b5b097..5e566913189c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6501,8 +6501,8 @@ if test $_os = "WINNT"; then
 cd -
 else
 UCRT_REDISTDIR=""
-AC_MSG_WARN([No --with-ucrt-dir not specified or dlls not found - 
installer will have runtime dependency])
-add_warning "No --with-ucrt-dir not specified or dlls not found - 
installer will have runtime dependency"
+AC_MSG_WARN([--without-ucrt-dir not specified or dlls not found - 
installer will have runtime dependency])
+add_warning "--without-ucrt-dir not specified or dlls not found - 
installer will have runtime dependency"
 fi
 fi
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Caolán McNamara

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

New commits:
commit bb90e3c28389ec411f6bcd94add4770990bf2f14
Author: CaolÃ¡n McNamara 
Date:   Fri Nov 3 09:15:04 2017 +

ofz#4034 Integer-overflow

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

diff --git a/svx/source/table/tablelayouter.cxx 
b/svx/source/table/tablelayouter.cxx
index 4823f6a8ef92..fb01fec34282 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -637,7 +637,7 @@ void TableLayouter::LayoutTableWidth( tools::Rectangle& 
rArea, bool bFit )
 while( coliter.next(nCol ) )
 {
 maColumns[nCol].mnPos = nNewWidth;
-nNewWidth += maColumns[nCol].mnSize;
+nNewWidth = o3tl::saturating_add(nNewWidth, maColumns[nCol].mnSize);
 if( bFit )
 {
 Reference< XPropertySet > xColSet( xCols->getByIndex(nCol), 
UNO_QUERY_THROW );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Samuel Mehrbrodt

 xmlsecurity/source/helper/ooxmlsecparser.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 08434e96efb1706a62893a3812299cc3c750a9f1
Author: Samuel Mehrbrodt 
Date:   Fri Nov 3 15:38:06 2017 +0100

Missing initialization of m_bInSignatureLineId

Change-Id: I563f7324129828d13c4549d330d58d6ab972472c
Reviewed-on: https://gerrit.libreoffice.org/44268
Reviewed-by: Serge Krot (CIB) 
Tested-by: Serge Krot (CIB) 

diff --git a/xmlsecurity/source/helper/ooxmlsecparser.cxx 
b/xmlsecurity/source/helper/ooxmlsecparser.cxx
index e9a4b61e8b98..cb5334cc8a59 100644
--- a/xmlsecurity/source/helper/ooxmlsecparser.cxx
+++ b/xmlsecurity/source/helper/ooxmlsecparser.cxx
@@ -25,6 +25,7 @@ OOXMLSecParser::OOXMLSecParser(XMLSignatureHelper& 
rXMLSignatureHelper, XSecCont
 ,m_bInCertDigest(false)
 ,m_bInValidSignatureImage(false)
 ,m_bInInvalidSignatureImage(false)
+,m_bInSignatureLineId(false)
 ,m_bReferenceUnresolved(false)
 ,m_rXMLSignatureHelper(rXMLSignatureHelper)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: common/IoUtil.cpp common/Util.cpp test/httpwstest.cpp test/TileCacheTests.cpp test/TileQueueTests.cpp wsd/ClientSession.cpp wsd/FileServer.cpp

2017-11-03 Thread Miklos Vajna

 common/IoUtil.cpp   |1 -
 common/Util.cpp |1 -
 test/TileCacheTests.cpp |2 +-
 test/TileQueueTests.cpp |1 -
 test/httpwstest.cpp |1 -
 wsd/ClientSession.cpp   |1 -
 wsd/FileServer.cpp  |1 -
 7 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit a3d6dee5030678baf141e91706d2e80a8f3af44f
Author: Miklos Vajna 
Date:   Fri Nov 3 15:18:38 2017 +0100

Remove unused strings

Change-Id: I621c462bca38222dcf26dfa1e414cf27e1a3e088

diff --git a/common/IoUtil.cpp b/common/IoUtil.cpp
index da9a4242..c93023af 100644
--- a/common/IoUtil.cpp
+++ b/common/IoUtil.cpp
@@ -113,7 +113,6 @@ void SocketProcessor(const std::shared_ptr& 
ws,
 
 LOG_CHECK(n > 0);
 
-const std::string firstLine = LOOLProtocol::getFirstLine(payload);
 if ((flags & WebSocket::FrameFlags::FRAME_FLAG_FIN) != 
WebSocket::FrameFlags::FRAME_FLAG_FIN)
 {
 // One WS message split into multiple frames.
diff --git a/common/Util.cpp b/common/Util.cpp
index a3e5e798..9dd3c80c 100644
--- a/common/Util.cpp
+++ b/common/Util.cpp
@@ -164,7 +164,6 @@ namespace Util
 while (!isdigit(line[len]) && line[len] != '\0')
 ++len;
 
-const auto str = std::string(line + len, strlen(line + len) - 1);
 return line + len;
 }
 
diff --git a/test/TileCacheTests.cpp b/test/TileCacheTests.cpp
index cac39144..2231dfa9 100644
--- a/test/TileCacheTests.cpp
+++ b/test/TileCacheTests.cpp
@@ -381,7 +381,7 @@ void TileCacheTests::testDisconnectMultiView()
 }
 
 // Should never get more than 4 tiles on socket2.
-const auto res2 = getResponseString(socket2, "tile:", 
"disconnectMultiView-2 ", 500);
+getResponseString(socket2, "tile:", "disconnectMultiView-2 ", 500);
 }
 }
 
diff --git a/test/TileQueueTests.cpp b/test/TileQueueTests.cpp
index 72f263eb..bcf38ba3 100644
--- a/test/TileQueueTests.cpp
+++ b/test/TileQueueTests.cpp
@@ -119,7 +119,6 @@ void TileQueueTests::testTileCombinedRendering()
 const std::string req1 = "tile part=0 width=256 height=256 tileposx=0 
tileposy=0 tilewidth=3840 tileheight=3840";
 const std::string req2 = "tile part=0 width=256 height=256 tileposx=3840 
tileposy=0 tilewidth=3840 tileheight=3840";
 const std::string req3 = "tile part=0 width=256 height=256 tileposx=0 
tileposy=3840 tilewidth=3840 tileheight=3840";
-const std::string req4 = "tile part=0 width=256 height=256 tileposx=3840 
tileposy=3840 tilewidth=3840 tileheight=3840";
 
 const std::string resHor = "tilecombine part=0 width=256 height=256 
tileposx=0,3840 tileposy=0,0 imgsize=0,0 tilewidth=3840 tileheight=3840 
ver=-1,-1 oldwid=0,0 wid=0,0";
 const TileQueue::Payload payloadHor(resHor.data(), resHor.data() + 
resHor.size());
diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp
index 14a2fb24..dee2e160 100644
--- a/test/httpwstest.cpp
+++ b/test/httpwstest.cpp
@@ -2375,7 +2375,6 @@ void HTTPWSTest::testEachView(const std::string& doc, 
const std::string& type,
   const std::string& testname)
 {
 const std::string view = testname + "view %d -> ";
-const std::string load = testname + "view %d, cannot load the document ";
 const std::string error = testname + "view %d, did not receive a %s 
message as expected";
 
 try
diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index be9f542f..630c0f38 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -861,7 +861,6 @@ bool ClientSession::forwardToClient(const 
std::shared_ptr& payload)
 
 Authorization ClientSession::getAuthorization() const
 {
-std::string accessToken;
 Poco::URI::QueryParameters queryParams = _uriPublic.getQueryParameters();
 
 // prefer the access_token
diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index f27d9272..949ad0f1 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -132,7 +132,6 @@ bool FileServerRequestHandler::isAdminLoggedIn(const 
HTTPRequest& request,
 if (credentials.getUsername() == user &&
 userProvidedPwd == pass)
 {
-const std::string htmlMimeType = "text/html";
 // generate and set the cookie
 JWTAuth authAgent(sslKeyPath, "admin", "admin", "admin");
 const std::string jwtToken = authAgent.getAccessToken();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Ashod Nakashian

 svx/source/dialog/ClassificationDialog.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 012946122bed55d9a51c4b37a3b72899274e49c9
Author: Ashod Nakashian 
Date:   Fri Nov 3 09:50:50 2017 -0400

TSCP: fix build by correcting member names

Change-Id: I77212f1c6ca3d54ced1b73604e9d8a3022d72700

diff --git a/svx/source/dialog/ClassificationDialog.cxx 
b/svx/source/dialog/ClassificationDialog.cxx
index 7eed3b94e424..30f6c796240f 100644
--- a/svx/source/dialog/ClassificationDialog.cxx
+++ b/svx/source/dialog/ClassificationDialog.cxx
@@ -76,7 +76,7 @@ OUString 
getStringRepresentation(std::vector const & rResu
 case svx::ClassificationType::INTELLECTUAL_PROPERTY_PART:
 case svx::ClassificationType::MARKING:
 case svx::ClassificationType::TEXT:
-sRepresentation += rResult.msString;
+sRepresentation += rResult.msName;
 break;
 
 case svx::ClassificationType::PARAGRAPH:
@@ -109,10 +109,10 @@ void writeResultToXml(tools::XmlWriter & rXmlWriter,
 }
 rXmlWriter.attribute("type", sType);
 rXmlWriter.startElement("string");
-rXmlWriter.content(rResult.msString);
+rXmlWriter.content(rResult.msName);
 rXmlWriter.endElement();
 rXmlWriter.startElement("abbreviatedString");
-rXmlWriter.content(rResult.msAbbreviatedString);
+rXmlWriter.content(rResult.msAbbreviatedName);
 rXmlWriter.endElement();
 rXmlWriter.endElement();
 }
@@ -311,7 +311,7 @@ void ClassificationDialog::readRecentlyUsed()
 }
 aWalker.parent();
 
-aResults.push_back({ eType, sString, 
sAbbreviatedString });
+aResults.push_back({ eType, sString, 
sAbbreviatedString, OUString() });
 }
 }
 aWalker.next();
___
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/libreoffice-5.4.3.2-hotfix1'

2017-11-03 Thread Christian Lohmaier

Tag 'libreoffice-5.4.3.2-hotfix1' created by Christian Lohmaier 
 at 2017-11-03 14:12 +

Tag libreoffice-5.4.3.2-hotfix1
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJZ/HliAAoJEPQ0oe+v7q6jj0cQALXoT1XGleo6bf4a/bQ8wvJO
/Iat76kjIu+I1m0NBTpP+cMv+26jjALwc0sdgwIjiYNgxJ3xR8z4HvBjsKZn6SGh
MVsRop9c/XxnIrXT0dPSN6Z9C25HtHzY7WInvq8pRwEAkefdd3lUbPULBI97ZBeT
UMKSqEymB+84hRXI2HcRUsG++b+YTAp9pHfRO0PJz4EX+H1YCJeHr86FxiI3qRP2
Ta9dXTEVqwEAEA6ZlzIK3A4rAeBK7r6RRlzjDg3kiIFdBTdsWISR5436MR9UP+6Z
lig5akn1Ij6lQAwvKInVrLjZzhfgEmsoMin7qxO7J+/2nguChkQ4USlmydO6d9Gw
3uvZ3nTfVYblv/GCNcRJczPHPfBxiDv25JyKY6nuR6dFz2ozy0H2Jx7fyKgcXNsL
MxkUs/ULK3XITi9q/IPGb0/S2Gj6Go0OaP4i96BPwcYM+cri2PSe0Q+XV8r0nYJD
k6zJ/+60RJkGvu6NNNzegD+A4+Qjf0ZdO8bmRLxdoFDA9zZCaLmarAn/Q2MSIK7g
XtwS7WlCI2iCs7ozN54Tnp/0VwETbfgnap9uOU9bN5l6PNg8DtjOPhojJSEBtMoN
uLgxKgrpdwvYCZ6jIKB5KWb0LEM2jxi338apj4cd5OMazUbRoW2hYC0T62npBS+w
ZN+sbsQqKtAxjT4O/xXy
=rn5x
-END PGP SIGNATURE-

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

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-5.4.3.2-hotfix1'

2017-11-03 Thread Christian Lohmaier

Tag 'libreoffice-5.4.3.2-hotfix1' created by Christian Lohmaier 
 at 2017-11-03 14:12 +

Tag libreoffice-5.4.3.2-hotfix1
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJZ/HlfAAoJEPQ0oe+v7q6j0DQP/1FYtPonyJQeU5uZxIpVuOnW
gGGIDEcbXmSnNSe+YF5Cj3dJrGPI33TCOy0ovOr/V3WA2ok6MG740Sha0MueSu33
RILDy6O/rTl4+bUyzwWUFX489LY/CPOh9NUDrAFqjnhFV91Kys8DrU1ESfXNWFu5
OBg47fYrs2CGjbIwUWu4HHjV3gs9XbvRfmNogfxABrP+EV5JBlRvbGVDcbzdx0uN
4KT114n5LV9/x3d6XQiHW6NegXJOJv+YA+QJt02xkUmP0xKJD5waFmThtGNv+qEf
bCRNXHdQq9WjRHHBQd3aRKpnOVMoVu8+MYjeInjWS4aMTwtwrJDYbQCQGXCcrAyl
7QTYxRE8Kga3tbSxkHYEQki1Rc7xc9++d5sEBhF5OPNhmfRCtOEzDVKQlnJ3Fl0v
EYWM7IL4yOoXd0SrcoMoL6YEGT64TfUwXJJuDbAsYQKGK50kLphXi6hr2Yij41m3
2U6A8B5Nl1dlVDM8q6CYE2TzRg6WJ+qi4V6T1tbJnqswTpilc2iiNwedsYGxPtDp
ExuSDtIjFX81KE33nhsTAOfr70pgfa1f4un2Wlq9AKk8+vxQ7v8UyyTWw9vYaNDN
ZU6lTeNKXClHMoy/JGxMKAFAYzY72x+K4srpt8BYUNuL9yMHEQcw7YA+NR1nO5Jf
eO/2DU4ODrUSAB1zv0b2
=Pgcd
-END PGP SIGNATURE-

Changes since libreoffice-5.4.3.2:
Christian Lohmaier (1):
  Version 5.4.3.2, tag libreoffice-5.4.3.2-hotfix1

---
 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/libreoffice-5.4.3.2-hotfix1'

2017-11-03 Thread Christian Lohmaier

Tag 'libreoffice-5.4.3.2-hotfix1' created by Christian Lohmaier 
 at 2017-11-03 14:12 +

Tag libreoffice-5.4.3.2-hotfix1
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJZ/HlcAAoJEPQ0oe+v7q6j4VMQAI2W115ulEXsww6Mt0ClF7yU
1i940/C/Aa6O2cAu+zo4ChyCrQEzVzZrLQ2VUZvxHKGN3gNuueYfQobS/WRUKefB
qbkFeiQv/lGdjDe87ALwVUVjWRxIvhIKGp8voa341upY33Lx5LbIzX9RRowxMuT1
dVikTr6FE0XL4+KWl3DPVAU6O0YnV4rLu76OBd6Hmu7OK+7oNgycX/NzjUH7MVFr
rG818zQOjP6EKTFqQhIBXyTsVKmSWPr5ehzBfd9egJqnk9C5iqZzHCUFu2VhCCyo
ygRncbKsRRB+4JzFh0AoSXTA4iVr3LfaSXyYEI+9UggGU8+Lj9BxX2MFJ+sBb6Zd
Kdq/X6SXXdXMGEGfxWdBAh3aLJLwb5KXfpipO76cZKclrSn/O+GyBYfKc8T4bEGL
PZJUuPa6Dc0lWheKfHhfY4P1zobZCdIAY6GOanOAOUcsewzGb13jOYZ0iolgAaGS
hLPx2jNGtQ0GW+qVtcTexxRS72huuHkenNU2HSge6FdDWOjZI0hGai0ULtLyra4R
EPxwZkckCl+nYKEa4ohVMS6ywZPXMcwEnxx0bGnXRSZ2THsmULjpPs/EyvatqYWH
B0vXTFguRjZSmbT6KN+XSzHSLga4SYeEkHl6T8Id2lkJysB+sGOKXu3+Iz6+6oRO
QR7GZfUBS1jCvtZwVti4
=OVaD
-END PGP SIGNATURE-

Changes since libreoffice-5.4.3.2:
Christian Lohmaier (1):
  Version 5.4.3.2, tag libreoffice-5.4.3.2-hotfix1

---
 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/libreoffice-5.4.3.2-hotfix1'

2017-11-03 Thread Christian Lohmaier

Tag 'libreoffice-5.4.3.2-hotfix1' created by Christian Lohmaier 
 at 2017-11-03 14:12 +

Tag libreoffice-5.4.3.2-hotfix1
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJZ/HlZAAoJEPQ0oe+v7q6jWg4P/RdLKwDkYjsxk6xMXWubFAfm
lvEryDxWHibCjfRvb0u3RDkrOyguBtrEYb9GX4Wgy7ni3ZCflHo4LF2/S0HHCF2q
WlZe3U0G6orls2AcVEn9DrKOJ9tYvArOYDwIzTeusSScGpfhND91NRbpKa7bp0h4
eqT/znk27qquaV971mwO9qKHcbi2DJMifZtILIayqLghonTQ+js/bQOfQyUiAhMo
UqW3RXkYZe1+ohVyT8CkxtDF6AAjdjZFzfof9f6mYiQZro1y4uOUFxZP9kxvht4G
cBVJUPgYUk98DPNhaQbE3EGw9AWt5Whv6j1lyBmCVp+fqrE2osUu+3bHcEV0KTfJ
TAHCOs2WTqxzuJevzleCdOmJJOYQO6gNlQFV/PtVAjQyoBgNrjPNhNuW2HZygGbP
gwMYSE4n8xDYVge93oIGIPHpRVhuZ+kM6U3bANIfjnwNz/QFfSf1fbKXfRv9swMH
2VaGAdI+S5kMX/nF/YnJLkpap9rV4iqtH1OW6loUcpQzbJuXcQI1INgs3Z+jTviB
Sr2tQmzLNL7ZfpasHInLiiat2lxN1DiX80ltZ4rQRg8Cg7ZvxmTmJr/0wsq2awK+
aZYQaO8RdG4L8ED9uwVNnBzLGs24fxg92LLNg4ViFJDL7mphFbQToWPRP6AIw8Zf
94NIw9xRbLHqLl0g9mUf
=LsiD
-END PGP SIGNATURE-

Changes since libreoffice-5.4.3.2:
Christian Lohmaier (1):
  Version 5.4.3.2, tag libreoffice-5.4.3.2-hotfix1

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

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

2017-11-03 Thread Eike Rathke

 sc/source/core/data/column.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit f80ec94e75a9257504135bc32793c5eb37914bbe
Author: Eike Rathke 
Date:   Thu Nov 2 12:53:14 2017 +0100

Resolves: tdf#111428 swap ScColumn::mnBlkCountFormula

 This is a combination of 2 commits.

(cherry picked from commit 423df1fa929784c14e3a133c06468589fe9269cd)
(cherry picked from commit 911e2aff3cc37cb7410292728ffea05fffbfb0b3)

CellStoreEvent remembered the original ScColumn::mnBlkCountFormula,
hence after inserting a column to the left the quick check of
ScColumn::HasFormulaCell() whether there are any formula cells worked on
the swapped in count (originally the one to the right) that happens to
be empty in the scenario. Things worked correctly by accident if the
next column to the right already contained a formula cell.

c44fed96c49bea7365bf1200e06788860966795c

Change-Id: If993856ceee657736f516a81c293506041a6b7eb
Reviewed-on: https://gerrit.libreoffice.org/44211
Reviewed-by: Markus Mohrhard 
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 45f211cbedd1..5a817c2f747e 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1899,6 +1899,9 @@ void ScColumn::SwapCol(ScColumn& rCol)
 maCellTextAttrs.swap(rCol.maCellTextAttrs);
 maCellNotes.swap(rCol.maCellNotes);
 
+// Swap all CellStoreEvent mdds event_func related.
+std::swap( mnBlkCountFormula, rCol.mnBlkCountFormula);
+
 // notes update caption
 UpdateNoteCaptions(0, MAXROW);
 rCol.UpdateNoteCaptions(0, MAXROW);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-5.4.3.2'

2017-11-03 Thread Christian Lohmaier

Tag 'libreoffice-5.4.3.2' created by Christian Lohmaier 
 at 2017-11-03 13:59 +

Tag libreoffice-5.4.3.2
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJZ/HZaAAoJEPQ0oe+v7q6jSzcP/RH4zvANXQYykPg1Wpmq2bVR
5nvKExrWmzmQ/zonPFicJjZVIEmz7qpuTo6YhmmvFaZjoZRhyC5vcaZ4HN6nQBfJ
crHmvNBXZx83Yko5vZueN6eI3vZoLvvwvfpFviQLyBpuTva7Gdy477htXtPkoNvi
pM+stKVHceittUZ24Zo0uMFSbZy55mjOJ773yIkUKfnwgqoZTmIvKvqKTl8MvP7c
cJuR95b8J6PqpNiV2pHSsEDiHMPKOsfT8i7ScNj0sNhWttPIH1Z4WYjDuo/AdwnJ
ssDsEjeT+bwhUSNX5UeJhesmQT+SR8TH4ns0WP8khQ0RuKrCUsggtUJjAkHzVwZJ
c+J0wQ8MSWtSU5wEWOpw0LzdHQUB0NAif6u+QkrKotNOWKZxzTOkDDltJarPf8hw
za+VgpQzp4/YH+QNRmYQ+xnsyAIMfWQFz3m7Pt6IxlDIL6t26TC35A7NGoyKlly7
S2qzJNDaa6XyB4wxoU0m9AotZXv2Lcq9l6VzBKezA7xLR4pbdfuRnq7+SmTGKbkR
VYVg83/es+oYyzJU0Ikdx5Q7YclRgfTGxDzVa5FVS6EJSa9+8nh7FZMMQUcMVIsG
tOf7Ffl6mftTld3JajLeBnujcmL4WYE1RLvziyjELWQKWhsAmWtNYA3oWI+6I04i
tGW3xmQyrnZdPQHJ7+Qv
=BStt
-END PGP SIGNATURE-

Changes since libreoffice-5.4.3.1-1:
---
 0 files changed
---
___
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/libreoffice-5.4.3.2'

2017-11-03 Thread Christian Lohmaier

Tag 'libreoffice-5.4.3.2' created by Christian Lohmaier 
 at 2017-11-03 13:59 +

Tag libreoffice-5.4.3.2
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJZ/HZdAAoJEPQ0oe+v7q6j9Z4QAJwNkxRb78WUQ1/PiGCFfIPk
IoTu28LpphyGS3Ay3Ze2kLey2YzYOhF2oZjBgN+a3Ofxd74gaXil+Gw7I4LqqD2O
9e4LodZoR2s6nDu5Q8SKV8u2YI+c93QIjFyGvjxDkZRjF9wglZGBhqti2RHp3/9k
ze8N8V0+AZxJPy1iLBq5IZioJCGVn0VDVojlU8v/FBGDrZTllfS0FYvaHgv8g7aI
60HNRRHhzfAhGknNymRxHuW3X1/Voq3XIonbW1Qsb1lRv5dPCxpIQplDEQ7z/zlF
coXw8K97OJxPYnr9Tx/hW95Sw+FKEKjZhOj4euQU7TzqO/y7STBw7FLWGg/bMPUX
r8sJpzfslEXDIAtydoveKR17wNlZwO9mR03yib9kFt7xr7BUg/2Z7ZhBWj6c6uaz
HUyHe6U45Q212sIzQevphHqoWIXcEdsZ8LNVFnf7iZdfLYomYIXfqQr46UqlbZi/
dTrOKQZhqVhcjzomjaEEsqReIXyjdL5O6smqZ5yuOD2PXBTMqEyJb9DKuleEeP7L
KL2/WtBJuqPzD1X6VW3o1SakX+Rhmp5ASZOO8KjxTe6KI1V9U1CaoRtBsjtc2keh
OLvXte0QAbyG5VilwYnlInPsSOG4DvOxQNrPRyhnw6sQkwiUxWizkb+/KfJ9aStD
X/wT6MtdF+wqArY9bvsT
=o8J+
-END PGP SIGNATURE-

Changes since libreoffice-5-4-branch-point-734:
---
 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/libreoffice-5.4.3.2'

2017-11-03 Thread Christian Lohmaier

Tag 'libreoffice-5.4.3.2' created by Christian Lohmaier 
 at 2017-11-03 13:59 +

Tag libreoffice-5.4.3.2
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJZ/HZWAAoJEPQ0oe+v7q6jwzcP/A9GbVn9I9/BZ9cDHo/G1Gpq
zlYe3eTMcCb7hJh2B4cBwUk3hERXZozI3pEOuD0hA8f6oHeO46r0dZOaBTrpPXmE
VKBnC3HGrXUOP+/qNgIfowLVUJI3/ojWil3a10DDKTkxnbPHKGVTti4/QrMgxpY7
eIkbvG1l+TdmqlAvHH3gARqjycsYnjPu5FdfCbiAxs1ip3/9bjRcb3ZdlFEl+YBH
BUgESMKHXCYlO7dNCgueeVa8uM3Pg7dvQ7SDRUvoC79ewM7iLKPSIvpO3q8bCM6f
mgmQXQXR4RI3WLrckDvMglPGVOWlcfWMeGzi1lyw0lhA+u7PZefaJ/LU8gxzPF73
9XPGi1n9UQvfnEqnQ05hIycgo6HHHsN2Ija67kRcNqI4NM5E8JSGjeJR+5qqT30B
FW+b3QIgrKzZedT97innIKqAnu8/NtBeuvVx00V/AbBsbnYaIitx1/nNzu2FHW3m
AC6oyuDnR94Vna5mV2EsLVbOFANMbd/UeVxZchl/xOlrnKtZ/X7j1gdJMgKVpDDm
muy+RuE0mlwXOJMZ0e+ZcJ5CkFZTfKmW//L+s6z9BrOgssS/2iikqMRyX+Hlnl5K
pBnfyxuZIrOfbR2IuwmkbBXqY7SMDvJy9yOMVDcDuFqD5IVs6OnpQylLQSconyW3
CTcw9Sga4qgR6Z+byoPR
=+6WB
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4-3' - configure.ac

2017-11-03 Thread Christian Lohmaier

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

New commits:
commit 3ac576a4a20a294fcc9652533e02e3d9e4d886bd
Author: Christian Lohmaier 
Date:   Fri Nov 3 15:00:25 2017 +0100

bump product version to 5.4.3.2.0+

Change-Id: I78fbcf547a2afd1f50f7597f310f0edf7276bb93

diff --git a/configure.ac b/configure.ac
index 493fa4f8381f..0b6850ecd103 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.4.3.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.4.3.2.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
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/libreoffice-5.4.3.2'

2017-11-03 Thread Christian Lohmaier

Tag 'libreoffice-5.4.3.2' created by Christian Lohmaier 
 at 2017-11-03 13:59 +

Tag libreoffice-5.4.3.2
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJZ/HZSAAoJEPQ0oe+v7q6jDTEP/1xyDSGMn0Ad2Dtvw+/eindQ
edRuOCEp1jTMfx+ebEEBDcUd/cesHax8S2WfS0+3GTixylu3bPOit9SYgsd6WH7K
/Xswdsq0rnfsrcgK7WHjo+6PVKWLKJMXrj/tVjw0qXZkkwHgqH9TPaZk3fK9P9xP
XP/KQq8Ji0Ja+6Ki3sWySoteORqTGK/rOakz9o7gezYmNiVmNlU38JaeMsOIabep
V3cKbKUA7tt+Ri5DEioVoew56VbIfuwBtKp2jJs+ikgKEzwA266yp5CVQNT1ws0O
BdagZcl0Y9D4c0MvQpec2wL3ac7vmLz/oA3RS2mxcFT+kQk6kKM8cNjYAxKBuSH8
ZuGfkEFfDGUpGSc9gVjbRvufUKG7mclZeVHz6yDw7lAdsKODKISTr3+kTJssj+xb
IfqtH/u645ma1bkNrbqzoFruSbD5eC2xKFz1XtlG7omgnfQw7hLX7nQ3rbjfy79D
q3g8DbrFA6bJxOK7OzgkUMVhkPTIKZ4BpdUHdbJFBIvLnCTUTo3pjsgwJZTwBlL+
tA4APp/TbA7VoThHNPERlGZ2P7i/A5/lNRMWQtbcz2UforCWrECOnkCMHo1q+ei0
QbyWu2644xfkF6pVCdGGGSpV82295TAQZFcfK5rg/FvuSwj8jgpONfrtxVyfC51m
rWwBfhlFLUoMb51Ea1O/
=pjAK
-END PGP SIGNATURE-

Changes since libreoffice-5-4-branch-point-8:
---
 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

2017-11-03 Thread Michael Stahl

 sfx2/source/dialog/filtergrouping.cxx |   41 +-
 1 file changed, 21 insertions(+), 20 deletions(-)

New commits:
commit 3d471f5fea7dfb65ceb6bffb4da54f8d068ca63b
Author: Michael Stahl 
Date:   Fri Nov 3 14:49:35 2017 +0100

Revert "Replace list by vector in filtergrouping (sfx2)"

This reverts commit 62896fb7a5983eb13ee87b94ae803e6552626d8d.

The usage of iterators in CreateEmptyClassRememberPos
operator() is bogus and causes:

Error: attempt to dereference a singular iterator.

diff --git a/sfx2/source/dialog/filtergrouping.cxx 
b/sfx2/source/dialog/filtergrouping.cxx
index 47c10dd13eca..04e09f66807b 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -35,6 +35,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -119,8 +120,8 @@ namespace sfx2
 
 
 typedef StringPair  FilterDescriptor;   // a 
single filter or a filter class (display name and filter mask)
-typedef ::std::vector< FilterDescriptor >   FilterGroup;// a 
vector of single filter entries
-typedef ::std::vector< FilterGroup >GroupedFilterList;  // a 
vector of all filters, already grouped
+typedef ::std::list< FilterDescriptor > FilterGroup;// a list 
of single filter entries
+typedef ::std::list< FilterGroup >  GroupedFilterList;  // a list 
of all filters, already grouped
 
 /// the logical name of a filter
 typedef OUString FilterName;
@@ -137,8 +138,8 @@ namespace sfx2
 Sequence< FilterName >  aSubFilters;// the (logical) names 
of the filter which belong to the class
 } FilterClass;
 
-typedef ::std::vector< FilterClass >   
FilterClassVector;
-typedef ::std::map< OUString, FilterClassVector::iterator >
FilterClassReferrer;
+typedef ::std::list< FilterClass >  
FilterClassList;
+typedef ::std::map< OUString, FilterClassList::iterator >
FilterClassReferrer;
 
 typedef ::std::vector< OUString >StringArray;
 
@@ -161,12 +162,12 @@ namespace sfx2
 struct CreateEmptyClassRememberPos
 {
 protected:
-FilterClassVector&  m_rClassVector;
+FilterClassList&m_rClassList;
 FilterClassReferrer&m_rClassesReferrer;
 
 public:
-CreateEmptyClassRememberPos( FilterClassVector& _rClassVector, 
FilterClassReferrer& _rClassesReferrer )
-:m_rClassVector   ( _rClassVector )
+CreateEmptyClassRememberPos( FilterClassList& _rClassList, 
FilterClassReferrer& _rClassesReferrer )
+:m_rClassList   ( _rClassList )
 ,m_rClassesReferrer ( _rClassesReferrer )
 {
 }
@@ -175,9 +176,9 @@ namespace sfx2
 void operator() ( const FilterName& _rLogicalFilterName )
 {
 // insert a new (empty) class
-m_rClassVector.emplace_back( );
+m_rClassList.emplace_back( );
 // get the position of this new entry
-FilterClassVector::iterator aInsertPos = m_rClassVector.end();
+FilterClassList::iterator aInsertPos = m_rClassList.end();
 --aInsertPos;
 // remember this position
 m_rClassesReferrer.emplace( _rLogicalFilterName, aInsertPos );
@@ -218,7 +219,7 @@ namespace sfx2
 };
 
 
-void lcl_ReadGlobalFilters( const OConfigurationNode& 
_rFilterClassification, FilterClassVector& _rGlobalClasses, StringArray& 
_rGlobalClassNames )
+void lcl_ReadGlobalFilters( const OConfigurationNode& 
_rFilterClassification, FilterClassList& _rGlobalClasses, StringArray& 
_rGlobalClassNames )
 {
 _rGlobalClasses.clear();
 _rGlobalClassNames.clear();
@@ -266,10 +267,10 @@ namespace sfx2
 {
 protected:
 OConfigurationNode  m_aClassesNode;
-FilterClassVector&m_rClasses;
+FilterClassList&m_rClasses;
 
 public:
-ReadLocalFilter( const OConfigurationNode& _rClassesNode, 
FilterClassVector& _rClasses )
+ReadLocalFilter( const OConfigurationNode& _rClassesNode, 
FilterClassList& _rClasses )
 :m_aClassesNode ( _rClassesNode )
 ,m_rClasses ( _rClasses )
 {
@@ -288,7 +289,7 @@ namespace sfx2
 };
 
 
-void lcl_ReadLocalFilters( const OConfigurationNode& 
_rFilterClassification, FilterClassVector& _rLocalClasses )
+void lcl_ReadLocalFilters( const OConfigurationNode& 
_rFilterClassification, FilterClassList& _rLocalClasses )
 {
 _rLocalClasses.clear();
 
@@ -305,7 +306,7 @@ namespace sfx2
 }
 
 
-void lcl_ReadClassification( FilterClassVector& _rGlobalClasses, 
StringArray& _rGlobalClassNames, FilterClassVector& _rLocalClasses )
+void lcl_ReadClassification( FilterClassList& _rGlobalClasses, 
StringArray& _rGlobalClassNames, FilterC

[Libreoffice-commits] core.git: Branch 'feature/RotateFlyFrame3' - sw/source

2017-11-03 Thread Armin Le Grand

 sw/source/core/doc/notxtfrm.cxx  |   75 +++---
 sw/source/core/inc/flyfrms.hxx   |   10 +++
 sw/source/core/inc/frame.hxx |   34 
 sw/source/core/inc/notxtfrm.hxx  |   10 +++
 sw/source/core/layout/flylay.cxx |   89 ---
 sw/source/core/layout/wsfrm.cxx  |  110 +++
 6 files changed, 234 insertions(+), 94 deletions(-)

New commits:
commit 86376903ae9dbb6c3857db72b178ae2673f3f88c
Author: Armin Le Grand 
Date:   Fri Nov 3 14:45:42 2017 +0100

RotateFlyFrame3: Added transformation support to SwFrame

The layout element SwFrame now has methods to get linear
transformations for the geometry-defining FrameAreaDefinitions.
These return by default the SwRect (without being relative
for the FramePrintArea to make things easier), but are
replaced by the now two SwFrame derivates that support
rotation. The layout will now use the BoundRects of the
transformations, thus supporting a future that will allow
all kinds of free transformations (including mirror, rotation
and shear)

Change-Id: I18b85f5ddc2970a1b8c137d30b0c2ee49bb8df72

diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 4631dbb7a2e3..4a040cedfb9d 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -143,7 +143,9 @@ static void lcl_PaintReplacement( const SwRect &rRect, 
const OUString &rText,
 }
 
 SwNoTextFrame::SwNoTextFrame(SwNoTextNode * const pNode, SwFrame* pSib )
-: SwContentFrame( pNode, pSib )
+:   SwContentFrame( pNode, pSib ),
+maFrameAreaTransformation(),
+maFramePrintAreaTransformation()
 {
 mnFrameType = SwFrameType::NoTxt;
 }
@@ -493,34 +495,63 @@ void SwNoTextFrame::MakeAll(vcl::RenderContext* 
/*pRenderContext*/)
 }
 }
 
-// RotateFlyFrame3 - inner frame
-// After the layout is finished, apply possible set rotation to it
+// RotateFlyFrame3 - outer frame
+// After the unrotated layout is finished, apply possible set rotation to 
it
 const double fRotation(getRotation());
 
-if(0.0 != fRotation)
+if(basegfx::fTools::equalZero(fRotation))
 {
-SwRect aFrameArea(getFrameArea());
-SwRect aFramePrintArea(getFramePrintArea());
-const Point aCenter(aFrameArea.Center());
+// reset transformations to show that they are not used
+maFrameAreaTransformation.identity();
+maFramePrintAreaTransformation.identity();
+}
+else
+{
+// save Transformations to local maFrameAreaTransformation
+// and maFramePrintAreaTransformation.
+const Point aCenter(getFrameArea().Center());
+const basegfx::B2DPoint aB2DCenter(aCenter.X(), aCenter.Y());
+
+createFrameAreaTransformations(
+maFrameAreaTransformation,
+maFramePrintAreaTransformation,
+fRotation,
+aB2DCenter);
+
+// create BoundRects of FrameAreas and re-set the FrameArea definitions
+// to represent the rotated geometry in the layout object
+setFrameAreaDefinitionsToBoundRangesOfTransformations(
+maFrameAreaTransformation,
+maFramePrintAreaTransformation);
+}
+}
 
-// apply rotation and re-set the FrameArea definitions
-rotateFrameAreaDefinitionAroundPoint(aFrameArea, aFramePrintArea, 
aCenter, fRotation);
+// RotateFlyFrame3 - Support for Transformations - outer frame
+basegfx::B2DHomMatrix SwNoTextFrame::getFrameAreaTransformation() const
+{
+if(!maFrameAreaTransformation.isIdentity())
+{
+// use pre-created transformation
+return maFrameAreaTransformation;
+}
 
-if(aFrameArea != getFrameArea())
-{
-SwFrameAreaDefinition::FrameAreaWriteAccess aFrm(*this);
-aFrm.setSwRect(aFrameArea);
-}
+// call parent
+return SwContentFrame::getFrameAreaTransformation();
+}
 
-if(aFramePrintArea != getFramePrintArea())
-{
-SwFrameAreaDefinition::FramePrintAreaWriteAccess aPrt(*this);
-aPrt.setSwRect(aFramePrintArea);
-}
+basegfx::B2DHomMatrix SwNoTextFrame::getFramePrintAreaTransformation() const
+{
+if(!maFramePrintAreaTransformation.isIdentity())
+{
+// use pre-created transformation
+return maFramePrintAreaTransformation;
 }
+
+// call parent
+return SwContentFrame::getFramePrintAreaTransformation();
 }
 
-// RotateFlyFrame3 - inner frame
+// RotateFlyFrame3 - outer frame
 // Check if we contain a SwGrfNode and get possible rotation from it
 double SwNoTextFrame::getRotation() const
 {
@@ -701,7 +732,9 @@ void SwNoTextFrame::Modify( const SfxPoolItem* pOld, const 
SfxPoolItem* pNew )
 }
 
 // RotateFlyFrame3 - invalidate needed for 
ContentFrame (inner, this)
-// and LayoutFrame (outer, GetUp

[Libreoffice-commits] core.git: Branch 'private/jmux/qt5' - 12 commits - config_host/config_qt5.h.in config_host.mk.in configure.ac include/sal RepositoryExternal.mk Repository.mk scp2/InstallScript_s

2017-11-03 Thread Jan-Marek Glogowski

Rebased ref, commits from common ancestor:
commit 84d627b49786c8152cf0cd56191cef098bf3bc21
Author: Jan-Marek Glogowski 
Date:   Mon Oct 30 16:11:09 2017 +0100

QT5 implement Graphics damage tracking

Since we implement SalGraphics handling like the gtk3 backend, we
need damage tracking to queue updates.

Since there is no native damage tracking in Qt5, we have to log
the damage in our subclassed QPainter, which will queue an update
on destruction.

Change-Id: Ife17770750a5be9959c2fc2633b422908d196869

diff --git a/vcl/Library_vclplug_qt5.mk b/vcl/Library_vclplug_qt5.mk
index d82b7d2fcd31..fba78d738883 100644
--- a/vcl/Library_vclplug_qt5.mk
+++ b/vcl/Library_vclplug_qt5.mk
@@ -91,6 +91,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_qt5,\
 vcl/qt5/Qt5Instance \
 vcl/qt5/Qt5Instance_Print \
 vcl/qt5/Qt5Object \
+vcl/qt5/Qt5Painter \
 vcl/qt5/Qt5Printer \
 vcl/qt5/Qt5Timer \
 vcl/qt5/Qt5Tools \
diff --git a/vcl/qt5/Qt5Graphics.cxx b/vcl/qt5/Qt5Graphics.cxx
index 676e9e54664e..eae47c5f21e9 100644
--- a/vcl/qt5/Qt5Graphics.cxx
+++ b/vcl/qt5/Qt5Graphics.cxx
@@ -18,7 +18,11 @@
  */
 
 #include "Qt5Graphics.hxx"
+
 #include "Qt5Frame.hxx"
+#include "Qt5Painter.hxx"
+
+#include 
 
 #include 
 
@@ -46,30 +50,6 @@ Qt5Graphics::~Qt5Graphics()
 delete m_pTextStyle[ i ];
 }
 
-void Qt5Graphics::PreparePainter( QPainter& rPainter, sal_uInt8 nTransparency )
-{
-if ( m_pQImage )
-rPainter.begin( m_pQImage );
-else
-{
-assert( dynamic_cast< QPaintDevice* >( m_pFrame->GetQWidget() ) );
-rPainter.begin( m_pFrame->GetQWidget() );
-}
-if ( !m_aClipPath.isEmpty() )
-rPainter.setClipPath( m_aClipPath );
-else
-rPainter.setClipRegion( m_aClipRegion );
-if ( SALCOLOR_NONE != m_aLineColor )
-{
-QColor aColor = QColor::fromRgb( QRgb( m_aLineColor ) );
-aColor.setAlpha( nTransparency );
-rPainter.setPen( aColor );
-}
-else
-rPainter.setPen( Qt::NoPen );
-rPainter.setCompositionMode( m_eCompositionMode );
-}
-
 void Qt5Graphics::ChangeQImage( QImage *pQImage )
 {
 m_pQImage = pQImage;
diff --git a/vcl/qt5/Qt5Graphics.hxx b/vcl/qt5/Qt5Graphics.hxx
index 52c1c90ec5df..9ffe2c47e461 100644
--- a/vcl/qt5/Qt5Graphics.hxx
+++ b/vcl/qt5/Qt5Graphics.hxx
@@ -30,16 +30,14 @@
 class Qt5Font;
 class Qt5FontFace;
 class Qt5Frame;
+class Qt5Painter;
 class PhysicalFontCollection;
 class QImage;
 
-#define PREPARE_PAINTER \
-QPainter aPainter; \
-PreparePainter( aPainter );
-
 class Qt5Graphics : public SalGraphics
 {
 friend class Qt5Bitmap;
+friend class Qt5Painter;
 
 Qt5Frame *m_pFrame;
 QImage   *m_pQImage;
@@ -55,7 +53,6 @@ class Qt5Graphics : public SalGraphics
 SalColor  m_aTextColor;
 
 Qt5Graphics( Qt5Frame *pFrame, QImage *pQImage );
-void PreparePainter( QPainter &rPainter, sal_uInt8 nTransparency = 0xff );
 
 public:
 Qt5Graphics( Qt5Frame *pFrame )
diff --git a/vcl/qt5/Qt5Graphics_GDI.cxx b/vcl/qt5/Qt5Graphics_GDI.cxx
index f8434bb3bc32..a1e407e088e1 100644
--- a/vcl/qt5/Qt5Graphics_GDI.cxx
+++ b/vcl/qt5/Qt5Graphics_GDI.cxx
@@ -20,8 +20,7 @@
 #include "Qt5Graphics.hxx"
 
 #include "Qt5Bitmap.hxx"
-#include "Qt5Frame.hxx"
-#include "Qt5Tools.hxx"
+#include "Qt5Painter.hxx"
 
 #include 
 #include 
@@ -164,48 +163,88 @@ void Qt5Graphics::ResetClipRegion()
 
 void Qt5Graphics::drawPixel( long nX, long nY )
 {
-PREPARE_PAINTER;
+Qt5Painter aPainter( *this );
 aPainter.drawPoint( nX, nY );
+aPainter.update( nX, nY, 1, 1 );
 }
 
 void Qt5Graphics::drawPixel( long nX, long nY, SalColor nSalColor )
 {
-PREPARE_PAINTER;
+Qt5Painter aPainter( *this );
 aPainter.setPen( QColor( QRgb( nSalColor )  ) );
 aPainter.setPen( Qt::SolidLine );
 aPainter.drawPoint( nX, nY );
+aPainter.update( nX, nY, 1, 1 );
 }
 
 void Qt5Graphics::drawLine( long nX1, long nY1, long nX2, long nY2 )
 {
-PREPARE_PAINTER;
+Qt5Painter aPainter( *this );
 aPainter.drawLine( nX1, nY1, nX2, nY2 );
+
+long tmp;
+if ( nX1 > nX2 )
+{
+tmp = nX1;
+nX1 = nX2;
+nX2 = tmp;
+}
+if ( nY1 > nY2 )
+{
+tmp = nY1;
+nY1 = nY2;
+nY2 = tmp;
+}
+aPainter.update( nX1, nY1, nX2 - nX1, nY2 - nY1 );
 }
 
 void Qt5Graphics::drawRect( long nX, long nY, long nWidth, long nHeight )
 {
-PREPARE_PAINTER;
-aPainter.drawRect( nX, nY, nWidth, nHeight );
+if (SALCOLOR_NONE == m_aFillColor && SALCOLOR_NONE == m_aLineColor )
+return;
+
+Qt5Painter aPainter( *this, true );
+if ( SALCOLOR_NONE != m_aFillColor )
+aPainter.fillRect( nX, nY, nWidth, nHeight, aPainter.brush() );
+else
+aPainter.drawRect( nX, nY, nWidth, nHeight );
+aPainter.update( nX, nY, nWidth, nHeight );
 }
 
 void Qt5Graphics::drawPolyLine( sal_uInt32 nPoints, cons

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

2017-11-03 Thread Eike Rathke

 sc/inc/mtvelements.hxx  |2 --
 sc/source/core/data/column.cxx  |1 -
 sc/source/core/data/mtvelements.cxx |5 -
 3 files changed, 8 deletions(-)

New commits:
commit 911e2aff3cc37cb7410292728ffea05fffbfb0b3
Author: Eike Rathke 
Date:   Fri Nov 3 14:43:21 2017 +0100

Resolves: tdf#111428 swap (only) ScColumn::mnBlkCountFormula

commit 423df1fa929784c14e3a133c06468589fe9269cd
Date:   Thu Nov 2 12:53:14 2017 +0100

Resolves: tdf#111428 implement CellStoreEvent::swap() in 
ScColumn::SwapCol()

erroneously swapped also the CellStoreEvent's ScColumn* but of
course the CellStoreEvent stays at its ScColumn and is not swapped
with the CellStoreType. So swap only the mnBlkCountFormula that
CellStoreEvent::mpCol accesses.

ASAN rightly complained about heap-use-after-free.

Change-Id: Ic44fed96c49bea7365bf1200e06788860966795c

diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
index 2809b7a621c5..f13562d47fbd 100644
--- a/sc/inc/mtvelements.hxx
+++ b/sc/inc/mtvelements.hxx
@@ -97,8 +97,6 @@ public:
 
 void element_block_acquired(const mdds::mtv::base_element_block* block);
 void element_block_released(const mdds::mtv::base_element_block* block);
-
-void swap(CellStoreEvent& r);
 };
 
 /// Cell note container
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 3afcc2bce2ec..ea93b02156f1 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1896,7 +1896,6 @@ void ScColumn::SwapCol(ScColumn& rCol)
 maCellNotes.swap(rCol.maCellNotes);
 
 // Swap all CellStoreEvent mdds event_func related.
-maCells.event_handler().swap( rCol.maCells.event_handler());
 std::swap( mnBlkCountFormula, rCol.mnBlkCountFormula);
 
 // notes update caption
diff --git a/sc/source/core/data/mtvelements.cxx 
b/sc/source/core/data/mtvelements.cxx
index 199284cad878..e34010af54d8 100644
--- a/sc/source/core/data/mtvelements.cxx
+++ b/sc/source/core/data/mtvelements.cxx
@@ -54,11 +54,6 @@ void CellStoreEvent::element_block_released(const 
mdds::mtv::base_element_block*
 }
 }
 
-void CellStoreEvent::swap(CellStoreEvent& r)
-{
-std::swap( mpCol, r.mpCol);
-}
-
 ColumnBlockPositionSet::ColumnBlockPositionSet(ScDocument& rDoc) : mrDoc(rDoc) 
{}
 
 ColumnBlockPosition* ColumnBlockPositionSet::getBlockPosition(SCTAB nTab, 
SCCOL nCol)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/jmux/qt5' - 207 commits - basctl/source basegfx/source basic/source bridges/source canvas/source chart2/source .clang-format codemaker/source compilerpl

2017-11-03 Thread Jan-Marek Glogowski

Rebased ref, commits from common ancestor:
commit 6686ca689670036d6fcf7c0b364e8ddc74fc0d18
Author: Jan-Marek Glogowski 
Date:   Mon Oct 30 16:11:09 2017 +0100

QT5 implement Graphics damage tracking

Since we implement SalGraphics handling like the gtk3 backend, we
need damage tracking to queue updates.

Since there is no native damage tracking in Qt5, we have to log
the damage in our subclassed QPainter, which will queue an update
on destruction.

Change-Id: Ife17770750a5be9959c2fc2633b422908d196869

diff --git a/vcl/Library_vclplug_qt5.mk b/vcl/Library_vclplug_qt5.mk
index d82b7d2fcd31..fba78d738883 100644
--- a/vcl/Library_vclplug_qt5.mk
+++ b/vcl/Library_vclplug_qt5.mk
@@ -91,6 +91,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_qt5,\
 vcl/qt5/Qt5Instance \
 vcl/qt5/Qt5Instance_Print \
 vcl/qt5/Qt5Object \
+vcl/qt5/Qt5Painter \
 vcl/qt5/Qt5Printer \
 vcl/qt5/Qt5Timer \
 vcl/qt5/Qt5Tools \
diff --git a/vcl/qt5/Qt5Graphics.cxx b/vcl/qt5/Qt5Graphics.cxx
index 676e9e54664e..eae47c5f21e9 100644
--- a/vcl/qt5/Qt5Graphics.cxx
+++ b/vcl/qt5/Qt5Graphics.cxx
@@ -18,7 +18,11 @@
  */
 
 #include "Qt5Graphics.hxx"
+
 #include "Qt5Frame.hxx"
+#include "Qt5Painter.hxx"
+
+#include 
 
 #include 
 
@@ -46,30 +50,6 @@ Qt5Graphics::~Qt5Graphics()
 delete m_pTextStyle[ i ];
 }
 
-void Qt5Graphics::PreparePainter( QPainter& rPainter, sal_uInt8 nTransparency )
-{
-if ( m_pQImage )
-rPainter.begin( m_pQImage );
-else
-{
-assert( dynamic_cast< QPaintDevice* >( m_pFrame->GetQWidget() ) );
-rPainter.begin( m_pFrame->GetQWidget() );
-}
-if ( !m_aClipPath.isEmpty() )
-rPainter.setClipPath( m_aClipPath );
-else
-rPainter.setClipRegion( m_aClipRegion );
-if ( SALCOLOR_NONE != m_aLineColor )
-{
-QColor aColor = QColor::fromRgb( QRgb( m_aLineColor ) );
-aColor.setAlpha( nTransparency );
-rPainter.setPen( aColor );
-}
-else
-rPainter.setPen( Qt::NoPen );
-rPainter.setCompositionMode( m_eCompositionMode );
-}
-
 void Qt5Graphics::ChangeQImage( QImage *pQImage )
 {
 m_pQImage = pQImage;
diff --git a/vcl/qt5/Qt5Graphics.hxx b/vcl/qt5/Qt5Graphics.hxx
index 52c1c90ec5df..9ffe2c47e461 100644
--- a/vcl/qt5/Qt5Graphics.hxx
+++ b/vcl/qt5/Qt5Graphics.hxx
@@ -30,16 +30,14 @@
 class Qt5Font;
 class Qt5FontFace;
 class Qt5Frame;
+class Qt5Painter;
 class PhysicalFontCollection;
 class QImage;
 
-#define PREPARE_PAINTER \
-QPainter aPainter; \
-PreparePainter( aPainter );
-
 class Qt5Graphics : public SalGraphics
 {
 friend class Qt5Bitmap;
+friend class Qt5Painter;
 
 Qt5Frame *m_pFrame;
 QImage   *m_pQImage;
@@ -55,7 +53,6 @@ class Qt5Graphics : public SalGraphics
 SalColor  m_aTextColor;
 
 Qt5Graphics( Qt5Frame *pFrame, QImage *pQImage );
-void PreparePainter( QPainter &rPainter, sal_uInt8 nTransparency = 0xff );
 
 public:
 Qt5Graphics( Qt5Frame *pFrame )
diff --git a/vcl/qt5/Qt5Graphics_GDI.cxx b/vcl/qt5/Qt5Graphics_GDI.cxx
index f8434bb3bc32..a1e407e088e1 100644
--- a/vcl/qt5/Qt5Graphics_GDI.cxx
+++ b/vcl/qt5/Qt5Graphics_GDI.cxx
@@ -20,8 +20,7 @@
 #include "Qt5Graphics.hxx"
 
 #include "Qt5Bitmap.hxx"
-#include "Qt5Frame.hxx"
-#include "Qt5Tools.hxx"
+#include "Qt5Painter.hxx"
 
 #include 
 #include 
@@ -164,48 +163,88 @@ void Qt5Graphics::ResetClipRegion()
 
 void Qt5Graphics::drawPixel( long nX, long nY )
 {
-PREPARE_PAINTER;
+Qt5Painter aPainter( *this );
 aPainter.drawPoint( nX, nY );
+aPainter.update( nX, nY, 1, 1 );
 }
 
 void Qt5Graphics::drawPixel( long nX, long nY, SalColor nSalColor )
 {
-PREPARE_PAINTER;
+Qt5Painter aPainter( *this );
 aPainter.setPen( QColor( QRgb( nSalColor )  ) );
 aPainter.setPen( Qt::SolidLine );
 aPainter.drawPoint( nX, nY );
+aPainter.update( nX, nY, 1, 1 );
 }
 
 void Qt5Graphics::drawLine( long nX1, long nY1, long nX2, long nY2 )
 {
-PREPARE_PAINTER;
+Qt5Painter aPainter( *this );
 aPainter.drawLine( nX1, nY1, nX2, nY2 );
+
+long tmp;
+if ( nX1 > nX2 )
+{
+tmp = nX1;
+nX1 = nX2;
+nX2 = tmp;
+}
+if ( nY1 > nY2 )
+{
+tmp = nY1;
+nY1 = nY2;
+nY2 = tmp;
+}
+aPainter.update( nX1, nY1, nX2 - nX1, nY2 - nY1 );
 }
 
 void Qt5Graphics::drawRect( long nX, long nY, long nWidth, long nHeight )
 {
-PREPARE_PAINTER;
-aPainter.drawRect( nX, nY, nWidth, nHeight );
+if (SALCOLOR_NONE == m_aFillColor && SALCOLOR_NONE == m_aLineColor )
+return;
+
+Qt5Painter aPainter( *this, true );
+if ( SALCOLOR_NONE != m_aFillColor )
+aPainter.fillRect( nX, nY, nWidth, nHeight, aPainter.brush() );
+else
+aPainter.drawRect( nX, nY, nWidth, nHeight );
+aPainter.update( nX, nY, nWidth, nHeight );
 }
 
 void Qt5Graphics::drawPolyLine( sal_uInt32 nPoints, cons

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

2017-11-03 Thread Fyodor Yemelyanenko

 sw/source/core/undo/untblk.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit c263c25052ca7812ec8789b8825bca11da845054
Author: Fyodor Yemelyanenko 
Date:   Thu Oct 26 11:12:39 2017 +1000

tdf#108124 fix: crash during redo, when document contains images
Redo action fixed to reinsert images to document correctly.

For details, pls see 
https://bugs.documentfoundation.org/show_bug.cgi?id=108124

Change-Id: Ie20dfcc8b9bfd5096c3c9459446c2a972129f3bf
Reviewed-on: https://gerrit.libreoffice.org/43862
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/source/core/undo/untblk.cxx b/sw/source/core/undo/untblk.cxx
index 9c5ac1eb8ec0..9b44e00522ea 100644
--- a/sw/source/core/undo/untblk.cxx
+++ b/sw/source/core/undo/untblk.cxx
@@ -285,9 +285,17 @@ void SwUndoInserts::RedoImpl(::sw::UndoRedoContext & 
rContext)
 pTextNd->ChgFormatColl( pLastNdColl );
 }
 
-for (size_t n = m_FlyUndos.size(); 0 < n; --n)
+// tdf#108124 (10/25/2017)
+// During UNDO we call SwUndoInsLayFormat::UndoImpl in reverse order,
+//  firstly for m_FlyUndos[ m_FlyUndos.size()-1 ], etc.
+// As absolute node index of fly stored in SwUndoFlyBase::nNdPgPos we
+//  should recover from Undo in direct order (last should be recovered 
first)
+// During REDO we should recover Flys (Images) in direct order,
+//  firstly m_FlyUndos[0], then with m_FlyUndos[1] index, etc.
+
+for (size_t n = 0; m_FlyUndos.size() > n; ++n)
 {
-m_FlyUndos[ n-1 ]->RedoImpl(rContext);
+m_FlyUndos[n]->RedoImpl(rContext);
 }
 
 pHistory->Rollback( pDoc, nSetPos );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Maxim Monastirsky

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

New commits:
commit aa302e7decc945dfac389b858d2d513129527b5a
Author: Maxim Monastirsky 
Date:   Thu Jan 5 14:05:39 2017 +0200

tdf#105121 Crash in GrabFocus during dispose

Change-Id: I03a001f5c670e0ca2c6d78fcf726ea5a46a93eab
(cherry picked from commit fae07692473f0e29e469b1da5d767fc9203dd22c)

diff --git a/svtools/source/brwbox/ebbcontrols.cxx 
b/svtools/source/brwbox/ebbcontrols.cxx
index 0271ff821527..0e6248212166 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -289,7 +289,8 @@ namespace svt
 
 void CheckBoxControl::GetFocus()
 {
-pBox->GrabFocus();
+if (pBox)
+pBox->GrabFocus();
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/oox include/sal include/svl offapi/com oox/source svtools/source writerfilter/source xmlsecurity/inc xmlsecurity/source

2017-11-03 Thread Samuel Mehrbrodt

 include/oox/vml/vmlshape.hxx  |7 
 include/sal/log-areas.dox |1 
 include/svl/sigstruct.hxx |6 
 offapi/com/sun/star/security/DocumentSignatureInformation.idl |   17 ++
 oox/source/vml/vmlshape.cxx   |   74 --
 oox/source/vml/vmlshapecontext.cxx|7 
 svtools/source/graphic/provider.cxx   |9 -
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |8 -
 xmlsecurity/inc/xsecctl.hxx   |3 
 xmlsecurity/source/component/documentdigitalsignatures.cxx|9 +
 xmlsecurity/source/helper/ooxmlsecparser.cxx  |   49 ++
 xmlsecurity/source/helper/ooxmlsecparser.hxx  |6 
 xmlsecurity/source/helper/xsecverify.cxx  |   63 
 13 files changed, 241 insertions(+), 18 deletions(-)

New commits:
commit bd3c5c4c234e3dc6b89cd235321945a41a08d562
Author: Samuel Mehrbrodt 
Date:   Tue Aug 8 16:23:07 2017 +0200

[API CHANGE] tdf#65393 Import signature line images from ooxml

showing whether the signature behind the signature line is valid or not.

Change-Id: Ia6cca62812019f26d55d234cac767a9b4b7c8175
Reviewed-on: https://gerrit.libreoffice.org/40980
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx
index cad99b719c26..3874556ad8df 100644
--- a/include/oox/vml/vmlshape.hxx
+++ b/include/oox/vml/vmlshape.hxx
@@ -208,6 +208,8 @@ struct ShapeModel
 OUString maControl1; ///< Bezier control point 1
 OUString maControl2; ///< Bezier control point 2
 OUString maVmlPath;  ///< VML path for this shape
+bool mbIsSignatureLine;  ///< Shape is a signature line
+OUString maSignatureId;  ///< ID of the signature
 
 explicitShapeModel();
 ~ShapeModel();
@@ -293,9 +295,12 @@ protected:
 const css::uno::Reference< css::drawing::XShapes 
>& rxShapes,
 const css::awt::Rectangle& rShapeRect ) const 
override;
 /** Used by both RectangleShape and ComplexShape. */
+css::uno::ReferencecreateEmbeddedPictureObject(
+const css::uno::Reference< css::drawing::XShapes >& rxShapes,
+const css::awt::Rectangle& rShapeRect, OUString const & rGraphicPath ) 
const;
 css::uno::ReferencecreatePictureObject(
 const css::uno::Reference< css::drawing::XShapes >& rxShapes,
-const css::awt::Rectangle& rShapeRect, OUString const & 
rGraphicPath ) const;
+const css::awt::Rectangle& rShapeRect, OUString const & 
rGraphicUrl ) const;
 
 private:
 OUString maService;  ///< Name of the UNO shape service.
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 3ebec81f6112..ed93026f7d6b 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -241,6 +241,7 @@ certain functionality.
 @li @c oox.ppt - pptx filter
 @li @c oox.shape
 @li @c oox.storage - ZipStorage class
+@li @c oox.vml - VML
 @li @c oox.xmlstream - XmlStream class
 
 @section forms
diff --git a/include/svl/sigstruct.hxx b/include/svl/sigstruct.hxx
index a7da2994664c..de5a03497dc4 100644
--- a/include/svl/sigstruct.hxx
+++ b/include/svl/sigstruct.hxx
@@ -22,6 +22,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -105,6 +106,11 @@ struct SignatureInformation
 OUString ouDescriptionPropertyId;
 /// OOXML certificate SHA-256 digest, empty for ODF except when doing 
XAdES signature.
 OUString ouCertDigest;
+/// OOXML Valid and invalid signature images
+css::uno::Reference aValidSignatureImage;
+css::uno::Reference aInvalidSignatureImage;
+/// OOXML Signature Line Id, used to map signatures to their respective 
signature line images.
+OUString ouSignatureLineId;
 /// A full OOXML signature for unchanged roundtrip, empty for ODF.
 css::uno::Sequence aSignatureBytes;
 /// For PDF: digest format, from css::xml::crypto::DigestID
diff --git a/offapi/com/sun/star/security/DocumentSignatureInformation.idl 
b/offapi/com/sun/star/security/DocumentSignatureInformation.idl
index 8c411a7b276f..99c14af09eb9 100644
--- a/offapi/com/sun/star/security/DocumentSignatureInformation.idl
+++ b/offapi/com/sun/star/security/DocumentSignatureInformation.idl
@@ -20,6 +20,7 @@
 #ifndef __com_sun_star_security_DocumentSignatureInformation_idl__
 #define __com_sun_star_security_DocumentSignatureInformation_idl__
 
+#include 
 #include 
 #include 
 
@@ -66,7 +67,21 @@ struct DocumentSignatureInformation
  *  the fact, that not everything in this document is signed.
  */
 boolean PartialDocumentSignature;
-
+/**
+ *  The ID of the Signature Line
+ *

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

2017-11-03 Thread Heiko Tietze

 extras/source/misc_config/autotbl.fmt |binary
 1 file changed

New commits:
commit 22a95ea367cc005a382de23e51cba850b6dd5e6f
Author: Heiko Tietze 
Date:   Fri Nov 3 13:57:47 2017 +0200

Revert "tdf#101349 Default table styles"

Table Styles created by the user are not compatible

This reverts commit f8a754e49cac05c356abddb3d22d03874f1bec7d.

Change-Id: Ied09093f20c5851a7013a57cff765e8aee3fed01
Reviewed-on: https://gerrit.libreoffice.org/44256
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 

diff --git a/extras/source/misc_config/autotbl.fmt 
b/extras/source/misc_config/autotbl.fmt
index 9d4ce085c146..660159052990 100644
Binary files a/extras/source/misc_config/autotbl.fmt and 
b/extras/source/misc_config/autotbl.fmt differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Jean-Pierre Ledure

 wizards/source/access2base/Module.xba |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 42d7a388989d57928a31e62999eb623366a485f0
Author: Jean-Pierre Ledure 
Date:   Fri Nov 3 12:37:20 2017 +0100

Access2Base - Correct error in module parsing

Error occurs when an unclosed string is present in a comment

diff --git a/wizards/source/access2base/Module.xba 
b/wizards/source/access2base/Module.xba
index 4e6156c81b9f..b26ba837936c 100644
--- a/wizards/source/access2base/Module.xba
+++ b/wizards/source/access2base/Module.xba
@@ -445,7 +445,7 @@ Private Function _FindPattern(ByVal psPattern As Variant, 
Optional ByRef plStart
 
 ' Common patterns
 Const cstComment = "('|\bREM\b)[^\n]*$"
-Const cstString = """[^""]*"""
+Const cstString = """[^""\n]*"""
 Const cstBeginStatement = "(^|:|\bthen\b|\belse\b|\n)[ \t]*"
 Const cstEndStatement = "[ \t]*($|:|\bthen\b|\belse\b|\n)"
 Const cstContinuation = "[ \t]_\n"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Ashod Nakashian

 include/sfx2/classificationhelper.hxx |   27 ++-
 sd/source/ui/view/drviews2.cxx|6 +++---
 sw/source/core/edit/edfcol.cxx|   32 +++-
 3 files changed, 40 insertions(+), 25 deletions(-)

New commits:
commit 7bd8f9ed9559a745f3ed59161d282b199edd69a7
Author: Ashod Nakashian 
Date:   Tue Oct 31 21:42:24 2017 -0400

TSCP: Paragraph signature RDF namespace now urn:bails

And remove PARAGRAPH entries from ClassificationResults
to restore adding the parens correctly.

Change-Id: Id0f07758e4daad8d0736800e211e35e9c7e026cf
Reviewed-on: https://gerrit.libreoffice.org/44145
Tested-by: Jenkins 
Reviewed-by: Ashod Nakashian 

diff --git a/include/sfx2/classificationhelper.hxx 
b/include/sfx2/classificationhelper.hxx
index 11782247ca23..6467976c952b 100644
--- a/include/sfx2/classificationhelper.hxx
+++ b/include/sfx2/classificationhelper.hxx
@@ -113,16 +113,18 @@ namespace sfx
 class ClassificationKeyCreator
 {
 private:
-SfxClassificationPolicyType m_ePolicyType;
+const SfxClassificationPolicyType m_ePolicyType;
+const OUString m_sPolicy;
 sal_Int32 m_nTextNumber;
 
 OUString getPolicyKey() const
 {
-return SfxClassificationHelper::policyTypeToString(m_ePolicyType);
+return m_sPolicy;
 }
 public:
 ClassificationKeyCreator(SfxClassificationPolicyType ePolicyType)
 : m_ePolicyType(ePolicyType)
+, m_sPolicy(SfxClassificationHelper::policyTypeToString(m_ePolicyType))
 , m_nTextNumber(1)
 {}
 
@@ -133,9 +135,7 @@ public:
 
 OUString makeNumberedMarkingTextKey()
 {
-OUString sKey = makeMarkingTextKey() + ":" + 
OUString::number(m_nTextNumber);
-m_nTextNumber++;
-return sKey;
+return makeMarkingTextKey() + ":" + OUString::number(m_nTextNumber++);
 }
 
 bool isMarkingTextKey(OUString const & aKey) const
@@ -143,15 +143,24 @@ public:
 return aKey.startsWith(makeMarkingTextKey());
 }
 
-OUString makeCategoryKey() const
+OUString makeCategoryNameKey() const
 {
 return getPolicyKey() + "BusinessAuthorizationCategory:Name";
 }
 
-bool isCategoryKey(OUString const & aKey) const
+bool isCategoryNameKey(OUString const & aKey) const
 {
-return aKey.startsWith(makeCategoryKey()) ||
-   aKey.startsWith(getPolicyKey() + 
"BusinessAuthorizationCategory:Identifier");
+return aKey.startsWith(makeCategoryNameKey());
+}
+
+OUString makeCategoryIdentifierKey() const
+{
+return getPolicyKey() + "BusinessAuthorizationCategory:Identifier";
+}
+
+bool isCategoryIdentifierKey(OUString const & aKey) const
+{
+return aKey.startsWith(makeCategoryIdentifierKey());
 }
 
 OUString makeMarkingKey() const
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 3ccbe562ccf8..d01957dcf10c 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -323,7 +323,7 @@ private:
 OUString aValue = lcl_getProperty(xPropertyContainer, 
aKey);
 m_aResults.push_back({ svx::ClassificationType::TEXT, 
aValue, sBlank, sBlank });
 }
-else if (aKeyCreator.isCategoryKey(aKey))
+else if (aKeyCreator.isCategoryNameKey(aKey) || 
aKeyCreator.isCategoryIdentifierKey(aKey))
 {
 OUString aValue = lcl_getProperty(xPropertyContainer, 
aKey);
 m_aResults.push_back({ svx::ClassificationType::CATEGORY, 
aValue, sBlank, sBlank });
@@ -406,7 +406,7 @@ private:
 void deleteExistingObjects()
 {
 sfx::ClassificationKeyCreator 
aKeyCreator(SfxClassificationHelper::getPolicyType());
-OUString sKey = aKeyCreator.makeCategoryKey();
+OUString sKey = aKeyCreator.makeCategoryNameKey();
 
 const sal_uInt16 nCount = 
m_rDrawViewShell.GetDoc()->GetMasterSdPageCount(PageKind::Standard);
 
@@ -498,7 +498,7 @@ public:
 
 case svx::ClassificationType::CATEGORY:
 {
-OUString sKey = aKeyCreator.makeCategoryKey();
+OUString sKey = aKeyCreator.makeCategoryNameKey();
 
pOutliner->QuickInsertField(SvxFieldItem(editeng::CustomPropertyField(sKey, 
rResult.msName), EE_FEATURE_FIELD), aPosition);
 }
 break;
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 2e0fa19c32e7..fe274fe5 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -95,11 +95,11 @@ namespace
 {
 static const OUString MetaFilename("tscp/bails.rdf");
 static const OUString MetaNS("urn:bails");
-static const OUString ParagraphSignatureRDFName = "loext:paragraph:signature";
-static const OUString ParagraphSignatureDateRDFName = 
"loext:paragraph:signature:date";
-static const OUString P

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

2017-11-03 Thread Ashod Nakashian

 sw/source/filter/ww8/wrtw8nds.cxx |   39 +-
 sw/source/filter/ww8/wrtww8.hxx   |3 +-
 2 files changed, 40 insertions(+), 2 deletions(-)

New commits:
commit 4bba85e04cda1cb5769114be5ad771de55d56d14
Author: Ashod Nakashian 
Date:   Mon Oct 30 15:08:44 2017 -0400

TSCP: don't export metadata field text in DOCX

Change-Id: I28ae3e57d3766497077af091fe4721fe653def4b
Reviewed-on: https://gerrit.libreoffice.org/44118
Tested-by: Jenkins 
Reviewed-by: Ashod Nakashian 

diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index de71bd55e618..87c27db44c89 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -658,7 +658,7 @@ FlyProcessingState SwWW8AttrIter::OutFlys(sal_Int32 nSwPos)
 return ( m_rExport.AttrOutput().IsFlyProcessingPostponed() ? FLY_POSTPONED 
: FLY_PROCESSED ) ;
 }
 
-bool SwWW8AttrIter::IsTextAttr( sal_Int32 nSwPos )
+bool SwWW8AttrIter::IsTextAttr( sal_Int32 nSwPos ) const
 {
 // search for attrs with dummy character or content
 if (const SwpHints* pTextAttrs = rNd.GetpSwpHints())
@@ -683,6 +683,32 @@ bool SwWW8AttrIter::IsTextAttr( sal_Int32 nSwPos )
 return false;
 }
 
+bool SwWW8AttrIter::IsExportableAttr(sal_Int32 nSwPos) const
+{
+if (const SwpHints* pTextAttrs = rNd.GetpSwpHints())
+{
+for (size_t i = 0; i < pTextAttrs->Count(); ++i)
+{
+const SwTextAttr* pHt = pTextAttrs->GetSortedByEnd(i);
+const sal_Int32 nStart = pHt->GetStart();
+const sal_Int32 nEnd = pHt->End() ? *pHt->End() : INT_MAX;
+if (nSwPos >= nStart && nSwPos < nEnd)
+{
+switch (pHt->GetAttr().Which())
+{
+// Metadata fields should be dynamically generated, not 
dumped as text.
+case RES_TXTATR_METAFIELD:
+return false;
+}
+}
+else if (nSwPos > nEnd)
+break;
+}
+}
+
+return true;
+}
+
 bool SwWW8AttrIter::IsDropCap( int nSwPos )
 {
 // see if the current position falls on a DropCap
@@ -2151,12 +2177,23 @@ void MSWordExportBase::OutputTextNode( SwTextNode& 
rNode )
 }
 
 do {
+
 const SwRedlineData* pRedlineData = aAttrIter.GetRunLevelRedline( 
nAktPos );
 FlyProcessingState nStateOfFlyFrame = FLY_PROCESSED;
 bool bPostponeWritingText= false ;
 OUString aSavedSnippet ;
 
 sal_Int32 nNextAttr = GetNextPos( &aAttrIter, rNode, nAktPos );
+
+// Skip un-exportable attributes.
+if (!aAttrIter.IsExportableAttr(nAktPos))
+{
+nAktPos = nNextAttr;
+UpdatePosition(&aAttrIter, nAktPos);
+eChrSet = aAttrIter.GetCharSet();
+continue;
+}
+
 // Is this the only run in this paragraph and it's empty?
 bool bSingleEmptyRun = nAktPos == 0 && nNextAttr == 0;
 AttrOutput().StartRun( pRedlineData, bSingleEmptyRun );
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index e995f61cf140..c3f05caad3c9 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -1482,7 +1482,8 @@ private:
 public:
 SwWW8AttrIter( MSWordExportBase& rWr, const SwTextNode& rNd );
 
-bool IsTextAttr( sal_Int32 nSwPos );
+bool IsTextAttr( sal_Int32 nSwPos ) const;
+bool IsExportableAttr(sal_Int32 nSwPos) const;
 bool IncludeEndOfParaCRInRedlineProperties(sal_Int32 nPos) const;
 bool IsDropCap( int nSwPos );
 bool RequiresImplicitBookmark();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Serge Krot

 sw/qa/extras/ww8export/data/tdf38778_properties_in_run_for_field.doc |binary
 sw/qa/extras/ww8export/ww8export.cxx |6 

 sw/source/filter/ww8/docxattributeoutput.cxx |   15 
+-
 sw/source/filter/ww8/wrtw8nds.cxx|5 ++-
 sw/source/filter/ww8/wrtww8.hxx  |2 -
 sw/source/filter/ww8/ww8atr.cxx  |   14 
+++--
 6 files changed, 36 insertions(+), 6 deletions(-)

New commits:
commit 3f2e84b4bd0bbd936e0af845ba7cbf68cb2803d6
Author: Serge Krot 
Date:   Tue Oct 31 23:39:26 2017 +0100

tdf#38778 Fix output of the font in DOC run

The font information should be output before field declaration.
Added unit test.

Change-Id: I147dd8956fbd8e69c3a2e86aff01dc249f4fa815

tdf#38778 DOCX output: no double output of the font info

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

diff --git 
a/sw/qa/extras/ww8export/data/tdf38778_properties_in_run_for_field.doc 
b/sw/qa/extras/ww8export/data/tdf38778_properties_in_run_for_field.doc
new file mode 100644
index ..960fe50dae35
Binary files /dev/null and 
b/sw/qa/extras/ww8export/data/tdf38778_properties_in_run_for_field.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export.cxx 
b/sw/qa/extras/ww8export/ww8export.cxx
index 38f41d83bf49..825ba6be7cf0 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -702,6 +702,12 @@ DECLARE_WW8EXPORT_TEST(testTdf102334, "tdf102334.doc")
 CPPUNIT_ASSERT_EQUAL(true, getProperty(getRun(getParagraph(7), 1), 
"CharHidden"));
 }
 
+DECLARE_WW8EXPORT_TEST(testTdf38778, 
"tdf38778_properties_in_run_for_field.doc")
+{
+CPPUNIT_ASSERT_EQUAL(10.0f, getProperty(getRun(getParagraph(1), 1), 
"CharHeight"));
+CPPUNIT_ASSERT_EQUAL(OUString("Courier New"), 
getProperty(getRun(getParagraph(1), 1), "CharFontName"));
+}
+
 DECLARE_WW8EXPORT_TEST(testN325936, "n325936.doc")
 {
 /*
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 6cbd0a6cdc18..146b7b9e3a5f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6699,11 +6699,24 @@ void DocxAttributeOutput::CharFont( const SvxFontItem& 
rFont)
 {
 GetExport().GetId( rFont ); // ensure font info is written to fontTable.xml
 const OUString& sFontName(rFont.GetFamilyName());
-OString sFontNameUtf8 = OUStringToOString(sFontName, 
RTL_TEXTENCODING_UTF8);
+const OString sFontNameUtf8 = OUStringToOString(sFontName, 
RTL_TEXTENCODING_UTF8);
 if (!sFontNameUtf8.isEmpty())
+{
+if (m_pFontsAttrList &&
+(   m_pFontsAttrList->hasAttribute(FSNS( XML_w, XML_ascii )) ||
+m_pFontsAttrList->hasAttribute(FSNS( XML_w, XML_hAnsi )))
+)
+{
+// tdf#38778: do to fields output into DOC the font could be added 
before and after field declaration
+// that all sub runs of the field will have correct font inside.
+// For DOCX we should do not add the same font information twice 
in the same node
+return;
+}
+
 AddToAttrList( m_pFontsAttrList, 2,
 FSNS( XML_w, XML_ascii ), sFontNameUtf8.getStr(),
 FSNS( XML_w, XML_hAnsi ), sFontNameUtf8.getStr() );
+}
 }
 
 void DocxAttributeOutput::CharFontSize( const SvxFontHeightItem& rFontSize)
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index de0820b8204a..de71bd55e618 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -481,7 +481,10 @@ void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby )
 m_rExport.m_pOutFormatNode = &rNd;
 m_rExport.m_aCurrentCharPropStarts.push( nSwPos );
 
-m_rExport.ExportPoolItemsToCHP( aExportItems, GetScript() );
+// tdf#38778 Fix output of the font in DOC run for fields
+const SvxFontItem * pFontToOutput = ( rParentFont != *pFont )? pFont : 
nullptr;
+
+m_rExport.ExportPoolItemsToCHP( aExportItems, GetScript(), 
pFontToOutput );
 
 // HasTextItem only allowed in the above range
 m_rExport.m_aCurrentCharPropStarts.pop();
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 6d7f0069731d..e995f61cf140 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -588,7 +588,7 @@ public:
 void WriteSpecialText( sal_uLong nStart, sal_uLong nEnd, sal_uInt8 nTTyp );
 
 /// Export the pool items to attributes (through an attribute output 
class).
-void ExportPoolItemsToCHP( ww8::PoolItems &rItems, sal_uInt16 nScript );
+void ExportPoolItemsToCHP( ww8::PoolItems &rItems,

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

2017-11-03 Thread Ashod Nakashian

 include/svx/ClassificationField.hxx|   40 +++--
 sd/source/ui/view/drviews2.cxx |   18 ++---
 svx/source/dialog/ClassificationDialog.cxx |   20 +++---
 sw/source/core/edit/edfcol.cxx |   16 +--
 4 files changed, 59 insertions(+), 35 deletions(-)

New commits:
commit 25a26b66b398d127842369e06c3ef95fe901e305
Author: Ashod Nakashian 
Date:   Mon Oct 30 14:25:23 2017 -0400

TSCP: flesh out ClassificationResult

Change-Id: Ie6ee33cc21f6f27ae1d58a0e47f367b0539e4378
Reviewed-on: https://gerrit.libreoffice.org/44117
Tested-by: Jenkins 
Reviewed-by: Ashod Nakashian 

diff --git a/include/svx/ClassificationField.hxx 
b/include/svx/ClassificationField.hxx
index 4d4588c68177..32f783eb1896 100644
--- a/include/svx/ClassificationField.hxx
+++ b/include/svx/ClassificationField.hxx
@@ -26,6 +26,38 @@ enum class ClassificationType
 PARAGRAPH,
 };
 
+class SVX_DLLPUBLIC ClassificationResult
+{
+public:
+ClassificationType meType;
+OUString msName;//< Display text or 'Name' field (from 
example.xml).
+OUString msAbbreviatedName; //< Abbreviated name, displayed instead of 
Name.
+OUString msIdentifier;  //< The identifier of this entry (from 
example.xml).
+
+ClassificationResult(ClassificationType eType, const OUString& sName,
+ const OUString& sAbbreviatedName = "", const 
OUString& sIdentifier = "")
+: meType(eType)
+, msName(sName)
+, msAbbreviatedName(sAbbreviatedName)
+, msIdentifier(sIdentifier)
+{
+}
+
+/// Returns the text to display, which is the Abbreviated Name, if 
provided, otherwise Name.
+OUString getDisplayText() const
+{
+return !msAbbreviatedName.isEmpty() ? msAbbreviatedName : msName;
+}
+
+bool operator==(const ClassificationResult& rOther) const
+{
+return (meType == rOther.meType &&
+msName == rOther.msName &&
+msAbbreviatedName == rOther.msAbbreviatedName &&
+msIdentifier == rOther.msIdentifier);
+}
+};
+
 class SVX_DLLPUBLIC ClassificationField : public SvxFieldData
 {
 public:
@@ -60,14 +92,6 @@ public:
 }
 };
 
-struct SVX_DLLPUBLIC ClassificationResult
-{
-ClassificationType meType;
-OUString msString;  //< Display text or 'Name' field (from example.xml).
-OUString msAbbreviatedString; //< Abbreviated name, displayed instead of 
msString.
-OUString msIdentifier; //< The identifier of this entry (from example.xml).
-};
-
 } // end svx namespace
 
 #endif // INCLUDED_SVX_CLASSIFICATIONFIELD_HXX
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 992e6608f961..3ccbe562ccf8 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -470,7 +470,7 @@ public:
 for (svx::ClassificationResult const & rResult : rResults)
 {
 if (rResult.meType == svx::ClassificationType::CATEGORY)
-aHelper.SetBACName(rResult.msString, 
SfxClassificationHelper::getPolicyType());
+aHelper.SetBACName(rResult.msName, 
SfxClassificationHelper::getPolicyType());
 }
 
 sfx::ClassificationKeyCreator 
aKeyCreator(SfxClassificationHelper::getPolicyType());
@@ -491,31 +491,31 @@ public:
 case svx::ClassificationType::TEXT:
 {
 OUString sKey = aKeyCreator.makeNumberedMarkingTextKey();
-addOrInsertDocumentProperty(xPropertyContainer, sKey, 
rResult.msString);
-
pOutliner->QuickInsertField(SvxFieldItem(editeng::CustomPropertyField(sKey, 
rResult.msString), EE_FEATURE_FIELD), aPosition);
+addOrInsertDocumentProperty(xPropertyContainer, sKey, 
rResult.msName);
+
pOutliner->QuickInsertField(SvxFieldItem(editeng::CustomPropertyField(sKey, 
rResult.msName), EE_FEATURE_FIELD), aPosition);
 }
 break;
 
 case svx::ClassificationType::CATEGORY:
 {
 OUString sKey = aKeyCreator.makeCategoryKey();
-
pOutliner->QuickInsertField(SvxFieldItem(editeng::CustomPropertyField(sKey, 
rResult.msString), EE_FEATURE_FIELD), aPosition);
+
pOutliner->QuickInsertField(SvxFieldItem(editeng::CustomPropertyField(sKey, 
rResult.msName), EE_FEATURE_FIELD), aPosition);
 }
 break;
 
 case svx::ClassificationType::MARKING:
 {
 OUString sKey = aKeyCreator.makeMarkingKey();
-addOrInsertDocumentProperty(xPropertyContainer, sKey, 
rResult.msString);
-
pOutliner->QuickInsertField(SvxFieldItem(editeng::CustomPropertyField(sKey, 
rResult.msString), EE_FEATURE_FIELD), aPosition);
+addOrInsertDocumentProperty(xPropertyContainer, sKey, 
rResult.m

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

2017-11-03 Thread Ashod Nakashian

 include/sfx2/classificationhelper.hxx  |5 +-
 include/svx/ClassificationDialog.hxx   |2 
 include/svx/ClassificationField.hxx|   14 --
 sd/source/ui/view/drviews2.cxx |   10 ++--
 sfx2/source/view/classificationhelper.cxx  |   21 -
 svx/source/dialog/ClassificationDialog.cxx |   20 +
 sw/source/core/edit/edfcol.cxx |   62 +++--
 7 files changed, 91 insertions(+), 43 deletions(-)

New commits:
commit 2ecd194d091fd33c2554bfff960985b2bd5e654e
Author: Ashod Nakashian 
Date:   Mon Oct 30 06:05:09 2017 -0400

TSCP: use the BAC identifier as the RDF key

DOCX RDF -> SmartTag logic expects urn:bails
namespace to dump the RDF, and it also needs
to have the rdf file in tscp/bails.rdf, hence
the move.

Change-Id: I9ae496c97abe97d3596de46ffccd5f7c80e37d34
Reviewed-on: https://gerrit.libreoffice.org/44116
Tested-by: Jenkins 
Reviewed-by: Ashod Nakashian 

diff --git a/include/sfx2/classificationhelper.hxx 
b/include/sfx2/classificationhelper.hxx
index a389ec7e4ac0..11782247ca23 100644
--- a/include/sfx2/classificationhelper.hxx
+++ b/include/sfx2/classificationhelper.hxx
@@ -63,6 +63,8 @@ public:
 const OUString& GetBACName(SfxClassificationPolicyType eType);
 /// Return all possible valid category names, based on the policy.
 std::vector GetBACNames();
+/// Return all possible valid category identifiers, based on the policy.
+std::vector GetBACIdentifiers();
 /// Get the currently selected category abbreviation for eType. Returns 
full name if no abbreviation defined.
 const OUString& GetAbbreviatedBACName(const OUString& sFullName);
 /// Return all possible valid abbreviated category names, based on the 
policy.
@@ -148,7 +150,8 @@ public:
 
 bool isCategoryKey(OUString const & aKey) const
 {
-return aKey.startsWith(makeCategoryKey());
+return aKey.startsWith(makeCategoryKey()) ||
+   aKey.startsWith(getPolicyKey() + 
"BusinessAuthorizationCategory:Identifier");
 }
 
 OUString makeMarkingKey() const
diff --git a/include/svx/ClassificationDialog.hxx 
b/include/svx/ClassificationDialog.hxx
index ddea7af12592..85a70eb95f95 100644
--- a/include/svx/ClassificationDialog.hxx
+++ b/include/svx/ClassificationDialog.hxx
@@ -55,7 +55,7 @@ private:
 DECL_LINK(SelectRecentlyUsedHdl, ListBox&, void);
 DECL_LINK(SelectIPPartHdl, ListBox&, void);
 
-void insertField(ClassificationType eType, OUString const & rString, 
OUString const & rFullString);
+void insertField(ClassificationType eType, OUString const & rString, 
OUString const & rFullString, OUString const & rIdentifier = OUString());
 
 std::vector> 
m_aRecentlyUsedValuesCollection;
 std::vector m_aInitialValues;
diff --git a/include/svx/ClassificationField.hxx 
b/include/svx/ClassificationField.hxx
index b57f29cbafbe..4d4588c68177 100644
--- a/include/svx/ClassificationField.hxx
+++ b/include/svx/ClassificationField.hxx
@@ -32,17 +32,19 @@ public:
 ClassificationType meType;
 OUString msDescription;
 OUString msFullClassName;
+OUString msIdentifier;
 
-ClassificationField(ClassificationType eType, OUString const & 
sDescription, OUString const & sFullClassName)
+ClassificationField(ClassificationType eType, OUString const & 
sDescription, OUString const & sFullClassName, OUString const & sIdentifier = 
"")
 : SvxFieldData()
 , meType(eType)
 , msDescription(sDescription)
 , msFullClassName(sFullClassName)
+, msIdentifier(sIdentifier)
 {}
 
 ClassificationField* Clone() const override
 {
-return new ClassificationField(meType, msDescription, msFullClassName);
+return new ClassificationField(meType, msDescription, msFullClassName, 
msIdentifier);
 }
 
 bool operator==(const SvxFieldData& rOther) const override
@@ -53,15 +55,17 @@ public:
 const ClassificationField& rOtherField = static_cast(rOther);
 return (meType == rOtherField.meType &&
 msDescription == rOtherField.msDescription &&
-msFullClassName == rOtherField.msFullClassName);
+msFullClassName == rOtherField.msFullClassName &&
+msIdentifier == rOtherField.msIdentifier);
 }
 };
 
 struct SVX_DLLPUBLIC ClassificationResult
 {
 ClassificationType meType;
-OUString msString;
-OUString msAbbreviatedString;
+OUString msString;  //< Display text or 'Name' field (from example.xml).
+OUString msAbbreviatedString; //< Abbreviated name, displayed instead of 
msString.
+OUString msIdentifier; //< The identifier of this entry (from example.xml).
 };
 
 } // end svx namespace
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index fa89000bddca..992e6608f961 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -308,7 +308,7 @@ private:

Re: RotGrfFlyFrame: Problems with rotated images, that need to be solved before next release

2017-11-03 Thread Armin Le Grand


Hi,

I am on it (see feature/RotateFlyFrame3). If I do not get a good 
solution working n reasonable time, I agree, we should set it as 
experimental and add a switch to it (what will be some work due to the 
UI stuff...)


regards,
Armin (alg)

--
ALG (PGP Key: EE1C 4B3F E751 D8BC C485 DEC1 3C59 F953 D81C F4A2)

On 10/29/2017 5:27 PM, Kaganski Mike wrote:

On 10/29/2017 5:24 PM, Regina Henschel wrote:

Hi all,

I consider the current state of the new feature of rotating Writer
images not complete enough to be released.

I agree that this is WIP, and IMO should be experimental.



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

Re: minutes of ESC call ...

2017-11-03 Thread Miklos Vajna

Hi,

On Fri, Nov 03, 2017 at 10:05:05AM +0100, Stephan Bergmann 
 wrote:
> The only way I see how we can reach that goal of zero future reformatting
> commits is to have the invariant that all commits to the central git repo
> are enforce-formatted (after one round of "big noise" reformatting any
> existing source code, if we ever get there). Therefore, I am not interested
> in experiments that cover some subset of the git repo's files but are done
> in a way that they don't guarantee that invariant over that subset.  My fear
> is that such experiments will increase the level of noise in the repo,
> instead of helping to keep it flat at its historical level.

So in case some mechanism in gerrit and (for those who decide to push
directly and have clang-format installed locally) the pre-commit git
hook is in place, that addresses this concern, I hope.

Seeing the recent thread "Gerrit Code-Review +1 / -1" (from Kendy), I
hope not only the git hook part, but also the gerrit part will be a
reality in the near future.

Regards,

Miklos


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

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

2017-11-03 Thread Caolán McNamara

 sc/source/filter/rtf/rtfparse.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 82173efd8e639f387c87763a069ddad643b447d6
Author: CaolÃ¡n McNamara 
Date:   Thu Nov 2 16:48:10 2017 +

crash on loading tdf77861-3.rtf in calc rtf filter

pActDefault is either pInsDefault or a member of maDefaultList,
so clear it if its not pInsDefault at this location

 ScRTFParser::ProcToken(RtfImportInfo*) (rtfparse.cxx:332)
 ScRTFParser::RTFImportHdl(RtfImportInfo&) (rtfparse.cxx:160)
 ScRTFParser::LinkStubRTFImportHdl(void*, RtfImportInfo&) (rtfparse.cxx:155)
 Link::Call(RtfImportInfo&) const (link.hxx:84)
 EditEngine::CallRtfImportHandler(RtfImportInfo&) (editeng.cxx:2770)
 EditRTFParser::NextToken(int) (eertfpar.cxx:231)
 SvRTFParser::Continue(int) (parrtf.cxx:643)
 SvxRTFParser::Continue(int) (svxrtf.cxx:128)
 SvRTFParser::CallParser() (parrtf.cxx:574)
 SvxRTFParser::CallParser() (svxrtf.cxx:123)
 EditRTFParser::CallParser() (eertfpar.cxx:112)
 ImpEditEngine::ReadRTF(SvStream&, EditSelection) (impedit4.cxx:161)
Address is 52 bytes inside a block of size 56 free'd
 std::default_delete::operator()(ScRTFCellDefault*) const 
(unique_ptr.h:76)
 std::unique_ptr 
>::~unique_ptr() (unique_ptr.h:239)
 void std::_Destroy > >(std::unique_ptr >*) (stl_construct.h:93)
 void std::_Destroy_aux::__destroy >*>(std::unique_ptr >*, std::unique_ptr >*) (stl_construct.h:103)
 void std::_Destroy >*>(std::unique_ptr >*, std::unique_ptr >*) (stl_construct.h:126)
 void std::_Destroy >*, std::unique_ptr > >(std::unique_ptr >*, std::unique_ptr >*, 
std::allocator > >&) (stl_construct.h:151)
 std::__cxx1998::vector >, 
std::allocator > > 
>::_M_erase_at_end(std::unique_ptr >*) (stl_vector.h:1436)
 std::__cxx1998::vector >, 
std::allocator > > >::clear() (stl_vector.h:1210)
 std::__debug::vector >, 
std::allocator > > >::clear() (vector:690)
 ScRTFParser::ProcToken(RtfImportInfo*) (rtfparse.cxx:274)
 ScRTFParser::RTFImportHdl(RtfImportInfo&) (rtfparse.cxx:160)

Change-Id: I36624a76ddb01f0d26d38f708af6b910384ad7fd
Reviewed-on: https://gerrit.libreoffice.org/44226
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sc/source/filter/rtf/rtfparse.cxx 
b/sc/source/filter/rtf/rtfparse.cxx
index d5262fd13a16..00c207174ae6 100644
--- a/sc/source/filter/rtf/rtfparse.cxx
+++ b/sc/source/filter/rtf/rtfparse.cxx
@@ -272,6 +272,8 @@ void ScRTFParser::ProcToken( RtfImportInfo* pInfo )
 nLastWidth = maDefaultList.back()->nTwips;
 
 nColCnt = 0;
+if (pActDefault != pInsDefault)
+pActDefault = nullptr;
 maDefaultList.clear();
 pDefMerge = nullptr;
 nRtfLastToken = pInfo->nToken;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Caolán McNamara

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

New commits:
commit a6dc83081d95deddb9906d8b577a21fcf41d25f3
Author: CaolÃ¡n McNamara 
Date:   Thu Nov 2 14:02:18 2017 +

Infinite loop in ooo32227-1.rtf with calc rtf filter

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

diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index 17921cdaf718..9d3a03087d1c 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -336,7 +336,9 @@ void SvRTFParser::ScanText()
 sal_Char nSlash = '\\';
 while (!bBreak)
 {
-wchar_t next=GetNextChar();
+auto next = GetNextChar();
+if (sal_Unicode(EOF) == next)
+break;
 if (next>0xFF) // fix for #i43933# and #i35653#
 {
 if (!aByteString.isEmpty())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Takeshi Abe

 sfx2/source/doc/doctempl.cxx |   36 +---
 1 file changed, 13 insertions(+), 23 deletions(-)

New commits:
commit 501698657afeed006812e071a77a5228e3f7b3d5
Author: Takeshi Abe 
Date:   Thu Nov 2 18:56:46 2017 +0900

sfx2: Simplify SfxDocTemplate_Impl with std::unique_ptr

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

diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index ce3866b72602..e963a8b7797a 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -95,8 +95,6 @@ using namespace ::ucbhelper;
 #include 
 #include 
 #include 
-using ::std::vector;
-using ::std::advance;
 
 
 #define TITLE   "Title"
@@ -181,8 +179,6 @@ public:
 int Compare( RegionData_Impl const * pCompareWith ) const;
 };
 
-typedef vector< RegionData_Impl* > RegionList_Impl;
-
 
 class SfxDocTemplate_Impl : public SvRefBase
 {
@@ -192,7 +188,7 @@ class SfxDocTemplate_Impl : public SvRefBase
 ::osl::MutexmaMutex;
 OUStringmaRootURL;
 OUStringmaStandardGroup;
-RegionList_Impl maRegions;
+std::vector> maRegions;
 boolmbConstructed;
 
 uno::Reference< XAnyCompareFactory > m_rCompareFactory;
@@ -1328,7 +1324,7 @@ void RegionData_Impl::AddEntry( const OUString& rTitle,
 pEntry->SetHierarchyURL( aLinkURL );
 if ( nPos < maEntries.size() ) {
 auto it = maEntries.begin();
-advance( it, nPos );
+std::advance( it, nPos );
 maEntries.insert( it, std::move(pEntry) );
 }
 else
@@ -1385,7 +1381,7 @@ void RegionData_Impl::DeleteEntry( size_t nIndex )
 if ( nIndex < maEntries.size() )
 {
 auto it = maEntries.begin();
-advance( it, nIndex );
+std::advance( it, nIndex );
 maEntries.erase( it );
 }
 }
@@ -1406,8 +1402,6 @@ SfxDocTemplate_Impl::SfxDocTemplate_Impl()
 
 SfxDocTemplate_Impl::~SfxDocTemplate_Impl()
 {
-Clear();
-
 gpTemplateData = nullptr;
 }
 
@@ -1430,7 +1424,7 @@ void SfxDocTemplate_Impl::DecrementLock()
 RegionData_Impl* SfxDocTemplate_Impl::GetRegion( size_t nIndex ) const
 {
 if ( nIndex < maRegions.size() )
-return maRegions[ nIndex ];
+return maRegions[ nIndex ].get();
 return nullptr;
 }
 
@@ -1438,10 +1432,10 @@ RegionData_Impl* SfxDocTemplate_Impl::GetRegion( size_t 
nIndex ) const
 RegionData_Impl* SfxDocTemplate_Impl::GetRegion( const OUString& rName )
 const
 {
-for (RegionData_Impl* pData : maRegions)
+for (auto& pData : maRegions)
 {
 if( pData->GetTitle() == rName )
-return pData;
+return pData.get();
 }
 return nullptr;
 }
@@ -1451,9 +1445,8 @@ void SfxDocTemplate_Impl::DeleteRegion( size_t nIndex )
 {
 if ( nIndex < maRegions.size() )
 {
-delete maRegions[ nIndex ];
-RegionList_Impl::iterator it = maRegions.begin();
-advance( it, nIndex );
+auto it = maRegions.begin();
+std::advance( it, nIndex );
 maRegions.erase( it );
 }
 }
@@ -1593,7 +1586,7 @@ bool SfxDocTemplate_Impl::InsertRegion( RegionData_Impl 
*pNew, size_t nPos )
 ::osl::MutexGuard   aGuard( maMutex );
 
 // return false (not inserted) if the entry already exists
-for (const RegionData_Impl* pRegion : maRegions)
+for (auto const& pRegion : maRegions)
 if ( pRegion->Compare( pNew ) == 0 )
 return false;
 
@@ -1603,12 +1596,12 @@ bool SfxDocTemplate_Impl::InsertRegion( RegionData_Impl 
*pNew, size_t nPos )
 
 if ( newPos < maRegions.size() )
 {
-RegionList_Impl::iterator it = maRegions.begin();
-advance( it, newPos );
-maRegions.insert( it, pNew );
+auto it = maRegions.begin();
+std::advance( it, newPos );
+maRegions.emplace( it, pNew );
 }
 else
-maRegions.push_back( pNew );
+maRegions.emplace_back( pNew );
 
 return true;
 }
@@ -1687,9 +1680,6 @@ void SfxDocTemplate_Impl::Clear()
 ::osl::MutexGuard   aGuard( maMutex );
 if ( mnLockCounter )
 return;
-
-for (RegionData_Impl* pRegion : maRegions)
-delete pRegion;
 maRegions.clear();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svl include/svtools include/vcl sax/source svl/source svtools/source vcl/inc vcl/source

2017-11-03 Thread Noel Grandin

 include/svl/zformat.hxx   |2 +-
 include/svtools/ivctrl.hxx|2 +-
 include/svtools/ruler.hxx |2 +-
 include/vcl/bitmap.hxx|2 +-
 sax/source/fastparser/fastparser.cxx  |4 ++--
 svl/source/crypto/cryptosign.cxx  |2 +-
 svl/source/numbers/zformat.cxx|2 +-
 svtools/source/contnr/imivctl.hxx |6 +++---
 svtools/source/contnr/imivctl1.cxx|6 +++---
 svtools/source/contnr/ivctrl.cxx  |2 +-
 svtools/source/control/ruler.cxx  |2 +-
 vcl/inc/sallayout.hxx |2 +-
 vcl/inc/sft.hxx   |8 
 vcl/source/filter/jpeg/JpegReader.cxx |2 +-
 vcl/source/filter/jpeg/JpegReader.hxx |2 +-
 vcl/source/fontsubset/sft.cxx |8 
 vcl/source/fontsubset/ttcr.cxx|4 ++--
 vcl/source/gdi/bitmap3.cxx|2 +-
 vcl/source/gdi/pdfwriter_impl.cxx |6 +++---
 vcl/source/gdi/pdfwriter_impl.hxx |6 +++---
 vcl/source/gdi/sallayout.cxx  |2 +-
 vcl/source/gdi/salmisc.cxx|   14 +++---
 vcl/source/window/cursor.cxx  |2 +-
 vcl/source/window/toolbox.cxx |2 +-
 vcl/source/window/winproc.cxx |   20 ++--
 25 files changed, 56 insertions(+), 56 deletions(-)

New commits:
commit 0dca40256320753fdbd42ac9c7de889026d7d469
Author: Noel Grandin 
Date:   Wed Nov 1 16:38:15 2017 +0200

loplugin:constparam in vcl,svtools

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

diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index 882082a6313e..9077e45d92ff 100644
--- a/include/svl/zformat.hxx
+++ b/include/svl/zformat.hxx
@@ -580,7 +580,7 @@ private:
 inserted at a proper position to rString after all bracketed prefixes.
  */
 SVL_DLLPRIVATE OUString ImpObtainCalendarAndNumerals( OUStringBuffer & 
rString,
-  sal_Int32 & nPos,
+  sal_Int32 nPos,
   LanguageType & nLang,
   const LocaleType & 
aTmpLocale );
 
diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx
index 3d7a4842ca91..18641b419422 100644
--- a/include/svtools/ivctrl.hxx
+++ b/include/svtools/ivctrl.hxx
@@ -256,7 +256,7 @@ public:
 
 sal_Int32   GetEntryCount() const;
 SvxIconChoiceCtrlEntry* GetEntry( sal_Int32 nPos ) const;
-sal_Int32   GetEntryListPos( SvxIconChoiceCtrlEntry* pEntry ) 
const;
+sal_Int32   GetEntryListPos( SvxIconChoiceCtrlEntry const * 
pEntry ) const;
 using Window::SetCursor;
 voidSetCursor( SvxIconChoiceCtrlEntry* pEntry );
 SvxIconChoiceCtrlEntry* GetCursor() const;
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index e95febf8fabd..23aac6fc2fcc 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -697,7 +697,7 @@ private:
  bool bRequiredStyle = false,
  RulerIndentStyle nRequiredStyle = 
RulerIndentStyle::Top ) const;
 SVT_DLLPRIVATE bool ImplDocHitTest( const Point& rPos, RulerType 
eDragType, RulerSelection* pHitTest ) const;
-SVT_DLLPRIVATE bool ImplStartDrag( RulerSelection* pHitTest, 
sal_uInt16 nModifier );
+SVT_DLLPRIVATE bool ImplStartDrag( RulerSelection const * pHitTest, 
sal_uInt16 nModifier );
 SVT_DLLPRIVATE void ImplDrag( const Point& rPos );
 SVT_DLLPRIVATE void ImplEndDrag();
 
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index b844807d7d48..66a056448b53 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -668,7 +668,7 @@ public:
 BitmapReadAccess const * pReadAcc,
 int aNumberOfContributions,
 const double* pWeights,
-int* pPixels,
+int const * pPixels,
 const int* pCount );
 
 SAL_DLLPRIVATE bool ImplMakeMono( sal_uInt8 cThreshold );
diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index 507d40208928..1f278b244616 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -189,7 +189,7 @@ struct Entity : public ParserData
 
 explicit Entity( const ParserData& rData );
 Entity( const Entity& rEntity );
-void startElement( Event *pEvent );
+void startElement( Event const *pEvent );
 void characters( const OUString& sChars );
 void endElement();
 void processingInstruction( const OUString& rTarget, c

Re: minutes of ESC call ...

2017-11-03 Thread Stephan Bergmann


On 11/02/2017 06:10 PM, Michael Meeks wrote:

* clang-format-ness (Miklos)

[...]

 + propose merge step#1 without clang-format enforced (Michael)
+ don’t like the auto-re-format of others’ commits (Stephan)
   + if want to have enforced – make sure all commits is formatted right
 or we get these issues.


To maybe clarify that a bit:  I see no value at all in enforcing any 
formatting as an end in itself.  I only see it as a means to drop the 
future amount of reformatting commits to zero.  (What I mean with 
"reformatting commits" is both commits that do no changes other than 
reformatting source code, as well as commits that mix---related, or even 
unrelated---reformatting of source code with some "real" changes. 
Either form creates "noise" that makes it harder to inspect individual 
git commits and the git history.)


The only way I see how we can reach that goal of zero future 
reformatting commits is to have the invariant that all commits to the 
central git repo are enforce-formatted (after one round of "big noise" 
reformatting any existing source code, if we ever get there). 
Therefore, I am not interested in experiments that cover some subset of 
the git repo's files but are done in a way that they don't guarantee 
that invariant over that subset.  My fear is that such experiments will 
increase the level of noise in the repo, instead of helping to keep it 
flat at its historical level.

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

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

2017-11-03 Thread Caolán McNamara

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

New commits:
commit b477f791e3e332b41c80782844c4c379212f0fd8
Author: CaolÃ¡n McNamara 
Date:   Thu Nov 2 13:53:23 2017 +

ofz#2980 Timeout

Change-Id: Ic5122524d06a1d5c5fccc98acbd5f8d472d39553
Reviewed-on: https://gerrit.libreoffice.org/44217
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 44f8630ead1d..1109229f4e58 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -779,7 +779,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, 
WW8_CP& rEndCp,
 
 // then determine start and end
 void* pT0;
-if( !pT->Get( rStartCp, pT0 ) )
+if (!pT->Get(rStartCp, pT0) || rStartCp < 0)
 {
 OSL_ENSURE( false, "+where's the text graphic (2)?" );
 return false;
@@ -800,7 +800,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, 
WW8_CP& rEndCp,
 }
 }
 pT->advance();
-if( !pT->Get( rEndCp, pT0 ) )
+if (!pT->Get(rEndCp, pT0) || rEndCp < 0)
 {
 OSL_ENSURE( false, "+where's the text graphic (3)?" );
 return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Caolán McNamara

 sc/source/filter/rtf/rtfparse.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 26bd20f5f350a8438fb2ff19fd92c7ba2a84bf48
Author: CaolÃ¡n McNamara 
Date:   Thu Nov 2 16:48:10 2017 +

crash on loading tdf77861-3.rtf in calc rtf filter

pActDefault is either pInsDefault or a member of maDefaultList,
so clear it if its not pInsDefault at this location

 ScRTFParser::ProcToken(RtfImportInfo*) (rtfparse.cxx:332)
 ScRTFParser::RTFImportHdl(RtfImportInfo&) (rtfparse.cxx:160)
 ScRTFParser::LinkStubRTFImportHdl(void*, RtfImportInfo&) (rtfparse.cxx:155)
 Link::Call(RtfImportInfo&) const (link.hxx:84)
 EditEngine::CallRtfImportHandler(RtfImportInfo&) (editeng.cxx:2770)
 EditRTFParser::NextToken(int) (eertfpar.cxx:231)
 SvRTFParser::Continue(int) (parrtf.cxx:643)
 SvxRTFParser::Continue(int) (svxrtf.cxx:128)
 SvRTFParser::CallParser() (parrtf.cxx:574)
 SvxRTFParser::CallParser() (svxrtf.cxx:123)
 EditRTFParser::CallParser() (eertfpar.cxx:112)
 ImpEditEngine::ReadRTF(SvStream&, EditSelection) (impedit4.cxx:161)
Address is 52 bytes inside a block of size 56 free'd
 std::default_delete::operator()(ScRTFCellDefault*) const 
(unique_ptr.h:76)
 std::unique_ptr 
>::~unique_ptr() (unique_ptr.h:239)
 void std::_Destroy > >(std::unique_ptr >*) (stl_construct.h:93)
 void std::_Destroy_aux::__destroy >*>(std::unique_ptr >*, std::unique_ptr >*) (stl_construct.h:103)
 void std::_Destroy >*>(std::unique_ptr >*, std::unique_ptr >*) (stl_construct.h:126)
 void std::_Destroy >*, std::unique_ptr > >(std::unique_ptr >*, std::unique_ptr >*, 
std::allocator > >&) (stl_construct.h:151)
 std::__cxx1998::vector >, 
std::allocator > > 
>::_M_erase_at_end(std::unique_ptr >*) (stl_vector.h:1436)
 std::__cxx1998::vector >, 
std::allocator > > >::clear() (stl_vector.h:1210)
 std::__debug::vector >, 
std::allocator > > >::clear() (vector:690)
 ScRTFParser::ProcToken(RtfImportInfo*) (rtfparse.cxx:274)
 ScRTFParser::RTFImportHdl(RtfImportInfo&) (rtfparse.cxx:160)

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

diff --git a/sc/source/filter/rtf/rtfparse.cxx 
b/sc/source/filter/rtf/rtfparse.cxx
index ceab38517666..49ad81fcb518 100644
--- a/sc/source/filter/rtf/rtfparse.cxx
+++ b/sc/source/filter/rtf/rtfparse.cxx
@@ -271,6 +271,8 @@ void ScRTFParser::ProcToken( RtfImportInfo* pInfo )
 nLastWidth = maDefaultList.back()->nTwips;
 
 nColCnt = 0;
+if (pActDefault != pInsDefault)
+pActDefault = nullptr;
 maDefaultList.clear();
 pDefMerge = nullptr;
 nRtfLastToken = pInfo->nToken;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Caolán McNamara

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

New commits:
commit 79aaf5a7a181ff701dc19b8978c989ff49908712
Author: CaolÃ¡n McNamara 
Date:   Thu Nov 2 19:32:16 2017 +

ofz: crash with empty aParserStates

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

diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index 7db60878a9e4..7ef29c77e289 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -447,7 +447,8 @@ void SvRTFParser::ScanText()
 nNextCh = GetNextChar();
 } while ( RTF_ISDIGIT( nNextCh ) );
 nUCharOverread = nNewOverread;
-aParserStates.top().nUCharOverread = 
nNewOverread;
+if (!aParserStates.empty())
+aParserStates.top().nUCharOverread = 
nNewOverread;
 }
 bNextCh = 0x20 == nNextCh;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Bartosz Kosiorek

 drawinglayer/source/tools/emfphelperdata.cxx |   62 ++-
 1 file changed, 24 insertions(+), 38 deletions(-)

New commits:
commit 64024d7c18bd114eb9958cf80eea9129e09923bd
Author: Bartosz Kosiorek 
Date:   Thu Nov 2 16:53:19 2017 +0100

tdf#111486 Fix component names in SAL_INFOs

Change-Id: I22a6747446d5571a883555db748ca3d40579cb13
Reviewed-on: https://gerrit.libreoffice.org/44222
Tested-by: Jenkins 
Reviewed-by: Bartosz Kosiorek 

diff --git a/drawinglayer/source/tools/emfphelperdata.cxx 
b/drawinglayer/source/tools/emfphelperdata.cxx
index f3e2cf9832ff..9984878c8466 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -1322,34 +1322,30 @@ namespace emfplushelper
 }
 case EmfPlusRecordTypeSetWorldTransform:
 {
-SAL_INFO("drawinglayer", "EMF+ SetWorldTransform");
-basegfx::B2DHomMatrix transform;
-readXForm(rMS, transform);
-maWorldTransform = transform;
+SAL_INFO("drawinglayer", "EMF+ SetWorldTransform, Post 
multiply: " << (flags & 0x2000));
+readXForm(rMS, maWorldTransform);
 mappingChanged();
-SAL_INFO("drawinglayer",
-"EMF+\tm11: " << maWorldTransform.get(0,0) << 
"\tm12: " << maWorldTransform.get(1,0) <<
-"\tm21: " << maWorldTransform.get(0,1) << "\tm22: 
" << maWorldTransform.get(1,1) <<
-"\tdx: " << maWorldTransform.get(0,2) << "\tdy: " 
<< maWorldTransform.get(1,2));
+SAL_INFO("drawinglayer", "EMF+\t: " << 
maWorldTransform);
 break;
 }
 case EmfPlusRecordTypeResetWorldTransform:
 {
-SAL_INFO("drawinglayer", "EMF+ ResetWorldTransform");
+SAL_INFO("drawinglayer",
+ "EMF+ ResetWorldTransform");
 maWorldTransform.identity();
+SAL_INFO("drawinglayer",
+ "EMF+\t: " << maWorldTransform);
 mappingChanged();
 break;
 }
 case EmfPlusRecordTypeMultiplyWorldTransform:
 {
-SAL_INFO("drawinglayer", "EMF+ 
MultiplyWorldTransform");
+SAL_INFO("drawinglayer", "EMF+ MultiplyWorldTransform, 
post multiply: " << (flags & 0x2000));
 basegfx::B2DHomMatrix transform;
 readXForm(rMS, transform);
 
 SAL_INFO("drawinglayer",
-"EMF+\tmatrix m11: " << transform.get(0,0) << 
"m12: " << transform.get(0,1) <<
-"EMF+\tm21: " << transform.get(1,0) << "m22: " << 
transform.get(1,1) <<
-"EMF+\tdx: " << transform.get(2,0) << "dy: " << 
transform.get(2,1));
+ "EMF+\t Transform matrix: " << transform);
 
 if (flags & 0x2000)
 {
@@ -1366,14 +1362,12 @@ namespace emfplushelper
 mappingChanged();
 
 SAL_INFO("drawinglayer",
-"EMF+\tmatrix m11: " << maWorldTransform.get(0, 0) 
<< "m12: " << maWorldTransform.get(0, 1) <<
-"EMF+\tm21: " << maWorldTransform.get(1, 0) << 
"m22: " << maWorldTransform.get(1, 1) <<
-"EMF+\tdx: " << maWorldTransform.get(2, 0) << "dy: 
" << maWorldTransform.get(2, 1));
+ "EMF+\t World transform matrix: " << 
maWorldTransform);
 break;
 }
 case EmfPlusRecordTypeTranslateWorldTransform:
 {
-SAL_INFO("drawinglayer", "EMF+ 
TranslateWorldTransform");
+SAL_INFO("drawinglayer", "EMF+ 
TranslateWorldTransform, Post multiply: " << (flags & 0x2000));
 
 basegfx::B2DHomMatrix transform;
 float eDx, eDy;
@@ -1382,9 +1376,7 @@ namespace emfplushelper
 transform.set(1, 2, eDy);
 
 SAL_INFO("drawinglayer",
-"EMF+\tmatrix m11: " << transform.get(0, 0) << 
"m12: " << transform.get(0, 1) <<
-"EMF+\tm21: " << transform.get(1, 0) << "m22: " << 
transform.get(1, 1) <<
-"EMF+\tdx: " << transform.get(2, 0) << "dy: " << 
transform.get(2, 1));
+"EMF+\t Translate matrix: " << transform);
 
 if (flags & 0x2000)
 {
@@

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

2017-11-03 Thread Samuel Mehrbrodt

 offapi/com/sun/star/security/DocumentSignatureInformation.idl |   43 +-
 1 file changed, 22 insertions(+), 21 deletions(-)

New commits:
commit 3135357a7441aa47141bab70447c0666ce24da42
Author: Samuel Mehrbrodt 
Date:   Thu Nov 2 15:57:42 2017 +0100

Fix comment markup

These do not appear on api.libreoffice.org if they arent marked up correctly

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

diff --git a/offapi/com/sun/star/security/DocumentSignatureInformation.idl 
b/offapi/com/sun/star/security/DocumentSignatureInformation.idl
index 39012bcd0491..8c411a7b276f 100644
--- a/offapi/com/sun/star/security/DocumentSignatureInformation.idl
+++ b/offapi/com/sun/star/security/DocumentSignatureInformation.idl
@@ -41,29 +41,30 @@ struct DocumentSignatureInformation
 longSignatureDate;
 longSignatureTime;
 boolean SignatureIsValid;
-/* reflects the validity of the certificate.
-   Contains a value from the constants of
-   com::sun::star::security::CertificateValidity.
+/**
+ * Reflects the validity of the certificate.
+ * Contains a value from the constants of 
com::sun::star::security::CertificateValidity.
  */
 long CertificateStatus;
-/* indicates what content of a document is signed.
-
-This value can be ignored when this struct is returned as part of
-a macro signature validation.
-As of OpenOffice.org 3.2 and ODF 1.2 the document signature comprises
-all files except the signature file itself.
-Signatures in OOo 2.x were only
-applied to the files in the root of the document, except mimetype, the
-Pictures and ObjectReplacements/Objects folder. That is, macros
-were not part of the document signature.
-OOo 3.0 signed everything, except mimetype and the META-INF folder.
-
-If PartialDocumentSignature is true, then the signature was created by 
OOo
-with a version less then 3.2. In this case, not all files are signed. 
The
-signature can still be regarded as valid, as long as SignatureIsValid 
is true
-and the certificate could be validated. However, users should be 
notified about
-the fact, that not everything in this document is signed.
-*/
+/**
+ *  Indicates what content of a document is signed.
+ *  
+ *  This value can be ignored when this struct is returned as part of
+ *  a macro signature validation.
+ *  As of OpenOffice.org 3.2 and ODF 1.2 the document signature comprises
+ *  all files except the signature file itself.
+ *  Signatures in OOo 2.x were only
+ *  applied to the files in the root of the document, except mimetype, the
+ *  Pictures and ObjectReplacements/Objects folder. That is, macros
+ *  were not part of the document signature.
+ *  OOo 3.0 signed everything, except mimetype and the META-INF folder.
+ *  
+ *  If PartialDocumentSignature is true, then the signature was created by 
OOo
+ *  with a version less then 3.2. In this case, not all files are signed. 
The
+ *  signature can still be regarded as valid, as long as SignatureIsValid 
is true
+ *  and the certificate could be validated. However, users should be 
notified about
+ *  the fact, that not everything in this document is signed.
+ */
 boolean PartialDocumentSignature;
 
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/qt5' - 42 commits - bridges/source .clang-format config_host/config_qt5.h.in config_host.mk.in configure.ac connectivity/source cppcanvas/source desktop

2017-11-03 Thread Thorsten Behrens

Rebased ref, commits from common ancestor:
commit 403668b2c19f7e9b244e970e197f45f88a1e553b
Author: Thorsten Behrens 
Date:   Thu Nov 2 01:49:00 2017 +0100

QT5 fixup non-qt5 build

Change-Id: Ifea73d81ba3863fd6a99453cb38303eb729f6ff4

diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index 132766753174..936369983d14 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -70,8 +70,8 @@ hb_blob_t* getFontTable(hb_face_t* /*face*/, hb_tag_t 
nTableTag, void* pUserData
 }
 #else
 const char* pBuffer = nullptr;
-CommonSalLayout *pLayout = static_cast( pUserData );
 #if ENABLE_QT5
+CommonSalLayout *pLayout = static_cast( pUserData );
 QByteArray aTable;
 if ( pLayout->mbUseQt5 )
 {
@@ -83,8 +83,9 @@ hb_blob_t* getFontTable(hb_face_t* /*face*/, hb_tag_t 
nTableTag, void* pUserData
 else
 #endif
 {
+FreetypeFont* pFont = static_cast(pUserData);
 pBuffer = reinterpret_cast(
-pLayout->mpFreetypeFont->GetTable(pTagName, &nLength) );
+pFont->GetTable(pTagName, &nLength) );
 }
 #endif
 
@@ -256,41 +257,44 @@ CommonSalLayout::CommonSalLayout(const CoreTextStyle& 
rCoreTextStyle)
 
 #else
 
+#if ENABLE_QT5
 CommonSalLayout::CommonSalLayout(const FontSelectPattern &rFSP,
  FreetypeFont *pFreetypeFont,
  Qt5Font *pQt5Font, bool bUseQt5)
 : mrFontSelData(rFSP)
 , mpFreetypeFont(pFreetypeFont)
-#if ENABLE_QT5
 , mbUseQt5(bUseQt5)
 , mpQFont(pQt5Font)
-#endif
 , mpVertGlyphs(nullptr)
 {
-#if ENABLE_QT5
 if (mbUseQt5)
 mpHbFont = mpQFont->GetHbFont();
 else
-#endif
 mpHbFont = mpFreetypeFont->GetHbFont();
 if (!mpHbFont)
 {
 hb_face_t* pHbFace = hb_face_create_for_tables(getFontTable, this, 
nullptr);
 
 mpHbFont = createHbFont(pHbFace);
-#if ENABLE_QT5
 if (mbUseQt5)
 mpQFont->SetHbFont(mpHbFont);
 else
-#endif
 mpFreetypeFont->SetHbFont(mpHbFont);
 }
 }
+#endif
 
-CommonSalLayout::CommonSalLayout(FreetypeFont& rFreetypeFont)
-: CommonSalLayout(rFreetypeFont.GetFontSelData(),
-  &rFreetypeFont, nullptr, false)
+CommonSalLayout::CommonSalLayout(FreetypeFont& rFreetypeFont) :
+mrFontSelData(rFreetypeFont.GetFontSelData())
+,   mpFreetypeFont(&rFreetypeFont)
+,   mpVertGlyphs(nullptr)
 {
+mpHbFont = rFreetypeFont.GetHbFont();
+if (!mpHbFont)
+{
+hb_face_t* pHbFace = hb_face_create_for_tables(getFontTable, 
&rFreetypeFont, nullptr);
+mpHbFont = createHbFont(pHbFace);
+}
 }
 
 #if ENABLE_QT5
commit e5b57ef74a9e6d8aba21d4b633980ed06774e5e9
Author: Jan-Marek Glogowski 
Date:   Mon Oct 30 16:11:09 2017 +0100

QT5 implement Graphics damage tracking

Since we implement SalGraphics handling like the gtk3 backend, we
need damage tracking to queue updates.

Since there is no native damage tracking in Qt5, we have to log
the damage in our subclassed QPainter, which will queue an update
on destruction.

Change-Id: Ife17770750a5be9959c2fc2633b422908d196869

diff --git a/vcl/Library_vclplug_qt5.mk b/vcl/Library_vclplug_qt5.mk
index d82b7d2fcd31..fba78d738883 100644
--- a/vcl/Library_vclplug_qt5.mk
+++ b/vcl/Library_vclplug_qt5.mk
@@ -91,6 +91,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_qt5,\
 vcl/qt5/Qt5Instance \
 vcl/qt5/Qt5Instance_Print \
 vcl/qt5/Qt5Object \
+vcl/qt5/Qt5Painter \
 vcl/qt5/Qt5Printer \
 vcl/qt5/Qt5Timer \
 vcl/qt5/Qt5Tools \
diff --git a/vcl/qt5/Qt5Graphics.cxx b/vcl/qt5/Qt5Graphics.cxx
index 676e9e54664e..eae47c5f21e9 100644
--- a/vcl/qt5/Qt5Graphics.cxx
+++ b/vcl/qt5/Qt5Graphics.cxx
@@ -18,7 +18,11 @@
  */
 
 #include "Qt5Graphics.hxx"
+
 #include "Qt5Frame.hxx"
+#include "Qt5Painter.hxx"
+
+#include 
 
 #include 
 
@@ -46,30 +50,6 @@ Qt5Graphics::~Qt5Graphics()
 delete m_pTextStyle[ i ];
 }
 
-void Qt5Graphics::PreparePainter( QPainter& rPainter, sal_uInt8 nTransparency )
-{
-if ( m_pQImage )
-rPainter.begin( m_pQImage );
-else
-{
-assert( dynamic_cast< QPaintDevice* >( m_pFrame->GetQWidget() ) );
-rPainter.begin( m_pFrame->GetQWidget() );
-}
-if ( !m_aClipPath.isEmpty() )
-rPainter.setClipPath( m_aClipPath );
-else
-rPainter.setClipRegion( m_aClipRegion );
-if ( SALCOLOR_NONE != m_aLineColor )
-{
-QColor aColor = QColor::fromRgb( QRgb( m_aLineColor ) );
-aColor.setAlpha( nTransparency );
-rPainter.setPen( aColor );
-}
-else
-rPainter.setPen( Qt::NoPen );
-rPainter.setCompositionMode( m_eCompositionMode );
-}
-
 void Qt5Graphics::ChangeQImage( QImage *pQImage )
 {
 m_pQImage = pQImage;
diff --git a/vcl/qt5/Qt5Graphics.hxx b/vcl/qt5/Qt5Graphics.hxx
index 52c1c90ec5df..9ffe2c47e461 100644
--- a/vcl/qt5/Qt5Graphics.hxx
+

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

2017-11-03 Thread Serge Krot

 sw/qa/extras/rtfexport/rtfexport2.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 9a08e340ca7c5353b5347e5c5346c857d48011f4
Author: Serge Krot 
Date:   Thu Nov 2 12:26:34 2017 +0100

Return new line symbol in unit test

For Win32 we cannot use directly "\n" symbol,
instead SAL_NEWLINE_STRING should be used.

Change-Id: Icf607fcc20086201fb34423f0a98d6817218bb0f
Reviewed-on: https://gerrit.libreoffice.org/44207
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/rtfexport/rtfexport2.cxx 
b/sw/qa/extras/rtfexport/rtfexport2.cxx
index 7746cec31862..35e5d461e15c 100644
--- a/sw/qa/extras/rtfexport/rtfexport2.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport2.cxx
@@ -1144,7 +1144,11 @@ DECLARE_RTFEXPORT_TEST(testCp118, "cp118.rtf")
 uno::Reference xFootnotesSupplier(mxComponent, 
uno::UNO_QUERY);
 uno::Reference 
xFootnotes(xFootnotesSupplier->getFootnotes(), uno::UNO_QUERY);
 uno::Reference xTextRange(xFootnotes->getByIndex(0), 
uno::UNO_QUERY);
-CPPUNIT_ASSERT(xTextRange->getString().startsWithIgnoreAsciiCase("Footnote 
first line"));
+
+OUString const aExpected = "Footnote first line." SAL_NEWLINE_STRING;
+OUString const aActual   = xTextRange->getString();
+
+CPPUNIT_ASSERT_EQUAL(aExpected, aActual);
 }
 
 DECLARE_RTFEXPORT_TEST(testFdo94835, "fdo94835.rtf")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Miklos Vajna

 sw/source/core/text/itrform2.cxx |8 
 1 file changed, 8 deletions(-)

New commits:
commit 6cef8dd228dacf680dfb78f7113de186143da82c
Author: Miklos Vajna 
Date:   Thu Nov 2 20:40:39 2017 +0100

sw: clean up temporary debug code in itrform2

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

diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 7309aad4674e..e9c18c644867 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -60,10 +60,6 @@
 
 #include 
 
-#if OSL_DEBUG_LEVEL > 1
-#include 
-#endif
-
 using namespace ::com::sun::star;
 
 namespace {
@@ -1821,10 +1817,6 @@ void SwTextFormatter::CalcRealHeight( bool bNewLine )
 default: OSL_FAIL( ": unknown InterLineSpaceRule" );
 }
 }
-#if OSL_DEBUG_LEVEL > 1
-sal_uInt16 nDummy = nLineHeight + 1;
-(void)nDummy;
-#endif
 
 if( IsRegisterOn() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: .clang-format .git-hooks/pre-commit solenv/clang-format

2017-11-03 Thread Miklos Vajna

 .clang-format   |   44 +
 .git-hooks/pre-commit   |  113 
 solenv/clang-format/generate-style-blacklist.sh |   12 ++
 3 files changed, 169 insertions(+)

New commits:
commit 98f5f4d39c9c1cae7e8b56e2b33ee0be58e79f1d
Author: Miklos Vajna 
Date:   Thu Nov 2 17:09:03 2017 +0100

Enforce coding style with clang-format for new code

- The actual blacklist has to be generated with
  solenv/clang-format/generate-style-blacklist.sh in a separate commit.

- .clang-format is from
  
,
  except:

  - the commented out lines are removed
  - Standard is Cpp11 instead of Cpp03
  - explicitly avoid sorting includes (requested during ESC meeting
2017-10-11)
  - no indentation inside namespaces (lots of existing code in sc wants 
this)

- The git hooks prints a diff when the style is violated, along with a
  command to fix up the violation automatically. It also enforces style
  only in new files and ignores all files listed in the blacklist.

- To avoid introducing one more hard-to-setup build dependency for new
  developers, help them two ways:

  - if clang-format is not installed, provide pre-built binaries for
Linux/Windows/macOS

  - download/install of these binaries are printed as cmdline
instructions, similar to how we have our own 'make' on Windows

- As per ESC call 2017-11-02, currently don't do any checks if
  clang-format is not installed (as a first step).

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

diff --git a/.clang-format b/.clang-format
new file mode 100644
index ..4dc707ef6468
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,44 @@
+AccessModifierOffset: -4
+ConstructorInitializerIndentWidth: 4
+AlignEscapedNewlinesLeft: false
+AlignTrailingComments: false
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakTemplateDeclarations: false
+AlwaysBreakBeforeMultilineStrings: false
+BreakBeforeBinaryOperators: true
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: true
+BinPackParameters: true
+ColumnLimit: 80
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+DerivePointerBinding: false
+ExperimentalAutoDetectBinPacking: false
+IndentCaseLabels: true
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 60
+PenaltyBreakString: 1000
+PenaltyBreakFirstLessLess: 120
+PenaltyExcessCharacter: 100
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerBindsToType: true
+SpacesBeforeTrailingComments: 1
+Cpp11BracedListStyle: false
+Standard:Cpp11
+IndentWidth: 4
+TabWidth:8
+UseTab:  Never
+BreakBeforeBraces: Allman
+IndentFunctionDeclarationAfterType: false
+SpacesInParentheses: false
+SpacesInAngles:  false
+SpaceInEmptyParentheses: false
+SpacesInCStyleCastParentheses: false
+SpaceAfterControlStatementKeyword: true
+SpaceBeforeAssignmentOperators: true
+ContinuationIndentWidth: 4
+SortIncludes: false
diff --git a/.git-hooks/pre-commit b/.git-hooks/pre-commit
index b0779e5aaa1f..b40ad6f004d9 100755
--- a/.git-hooks/pre-commit
+++ b/.git-hooks/pre-commit
@@ -108,6 +108,116 @@ sub check_whitespaces($)
 }
 }
 
+sub check_style($)
+{
+my ($h) = @_;
+my $src = "c|cpp|cxx|h|hxx|inl";
+my @bad_names = ();
+my %blacklist_names = ();
+
+# Use clang-format from PATH, unless it's available in our dedicated
+# directory.
+my $opt_lo = "/opt/lo/bin";
+my $clang_format = "$opt_lo/clang-format";
+if (! -x $clang_format)
+{
+foreach my $dir (split /:/, $ENV{PATH})
+{
+$clang_format = "$dir/clang-format";
+if (-x $clang_format)
+{
+last;
+}
+}
+}
+
+# Read the blacklist.
+if (open(LINES, "solenv/clang-format/blacklist"))
+{
+while (my $line = )
+{
+chomp $line;
+$blacklist_names{$line} = 1;
+}
+}
+
+# Check if clang-format is installed.
+if (! -x $clang_format)
+{
+# As a first step, don't do any checks in this case.
+return;
+
+my $version = "r302580";
+my $platform = "linux64";
+my $download = "wget";
+if ($^O eq "cygwin")
+{
+$platform = "win.exe";
+}
+elsif ($^O eq "darwin")
+{
+$platform = "mac";
+$download = "curl -O";
+}
+
+print("Error: clang-format is not found in $opt_lo or in your 
PATH.\n");
+print("To get a cl

[Libreoffice-commits] core.git: solenv/clang-format

2017-11-03 Thread Miklos Vajna

 solenv/clang-format/blacklist |19928 ++
 1 file changed, 19928 insertions(+)

New commits:
commit cd592cca271cdf5eabe2aba3479e4831ef3e14a6
Author: Miklos Vajna 
Date:   Thu Nov 2 17:35:54 2017 +0100

solenv: add list of existing C++ files for clang-format blacklist purposes

Generated with solenv/clang-format/generate-style-blacklist.sh from
.

Change-Id: I9ac621494450c42ef83e5cb7c1956124d17a8de6

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
new file mode 100644
index ..f08327bdc2e0
--- /dev/null
+++ b/solenv/clang-format/blacklist
@@ -0,0 +1,19928 @@
+UnoControls/inc/basecontainercontrol.hxx
+UnoControls/inc/basecontrol.hxx
+UnoControls/inc/multiplexer.hxx
+UnoControls/source/base/basecontainercontrol.cxx
+UnoControls/source/base/basecontrol.cxx
+UnoControls/source/base/multiplexer.cxx
+UnoControls/source/base/registercontrols.cxx
+UnoControls/source/controls/OConnectionPointContainerHelper.cxx
+UnoControls/source/controls/OConnectionPointHelper.cxx
+UnoControls/source/controls/framecontrol.cxx
+UnoControls/source/controls/progressbar.cxx
+UnoControls/source/controls/progressmonitor.cxx
+UnoControls/source/controls/statusindicator.cxx
+UnoControls/source/inc/OConnectionPointContainerHelper.hxx
+UnoControls/source/inc/OConnectionPointHelper.hxx
+UnoControls/source/inc/framecontrol.hxx
+UnoControls/source/inc/progressbar.hxx
+UnoControls/source/inc/progressmonitor.hxx
+UnoControls/source/inc/statusindicator.hxx
+accessibility/inc/extended/AccessibleBrowseBox.hxx
+accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
+accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
+accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
+accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
+accessibility/inc/extended/AccessibleBrowseBoxTable.hxx
+accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
+accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
+accessibility/inc/extended/AccessibleGridControl.hxx
+accessibility/inc/extended/AccessibleGridControlBase.hxx
+accessibility/inc/extended/AccessibleGridControlHeader.hxx
+accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
+accessibility/inc/extended/AccessibleGridControlTable.hxx
+accessibility/inc/extended/AccessibleGridControlTableBase.hxx
+accessibility/inc/extended/AccessibleGridControlTableCell.hxx
+accessibility/inc/extended/accessiblebrowseboxcell.hxx
+accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
+accessibility/inc/extended/accessibleiconchoicectrl.hxx
+accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
+accessibility/inc/extended/accessiblelistbox.hxx
+accessibility/inc/extended/accessiblelistboxentry.hxx
+accessibility/inc/extended/accessibletabbar.hxx
+accessibility/inc/extended/accessibletabbarbase.hxx
+accessibility/inc/extended/accessibletabbarpage.hxx
+accessibility/inc/extended/accessibletabbarpagelist.hxx
+accessibility/inc/extended/accessibletablistbox.hxx
+accessibility/inc/extended/accessibletablistboxtable.hxx
+accessibility/inc/extended/listboxaccessible.hxx
+accessibility/inc/extended/textwindowaccessibility.hxx
+accessibility/inc/helper/IComboListBoxHelper.hxx
+accessibility/inc/helper/accresmgr.hxx
+accessibility/inc/helper/characterattributeshelper.hxx
+accessibility/inc/helper/listboxhelper.hxx
+accessibility/inc/pch/precompiled_acc.cxx
+accessibility/inc/pch/precompiled_acc.hxx
+accessibility/inc/standard/accessiblemenubasecomponent.hxx
+accessibility/inc/standard/accessiblemenucomponent.hxx
+accessibility/inc/standard/accessiblemenuitemcomponent.hxx
+accessibility/inc/standard/vclxaccessiblebox.hxx
+accessibility/inc/standard/vclxaccessiblebutton.hxx
+accessibility/inc/standard/vclxaccessiblecheckbox.hxx
+accessibility/inc/standard/vclxaccessiblecombobox.hxx
+accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx
+accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx
+accessibility/inc/standard/vclxaccessibleedit.hxx
+accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx
+accessibility/inc/standard/vclxaccessiblefixedtext.hxx
+accessibility/inc/standard/vclxaccessiblelist.hxx
+accessibility/inc/standard/vclxaccessiblelistbox.hxx
+accessibility/inc/standard/vclxaccessiblelistitem.hxx
+accessibility/inc/standard/vclxaccessiblemenu.hxx
+accessibility/inc/standard/vclxaccessiblemenubar.hxx
+accessibility/inc/standard/vclxaccessiblemenuitem.hxx
+accessibility/inc/standard/vclxaccessiblemenuseparator.hxx
+accessibility/inc/standard/vclxaccessiblepopupmenu.hxx
+accessibility/inc/standard/vclxaccessibleradiobutton.hxx
+accessibility/inc/standard/vclxaccessiblescrollbar.hxx
+accessibility/inc/standard/vclxaccessiblestatusbar.hxx
+accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
+accessibility/inc/standard/vclxaccessibletabcontrol.hxx
+accessibility/inc/standard/vclxaccessibletabpage.hxx
+accessibility/i

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

2017-11-03 Thread Miklos Vajna

 xmlsecurity/inc/xmlsignaturehelper.hxx|4 ++--
 xmlsecurity/inc/xmlsignaturehelper2.hxx   |6 +++---
 xmlsecurity/inc/xsecctl.hxx   |   10 --
 xmlsecurity/source/helper/xmlsignaturehelper.cxx  |2 +-
 xmlsecurity/source/helper/xmlsignaturehelper2.cxx |2 +-
 xmlsecurity/source/helper/xsecctl.cxx |5 ++---
 6 files changed, 13 insertions(+), 16 deletions(-)

New commits:
commit 6cf3ef823a6419212e69f0ad308e0ef8efe31481
Author: Miklos Vajna 
Date:   Thu Nov 2 14:11:49 2017 +0100

xmlsecurity: can hold UriBindingHelper by rtl::Reference

... in XMLSignatureHelper and XSecController

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

diff --git a/xmlsecurity/inc/xmlsignaturehelper.hxx 
b/xmlsecurity/inc/xmlsignaturehelper.hxx
index 97d73bfb3619..6f9784f4a690 100644
--- a/xmlsecurity/inc/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsignaturehelper.hxx
@@ -28,10 +28,10 @@
 #include 
 #include "xsecctl.hxx"
 #include "xmlsecuritydllapi.h"
+#include "xmlsignaturehelper.hxx"
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -66,7 +66,7 @@ class XMLSECURITY_DLLPUBLIC XMLSignatureHelper
 {
 private:
 css::uno::Reference< css::uno::XComponentContext > mxCtx;
-css::uno::Reference< css::xml::crypto::XUriBinding > mxUriBinding;
+rtl::Reference mxUriBinding;
 
 rtl::Reference mpXSecController;
 boolmbError;
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx 
b/xmlsecurity/inc/xmlsignaturehelper2.hxx
similarity index 90%
rename from xmlsecurity/source/helper/xmlsignaturehelper2.hxx
rename to xmlsecurity/inc/xmlsignaturehelper2.hxx
index 1b62f601e509..867118ba8da9 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
+++ b/xmlsecurity/inc/xmlsignaturehelper2.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_XMLSECURITY_SOURCE_HELPER_XMLSIGNATUREHELPER2_HXX
-#define INCLUDED_XMLSECURITY_SOURCE_HELPER_XMLSIGNATUREHELPER2_HXX
+#ifndef INCLUDED_XMLSECURITY_INC_XMLSIGNATUREHELPER2_HXX
+#define INCLUDED_XMLSECURITY_INC_XMLSIGNATUREHELPER2_HXX
 
 #include 
 #include 
@@ -54,6 +54,6 @@ public:
 static css::uno::Reference < css::io::XInputStream > OpenInputStream( 
const css::uno::Reference < css::embed::XStorage >& rxStore, const OUString& 
rURI );
 };
 
-#endif // INCLUDED_XMLSECURITY_SOURCE_HELPER_XMLSIGNATUREHELPER2_HXX
+#endif // INCLUDED_XMLSECURITY_INC_XMLSIGNATUREHELPER2_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/inc/xsecctl.hxx b/xmlsecurity/inc/xsecctl.hxx
index 68968a2bb2f0..a041bd3b7069 100644
--- a/xmlsecurity/inc/xsecctl.hxx
+++ b/xmlsecurity/inc/xsecctl.hxx
@@ -41,11 +41,12 @@
 
 #include 
 #include 
-
 #include 
 
 #include 
 
+#include "xmlsignaturehelper2.hxx"
+
 #define NS_XMLDSIG "http://www.w3.org/2000/09/xmldsig#";
 #define NS_DC  "http://purl.org/dc/elements/1.1/";
 #define NS_XD  "http://uri.etsi.org/01903/v1.3.2#";
@@ -219,7 +220,7 @@ public:
 /*
  * An xUriBinding is provided to map Uris to XInputStream interfaces.
  */
-css::uno::Reference< css::xml::crypto::XUriBinding > m_xUriBinding;
+rtl::Reference m_xUriBinding;
 
 private:
 
@@ -289,10 +290,7 @@ public:
 
 sal_Int32 getNewSecurityId(  );
 
-void startMission( const css::uno::Reference<
-css::xml::crypto::XUriBinding >& xUriBinding,
-const css::uno::Reference<
-css::xml::crypto::XXMLSecurityContext >& xSecurityContext );
+void startMission(const rtl::Reference& xUriBinding, 
const css::uno::Reference& 
xSecurityContext);
 
 void setSAXChainConnector(const css::uno::Reference< 
css::lang::XInitialization >& xInitialization);
 
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx 
b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index bcfc19936688..0f7630171285 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -22,7 +22,7 @@
 #include 
 #include 
 
-#include "xmlsignaturehelper2.hxx"
+#include 
 
 #include 
 #include 
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx 
b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
index d63052996763..49d9e84f74e4 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
@@ -18,7 +18,7 @@
  */
 
 #include 
-#include "xmlsignaturehelper2.hxx"
+#include 
 
 #include 
 #include 
diff --git a/xmlsecurity/source/helper/xsecctl.cxx 
b/xmlsecurity/source/helper/xsecctl.cxx
index 301085df668f..a64883d842b1 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -43,6 +43,7 @@
 #include 
 #include 
 #include "ooxmlsecexporter.hxx"
+#include 
 
 namespace cssu = com

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

2017-11-03 Thread Jens Carl

 include/test/sheet/xsheetcellrange.hxx  |   36 +++
 qadevOOo/Jar_OOoRunner.mk   |1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv |1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv  |1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv |1 
 qadevOOo/tests/java/ifc/sheet/_XSheetCellRange.java |   48 
--
 sc/qa/extras/sccellcursorobj.cxx|7 +
 sc/qa/extras/sccellrangeobj.cxx |7 +
 sc/qa/extras/sctablesheetobj.cxx|7 +
 test/Library_subsequenttest.mk  |1 
 test/source/sheet/xsheetcellrange.cxx   |   34 +++
 11 files changed, 89 insertions(+), 55 deletions(-)

New commits:
commit c3965b1ce4428a97a8050a7bc53d60b642062502
Author: Jens Carl 
Date:   Fri Nov 3 05:16:30 2017 +

tdf#45904 Move Java _XSheetCellRange tests to C++

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

diff --git a/include/test/sheet/xsheetcellrange.hxx 
b/include/test/sheet/xsheetcellrange.hxx
new file mode 100644
index ..80fd064b7832
--- /dev/null
+++ b/include/test/sheet/xsheetcellrange.hxx
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_SHEET_XSHEETCELLRANGE_HXX
+#define INCLUDED_TEST_SHEET_XSHEETCELLRANGE_HXX
+
+
+#include 
+#include 
+
+#include 
+
+namespace apitest {
+
+class OOO_DLLPUBLIC_TEST XSheetCellRange
+{
+public:
+virtual css::uno::Reference< css::uno::XInterface > init() =0;
+
+void testGetSpreadsheet();
+
+protected:
+~XSheetCellRange() {}
+};
+
+}
+
+#endif // INCLUDED_TEST_SHEET_XSHEETCELLRANGE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 94b198cf34d2..16ebecb84344 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -618,7 +618,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationsSupplier \
 qadevOOo/tests/java/ifc/sheet/_XSheetAuditing \
 qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor \
-qadevOOo/tests/java/ifc/sheet/_XSheetCellRange \
 qadevOOo/tests/java/ifc/sheet/_XSheetCellRangeContainer \
 qadevOOo/tests/java/ifc/sheet/_XSheetFilterableEx \
 qadevOOo/tests/java/ifc/sheet/_XSpreadsheetView \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
index 3b19776b3b04..4e672f8418af 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
@@ -126,7 +126,6 @@
 "ScCellCursorObj";"com::sun::star::util::XIndent";"incrementIndent()"
 
"ScCellCursorObj";"com::sun::star::sheet::XMultipleOperation";"setTableOperation()"
 "ScCellCursorObj";"com::sun::star::table::XAutoFormattable";"autoFormat()"
-"ScCellCursorObj";"com::sun::star::sheet::XSheetCellRange";"getSpreadsheet()"
 
"ScCellCursorObj";"com::sun::star::sheet::XCellRangesQuery";"queryVisibleCells()"
 "ScCellCursorObj";"com::sun::star::sheet::XCellRangesQuery";"queryEmptyCells()"
 
"ScCellCursorObj";"com::sun::star::sheet::XCellRangesQuery";"queryContentCells()"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
index 9f539f5bbf10..cd2e335c7834 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
@@ -121,7 +121,6 @@
 "ScCellRangeObj";"com::sun::star::util::XIndent";"incrementIndent()"
 
"ScCellRangeObj";"com::sun::star::sheet::XMultipleOperation";"setTableOperation()"
 "ScCellRangeObj";"com::sun::star::table::XAutoFormattable";"autoFormat()"
-"ScCellRangeObj";"com::sun::star::sheet::XSheetCellRange";"getSpreadsheet()"
 
"ScCellRangeObj";"com::sun::star::sheet::XCellRangesQuery";"queryVisibleCells()"
 "ScCellRangeObj";"com::sun::star::sheet::XCellRangesQuery";"queryEmptyCells()"
 
"ScCellRangeObj";"com::sun::star::sheet::XCellRangesQuery";"queryContentCells()"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
index b3ea64aca54d..1fd3970c58dd 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
+++ b/qadevOOo/objdsc/sc/co

[Libreoffice-commits] core.git: README.md

2017-11-03 Thread Mike Kaganski

 README.md |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 646448dda41484dfa936f906356d7c58c8a28605
Author: Mike Kaganski 
Date:   Fri Oct 27 15:39:12 2017 +0300

loplugin:includeform: document the requirements

See commits acb3ed0615a1b4e31257fa1014e9e2f2188c602c and
189abcf0db61c41a565bd355294bf6e712fc3e5a, and mail thread



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

diff --git a/README.md b/README.md
index 3fe1dabac50d..fa614b033d38 100644
--- a/README.md
+++ b/README.md
@@ -98,6 +98,16 @@ canvas/   | new (UNO) canvas rendering model with various 
backends
 cppcanvas/ | C++ helper classes for using the UNO canvas
 drawinglayer/ | View code to render drawable objects and break them down into 
primitives we can render more easily.
 
+## Rules for #include directives (C/C++)
+
+Use the `"..."` form if and only if the included file is found next to the
+including file. Otherwise, use the `<...>` form. (For further details, see the
+mail [Re: C[++]: Normalizing include syntax ("" vs
+<>)](https://lists.freedesktop.org/archives/libreoffice/2017-November/078778.html).)
+
+The UNO API include files should consistently use double quotes, for the
+benefit of external users of this API.
+
 
 ## Finding out more
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Mike Kaganski

 source/text/scalc/01/04060109.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d25e28bb1ef1f0c07c263c48167135f4116eb730
Author: Mike Kaganski 
Date:   Thu Nov 2 11:11:55 2017 +0200

Correct the explanation for STYLE spreadsheet function

Change-Id: Ia0fedd0bc673f3090cf065ac578ef193d1d3b6b7
Reviewed-on: https://gerrit.libreoffice.org/44196
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/source/text/scalc/01/04060109.xhp 
b/source/text/scalc/01/04060109.xhp
index ef61a9632..ef8d5bd5e 100644
--- a/source/text/scalc/01/04060109.xhp
+++ b/source/text/scalc/01/04060109.xhp
@@ -409,7 +409,7 @@
 
 
 STYLE
- Applies a style to the cell 
containing the formula. After a set amount of time, another style can 
be applied. This function always returns the value 0, allowing you to add it to 
another function without changing the value. Together with the CURRENT function 
you can apply a color to a cell regardless of the value. For example: 
=...+STYLE(IF(CURRENT()>3;"red";"green")) applies the style "red" to the 
cell if the value is greater than 3, otherwise the style "green" is applied. 
Both cell formats have to be defined beforehand.
+ Applies a style to the cell 
containing the formula. After a set amount of time, another style can 
be applied. This function always returns the value 0, allowing you to add it to 
another function without changing the value. Together with the CURRENT function 
you can apply a color to a cell depending on the value. For example: 
=...+STYLE(IF(CURRENT()>3;"red";"green")) applies the style "red" to the 
cell if the value is greater than 3, otherwise the style "green" is applied. 
Both cell formats have to be defined beforehand.
  Syntax
  STYLE("Style"; Time; "Style2")
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-11-03 Thread Mike Kaganski

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

New commits:
commit be2729b4b52d7aea51b847cd0e07dd1992196bf8
Author: Mike Kaganski 
Date:   Thu Nov 2 11:11:55 2017 +0200

Updated core
Project: help  d25e28bb1ef1f0c07c263c48167135f4116eb730

Correct the explanation for STYLE spreadsheet function

Change-Id: Ia0fedd0bc673f3090cf065ac578ef193d1d3b6b7
Reviewed-on: https://gerrit.libreoffice.org/44196
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 788f70916eaa..d25e28bb1ef1 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 788f70916eaa53d89775c5998a4d19235ed19f4a
+Subproject commit d25e28bb1ef1f0c07c263c48167135f4116eb730
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Stephan Bergmann

 connectivity/source/inc/ado/Aolevariant.hxx |4 ++--
 connectivity/source/inc/ado/Awrapado.hxx|4 ++--
 connectivity/source/inc/ado/Awrapadox.hxx   |4 ++--
 connectivity/source/inc/ado/WrapColumn.hxx  |4 ++--
 connectivity/source/inc/ado/adoimp.hxx  |4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 7ad68b82d252003f6c9233ea74d99f29f25016f0
Author: Stephan Bergmann 
Date:   Thu Nov 2 18:40:54 2017 +0100

Move ado_{pre,post}_sys_include.h

...to connectivity/source/inc/ado/, as it is included from include files 
there,
which only happens to work because of -I$(dir $(3)) in
gb_CObject__command_pattern (in solenv/gbuild/platform/com_MSC_class.mk) 
and the
fact that those include files in connectivity/source/inc/ado/ are in turn 
only
included from .cxx files in connectivity/source/drivers/ado/.

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

diff --git a/connectivity/source/inc/ado/Aolevariant.hxx 
b/connectivity/source/inc/ado/Aolevariant.hxx
index 37c0725b02c7..a9af47ee042e 100644
--- a/connectivity/source/inc/ado/Aolevariant.hxx
+++ b/connectivity/source/inc/ado/Aolevariant.hxx
@@ -23,9 +23,9 @@
 #include 
 #include 
 
-#include 
+#include 
 #include 
-#include 
+#include 
 
 namespace com
 {
diff --git a/connectivity/source/inc/ado/Awrapado.hxx 
b/connectivity/source/inc/ado/Awrapado.hxx
index e12239791149..f8b6d818f6d7 100644
--- a/connectivity/source/inc/ado/Awrapado.hxx
+++ b/connectivity/source/inc/ado/Awrapado.hxx
@@ -22,11 +22,11 @@
 #include 
 
 // Includes for ADO
-#include 
+#include 
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/connectivity/source/inc/ado/Awrapadox.hxx 
b/connectivity/source/inc/ado/Awrapadox.hxx
index 3b3c8583371f..83374761ac9b 100644
--- a/connectivity/source/inc/ado/Awrapadox.hxx
+++ b/connectivity/source/inc/ado/Awrapadox.hxx
@@ -53,10 +53,10 @@ typedef struct _ADOTable Table;
 #endif
 
 
-#include 
+#include 
 #include 
 #include 
-#include 
+#include 
 
 
 #include 
diff --git a/connectivity/source/inc/ado/WrapColumn.hxx 
b/connectivity/source/inc/ado/WrapColumn.hxx
index 9548c7890479..fd50fee44287 100644
--- a/connectivity/source/inc/ado/WrapColumn.hxx
+++ b/connectivity/source/inc/ado/WrapColumn.hxx
@@ -21,9 +21,9 @@
 
 #include 
 
-#include 
+#include 
 #include 
-#include 
+#include 
 
 namespace connectivity
 {
diff --git a/connectivity/source/drivers/ado/ado_post_sys_include.h 
b/connectivity/source/inc/ado/ado_post_sys_include.h
similarity index 100%
rename from connectivity/source/drivers/ado/ado_post_sys_include.h
rename to connectivity/source/inc/ado/ado_post_sys_include.h
diff --git a/connectivity/source/drivers/ado/ado_pre_sys_include.h 
b/connectivity/source/inc/ado/ado_pre_sys_include.h
similarity index 100%
rename from connectivity/source/drivers/ado/ado_pre_sys_include.h
rename to connectivity/source/inc/ado/ado_pre_sys_include.h
diff --git a/connectivity/source/inc/ado/adoimp.hxx 
b/connectivity/source/inc/ado/adoimp.hxx
index 1459d56f8bf7..a0ab03e369ee 100644
--- a/connectivity/source/inc/ado/adoimp.hxx
+++ b/connectivity/source/inc/ado/adoimp.hxx
@@ -21,9 +21,9 @@
 
 #include 
 
-#include 
+#include 
 #include 
-#include 
+#include 
 
 struct ADOConnection;
 namespace connectivity
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-03 Thread Stephan Bergmann

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

New commits:
commit 3d02f5199ea239a4376dab52cb772d306c86c3a4
Author: Stephan Bergmann 
Date:   Thu Nov 2 18:39:47 2017 +0100

-Werror,-Wsign-compare (clang-cl)

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

diff --git a/include/comphelper/windowserrorstring.hxx 
b/include/comphelper/windowserrorstring.hxx
index 4e401571a2fb..bb4b16241ca5 100644
--- a/include/comphelper/windowserrorstring.hxx
+++ b/include/comphelper/windowserrorstring.hxx
@@ -47,7 +47,7 @@ inline OUString WindowsErrorStringFromHRESULT(HRESULT hr)
 // we might actually have a Win32 error code converted using 
HRESULT_FROM_WIN32 macro
 
 DWORD nErrorCode = DWORD(hr);
-if ((hr & 0x) == MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, 0) 
|| hr == S_OK)
+if (HRESULT(hr & 0x) == MAKE_HRESULT(SEVERITY_ERROR, 
FACILITY_WIN32, 0) || hr == S_OK)
 {
 nErrorCode = HRESULT_CODE(hr);
 // https://msdn.microsoft.com/en-us/library/ms679360 mentions that the 
codes might have
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

1 2 >

1 - 100 of 103 matches

Mail list logo