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

[Stephan Bergmann]

 oox/source/ppt/timenodelistcontext.cxx |2 +-
 ucb/source/ucp/file/bc.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9c8ae146042a28d1d56b7c672d5b3a9d659515b4
Author: Stephan Bergmann 
Date:   Wed Jan 24 08:22:02 2018 +0100

sal_Bool -> bool (remaining uses of css::uno::Any::has)

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

diff --git a/oox/source/ppt/timenodelistcontext.cxx 
b/oox/source/ppt/timenodelistcontext.cxx
index 00841a2c487a..7c98cfd49340 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -185,7 +185,7 @@ namespace oox { namespace ppt {
 else if( aString == "false" )
 maTo <<= false;
 
-if (!maTo.has())
+if (!maTo.has())
 {
 SAL_WARN("oox.ppt", "conversion failed");
 maTo <<= false;
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index 9f9203166d2a..4f076002ac8c 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -353,7 +353,7 @@ BaseContent::execute( const Command& aCommand,
 }
 else if ( aCommand.Name == "delete" )
 {
-if( ! aCommand.Argument.has< sal_Bool >() )
+if( ! aCommand.Argument.has< bool >() )
 m_pMyShell->installError( CommandId,
   TASKHANDLING_WRONG_DELETE_ARGUMENT );
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 embedserv/source/inprocserv/dllentry.cxx  |3 
---
 embedserv/source/inprocserv/inprocembobj.cxx  |4 

 svl/source/svdde/ddecli.cxx   |5 
-
 winaccessibility/source/service/AccContainerEventListener.cxx |4 

 winaccessibility/source/service/AccDescendantManagerEventListener.cxx |4 

 winaccessibility/source/service/AccDialogEventListener.cxx|4 

 winaccessibility/source/service/AccFrameEventListener.cxx |4 

 winaccessibility/source/service/AccMenuEventListener.cxx  |4 

 winaccessibility/source/service/AccWindowEventListener.cxx|4 

 9 files changed, 36 deletions(-)

New commits:
commit 902698412183e93a1bd018200c63054a422f2636
Author: Stephan Bergmann 
Date:   Wed Jan 24 08:34:52 2018 +0100

loplugin:emptyif (clang-cl)

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

diff --git a/embedserv/source/inprocserv/dllentry.cxx 
b/embedserv/source/inprocserv/dllentry.cxx
index 581435cba1c3..65d8bc550a4b 100644
--- a/embedserv/source/inprocserv/dllentry.cxx
+++ b/embedserv/source/inprocserv/dllentry.cxx
@@ -163,9 +163,6 @@ extern "C" BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD 
dwReason, LPVOID /*lp
 {
 g_hInstance = hInstance;
 }
-else if (dwReason == DLL_PROCESS_DETACH)
-{
-}
 
 return TRUE;// ok
 }
diff --git a/embedserv/source/inprocserv/inprocembobj.cxx 
b/embedserv/source/inprocserv/inprocembobj.cxx
index cb43f94fe5ba..cffa2cf03c58 100644
--- a/embedserv/source/inprocserv/inprocembobj.cxx
+++ b/embedserv/source/inprocserv/inprocembobj.cxx
@@ -848,10 +848,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::DoVerb(
 if ( SUCCEEDED( hr ) && pOleObject )
 {
 hr = pOleObject->DoVerb( iVerb, pMsg, pActiveSite, nLong, hWin, 
pRect );
-if ( SUCCEEDED( hr ) )
-{
-}
-
 return hr;
 }
 
diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx
index 3faef58aca80..f5f30412c747 100644
--- a/svl/source/svdde/ddecli.cxx
+++ b/svl/source/svdde/ddecli.cxx
@@ -125,11 +125,6 @@ HDDEDATA CALLBACK DdeInternal::CliCallback( UINT nCode, 
UINT nCbType,
 SAL_FALLTHROUGH;
 
 case XTYP_REQUEST:
-if( !hData && XTYP_REQUEST == nCode )
-{
-
-}
-
 DdeData d;
 d.xImp->hData = hData;
 d.xImp->nFmt  = DdeData::GetInternalFormat( nCbType );
diff --git a/winaccessibility/source/service/AccContainerEventListener.cxx 
b/winaccessibility/source/service/AccContainerEventListener.cxx
index dc66b4b3df06..fefdd50827a6 100644
--- a/winaccessibility/source/service/AccContainerEventListener.cxx
+++ b/winaccessibility/source/service/AccContainerEventListener.cxx
@@ -137,8 +137,6 @@ void AccContainerEventListener::HandleChildChangedEvent(Any 
oldValue, Any newVal
 pAgent->NotifyAccEvent(UM_EVENT_CHILD_ADDED, pAcc);
 }
 }
-else
-{}
 }
 else if (oldValue >>= xChild)
 {
@@ -153,8 +151,6 @@ void AccContainerEventListener::HandleChildChangedEvent(Any 
oldValue, Any newVal
 pAgent->DeleteAccObj( pAcc );
 
 }
-else
-{}
 }
 
 }
diff --git 
a/winaccessibility/source/service/AccDescendantManagerEventListener.cxx 
b/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
index 71b77ff131c1..3f865cd2e27d 100644
--- a/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
+++ b/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
@@ -96,8 +96,6 @@ void 
AccDescendantManagerEventListener::HandleChildChangedEvent(Any oldValue, An
 pAgent->NotifyAccEvent(UM_EVENT_CHILD_ADDED, pAcc);
 
 }
-else
-{}
 }
 
 if (oldValue >>= xChild)
@@ -110,8 +108,6 @@ void 
AccDescendantManagerEventListener::HandleChildChangedEvent(Any oldValue, An
 pAgent->DeleteChildrenAccObj( pAcc );
 pAgent->DeleteAccObj( pAcc );
 }
-else
-{}
 }
 
 }
diff --git a/winaccessibility/source/service/AccDialogEventListener.cxx 
b/winaccessibility/source/service/AccDialogEventListener.cxx
index e75341c04127..c67b7ed6bf74 100644
--- a/winaccessibility/source/service/AccDialogEventListener.cxx
+++ b/winaccessibility/source/service/AccDialogEventListener.cxx
@@ -84,8 +84,6 @@ void AccDialogEventListener::HandleChildChangedEvent(Any 
oldValue, Any newValue)
 pAgent->InsertChildrenAccObj(pAcc);
 pAgent->NotifyAccEvent(UM_EVENT_CHILD_ADDED, pAcc);
 }
-else
-{}
 }
 else 

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

[Caolán McNamara]

 sw/source/filter/ww8/ww8par.cxx  |2 --
 sw/source/filter/ww8/ww8par.hxx  |1 -
 sw/source/filter/ww8/ww8par2.cxx |6 --
 3 files changed, 9 deletions(-)

New commits:
commit 0b55b36ac472e36f8bcfb74570039c4cd254ed49
Author: Caolán McNamara 
Date:   Wed Jan 24 11:22:16 2018 +

m_pTableEndPaM is unused

since...

commit 56b2cf0c10d9caa01ebae1d80465e342d046a85c
Author: Florian Reuter 
Date:   Tue Sep 14 14:40:15 2010 +0200

sw-collapse-empty-table-par-like-html.diff:

n#376690

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

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 7df189d5ea37..31a8b7cc9176 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5389,8 +5389,6 @@ ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const 
*pGloss)
 m_xLstManager.reset();
 }
 
-SAL_WARN_IF(m_pTableEndPaM, "sw.ww8", "document ended without table 
ending");
-m_pTableEndPaM.reset();  //ensure this is deleted before pPaM
 mpCursor.reset();
 m_pPaM = nullptr;
 m_pLastAnchorPos.reset();//ensure this is deleted before UpdatePageDescs
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 3eb92100d532..784bb7dc0a62 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1338,7 +1338,6 @@ private:
 
 bool m_bBidi;
 bool m_bReadTable;
-std::shared_ptr m_pTableEndPaM;
 // Indicate that currently on loading a TOC, managed by Read_F_TOX() and 
End_Field()
 bool m_bLoadingTOXCache;
 int m_nEmbeddedTOXLevel;
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index c0f8f1cbb164..3cbd764fa6d6 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3603,7 +3603,6 @@ void SwWW8ImplReader::TabCellEnd()
 
 m_bFirstPara = true;// We have come to the end of a cell so FirstPara 
flag
 m_bReadTable = false;
-m_pTableEndPaM.reset();
 }
 
 void SwWW8ImplReader::Read_TabCellEnd( sal_uInt16, const sal_uInt8* pData, 
short nLen)
@@ -3649,11 +3648,6 @@ void SwWW8ImplReader::StopTable()
 PopTableDesc();
 
 m_bReadTable = true;
-// #i101116# - Keep PaM on table end only for nested tables
-if ( m_nInTable > 1 )
-{
-m_pTableEndPaM.reset(new SwPaM(*m_pPaM, m_pPaM));
-}
 }
 
 bool SwWW8ImplReader::IsInvalidOrToBeMergedTabCell() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sw/source/core/unocore/unotbl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ea91dedef71a0c476dc168f39654c1212c46f824
Author: Stephan Bergmann 
Date:   Tue Jan 23 23:03:12 2018 +0100

USHRT_MAX -> SAL_MAX_UINT16

The checks against USHRT_MAX were like that already in
84a3db80b4fd66c6854b3135b5f69b61fd828e62 "initial import", while the casts 
to
sal_uInt16 were later introduced with 
a7762676e1326ffdefbd6020b667db323640d03f
"#83294# SwXTextTable/Cell::get/setData with a sequence of rows instead of a
sequence of columns".

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

diff --git a/sw/source/core/unocore/unotbl.cxx 
b/sw/source/core/unocore/unotbl.cxx
index 96cea290242c..68d9863910f0 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -2038,7 +2038,7 @@ SwFrameFormat* SwXTextTable::GetFrameFormat()
 
 void SwXTextTable::initialize(sal_Int32 nR, sal_Int32 nC)
 {
-if (!m_pImpl->IsDescriptor() || nR <= 0 || nC <= 0 || nR >= USHRT_MAX || 
nC >= USHRT_MAX)
+if (!m_pImpl->IsDescriptor() || nR <= 0 || nC <= 0 || nR >= SAL_MAX_UINT16 
|| nC >= SAL_MAX_UINT16)
 throw uno::RuntimeException();
 m_pImpl->m_nRows = static_cast(nR);
 m_pImpl->m_nColumns = static_cast(nC);
___
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/cp-5.3-38'

[Andras Timar]

Tag 'cp-5.3-38' created by Andras Timar  at 
2018-01-24 20:10 +

cp-5.3-38

Changes since cp-5.3-36-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: Changes to 'refs/tags/cp-5.3-38'

[Andras Timar]

Tag 'cp-5.3-38' created by Andras Timar  at 
2018-01-24 20:10 +

cp-5.3-38

Changes since cp-5.3-37-9:
---
 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 'distro/collabora/cp-5.3' - configure.ac

[Andras Timar]

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

New commits:
commit e183338d2aef0f976aaadd52e76ff9c478f92cdc
Author: Andras Timar 
Date:   Wed Jan 24 21:09:32 2018 +0100

Bump version to 5.3-38

Change-Id: I7c74a3cc5599afab3ed2613c5726c5f473c7c088

diff --git a/configure.ac b/configure.ac
index 0ddfb27d8668..a343eb6f5e7d 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([Collabora Office],[5.3.10.37],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.3.10.38],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

Tag 'cp-5.3-38' created by Andras Timar  at 
2018-01-24 20:10 +

cp-5.3-38

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

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

[Stephan Bergmann]

 svx/source/xoutdev/_xpoly.cxx |   22 +-
 1 file changed, 13 insertions(+), 9 deletions(-)

New commits:
commit d5af010a3287381db9accbf20063087ee18fcb62
Author: Stephan Bergmann 
Date:   Wed Jan 24 11:09:42 2018 +0100

Allocate ImpXPolygon::pPointAry as a true Point[]

...as the default Point ctor already zero-initializes its members, remvoing 
the
need for some memset calls (that cause -Werror=class-memaccess, "clearing an
object of non-trivial type ‘class Point’" with upcoming GCC 8).  Other such
problematic memset calls are replaced with std::fill, which appears to 
produce
adequate code with recent compilers (looked at GCC 7.2 and 8, Clang 7, at 
-O2),
a tight loop of filling the memory with zeroes.

A follow-up commit might want to use unique_ptr or vector for pPointAry.

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

diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx
index 4718a873228e..07ff1d214ec3 100644
--- a/svx/source/xoutdev/_xpoly.cxx
+++ b/svx/source/xoutdev/_xpoly.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
+#include 
+
 #include 
 #include 
 #include 
@@ -67,10 +71,10 @@ ImpXPolygon::ImpXPolygon( const ImpXPolygon& rImpXPoly )
 
 ImpXPolygon::~ImpXPolygon()
 {
-delete[] reinterpret_cast(pPointAry);
+delete[] pPointAry;
 if ( bDeleteOldPoints )
 {
-delete[] reinterpret_cast(pOldPointAry);
+delete[] pOldPointAry;
 pOldPointAry = nullptr;
 }
 }
@@ -111,8 +115,7 @@ void ImpXPolygon::Resize( sal_uInt16 nNewSize, bool 
bDeletePoints )
 }
 // create point array
 nSize = nNewSize;
-pPointAry = reinterpret_cast(new char[ nSize*sizeof( Point ) ]);
-memset( pPointAry, 0, nSize*sizeof( Point ) );
+pPointAry = new Point[ nSize ];
 
 // create flag array
 pFlagAry.reset( new PolyFlags[ nSize ] );
@@ -137,7 +140,7 @@ void ImpXPolygon::Resize( sal_uInt16 nNewSize, bool 
bDeletePoints )
 }
 if ( bDeletePoints )
 {
-delete[] reinterpret_cast(pOldPointAry);
+delete[] pOldPointAry;
 pOldPointAry = nullptr;
 }
 else
@@ -165,7 +168,7 @@ void ImpXPolygon::InsertSpace( sal_uInt16 nPos, sal_uInt16 
nCount )
  nMove * sizeof(Point) );
 memmove( [nPos+nCount], [nPos], nMove );
 }
-memset( [nPos], 0, nCount * sizeof( Point ) );
+std::fill(pPointAry + nPos, pPointAry + nPos + nCount, Point());
 memset(  [nPos], 0, nCount );
 
 nPoints = nPoints + nCount;
@@ -185,7 +188,7 @@ void ImpXPolygon::Remove( sal_uInt16 nPos, sal_uInt16 
nCount )
  nMove * sizeof(Point) );
 memmove( [nPos], [nPos+nCount], nMove );
 }
-memset( [nPoints - nCount], 0, nCount * sizeof( Point ) );
+std::fill(pPointAry + (nPoints - nCount), pPointAry + nPoints, 
Point());
 memset(  [nPoints - nCount], 0, nCount );
 nPoints = nPoints - nCount;
 }
@@ -195,7 +198,7 @@ void ImpXPolygon::CheckPointDelete() const
 {
 if ( bDeleteOldPoints )
 {
-delete[] reinterpret_cast(pOldPointAry);
+delete[] pOldPointAry;
 const_cast< ImpXPolygon* >(this)->pOldPointAry = nullptr;
 const_cast< ImpXPolygon* >(this)->bDeleteOldPoints = false;
 }
@@ -344,7 +347,8 @@ void XPolygon::SetPointCount( sal_uInt16 nPoints )
 if ( nPoints < pImpXPolygon->nPoints )
 {
 sal_uInt16 nSize = pImpXPolygon->nPoints - nPoints;
-memset( >pPointAry[nPoints], 0, nSize * sizeof( Point ) 
);
+std::fill(
+pImpXPolygon->pPointAry + nPoints, pImpXPolygon->pPointAry + 
nPoints + nSize, Point());
 memset( >pFlagAry [nPoints], 0, nSize );
 }
 pImpXPolygon->nPoints = nPoints;
___
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' - desktop/source sfx2/source

[Jan Holesovsky]

 desktop/source/lib/init.cxx  |1 +
 sfx2/source/control/unoctitm.cxx |3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 10c55f5c73f91ed56f3eae7952d1fff14039c3ca
Author: Jan Holesovsky 
Date:   Wed Jan 24 20:07:40 2018 +0100

lok: Send the enabled / disabled state of .uno:TransformDialog.

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

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 6961cca8e29c..873ee9e85443 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1772,6 +1772,7 @@ static void doc_iniUnoCommands ()
 OUString(".uno:OutlineBullet"),
 OUString(".uno:InsertIndexesEntry"),
 OUString(".uno:DocumentRepair"),
+OUString(".uno:TransformDialog"),
 OUString(".uno:InsertPageHeader"),
 OUString(".uno:InsertPageFooter")
 };
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index bb90866246e9..b74f971d6a07 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1081,7 +1081,8 @@ static void InterceptLOKStateChangeEvent(const 
SfxViewFrame* pViewFrame, const c
  aEvent.FeatureURL.Path == "FontDialog" ||
  aEvent.FeatureURL.Path == "ParagraphDialog" ||
  aEvent.FeatureURL.Path == "OutlineBullet" ||
- aEvent.FeatureURL.Path == "InsertIndexesEntry")
+ aEvent.FeatureURL.Path == "InsertIndexesEntry" ||
+ aEvent.FeatureURL.Path == "TransformDialog")
 
 {
 aBuffer.append(aEvent.IsEnabled ? OUString("enabled") : 
OUString("disabled"));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/drawinglayer include/osl io/test sax/test sd/qa sfx2/source

[Andrea Gelmini]

 include/drawinglayer/processor3d/zbufferprocessor3d.hxx |2 +-
 include/osl/process.h   |2 +-
 io/test/testcomponent.cxx   |2 +-
 sax/test/testcomponent.cxx  |2 +-
 sd/qa/unit/import-tests.cxx |2 +-
 sfx2/source/appl/sfxhelp.cxx|2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 34fe67be47ae1e78117a0df441627b2b113b2c06
Author: Andrea Gelmini 
Date:   Wed Jan 24 16:39:12 2018 +0100

Fix typos

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

diff --git a/include/drawinglayer/processor3d/zbufferprocessor3d.hxx 
b/include/drawinglayer/processor3d/zbufferprocessor3d.hxx
index 173c0415c29c..7d1ea3f69b9a 100644
--- a/include/drawinglayer/processor3d/zbufferprocessor3d.hxx
+++ b/include/drawinglayer/processor3d/zbufferprocessor3d.hxx
@@ -49,7 +49,7 @@ namespace drawinglayer
 namespace processor3d
 {
 /**
-This 3D renderer derived from DefaultProcessor3D renders all 
feeded primitives to a 2D
+This 3D renderer derived from DefaultProcessor3D renders all fed 
primitives to a 2D
 raster bitmap using a Z-Buffer based approach. It is able to 
supersample and to handle
 transparent content.
  */
diff --git a/include/osl/process.h b/include/osl/process.h
index f3aa86d2f6dc..772db9abc7c5 100644
--- a/include/osl/process.h
+++ b/include/osl/process.h
@@ -62,7 +62,7 @@ typedef sal_uInt32 oslProcessExitCode;
 typedef enum {
 osl_Process_E_None, /* no error */
 osl_Process_E_NotFound, /* image not found */
-osl_Process_E_TimedOut, /* timout occurred */
+osl_Process_E_TimedOut, /* timeout occurred */
 osl_Process_E_NoPermission, /* permission denied */
 osl_Process_E_Unknown,  /* unknown error */
 osl_Process_E_InvalidError, /* unmapped error */
diff --git a/io/test/testcomponent.cxx b/io/test/testcomponent.cxx
index 738f47d4f54c..27be71daf0bc 100644
--- a/io/test/testcomponent.cxx
+++ b/io/test/testcomponent.cxx
@@ -136,7 +136,7 @@ int main (int argc, char **argv)
 // loop until all test are performed
 while( nHandle != -1 )
 {
-// Instantiate serivce
+// Instantiate service
 Reference< XInterface > x =
 xSMgr->createInstance( OStringToOUString( argv[1] , 
RTL_TEXTENCODING_ASCII_US ) );
 if( ! x.is() )
diff --git a/sax/test/testcomponent.cxx b/sax/test/testcomponent.cxx
index 08a4b053cd89..9b6091fb9cae 100644
--- a/sax/test/testcomponent.cxx
+++ b/sax/test/testcomponent.cxx
@@ -153,7 +153,7 @@ int main (int argc, char **argv)
 // loop until all test are performed
 while( nHandle != -1 )
 {
-// Instantiate serivce
+// Instantiate service
 Reference< XInterface > x =
 xSMgr->createInstance( OStringToOUString( argv[1] , 
RTL_TEXTENCODING_ASCII_US ) );
 if( ! x.is() )
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 8210711ee906..3993d0bf33bc 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -2309,7 +2309,7 @@ void SdImportTest::testTdf90626()
 void SdImportTest::testTdf114488()
 {
 // This doc has two images - one WMF and the other PNG (fallback image).
-// When loading this doc, the WMF image should be prefered over the PNG 
image.
+// When loading this doc, the WMF image should be preferred over the PNG 
image.
 sd::DrawDocShellRef xDocShRef = 
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odg/tdf114488.fodg"), 
FODG);
 uno::Reference< beans::XPropertySet > xShape(getShapeFromPage(0, 0, 
xDocShRef), uno::UNO_QUERY_THROW);
 OUString sGraphicUrl;
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index acbf7e427bd7..367f4ad68494 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -208,7 +208,7 @@ static OUString  HelpLocaleString()
 aLocaleStr = aEnglish;
 else
 {
-// get fall-back langage (country)
+// get fall-back language (country)
 OUString sLang = aLocaleStr ;
 sal_Int32 nSepPos = sLang.indexOf( '-' );
 if (nSepPos != -1)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Dennis Francis]

 sc/qa/unit/parallelism.cxx   |   23 +++
 sc/source/core/tool/formulagroup.cxx |   16 +---
 2 files changed, 36 insertions(+), 3 deletions(-)

New commits:
commit de93c097e729f70c63de02e3d6b1d596fac7c5f6
Author: Dennis Francis 
Date:   Tue Jan 23 19:53:19 2018 +0530

tdf#115093 : Do not reuse singleref tokens...

...in formula group computation if the formula contains
only a single reference besides any ocOpen/ocClose pairs
wrapping it as the sole content.

In such a case the "result" formula token
returned by ScInterpreter::GetResultToken() is the same
as the original singleref token, so for each row of the
formulagroup, we need to use a separate singleref token.

Also added a unit test in sc/qa/unit/parallelism.cxx

Change-Id: I6032efc5be9b51ca1e9daf9bdd19997a949d2f43
Reviewed-on: https://gerrit.libreoffice.org/48449
Reviewed-by: Michael Meeks 
Tested-by: Jenkins 
(cherry picked from commit ff166845fa5ed178a97b54bb2deef4beb0cf3bdf)
Reviewed-on: https://gerrit.libreoffice.org/48495
Reviewed-by: Eike Rathke 
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/sc/qa/unit/parallelism.cxx b/sc/qa/unit/parallelism.cxx
index 428d65a20bec..896b7c1d8382 100644
--- a/sc/qa/unit/parallelism.cxx
+++ b/sc/qa/unit/parallelism.cxx
@@ -46,12 +46,14 @@ public:
 void testDivision();
 void testVLOOKUP();
 void testVLOOKUPSUM();
+void testSingleRef();
 
 CPPUNIT_TEST_SUITE(ScParallelismTest);
 CPPUNIT_TEST(testSUMIFS);
 CPPUNIT_TEST(testDivision);
 CPPUNIT_TEST(testVLOOKUP);
 CPPUNIT_TEST(testVLOOKUPSUM);
+CPPUNIT_TEST(testSingleRef);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -296,6 +298,27 @@ void ScParallelismTest::testVLOOKUPSUM()
 m_pDoc->DeleteTab(0);
 }
 
+void ScParallelismTest::testSingleRef()
+{
+m_pDoc->InsertTab(0, "1");
+
+const size_t nNumRows = 200;
+for (size_t i = 0; i < nNumRows; ++i)
+{
+m_pDoc->SetValue(0, i, 0, static_cast(i));
+m_pDoc->SetFormula(ScAddress(1, i, 0), "=A" + OUString::number(i+1), 
formula::FormulaGrammar::GRAM_NATIVE_UI);
+}
+
+m_xDocShell->DoHardRecalc();
+
+for (size_t i = 0; i < nNumRows; ++i)
+{
+OString aMsg = "At row " + OString::number(i);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(aMsg.getStr(), i, 
static_cast(m_pDoc->GetValue(1, i, 0)));
+}
+m_pDoc->DeleteTab(0);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(ScParallelismTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/core/tool/formulagroup.cxx 
b/sc/source/core/tool/formulagroup.cxx
index d763d15d2f1c..38b9c2a327ee 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -177,6 +177,7 @@ public:
 ScTokenArray aCode2;
 
 ScInterpreterContext aContext(mrDoc, mpFormatter);
+sal_uInt16 nNumNonOpenClose = mrCode.GetLen();
 
 for (SCROW i = mnIdx; i <= mnLastIdx; ++i, maBatchTopPos.IncRow())
 {
@@ -212,7 +213,7 @@ public:
 aCode2.AddString(rPool.intern(OUString(pStr)));
 else
 {
-if ( pTargetTok->GetType() == 
formula::svString )
+if ( ( pTargetTok->GetType() == 
formula::svString ) && ( nNumNonOpenClose > 1 ) )
 
pTargetTok->SetString(rPool.intern(OUString(pStr)));
 else
 {
@@ -226,7 +227,7 @@ public:
 // Value of NaN represents an empty cell.
 if ( !pTargetTok )
 aCode2.AddToken(ScEmptyCellToken(false, 
false));
-else if ( pTargetTok->GetType() != 
formula::svEmptyCell )
+else if ( ( pTargetTok->GetType() != 
formula::svEmptyCell ) || ( nNumNonOpenClose == 1 ) )
 {
 ScEmptyCellToken* pEmptyTok = new 
ScEmptyCellToken(false, false);
 aCode2.ReplaceToken(nTokIdx, pEmptyTok, 
formula::FormulaTokenArray::CODE_ONLY);
@@ -239,7 +240,7 @@ public:
 aCode2.AddDouble(fVal);
 else
 {
-if ( pTargetTok->GetType() == 
formula::svDouble )
+if ( ( pTargetTok->GetType() == 
formula::svDouble ) && ( nNumNonOpenClose > 1 ) )
 pTargetTok->GetDoubleAsReference() = fVal;
 else
 {
@@ -291,7 +292,16 @@ public:

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

[Christian Lohmaier]

Tag 'libreoffice-6.0.0.3' created by Christian Lohmaier 
 at 2018-01-24 20:32 +

Tag libreoffice-6.0.0.3
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJaaO1EAAoJEPQ0oe+v7q6jgwEP/i51ZVZAW9KkuDFzC4Q31Dgn
jwj/d441+FGR9Zw5TrVpCXDrJEoeQeQU1Wj4FHQ1AswPVlDdVsOcQ4PDx2qytpxp
IVOQls076lFaQaC9NBeKKg8RRCrAvYXsbm0JfFo/LAPgtA6ApvPWdZLigyT7CdvQ
nRXky2XJn73DBFctU3XkFXTCi3sEXf9x6pg/B8I/ejAcYsOJjxDE5FdQn7rXixHl
gebu2XTy2Xa5YaUOE5T+kIro4zac4cW5oRSZPaVVL0pgp62fbBMxQgeRXBgO5hC6
/uK5kwykH0wxXyb7CZPUzYS+6QRhXFa6apYGtrLqWV+T5ZNN1NxH8M3FXYYqWtKK
fY3JdJWr+rKt2FB9rKOhqN5RlJEl5OkiqeDStnzUD97KY+XAxDDhR3NvqfMKfbUh
nmf188aSFE8vSdJgzSA6sj2B6CrXFNu3CZv1impfYICPk7vZx0qs6OfPpD4FIU5H
rCzrI3N0PUUaMWVKdneIIHRL6Ve2ObrpZwEJmKdfw8fLjItQZPWRPx/8R60UcH9C
Y2URAjTOWxUs/1ocKBJey56GZum79jBVx1s3aFE8wi9+liocRZ6aUaO5BAN0v1Ae
VMeatmXB223mXbz58S3odGabxe93wx/BdWDic/PasN/jpJPMk2BednwYcug42yw+
hl0t5E2s3w2DaA0yYvK6
=MTNt
-END PGP SIGNATURE-

Changes since libreoffice-6-0-branch-point-18:
---
 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-6-0-0' - configure.ac

[Christian Lohmaier]

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

New commits:
commit 8876e7c11636a58f87f597f620fa3de9164c2338
Author: Christian Lohmaier 
Date:   Wed Jan 24 21:33:48 2018 +0100

bump product version to 6.0.0.3.0+

Change-Id: Id2647098fbe54588edd1f65608df483d35f10d55

diff --git a/configure.ac b/configure.ac
index 3fe28fefc455..b54d135f0e65 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],[6.0.0.2.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.0.0.3.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] help.git: Changes to 'refs/tags/libreoffice-6.0.0.3'

[Christian Lohmaier]

Tag 'libreoffice-6.0.0.3' created by Christian Lohmaier 
 at 2018-01-24 20:31 +

Tag libreoffice-6.0.0.3
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJaaO0+AAoJEPQ0oe+v7q6jxS0QAJiha9ilLFH0pE2pgLeSVhzj
eo2nyP/BU3MzcvKU3DxmCJcREXfogO1tLFBSXKh+fYWuhdYe0nzAi0dKMptWa1a/
cjjFg0z+oPv7atm/6UA70+NxEvZxM1gcuClmSbPJzPhCQ2nz4lZDIHmCYZKZnS9l
yp11L0L17u0pOFAC4bef9PbkhP/Mg1pGqr1lKoobgWxNfzb4tusi8AL4iUBQ2BUZ
0wW4z8+VvND7HJiStcFC6iqR8cSkRnv0cb5VxFfBQyxz9iFlqIT7+kv6Xytv4UNU
nEoRJL/ADnw61srmOOnc16i4QX8RIYkYrpq1NaWOlTAIbEGeI0YvNfBGyHJW2FRg
VJQERYK78ODkzjd+lk2x5k7LZihav/5ItWzy3ISgDXJC6WaJmTrMjrz0SF5/OXWL
cFXR4Aa49FdfCoVJs8fEBg4bJDuFIwpTOcxhUQcdp45EwD6wyMZd9FuOB+adtbge
ddzM1t1iK1pc3PgcCIRYy6CvZlPN7FT5f6yxem9uNkXTevrkm3uoo/Dd05kPuQUL
Kn7WIbW592J80GkdhIUXYmP0XaDZlXbFX+x1HisIHng03bE6FHff2qGOUl93PFQa
eFQQwrHzd94zaEEJ6Wg7fRyyryibpHJIfIPn1GziBGE7mGxRDFfV7SEVUQOLHmDC
5EijxqyHXRPzjod6g/xL
=93Ww
-END PGP SIGNATURE-

Changes since libreoffice-6-0-branch-point-40:
---
 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-6.0.0.3'

[Christian Lohmaier]

Tag 'libreoffice-6.0.0.3' created by Christian Lohmaier 
 at 2018-01-24 20:31 +

Tag libreoffice-6.0.0.3
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJaaO06AAoJEPQ0oe+v7q6j4ToP/i3pfd0Ub6O28kGAgFv0c3ho
YcPLg40Mm/V5yJLbusWzkWqbfiKJuNE0On+iY6XRZrtiAtAWPBt4WLvdaWC0KXMJ
aylOTYp8cFH5NK3fE2fgV7HYk9PMEd62a5TsqkzfgJKu0urmi/xkGO2okH+xTKdh
S/VKSYQXaaA94TRLA0ypzoguNiUcAaT9N/6/0oa1UocYAd1DZJsS4eE7iueTR57S
y1dmkqY3BjezI5q/43wXjxvqktapl5HtH+he8TirutymA1/6IA360tB3ZlZ3VWgG
ArIybBnBcFJPNOh7By/oZx3r41iHHHPvQUPnAUzvw0ZhgRgbu5tHE+30DbmE2M0x
sgxF266s7idtKUSlZkeg2oJY2jnQ1gtyP5ONd61GpVEQkJTMv3Sb5Hgl1Ah8ucf6
vXml8eZjHDxBgZ92KU9L9TLoEThQ//g5O9eQSA95YgmY3FqJ3zwTuSWWNGdTQKjW
o3Bw9junmyOA9tlg5YrhHbobw01ulsvDmIAdoE45FIgQ4yIsO8gxOZW0aqaRTanc
pI/IgfBIE8ienA+MoQb4XN1lX/YxxBamnu+5jrG5g0VQhkPT8CPYaiOYsd6IGpLJ
cdHweuSu2nppjULJXxjUus5bCuQePk8k+/ZtJwfg3FREeXTicdDVAA1H8STvIPBp
MI6boqImDdUMhRH94Pk0
=mzsx
-END PGP SIGNATURE-

Changes since libreoffice-6-0-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: Changes to 'refs/tags/libreoffice-6.0.0.3'

[Christian Lohmaier]

Tag 'libreoffice-6.0.0.3' created by Christian Lohmaier 
 at 2018-01-24 20:32 +

Tag libreoffice-6.0.0.3
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJaaO1HAAoJEPQ0oe+v7q6j2wEQAIjj5+E4nnHzvhEBYSZrwT/U
ww3AmIK7TpiiHLdlrxIdsJI5Pc7jeScaR0Xp9ncqCbJWNzQPwQcsZXZcpTGrx4M0
eAfCu71BIxo+RGlfVXNNTBEfKwP9lJC1Ohw6EW9suAMRZJ4pYNr7Wt33QP/GN6CC
38AZlOywG9GmpxlQ2sg5N2DEgu93tKY6zZokZKxxRPok0OKrRM0xlbLqvzLl9zzY
ty5BA84sqUVdVU4GJwXBIGFDS2E7fW8d7w8ZODmJddShPzjBOLPoRwHjOISkNN4k
HcvbtlaKsju29HB1f6LuQiDutviA6B9ZUH3q6qO1a7U7wtPTCGjMA2XPzUlhdgyn
kMDGRqmAdLt29hy2OPKO7sPFtAa3b/3VpNS8Oxu2IdKtnp0BNvLymc5zfWElmpJF
VL4D4qVVxmzoVhWny5Tp3j7Pj4tAx4uRjNA+C+qa+QJ5SxrB4Ls3CWvUh4vb6vSv
OOAbYekONXgS3D7c4HPvgL+vuYYQOVVpukxCmdsDajKWpKdbFVVA1Hz0c6cOTCIN
ELL8vU5t7lx39ASDfZpnFICycYQD3LxZEjMFpcS619h8v1Lf6ZQdpvByrMQAhMCq
rvekuGTojfX9/i3VHnAgYeWTeD87wm4VRpNAAWCm7CK2uovCzsicQdMxoxgqZf9c
GMt+ip0oitoj9bzgfh3W
=2iUk
-END PGP SIGNATURE-

Changes since libreoffice-6-0-branch-point-437:
---
 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-6-0' - include/svx svx/source svx/uiconfig

[Tomaž Vajngerl]

 include/svx/ClassificationDialog.hxx   |1 
 svx/source/dialog/ClassificationDialog.cxx |   33 ++---
 svx/uiconfig/ui/classificationdialog.ui|  165 +
 3 files changed, 91 insertions(+), 108 deletions(-)

New commits:
commit 2373acbbb21dd6095d7bfc20b31bbfaa1d9bbad6
Author: Tomaž Vajngerl 
Date:   Sat Dec 2 14:18:09 2017 +0900

tdf#114901 TSCP various advanced TSCP dialog changes

- change Markings from Combo to List box
- minimize whitespace
- move bold and sign paragraph under text area as it is fixed
- remove bold in paragraph dialog

Change-Id: I7ec20460d02d3611a1da325eb7d3de3aef10f03f
Reviewed-on: https://gerrit.libreoffice.org/47632
Reviewed-by: Tomaž Vajngerl 
Tested-by: Tomaž Vajngerl 
(cherry picked from commit 085852e2e2779de1712cf18b5e67740cb7a4bcb6)
Reviewed-on: https://gerrit.libreoffice.org/47924
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/include/svx/ClassificationDialog.hxx 
b/include/svx/ClassificationDialog.hxx
index a9ec24c99d45..14b1607cf7b7 100644
--- a/include/svx/ClassificationDialog.hxx
+++ b/include/svx/ClassificationDialog.hxx
@@ -66,7 +66,6 @@ private:
 DECL_LINK(SelectToolboxHdl, ToolBox*, void);
 DECL_LINK(SelectClassificationHdl, ListBox&, void);
 DECL_LINK(SelectMarkingHdl, ListBox&, void);
-DECL_LINK(LoseFocusMarkingHdl, Control&, void);
 DECL_LINK(SelectIPPartNumbersHdl, ListBox&, void);
 DECL_LINK(SelectRecentlyUsedHdl, ListBox&, void);
 DECL_LINK(SelectIPPartHdl, ListBox&, void);
diff --git a/svx/source/dialog/ClassificationDialog.cxx 
b/svx/source/dialog/ClassificationDialog.cxx
index fa5be8da164d..7e8097e7e120 100644
--- a/svx/source/dialog/ClassificationDialog.cxx
+++ b/svx/source/dialog/ClassificationDialog.cxx
@@ -180,7 +180,7 @@ ClassificationDialog::ClassificationDialog(vcl::Window* 
pParent, const bool bPer
 get(m_pClassificationListBox, "classificationCB");
 get(m_pInternationalClassificationListBox, 
"internationalClassificationCB");
 get(m_pMarkingLabel, "markingLabel");
-get(m_pMarkingListBox, "markingCB");
+get(m_pMarkingListBox, "markingLB");
 get(m_pIntellectualPropertyPartNumberListBox, 
"intellectualPropertyPartNumberLB");
 get(m_pIntellectualPropertyPartListBox, "intellectualPropertyPartLB");
 get(m_pIntellectualPropertyPartAddButton, 
"intellectualPropertyPartAddButton");
@@ -190,7 +190,15 @@ ClassificationDialog::ClassificationDialog(vcl::Window* 
pParent, const bool bPer
 m_pSignButton->SetClickHdl(LINK(this, ClassificationDialog, 
ButtonClicked));
 m_pSignButton->Show(m_bPerParagraph);
 
-m_pToolBox->SetSelectHdl(LINK(this, ClassificationDialog, 
SelectToolboxHdl));
+// no need for BOLD if we do paragraph classification
+if (m_bPerParagraph)
+{
+m_pToolBox->Show(false);
+}
+else
+{
+m_pToolBox->SetSelectHdl(LINK(this, ClassificationDialog, 
SelectToolboxHdl));
+}
 
 m_pIntellectualPropertyPartAddButton->SetClickHdl(LINK(this, 
ClassificationDialog, ButtonClicked));
 
@@ -206,9 +214,9 @@ ClassificationDialog::ClassificationDialog(vcl::Window* 
pParent, const bool bPer
 
 if (!maHelper.GetMarkings().empty())
 {
-m_pMarkingListBox->setMaxWidthChars(20);
-m_pMarkingListBox->SetSelectHdl(LINK(this, ClassificationDialog, 
SelectMarkingHdl));
-m_pMarkingListBox->SetLoseFocusHdl(LINK(this, ClassificationDialog, 
LoseFocusMarkingHdl));
+m_pMarkingListBox->setMaxWidthChars(10);
+m_pMarkingListBox->SetDropDownLineCount(4);
+m_pMarkingListBox->SetDoubleClickHdl(LINK(this, ClassificationDialog, 
SelectMarkingHdl));
 
 for (const OUString& rName : maHelper.GetMarkings())
 m_pMarkingListBox->InsertEntry(rName);
@@ -220,7 +228,7 @@ ClassificationDialog::ClassificationDialog(vcl::Window* 
pParent, const bool bPer
 }
 
 m_pIntellectualPropertyPartNumberListBox->SetDropDownLineCount(5);
-m_pIntellectualPropertyPartNumberListBox->setMaxWidthChars(20);
+m_pIntellectualPropertyPartNumberListBox->setMaxWidthChars(10);
 m_pIntellectualPropertyPartNumberListBox->SetDoubleClickHdl(LINK(this, 
ClassificationDialog, SelectIPPartNumbersHdl));
 for (const OUString& rName : maHelper.GetIntellectualPropertyPartNumbers())
 m_pIntellectualPropertyPartNumberListBox->InsertEntry(rName);
@@ -621,22 +629,13 @@ IMPL_LINK(ClassificationDialog, SelectClassificationHdl, 
ListBox&, rBox, void)
 m_nCurrentSelectedCategory = nSelected;
 }
 
-IMPL_LINK_NOARG(ClassificationDialog, LoseFocusMarkingHdl, Control&, void)
-{
-if (m_nInsertMarkings >= 0)
-{
-const OUString aString = maHelper.GetMarkings()[m_nInsertMarkings];
-insertField(ClassificationType::MARKING, aString, aString);
-m_nInsertMarkings = -1;
-  

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

[Caolán McNamara]

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

New commits:
commit bc75f71139a2f711813013fe2380d9a61e383574
Author: Caolán McNamara 
Date:   Wed Jan 24 15:39:28 2018 +

ofz: check nLevel against maParaSprms size

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

diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 397c664ad71c..d96f061af98d 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1422,7 +1422,8 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, 
SwWW8ImplReader& rReader_)
 aLFOLVL.bFormat = true;
 // if bStartup is true, replace Startup-Level
 // with the LVLF that is saved in the LVL
-bLVLOk = ReadLVL(aNumFormat, aItemSet[nLevel],
+bLVLOk = nLevel < rLFOInfo.maParaSprms.size() &&
+ReadLVL(aNumFormat, aItemSet[nLevel],
 pParentListInfo->aIdSty[nLevel],
 aLFOLVL.bStartAt, aNotReallyThere, nLevel,
 rLFOInfo.maParaSprms[nLevel]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

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

New commits:
commit d8fcf54fae9af7afbde16cceffbcf936ff58fa8d
Author: Caolán McNamara 
Date:   Wed Jan 24 15:39:28 2018 +

ofz: check nLevel against maParaSprms size

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

diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 8dc161d582d4..c00f7f09a916 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1414,7 +1414,8 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, 
SwWW8ImplReader& rReader_)
 aLFOLVL.bFormat = true;
 // if bStartup is true, replace Startup-Level
 // with the LVLF that is saved in the LVL
-bLVLOk = ReadLVL(aNumFormat, aItemSet[nLevel],
+bLVLOk = nLevel < rLFOInfo.maParaSprms.size() &&
+ReadLVL(aNumFormat, aItemSet[nLevel],
 pParentListInfo->aIdSty[nLevel],
 aLFOLVL.bStartAt, aNotReallyThere, nLevel,
 rLFOInfo.maParaSprms[nLevel]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 debian/changelog |6 ++
 debian/control   |2 +-
 loleaflet/dist/l10n/uno/af.json  |1 +
 loleaflet/dist/l10n/uno/am.json  |1 +
 loleaflet/dist/l10n/uno/ar.json  |1 +
 loleaflet/dist/l10n/uno/as.json  |1 +
 loleaflet/dist/l10n/uno/ast.json |1 +
 loleaflet/dist/l10n/uno/bg.json  |1 +
 loleaflet/dist/l10n/uno/bn-IN.json   |1 +
 loleaflet/dist/l10n/uno/bn.json  |1 +
 loleaflet/dist/l10n/uno/bo.json  |1 +
 loleaflet/dist/l10n/uno/br.json  |1 +
 loleaflet/dist/l10n/uno/brx.json |1 +
 loleaflet/dist/l10n/uno/bs.json  |1 +
 loleaflet/dist/l10n/uno/ca-valencia.json |1 +
 loleaflet/dist/l10n/uno/ca.json  |1 +
 loleaflet/dist/l10n/uno/cs.json  |1 +
 loleaflet/dist/l10n/uno/cy.json  |1 +
 loleaflet/dist/l10n/uno/da.json  |1 +
 loleaflet/dist/l10n/uno/de.json  |1 +
 loleaflet/dist/l10n/uno/dgo.json |1 +
 loleaflet/dist/l10n/uno/dz.json  |1 +
 loleaflet/dist/l10n/uno/el.json  |1 +
 loleaflet/dist/l10n/uno/en-GB.json   |1 +
 loleaflet/dist/l10n/uno/en-ZA.json   |1 +
 loleaflet/dist/l10n/uno/eo.json  |1 +
 loleaflet/dist/l10n/uno/es.json  |1 +
 loleaflet/dist/l10n/uno/et.json  |1 +
 loleaflet/dist/l10n/uno/eu.json  |1 +
 loleaflet/dist/l10n/uno/fa.json  |1 +
 loleaflet/dist/l10n/uno/fi.json  |1 +
 loleaflet/dist/l10n/uno/fr.json  |1 +
 loleaflet/dist/l10n/uno/ga.json  |1 +
 loleaflet/dist/l10n/uno/gd.json  |1 +
 loleaflet/dist/l10n/uno/gl.json  |1 +
 loleaflet/dist/l10n/uno/gu.json  |1 +
 loleaflet/dist/l10n/uno/gug.json |1 +
 loleaflet/dist/l10n/uno/he.json  |1 +
 loleaflet/dist/l10n/uno/hi.json  |1 +
 loleaflet/dist/l10n/uno/hr.json  |1 +
 loleaflet/dist/l10n/uno/hu.json  |1 +
 loleaflet/dist/l10n/uno/id.json  |1 +
 loleaflet/dist/l10n/uno/is.json  |1 +
 loleaflet/dist/l10n/uno/it.json  |1 +
 loleaflet/dist/l10n/uno/ja.json  |1 +
 loleaflet/dist/l10n/uno/ka.json  |1 +
 loleaflet/dist/l10n/uno/kk.json  |1 +
 loleaflet/dist/l10n/uno/km.json  |1 +
 loleaflet/dist/l10n/uno/kmr-Latn.json|1 +
 loleaflet/dist/l10n/uno/kn.json  |1 +
 loleaflet/dist/l10n/uno/ko.json  |1 +
 loleaflet/dist/l10n/uno/kok.json |1 +
 loleaflet/dist/l10n/uno/ks.json  |1 +
 loleaflet/dist/l10n/uno/lo.json  |1 +
 loleaflet/dist/l10n/uno/lt.json  |1 +
 loleaflet/dist/l10n/uno/lv.json  |1 +
 loleaflet/dist/l10n/uno/mai.json |1 +
 loleaflet/dist/l10n/uno/mk.json  |1 +
 loleaflet/dist/l10n/uno/ml.json  |1 +
 loleaflet/dist/l10n/uno/mn.json  |1 +
 loleaflet/dist/l10n/uno/mni.json |1 +
 loleaflet/dist/l10n/uno/mr.json  |1 +
 loleaflet/dist/l10n/uno/my.json  |1 +
 loleaflet/dist/l10n/uno/nb.json  |1 +
 loleaflet/dist/l10n/uno/ne.json  |1 +
 loleaflet/dist/l10n/uno/nl.json  |1 +
 loleaflet/dist/l10n/uno/nn.json  |1 +
 loleaflet/dist/l10n/uno/nso.json |1 +
 loleaflet/dist/l10n/uno/oc.json  |1 +
 loleaflet/dist/l10n/uno/om.json  |1 +
 loleaflet/dist/l10n/uno/or.json  |1 +
 loleaflet/dist/l10n/uno/pa-IN.json   |1 +
 loleaflet/dist/l10n/uno/pl.json  |1 +
 loleaflet/dist/l10n/uno/pt-BR.json   |1 +
 loleaflet/dist/l10n/uno/pt.json  |1 +
 loleaflet/dist/l10n/uno/ro.json  |1 +
 loleaflet/dist/l10n/uno/ru.json  |1 +
 loleaflet/dist/l10n/uno/rw.json  |1 +
 loleaflet/dist/l10n/uno/sa-IN.json   |1 +
 loleaflet/dist/l10n/uno/sd.json  |1 +
 loleaflet/dist/l10n/uno/si.json  |1 +
 loleaflet/dist/l10n/uno/sid.json |1 +
 loleaflet/dist/l10n/uno/sk.json  |1 +
 loleaflet/dist/l10n/uno/sl.json  |1 +
 loleaflet/dist/l10n/uno/sq.json  |1 +
 loleaflet/dist/l10n/uno/sr-Latn.json |1 +
 loleaflet/dist/l10n/uno/sr.json  |1 +
 loleaflet/dist/l10n/uno/sv.json  |1 +
 loleaflet/dist/l10n/uno/sw-TZ.json   |1 +
 loleaflet/dist/l10n/uno/ta.json  |1 +
 loleaflet/dist/l10n/uno/te.json  |1 +
 loleaflet/dist/l10n/uno/tg.json  |1 +
 loleaflet/dist/l10n/uno/th.json  |1 +
 loleaflet/dist/l10n/uno/tr.json  |1 +
 loleaflet/dist/l10n/uno/tt.json  |1 +
 loleaflet/dist/l10n/uno/ug.json  |1 +
 loleaflet/dist/l10n/uno/uk.json  |1 +
 loleaflet/dist/l10n/uno/uz.json  |   

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

[Olivier R]

Tag 'cp-5.3-38' created by Andras Timar  at 
2018-01-24 20:10 +

cp-5.3-38

Changes since cp-5.3-10:
Olivier R (1):
  tdf#107558 French spelling dictionary (6.0.3) and thesaurus

---
 fr_FR/README_fr.txt   |4 
 fr_FR/description.xml |2 
 fr_FR/fr.aff  |17751 ++--
 fr_FR/fr.dic  |155369 
+-
 fr_FR/package-description.txt |2 
 fr_FR/thes_fr.dat |  206 
 6 files changed, 88495 insertions(+), 84839 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

Tag 'CODE-3.0.0.2' created by Andras Timar  at 
2018-01-24 20:11 +

CODE-3.0.0.2

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

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

[Caolán McNamara]

 vcl/source/filter/igif/gifread.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 5f0e9a17e769e3f1f8c5f58df334cd130912e5fd
Author: Caolán McNamara 
Date:   Wed Jan 24 10:20:16 2018 +

ofz#5573 Out of memory

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

diff --git a/vcl/source/filter/igif/gifread.cxx 
b/vcl/source/filter/igif/gifread.cxx
index 5667960c5766..2afaa92d16d2 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -158,6 +158,8 @@ void GIFReader::CreateBitmaps( long nWidth, long nHeight, 
BitmapPalette* pPal,
 const Size aSize( nWidth, nHeight );
 
 sal_uInt64 nCombinedPixSize = nWidth * nHeight;
+if (bGCTransparent)
+nCombinedPixSize += (nCombinedPixSize/8);
 
 // "Overall data compression asymptotically approaches 3839 × 8 / 12 = 
2559 1/3"
 // so assume compression of 1:2560 is possible
@@ -167,9 +169,10 @@ void GIFReader::CreateBitmaps( long nWidth, long nHeight, 
BitmapPalette* pPal,
 sal_uInt64 nMinFileData = nWidth * nHeight / 2560;
 for (size_t i = 0; i < aAnimation.Count(); ++i)
 {
-const Size& rSize = aAnimation.Get(i).aSizePix;
+const AnimationBitmap& rBitmap = aAnimation.Get(i);
+const Size& rSize = rBitmap.aSizePix;
 nMinFileData += rSize.Width() * rSize.Height() / 2560;
-nCombinedPixSize += rSize.Width() * rSize.Height();
+nCombinedPixSize += rBitmap.aBmpEx.GetSizeBytes();
 }
 
 if (nMaxStreamData < nMinFileData)
@@ -187,7 +190,7 @@ void GIFReader::CreateBitmaps( long nWidth, long nHeight, 
BitmapPalette* pPal,
 // svtools/qa/cppunit/data/gif/fail/CVE-2008-5937-1.gif), but
 // which doesn't fail on 64-bit Mac OS X at least. Why the loading
 // fails on 64-bit Linux, no idea.
-if (nCombinedPixSize >= 64000U * 64000U)
+if (nCombinedPixSize >= SAL_MAX_INT32/3*2)
 {
 bStatus = false;
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 download.lst  |4 ++--
 external/curl/ExternalProject_curl.mk |3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 5e3799a0c8a92918b9e1868c942f8918ff61c003
Author: Michael Stahl 
Date:   Wed Jan 24 11:44:26 2018 +0100

curl: upgrade to release 7.58.0

* fixes 2 CVEs
* disable some new optional dependencies

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

diff --git a/download.lst b/download.lst
index f932b7a3b242..038dfdd5838e 100644
--- a/download.lst
+++ b/download.lst
@@ -29,8 +29,8 @@ export CPPUNIT_SHA256SUM := 
3d569869d27b48860210c758c4f313082103a5e58219a7669b52
 export CPPUNIT_TARBALL := cppunit-1.14.0.tar.gz
 export CT2N_SHA256SUM := 
71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3
 export CT2N_TARBALL := 
1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
-export CURL_SHA256SUM := 
7ce35f207562674e71dbada6891b37e3f043c1e7a82915cb9c2a17ad3a9d659b
-export CURL_TARBALL := curl-7.57.0.tar.gz
+export CURL_SHA256SUM := 
cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115
+export CURL_TARBALL := curl-7.58.0.tar.gz
 export EBOOK_SHA256SUM := 
7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9
 export EBOOK_TARBALL := libe-book-0.1.3.tar.xz
 export EPOXY_SHA256SUM := 
1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64
diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index b074a937b189..136e50f3a81c 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -43,10 +43,11 @@ $(call gb_ExternalProject_get_state_target,curl,build):
$(if $(filter IOS MACOSX,$(OS)),\
--with-darwinssl,\
$(if $(ENABLE_NSS),--with-nss$(if 
$(SYSTEM_NSS),,="$(call 
gb_UnpackedTarball_get_dir,nss)/dist/out"),--without-nss)) \
-   --without-ssl --without-gnutls --without-polarssl 
--without-cyassl --without-axtls \
+   --without-ssl --without-gnutls --without-polarssl 
--without-cyassl --without-axtls --without-mbedtls \
--enable-ftp --enable-http --enable-ipv6 \
--without-libidn2 --without-libpsl --without-librtmp \
--without-libssh2 --without-metalink --without-nghttp2 \
+   --without-libssh --without-brotli \
--disable-ares \
--disable-dict --disable-file --disable-gopher 
--disable-imap \
--disable-ldap --disable-ldaps --disable-manual 
--disable-pop3 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 loleaflet/src/control/Control.Menubar.js |1 +
 loleaflet/unocommands.js |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 01474347ec897b43213703a1dd826432f988b2ac
Author: Michael Meeks 
Date:   Mon Jan 22 16:40:15 2018 +

Add the Thesaurus dialog.

Change-Id: I976ffd46e95dfa675150ee66650f211b2c9f5cdc
Reviewed-on: https://gerrit.libreoffice.org/48537
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 1a458b1b..095ed06c 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -184,6 +184,7 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:ToolsMenu', 'text'), id: 'tools', 
type: 'menu', menu: [
{uno: '.uno:SpellingAndGrammarDialog'},
{uno: '.uno:SpellOnline'},
+   {uno: '.uno:ThesaurusDialog'},
{name: _UNO('.uno:LanguageMenu'), type: 'menu', 
menu: [
{name: 
_UNO('.uno:SetLanguageSelectionMenu', 'text'), type: 'menu', menu: [
{name: _('None (Do not check 
spelling)'), id: 'noneselection', uno: 
'.uno:LanguageStatus?Language:string=Current_LANGUAGE_NONE'}]},
diff --git a/loleaflet/unocommands.js b/loleaflet/unocommands.js
index 14ec0ce6..32221b0f 100644
--- a/loleaflet/unocommands.js
+++ b/loleaflet/unocommands.js
@@ -209,6 +209,7 @@ var unoCommandsArray = {
TableSelectMenu:{text:{menu:_('~Select'),},},
TaskPaneInsertPage:{presentation:{menu:_('Insert Slide'),},},
TextAlign:{global:{menu:_('Alig~n'),},},
+   
ThesaurusDialog:{global:{menu:_('~Thesaurus...'),},text:{menu:_('~Thesaurus...'),},},
ToggleMergeCells:{spreadsheet:{menu:_('M~erge and Center Cells'),},},
ToolsMenu:{global:{menu:_('~Tools'),},},
TrackChanges:{text:{menu:_('~Record'),},},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[ekuiitr]

 starmath/inc/types.hxx  |2 ++
 starmath/source/ooxmlimport.cxx |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 412d66c05fda48aeb820a035eee3fd1680a1b7ff
Author: ekuiitr 
Date:   Thu Jan 18 22:58:16 2018 +0800

tdf#115030 Formula use "dot" instead of "acute" math command.

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

diff --git a/starmath/inc/types.hxx b/starmath/inc/types.hxx
index 9d57536260ba..78e33b62905a 100644
--- a/starmath/inc/types.hxx
+++ b/starmath/inc/types.hxx
@@ -144,6 +144,8 @@ sal_Unicode const MS_COMBCHECK = 0x030C;
 sal_Unicode const MS_VEC = 0x20D7;
 sal_Unicode const MS_DOT = 0x02D9;
 sal_Unicode const MS_DDOT = 0x00A8;
+sal_Unicode const MS_COMBDOT = 0x0307;
+sal_Unicode const MS_COMBDDOT = 0x0308;
 sal_Unicode const MS_DDDOT = 0x20DB;
 sal_Unicode const MS_AND = 0x2227;
 sal_Unicode const MS_OR = 0x2228;
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx
index 1059edc9395c..6cfefc210569 100644
--- a/starmath/source/ooxmlimport.cxx
+++ b/starmath/source/ooxmlimport.cxx
@@ -208,9 +208,11 @@ OUString SmOoxmlImport::handleAcc()
 acc = "widehat";
 break;
 case MS_DOT:
+case MS_COMBDOT:
 acc = "dot";
 break;
 case MS_DDOT:
+case MS_COMBDDOT:
 acc = "ddot";
 break;
 case MS_DDDOT:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Minutes from the design meeting 2018-Jan-24

[Heiko Tietze]

Present: Jay, Heiko

No decisions have been made because less than three people were in the call. 
Chat about

 * Annual report
   + https://pad.documentfoundation.org/p/annualreport
   => everyone add your contributions please

 * Writer/Calc templates
   + tender new templates (tdf staff)
   + check what's on the template site (sophie)
   + have some categories first (Jay)

 * New bitmaps for the Gallery
   + https://bugs.documentfoundation.org/show_bug.cgi?id=114817
   => ideally we get the new and old bitmaps into some kind of voting




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

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

[Jan Holesovsky]

 sd/source/ui/func/fuarea.cxx   |2 +-
 sd/source/ui/func/fuline.cxx   |2 +-
 sd/source/ui/func/futransf.cxx |5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 3db822127e5bdf32eb9bd951c5d75f9492c5a09f
Author: Jan Holesovsky 
Date:   Wed Jan 24 19:13:46 2018 +0100

lokdialog: Parents for the Impress async dialogs.

After 072e3ce1cfea5bb61cc5f3001c288df6deb45613, the dialogs must have 
parents,
otherwise the LOK notification does not work for them.

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

diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx
index fa6c773b434c..da77b647a84d 100644
--- a/sd/source/ui/func/fuarea.cxx
+++ b/sd/source/ui/func/fuarea.cxx
@@ -65,7 +65,7 @@ void FuArea::DoExecute( SfxRequest& rReq )
 mpView->GetAttributes( aNewAttr );
 
 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-VclPtr pDlg(pFact ? 
pFact->CreateSvxAreaTabDialog(nullptr, , mpDoc, true) : nullptr);
+VclPtr pDlg(pFact ? 
pFact->CreateSvxAreaTabDialog(mpViewShell->GetActiveWindow(), , mpDoc, 
true) : nullptr);
 if (!pDlg)
 {
 mpViewShell->Cancel();
diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx
index 7e804262cc98..046d2f4387f8 100644
--- a/sd/source/ui/func/fuline.cxx
+++ b/sd/source/ui/func/fuline.cxx
@@ -79,7 +79,7 @@ void FuLine::DoExecute( SfxRequest& rReq )
 
 bool bHasMarked = mpView->AreObjectsMarked();
 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-VclPtr pDlg(pFact ? 
pFact->CreateSvxLineTabDialog(nullptr,pNewAttr.get(),mpDoc,pObj,bHasMarked) : 
nullptr);
+VclPtr pDlg(pFact ? 
pFact->CreateSvxLineTabDialog(mpViewShell->GetActiveWindow(), pNewAttr.get(), 
mpDoc, pObj, bHasMarked) : nullptr);
 if (!pDlg)
 {
 mpViewShell->Cancel();
diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx
index a9e05c9346df..2ed5bdd8ac7d 100644
--- a/sd/source/ui/func/futransf.cxx
+++ b/sd/source/ui/func/futransf.cxx
@@ -27,6 +27,7 @@
 #include "strings.hrc"
 #include "ViewShell.hxx"
 #include "View.hxx"
+#include "Window.hxx"
 #include "sdresid.hxx"
 #include "drawdoc.hxx"
 #include 
@@ -120,7 +121,7 @@ void FuTransform::DoExecute( SfxRequest& rReq )
 if (!pFact)
 return;
 
-pDlg.reset(pFact->CreateCaptionDialog(nullptr, mpView));
+pDlg.reset(pFact->CreateCaptionDialog(mpViewShell->GetActiveWindow(), 
mpView));
 
 const sal_uInt16* pRange = pDlg->GetInputRanges( *aNewAttr.GetPool() );
 SfxItemSet aCombSet( *aNewAttr.GetPool(), pRange );
@@ -134,7 +135,7 @@ void FuTransform::DoExecute( SfxRequest& rReq )
 if (!pFact)
 return;
 
-pDlg.reset(pFact->CreateSvxTransformTabDialog(nullptr, , mpView));
+
pDlg.reset(pFact->CreateSvxTransformTabDialog(mpViewShell->GetActiveWindow(), 
, mpView));
 }
 
 if (!pDlg)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 sfx2/source/doc/sfxbasemodel.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 877d94e5e90bf6599a30aa33e8504e4bcd332654
Author: Michael Meeks 
Date:   Tue Jan 16 13:31:37 2018 +

tdf#113755 - avoid null ptr de-reference during shutdown.

Why the PostUserEvent's that should do the XTDataObject async destroy
are not completed by here, is rather unclear; but - de-referencing
NULL is not a great thing to do during shutdown.


http://crashreport.libreoffice.org/stats/crash_details/a7d8fd19-0512-4292-b3a0-140dcff204c8

Change-Id: I3f294379f07f4cfc0106c1b5fc5e705c41e78b03
Reviewed-on: https://gerrit.libreoffice.org/48007
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 
(cherry picked from commit ad7e6339e5e5cf465a2ef25442099eb59f1a0deb)
Reviewed-on: https://gerrit.libreoffice.org/48179
Reviewed-by: Eike Rathke 
Reviewed-by: Christian Lohmaier 
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 56ab68ea97df..2403ca27d212 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -934,6 +934,13 @@ OUString SAL_CALL SfxBaseModel::getURL()
 Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs()
 {
 SfxModelGuard aGuard( *this );
+
+if (!SfxApplication::Get()) // tdf#113755
+{
+SAL_WARN("sfx.appl", "Unexpected operations on model");
+return m_pData->m_seqArguments;
+}
+
 if ( m_pData->m_pObjectShell.is() )
 {
 Sequence< beans::PropertyValue > seqArgsNew;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gulsah Kose]

 sw/source/uibase/uiview/view0.cxx   |   12 ++--
 sw/uiconfig/swriter/menubar/menubar.xml |4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit eb8c84846bdba32c17b23e7da6742463085bec9d
Author: Gulsah Kose 
Date:   Thu Jan 4 14:50:10 2018 +0300

tdf#62182 .uno:PrintLayout and .uno:BrowseView become set commands.

The patch was sent for the ULAKBIM/Pardus project

Change-Id: I2c8c5d92bc6755043e086a0cad7739dd06a7655e
Signed-off-by: Gulsah Kose 
Reviewed-on: https://gerrit.libreoffice.org/47390
Tested-by: Jenkins 

diff --git a/sw/source/uibase/uiview/view0.cxx 
b/sw/source/uibase/uiview/view0.cxx
index 6abebf33b8ed..311235097dbc 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -401,13 +401,13 @@ void SwView::ExecViewOptions(SfxRequest )
 break;
 
 case SID_BROWSER_MODE:
+bBrowseModeChanged = !pOpt->getBrowseMode();
+pOpt->setBrowseMode(true );
+break;
+
 case FN_PRINT_LAYOUT:
-if( STATE_TOGGLE == eState )
-bFlag = !pOpt->getBrowseMode();
-else if( nSlot == FN_PRINT_LAYOUT )
-bFlag = !bFlag;
-bBrowseModeChanged = bFlag != pOpt->getBrowseMode();
-pOpt->setBrowseMode( bFlag );
+bBrowseModeChanged = pOpt->getBrowseMode();
+pOpt->setBrowseMode( false );
 break;
 
 case SID_TOGGLE_NOTES:
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml 
b/sw/uiconfig/swriter/menubar/menubar.xml
index cfcc9cd1b908..ab133daf836c 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -165,8 +165,8 @@
   
   
 
-  
-  
+  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 include/xmloff/xmlnumfe.hxx|4 
 svl/source/config/cjkoptions.cxx   |   34 +++
 svl/source/items/itempool.cxx  |   30 +++---
 svl/source/items/srchitem.cxx  |   74 +++
 svl/source/items/style.cxx |   52 +-
 svl/source/misc/inethist.cxx   |   26 ++---
 svl/source/misc/sharecontrolfile.cxx   |   34 +++
 svl/source/misc/strmadpt.cxx   |   68 +++---
 svl/source/numbers/zforlist.cxx|   34 +++
 svl/source/numbers/zformat.cxx |   94 +--
 svl/source/passwordcontainer/passwordcontainer.cxx |  102 ++---
 xmloff/source/style/xmlnumfe.cxx   |   26 ++---
 12 files changed, 289 insertions(+), 289 deletions(-)

New commits:
commit 6a579702b1128372aa30c86156996e57ba73b2c8
Author: Noel Grandin 
Date:   Wed Jan 24 10:51:30 2018 +0200

loplugin:flatten in svl

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

diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx
index 405e8b93eb7c..58c9e0090626 100644
--- a/svl/source/config/cjkoptions.cxx
+++ b/svl/source/config/cjkoptions.cxx
@@ -116,7 +116,7 @@ SvtCJKOptions_Impl::SvtCJKOptions_Impl() :
 voidSvtCJKOptions_Impl::SetAll(bool bSet)
 {
 if (
-!bROCJKFont  &&
+!(!bROCJKFont  &&
 !bROVerticalText &&
 !bROAsianTypography  &&
 !bROJapaneseFind &&
@@ -124,23 +124,23 @@ voidSvtCJKOptions_Impl::SetAll(bool bSet)
 !bROChangeCaseMap&&
 !bRODoubleLines  &&
 !bROEmphasisMarks&&
-!bROVerticalCallOut
+!bROVerticalCallOut)
)
-{
-bCJKFont=bSet;
-bVerticalText=bSet;
-bAsianTypography=bSet;
-bJapaneseFind=bSet;
-bRuby=bSet;
-bChangeCaseMap=bSet;
-bDoubleLines=bSet;
-bEmphasisMarks=bSet;
-bVerticalCallOut=bSet;
-
-SetModified();
-Commit();
-NotifyListeners(ConfigurationHints::NONE);
-}
+return;
+
+bCJKFont=bSet;
+bVerticalText=bSet;
+bAsianTypography=bSet;
+bJapaneseFind=bSet;
+bRuby=bSet;
+bChangeCaseMap=bSet;
+bDoubleLines=bSet;
+bEmphasisMarks=bSet;
+bVerticalCallOut=bSet;
+
+SetModified();
+Commit();
+NotifyListeners(ConfigurationHints::NONE);
 }
 
 void SvtCJKOptions_Impl::Load()
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index 4357342dd499..3abc22b96003 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -344,24 +344,24 @@ SfxItemPool::~SfxItemPool()
 
 void SfxItemPool::Free(SfxItemPool* pPool)
 {
-if(pPool)
+if(!pPool)
+return;
+
+// tell all the registered SfxItemPoolUsers that the pool is in destruction
+std::vector 
aListCopy(pPool->pImpl->maSfxItemPoolUsers.begin(), 
pPool->pImpl->maSfxItemPoolUsers.end());
+for(std::vector::const_iterator aIterator = 
aListCopy.begin(); aIterator != aListCopy.end(); ++aIterator)
 {
-// tell all the registered SfxItemPoolUsers that the pool is in 
destruction
-std::vector 
aListCopy(pPool->pImpl->maSfxItemPoolUsers.begin(), 
pPool->pImpl->maSfxItemPoolUsers.end());
-for(std::vector::const_iterator aIterator = 
aListCopy.begin(); aIterator != aListCopy.end(); ++aIterator)
-{
-SfxItemPoolUser* pSfxItemPoolUser = *aIterator;
-DBG_ASSERT(pSfxItemPoolUser, "corrupt SfxItemPoolUser list (!)");
-pSfxItemPoolUser->ObjectInDestruction(*pPool);
-}
+SfxItemPoolUser* pSfxItemPoolUser = *aIterator;
+DBG_ASSERT(pSfxItemPoolUser, "corrupt SfxItemPoolUser list (!)");
+pSfxItemPoolUser->ObjectInDestruction(*pPool);
+}
 
-// Clear the vector. This means that user do not need to call 
RemoveSfxItemPoolUser()
-// when they get called from ObjectInDestruction().
-pPool->pImpl->maSfxItemPoolUsers.clear();
+// Clear the vector. This means that user do not need to call 
RemoveSfxItemPoolUser()
+// when they get called from ObjectInDestruction().
+pPool->pImpl->maSfxItemPoolUsers.clear();
 
-// delete pool
-delete pPool;
-}
+// delete pool
+delete pPool;
 }
 
 
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 86e93f1c8bbe..945ecc1aeded 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -163,43 +163,43 @@ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) :
 rFlags |= 

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

[Noel Grandin]

 xmloff/inc/txtflde.hxx |7 ---
 xmloff/source/text/txtflde.cxx |   12 
 2 files changed, 8 insertions(+), 11 deletions(-)

New commits:
commit cae452a167b78d8dc164059db8a9fbe1eb3d521d
Author: Noel Grandin 
Date:   Wed Jan 17 17:09:14 2018 +0200

loplugin:useuniqueptr in XMLTextFieldExport

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

diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx
index 5f7fd452f988..34c867017762 100644
--- a/xmloff/inc/txtflde.hxx
+++ b/xmloff/inc/txtflde.hxx
@@ -32,6 +32,7 @@
 
 #include 
 #include 
+#include 
 
 
 class SvXMLExport;
@@ -151,9 +152,9 @@ class XMLTextFieldExport final
 SvXMLExport& rExport;
 
 /// store used text field master names (NULL means: don't collect)
-::std::map<
+std::unique_ptr< ::std::map<
 css::uno::Reference< css::text::XText >,
-::std::set< OUString > > *
+::std::set< OUString > > >
 pUsedMasters;
 
 public:
@@ -481,7 +482,7 @@ private:
 const OUString sPropertyTooltip;
 const OUString sPropertyTextRange;
 
-XMLPropertyState* pCombinedCharactersPropertyState;
+std::unique_ptr pCombinedCharactersPropertyState;
 
 };
 
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 946b5f847df3..c2d52cf48421 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -274,7 +274,6 @@ inline Sequence const GetStringSequenceProperty(
 XMLTextFieldExport::XMLTextFieldExport( SvXMLExport& rExp,
 XMLPropertyState* pCombinedCharState)
 : rExport(rExp),
-  pUsedMasters(nullptr),
   sServicePrefix("com.sun.star.text.textfield."),
   sFieldMasterPrefix("com.sun.star.text.FieldMaster."),
   sPresentationServicePrefix("com.sun.star.presentation.TextField."),
@@ -352,8 +351,6 @@ XMLTextFieldExport::XMLTextFieldExport( SvXMLExport& rExp,
 
 XMLTextFieldExport::~XMLTextFieldExport()
 {
-delete pCombinedCharactersPropertyState;
-delete pUsedMasters;
 }
 
 /// get the field ID (as in FieldIDEnum) from XTextField
@@ -882,7 +879,7 @@ void XMLTextFieldExport::ExportFieldAutoStyle(
 // export text style with the addition of the combined characters
 DBG_ASSERT(nullptr != pCombinedCharactersPropertyState,
"need proper PropertyState for combined characters");
-const XMLPropertyState *aStates[] = { 
pCombinedCharactersPropertyState, nullptr };
+const XMLPropertyState *aStates[] = { 
pCombinedCharactersPropertyState.get(), nullptr };
 GetExport().GetTextParagraphExport()->Add(
 XML_STYLE_FAMILY_TEXT_TEXT, xRangePropSet,
 aStates);
@@ -969,7 +966,7 @@ void XMLTextFieldExport::ExportField(
 
 // special treatment for combined characters field, because it is
 // exported as a style
-const XMLPropertyState* aStates[] = { pCombinedCharactersPropertyState, 
nullptr };
+const XMLPropertyState* aStates[] = { 
pCombinedCharactersPropertyState.get(), nullptr };
 const XMLPropertyState **pStates =
 FIELD_ID_COMBINED_CHARACTERS == nToken
 ? aStates
@@ -2189,12 +2186,11 @@ void XMLTextFieldExport::ExportFieldDeclarations(
 void XMLTextFieldExport::SetExportOnlyUsedFieldDeclarations(
 bool bExportOnlyUsed)
 {
-delete pUsedMasters;
-pUsedMasters = nullptr;
+pUsedMasters.reset();
 
 // create used masters set (if none is used)
 if (bExportOnlyUsed)
-pUsedMasters = new map ;
+pUsedMasters.reset( new map );
 }
 
 void XMLTextFieldExport::ExportElement(enum XMLTokenEnum eElementName,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 xmloff/inc/XMLEventImportHelper.hxx   |5 -
 xmloff/source/draw/sdxmlexp.cxx   |   79 +++---
 xmloff/source/draw/sdxmlexp_impl.hxx  |9 +-
 xmloff/source/script/XMLEventImportHelper.cxx |9 +-
 4 files changed, 34 insertions(+), 68 deletions(-)

New commits:
commit 437fffe098429dcc2c65184876b6b8444a7d452c
Author: Noel Grandin 
Date:   Wed Jan 17 16:57:13 2018 +0200

loplugin:useuniqueptr in SdXMLExport

and flatten some data structures, no need to allocate some of the the
vector members on the heap

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

diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 44021c381ac9..68f34762be7b 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -392,11 +392,7 @@ SdXMLExport::SdXMLExport(
 mnDocMasterPageCount(0),
 mnDocDrawPageCount(0),
 mnObjectCount(0),
-mpPageMasterInfoList(new ImpXMLEXPPageMasterList),
-mpPageMasterUsageList(new ImpXMLEXPPageMasterList),
-mpNotesPageMasterUsageList(new ImpXMLEXPPageMasterList),
 mpHandoutPageMaster(nullptr),
-mpAutoLayoutInfoList(new ImpXMLAutoLayoutInfoList),
 mbIsDraw(bIsDraw),
 msPageLayoutNames( "PageLayoutNames" )
 {
@@ -641,39 +637,10 @@ SdXMLExport::~SdXMLExport()
 // cleanup presPage mapper, decrease refcount. Should lead to destruction.
 mpPresPagePropsMapper.clear();
 
-// clear evtl. temporary page master infos
-if(mpPageMasterUsageList)
-{
-// note: all items in this list are also in mpPageMasterInfoList
-delete mpPageMasterUsageList;
-mpPageMasterUsageList = nullptr;
-}
-
-if(mpNotesPageMasterUsageList)
-{
-// note: all items in this list are also in mpPageMasterInfoList
-delete mpNotesPageMasterUsageList;
-mpNotesPageMasterUsageList = nullptr;
-}
-
-if(mpPageMasterInfoList)
-{
-for (ImpXMLEXPPageMasterInfo* p : *mpPageMasterInfoList)
-delete p;
-mpPageMasterInfoList->clear();
-delete mpPageMasterInfoList;
-mpPageMasterInfoList = nullptr;
-}
+mvPageMasterInfoList.clear();
 
 // clear auto-layout infos
-if(mpAutoLayoutInfoList)
-{
-for (ImpXMLAutoLayoutInfo* p : *mpAutoLayoutInfoList)
-delete p;
-mpAutoLayoutInfoList->clear();
-delete mpAutoLayoutInfoList;
-mpAutoLayoutInfoList = nullptr;
-}
+mvAutoLayoutInfoList.clear();
 }
 
 void SdXMLExport::ImpPrepAutoLayoutInfos()
@@ -746,21 +713,21 @@ bool SdXMLExport::ImpPrepAutoLayoutInfo(const 
Reference& xPage, OUStr
 ImpXMLAutoLayoutInfo* pNew = new ImpXMLAutoLayoutInfo(nType, 
pInfo);
 bool bDidExist(false);
 
-for( size_t nCnt = 0; !bDidExist && nCnt < 
mpAutoLayoutInfoList->size(); nCnt++)
+for( size_t nCnt = 0; !bDidExist && nCnt < 
mvAutoLayoutInfoList.size(); nCnt++)
 {
-if( *mpAutoLayoutInfoList->at( nCnt ) == *pNew)
+if( *mvAutoLayoutInfoList.at( nCnt ) == *pNew)
 {
 delete pNew;
-pNew = mpAutoLayoutInfoList->at( nCnt );
+pNew = mvAutoLayoutInfoList.at( nCnt ).get();
 bDidExist = true;
 }
 }
 
 if(!bDidExist)
 {
-mpAutoLayoutInfoList->push_back( pNew );
+mvAutoLayoutInfoList.emplace_back( pNew );
 OUString sNewName = "AL";
-sNewName += OUString::number(mpAutoLayoutInfoList->size() 
- 1);
+sNewName += OUString::number(mvAutoLayoutInfoList.size() - 
1);
 sNewName += "T";
 sNewName += OUString::number(nType);
 pNew->SetLayoutName(sNewName);
@@ -777,9 +744,9 @@ bool SdXMLExport::ImpPrepAutoLayoutInfo(const 
Reference& xPage, OUStr
 
 void SdXMLExport::ImpWriteAutoLayoutInfos()
 {
-if( !mpAutoLayoutInfoList->empty() )
+if( !mvAutoLayoutInfoList.empty() )
 {
-for(ImpXMLAutoLayoutInfo* pInfo : *mpAutoLayoutInfoList)
+for(auto & pInfo : mvAutoLayoutInfoList)
 {
 if(pInfo)
 {
@@ -1217,20 +1184,20 @@ ImpXMLEXPPageMasterInfo* 
SdXMLExport::ImpGetOrCreatePageMasterInfo( const Refere
 ImpXMLEXPPageMasterInfo* pNewInfo = new ImpXMLEXPPageMasterInfo(*this, 
xMasterPage);
 
 // compare with prev page-master infos
-for( size_t a = 0; !bDoesExist && a < mpPageMasterInfoList->size(); a++)
+for( size_t a = 0; !bDoesExist && a < mvPageMasterInfoList.size(); a++)
 {
-if 

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

[Stephan Bergmann]

 sw/source/core/unocore/unotbl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1a95cd72d9cf5ff18a79eb8089a3a7e0a47be0e4
Author: Stephan Bergmann 
Date:   Tue Jan 23 22:52:13 2018 +0100

USHRT_MAX -> SAL_MAX_UINT16

...presumably forgotten when the following cast of nRepeat in the
SetRowsToRepeat call was changed from USHORT to sal_uInt16 in
7f33ed417b2e29e5470724ea76967f64699a2662 "removetooltypes01: #i112600# 
Remove
tools types from sw"

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

diff --git a/sw/source/core/unocore/unotbl.cxx 
b/sw/source/core/unocore/unotbl.cxx
index 68d9863910f0..67a96acbe0f9 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -230,7 +230,7 @@ static void lcl_SetSpecialProperty(SwFrameFormat* pFormat,
 {
 sal_Int32 nRepeat = 0;
 aValue >>= nRepeat;
-if( nRepeat >= 0 && nRepeat < USHRT_MAX )
+if( nRepeat >= 0 && nRepeat < SAL_MAX_UINT16 )
 pFormat->GetDoc()->SetRowsToRepeat( *pTable, 
static_cast(nRepeat) );
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 basic/source/runtime/dllmgr-x64.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7c7aa4e3077971627db09181405e3f388911c83d
Author: Stephan Bergmann 
Date:   Thu Jan 25 08:13:11 2018 +0100

loplugin:pointerbool (clang-cl)

Change-Id: Idaf9e1858afb8f22bba1767470138ec820a8d7cb

diff --git a/basic/source/runtime/dllmgr-x64.cxx 
b/basic/source/runtime/dllmgr-x64.cxx
index 96aa4fcbdd78..10a05ef9463f 100644
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -590,7 +590,7 @@ ErrCode call(
 //TODO
 break;
 case SbxBOOL:
-result.PutBool(iRetVal);
+result.PutBool(bool(iRetVal));
 break;
 case SbxBYTE:
 result.PutByte(static_cast< sal_uInt8 >(iRetVal));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai]

 sw/qa/extras/tiledrendering/data/tdf115088.odt |binary
 sw/qa/extras/tiledrendering/tiledrendering.cxx |   37 +
 2 files changed, 37 insertions(+)

New commits:
commit b4c0621134d24080479b7f11e07cbb2ea3d80769
Author: Tamás Zolnai 
Date:   Wed Jan 24 18:41:33 2018 +0100

Test for tdf#115088.

Change-Id: I27c97d174089c6567e38899522603d4a39d8ad40
Reviewed-on: https://gerrit.libreoffice.org/48540
Tested-by: Jenkins 
Reviewed-by: Tamás Zolnai 

diff --git a/sw/qa/extras/tiledrendering/data/tdf115088.odt 
b/sw/qa/extras/tiledrendering/data/tdf115088.odt
new file mode 100644
index ..b29681eb8ef1
Binary files /dev/null and b/sw/qa/extras/tiledrendering/data/tdf115088.odt 
differ
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 5a90230be574..62a70ea74d11 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -99,6 +99,7 @@ public:
 void testDocumentRepair();
 void testPageHeader();
 void testPageFooter();
+void testTdf115088();
 
 CPPUNIT_TEST_SUITE(SwTiledRenderingTest);
 CPPUNIT_TEST(testRegisterCallback);
@@ -148,6 +149,7 @@ public:
 CPPUNIT_TEST(testDocumentRepair);
 CPPUNIT_TEST(testPageHeader);
 CPPUNIT_TEST(testPageFooter);
+CPPUNIT_TEST(testTdf115088);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -2024,6 +2026,41 @@ void SwTiledRenderingTest::testPageFooter()
 comphelper::LibreOfficeKit::setActive(false);
 }
 
+void SwTiledRenderingTest::testTdf115088()
+{
+comphelper::LibreOfficeKit::setActive();
+
+// We have three lines in the test document and we try to copy the second 
and third line
+// To the beginning of the document
+SwXTextDocument* pXTextDocument = createDoc("tdf115088.odt");
+
+// Select and copy second and third line
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_HOME | 
KEY_MOD1);
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, KEY_HOME | KEY_MOD1);
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_DOWN);
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, KEY_DOWN);
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_DOWN | 
KEY_SHIFT);
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, KEY_DOWN | KEY_SHIFT);
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_RIGHT | 
KEY_SHIFT);
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, KEY_RIGHT | KEY_SHIFT);
+Scheduler::ProcessEventsToIdle();
+comphelper::dispatchCommand(".uno:Copy", 
uno::Sequence());
+
+// Move cursor to the begining of the first line and paste
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_HOME | 
KEY_MOD1);
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, KEY_HOME | KEY_MOD1);
+Scheduler::ProcessEventsToIdle();
+comphelper::dispatchCommand(".uno:PasteUnformatted", 
uno::Sequence());
+Scheduler::ProcessEventsToIdle();
+
+// Check the resulting text in the document. (it was 1text\n1\1)
+CPPUNIT_ASSERT_EQUAL(OUString("1\n1Text\n1\n1"), 
pXTextDocument->getText()->getString());
+
+mxComponent->dispose();
+mxComponent.clear();
+comphelper::LibreOfficeKit::setActive(false);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwTiledRenderingTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/qa odk/examples sal/osl sc/source soltools/cpp svgio/source sw/source toolkit/test vcl/source writerfilter/source

[Andrea Gelmini]

 dbaccess/qa/complex/dbaccess/DatabaseDocument.java |2 +-
 odk/examples/java/Text/TextReplace.java|2 +-
 sal/osl/unx/file_path_helper.hxx   |2 +-
 sc/source/core/inc/interpre.hxx|2 +-
 soltools/cpp/_macro.c  |2 +-
 svgio/source/svgreader/svgsvgnode.cxx  |2 +-
 sw/source/core/inc/rootfrm.hxx |2 +-
 toolkit/test/accessibility/AccessibilityWorkBench.java |2 +-
 vcl/source/window/printdlg.cxx |2 +-
 writerfilter/source/ooxml/OOXMLStreamImpl.cxx  |2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 4c0735830be6ebf83ce562025fdb34dfd036948e
Author: Andrea Gelmini 
Date:   Wed Jan 24 18:42:23 2018 +0100

Fix typos

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

diff --git a/dbaccess/qa/complex/dbaccess/DatabaseDocument.java 
b/dbaccess/qa/complex/dbaccess/DatabaseDocument.java
index 673f22d24677..a89bc13c5248 100644
--- a/dbaccess/qa/complex/dbaccess/DatabaseDocument.java
+++ b/dbaccess/qa/complex/dbaccess/DatabaseDocument.java
@@ -945,7 +945,7 @@ public class DatabaseDocument extends TestCase implements 
com.sun.star.document.
 {
 if ("OnTitleChanged".equals(_Event.EventName))
 // OnTitleChanged events are notified too often. This is known, and 
accepted.
-// (the deeper reason is that it's difficult to determine, in the 
DatabaseDocument implementatin,
+// (the deeper reason is that it's difficult to determine, in the 
DatabaseDocument implementation,
 // when the title actually changed. In particular, when we do a 
saveAsURL, and then ask for a
 // title *before* the TitleHelper got the document's OnSaveAsDone 
event, then the wrong (old)
 // title is obtained.
diff --git a/odk/examples/java/Text/TextReplace.java 
b/odk/examples/java/Text/TextReplace.java
index a43799ffadb9..9dc3eec0a2a8 100644
--- a/odk/examples/java/Text/TextReplace.java
+++ b/odk/examples/java/Text/TextReplace.java
@@ -69,7 +69,7 @@ public class TextReplace {
 xReplaceable = UnoRuntime.queryInterface(
 com.sun.star.util.XReplaceable.class, xTextDocument);
 
-// You need a descriptor to set properies for Replace
+// You need a descriptor to set properties for Replace
 xReplaceDescr = xReplaceable.createReplaceDescriptor();
 
 System.out.println("Change all occurrences of ...");
diff --git a/sal/osl/unx/file_path_helper.hxx b/sal/osl/unx/file_path_helper.hxx
index 86c10ccabcf5..2b2fd8891256 100644
--- a/sal/osl/unx/file_path_helper.hxx
+++ b/sal/osl/unx/file_path_helper.hxx
@@ -246,7 +246,7 @@ namespace osl
 
 @param  ppustrAbsolutePath [out] the
 resulting path which is a
-concatination of the base and
+concatenation of the base and
 the relative path
 if base path is empty the
 resulting absolute path is the
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 4b76a166bef0..3a3450654ff2 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -142,7 +142,7 @@ typedef ::std::map< const formula::FormulaConstTokenRef, 
formula::FormulaConstTo
 
 class ScInterpreter
 {
-// distibution function objects need the GetxxxDist methods
+// distribution function objects need the GetxxxDist methods
 friend class ScGammaDistFunction;
 friend class ScBetaDistFunction;
 friend class ScTDistFunction;
diff --git a/soltools/cpp/_macro.c b/soltools/cpp/_macro.c
index e8b87d002f4c..8a89e9379d36 100644
--- a/soltools/cpp/_macro.c
+++ b/soltools/cpp/_macro.c
@@ -577,7 +577,7 @@ void
 {
 if (len + ntp->len + ntp->wslen > sizeof(tt))
 {
-error(ERROR, "## string concatination buffer overrun");
+error(ERROR, "## string concatenation buffer overrun");
 break;
 }
 
diff --git a/svgio/source/svgreader/svgsvgnode.cxx 
b/svgio/source/svgreader/svgsvgnode.cxx
index 43fa092cd2c1..5803c877331b 100644
--- a/svgio/source/svgreader/svgsvgnode.cxx
+++ b/svgio/source/svgreader/svgsvgnode.cxx
@@ -310,7 +310,7 @@ namespace svgio
 if(getParent())
 {
 // #i122594# if width/height is not given, it's 100% (see 
5.1.2 The 'svg' element in SVG1.1 spec).
-// If it is relative, the question is to what. The 
previous implementatin assumed relative to the
+// If it is relative, the question is to what. The 
previous implementation assumed 

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

[Andrea Gelmini]

 framework/inc/helper/mischelper.hxx   |2 +-
 framework/qa/complex/loadAllDocuments/InteractionHandler.java |2 +-
 framework/qa/complex/loadAllDocuments/StatusIndicator.java|2 +-
 vcl/unx/generic/dtrans/X11_selection.hxx  |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d20afc4fb3bdae03d468b8fb8d888d98d3473ed2
Author: Andrea Gelmini 
Date:   Wed Jan 24 23:22:52 2018 +0100

Fix typos

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

diff --git a/framework/inc/helper/mischelper.hxx 
b/framework/inc/helper/mischelper.hxx
index bbbc39869ebe..73a9b18e5a79 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -140,7 +140,7 @@ FWI_DLLPUBLIC void FillLangItems( std::set< OUString > 
,
 //owns the Broadcaster which "owns" the Listener.
 
 //The WeakContainerListener allows breaking this cycle and retrofitting
-//afflicted implentations fairly easily.
+//afflicted implementations fairly easily.
 
 //OriginalListener owns the Broadcaster which "owns" the WeakContainerListener
 //which forwards the events to the OriginalListener without taking ownership of
diff --git a/framework/qa/complex/loadAllDocuments/InteractionHandler.java 
b/framework/qa/complex/loadAllDocuments/InteractionHandler.java
index d8e5091de55e..fa2ddba9226f 100644
--- a/framework/qa/complex/loadAllDocuments/InteractionHandler.java
+++ b/framework/qa/complex/loadAllDocuments/InteractionHandler.java
@@ -22,7 +22,7 @@ import com.sun.star.uno.AnyConverter;
 
 
 /**
- * Implemets a simple interaction handler,
+ * Implements a simple interaction handler,
  * which can abort all incoming interactions only ... but make it possible to
  * log it. So it can be used for debug and test purposes.
  */
diff --git a/framework/qa/complex/loadAllDocuments/StatusIndicator.java 
b/framework/qa/complex/loadAllDocuments/StatusIndicator.java
index 7a5be6607e9a..c1edbffd1e1b 100644
--- a/framework/qa/complex/loadAllDocuments/StatusIndicator.java
+++ b/framework/qa/complex/loadAllDocuments/StatusIndicator.java
@@ -24,7 +24,7 @@ package complex.loadAllDocuments;
 // __ Implementation __
 
 /**
- * Implemets a simple status indicator, which
+ * Implements a simple status indicator, which
  * provide information about state of a load request.
  * It can be used as an argument e.g. for loadComponentFromURL().
  */
diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx 
b/vcl/unx/generic/dtrans/X11_selection.hxx
index de6e631ab9cc..638e0f9f45b2 100644
--- a/vcl/unx/generic/dtrans/X11_selection.hxx
+++ b/vcl/unx/generic/dtrans/X11_selection.hxx
@@ -356,7 +356,7 @@ namespace x11 {
 m_aIncrementals;
 
 // do not use X11 multithreading capabilities
-// since this leads to deadlocks in different Xlib implentations
+// since this leads to deadlocks in different Xlib implementations
 // (XFree as well as Xsun) use an own mutex instead
 ::osl::Mutexm_aMutex;
 boolm_bShutDown;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 sc/uiconfig/scalc/ui/sortoptionspage.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4800c317a2a15230c0811dc578e8c1a152ddf7cf
Author: Samuel Mehrbrodt 
Date:   Mon Jan 22 18:04:56 2018 +0100

Sort dialog: Improve wording

Previously it could easily be misread as "Include comments - only in 
boundary columns"
(and the German translator obviously also read it that way).

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

diff --git a/sc/uiconfig/scalc/ui/sortoptionspage.ui 
b/sc/uiconfig/scalc/ui/sortoptionspage.ui
index d861eeab3e35..90300e8b5241 100644
--- a/sc/uiconfig/scalc/ui/sortoptionspage.ui
+++ b/sc/uiconfig/scalc/ui/sortoptionspage.ui
@@ -86,7 +86,7 @@
 
 
   
-Include comments-only boundary 
column(s)
+Include boundary column(s) containing 
only comments
 True
 True
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sw/source/core/crsr/findattr.cxx |8 ++--
 vcl/source/gdi/impvect.cxx   |   20 +---
 2 files changed, 11 insertions(+), 17 deletions(-)

New commits:
commit b6b5fd494f997be314d154df49c4017db99dda34
Author: Stephan Bergmann 
Date:   Wed Jan 24 16:41:22 2018 +0100

Allocate ImplPointArray::mpArray as a true Point[]

...as the default Point ctor already zero-initializes its members, removing 
the
need for the memset call (that causes -Werror=class-memaccess, "clearing an
object of non-trivial type 'class Point'" with upcoming GCC 8).  Also use
unique_ptr.

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

diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index b94886a841b1..5e7e8e31e4b6 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.cxx
@@ -18,6 +18,8 @@
  */
 
 #include 
+
+#include 
 #include 
 #include 
 #include 
@@ -123,14 +125,13 @@ extern "C" int ImplColorSetCmpFnc( const void* p1, const 
void* p2 )
 
 class ImplPointArray
 {
-Point* mpArray;
+std::unique_ptr mpArray;
 sal_uLong mnSize;
 sal_uLong mnRealSize;
 
 public:
 
 ImplPointArray();
-   ~ImplPointArray();
 
 void ImplSetSize( sal_uLong nSize );
 sal_uLong ImplGetRealSize() const { return mnRealSize; }
@@ -143,19 +144,12 @@ public:
 };
 
 ImplPointArray::ImplPointArray() :
-mpArray ( nullptr ),
 mnSize  ( 0 ),
 mnRealSize  ( 0 )
 
 {
 }
 
-ImplPointArray::~ImplPointArray()
-{
-if( mpArray )
-rtl_freeMemory( mpArray );
-}
-
 void ImplPointArray::ImplSetSize( sal_uLong nSize )
 {
 const sal_uLong nTotal = nSize * sizeof( Point );
@@ -163,11 +157,7 @@ void ImplPointArray::ImplSetSize( sal_uLong nSize )
 mnSize = nSize;
 mnRealSize = 0;
 
-if( mpArray )
-rtl_freeMemory( mpArray );
-
-mpArray = static_cast(rtl_allocateMemory( nTotal ));
-memset( mpArray, 0, nTotal );
+mpArray = o3tl::make_unique( nTotal );
 }
 
 inline Point& ImplPointArray::operator[]( sal_uLong nPos )
@@ -184,7 +174,7 @@ inline const Point& ImplPointArray::operator[]( sal_uLong 
nPos ) const
 
 void ImplPointArray::ImplCreatePoly( tools::Polygon& rPoly ) const
 {
-rPoly = tools::Polygon( sal::static_int_cast(mnRealSize), 
mpArray );
+rPoly = tools::Polygon( sal::static_int_cast(mnRealSize), 
mpArray.get() );
 }
 
 class ImplVectMap
commit 2a727074012782f41b0f4470c95f095e030e
Author: Stephan Bergmann 
Date:   Wed Jan 24 16:31:31 2018 +0100

Use std::fill instead of memset

...to avoid GCC 8 -Werror=class-memaccess ("clearing an object of 
non-trivial
type ‘struct SwSrchChrAttr’").  Similar to
 "Allocate 
ImpXPolygon::pPointAry as
a true Point[]", std::fill appears to produce adequate code here with recent
compilers.

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

diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index 3eed69cbc92a..d2d35f229f08 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -43,6 +43,8 @@
 #include 
 #include 
 #include 
+
+#include 
 #include 
 
 using namespace ::com::sun::star;
@@ -183,6 +185,8 @@ struct SwSrchChrAttr
 sal_Int32 nStt;
 sal_Int32 nEnd;
 
+SwSrchChrAttr(): nWhich(0), nStt(0), nEnd(0) {}
+
 SwSrchChrAttr( const SfxPoolItem& rItem,
 sal_Int32 nStart, sal_Int32 nAnyEnd )
 : nWhich( rItem.Which() ), nStt( nStart ), nEnd( nAnyEnd )
@@ -253,8 +257,8 @@ SwAttrCheckArr::~SwAttrCheckArr()
 
 void SwAttrCheckArr::SetNewSet( const SwTextNode& rTextNd, const SwPaM& rPam )
 {
-memset( pFndArr, 0, nArrLen * sizeof(SwSrchChrAttr) );
-memset( pStackArr, 0, nArrLen * sizeof(SwSrchChrAttr) );
+std::fill(pFndArr, pFndArr + nArrLen, SwSrchChrAttr());
+std::fill(pStackArr, pStackArr + nArrLen, SwSrchChrAttr());
 nFound = 0;
 nStackCnt = 0;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bridges/source odk/examples sal/osl sd/source

[Andrea Gelmini]

 bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx 
 |2 +-
 bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
 |2 +-
 bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx 
 |2 +-
 bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
 |2 +-
 bridges/source/jni_uno/jni_bridge.cxx  
 |4 ++--
 odk/examples/DevelopersGuide/ProfUNO/CppBinding/string_samples.cxx 
 |2 +-
 sal/osl/w32/file_dirvol.cxx
 |2 +-
 sal/osl/w32/module.cxx 
 |2 +-
 
sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx 
|4 ++--
 9 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit fbf42a4f13dd3ad9f70fc9f434e3cb6236f38300
Author: Andrea Gelmini 
Date:   Wed Jan 24 18:19:57 2018 +0100

Fix typos

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

diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
index a9222c00ee52..2cf39d998556 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
@@ -51,7 +51,7 @@ static typelib_TypeClass cpp2uno_call(
 #endif
 
 int ng = 0; //number of gpr registers used
-int nf = 0; //number of fpr regsiters used
+int nf = 0; //number of fpr registers used
 
 // gpreg:  [ret *], this, [gpr params]
 // fpreg:  [fpr params]
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
index 5499b506d3aa..ab3fbd4c76b3 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
@@ -57,7 +57,7 @@ static typelib_TypeClass cpp2uno_call(
 #endif
 
 int ng = 0; //number of gpr registers used
-int nf = 0; //number of fpr regsiters used
+int nf = 0; //number of fpr registers used
 
 // gpreg:  [ret *], this, [gpr params]
 // fpreg:  [fpr params]
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
index 539e5011fbce..b9e61b148304 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
@@ -46,7 +46,7 @@ static typelib_TypeClass cpp2uno_call(
 sal_Int64 * pRegisterReturn /* space for register return */ )
 {
 int ng = 0; //number of gpr registers used
-int nf = 0; //number of fpr regsiters used
+int nf = 0; //number of fpr registers used
 void ** pCppStack; //temporary stack pointer
 
 // gpreg:  [ret *], this, [gpr params]
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
index aa86340447a5..ed48be648bca 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
@@ -47,7 +47,7 @@ static typelib_TypeClass cpp2uno_call(
 fprintf(stderr, "as far as cpp2uno_call\n");
 #endif
 int ng = 0; //number of gpr registers used
-int nf = 0; //number of fpr regsiters used
+int nf = 0; //number of fpr registers used
 
 // gpreg:  [ret *], this, [gpr params]
 // fpreg:  [fpr params]
diff --git a/bridges/source/jni_uno/jni_bridge.cxx 
b/bridges/source/jni_uno/jni_bridge.cxx
index ac671d173e9c..de575a02bbcd 100644
--- a/bridges/source/jni_uno/jni_bridge.cxx
+++ b/bridges/source/jni_uno/jni_bridge.cxx
@@ -104,7 +104,7 @@ void Mapping_map_to_uno(
 {
 SAL_WARN(
 "bridges",
-"ingoring BridgeRuntimeError \"" << err.m_message << "\"");
+"ignoring BridgeRuntimeError \"" << err.m_message << "\"");
 }
 catch (const 
::jvmaccess::VirtualMachine::AttachGuard::CreationException &)
 {
@@ -168,7 +168,7 @@ void Mapping_map_to_java(
 {
 SAL_WARN(
 "bridges",
-"ingoring BridgeRuntimeError \"" << err.m_message << "\"");
+"ignoring BridgeRuntimeError \"" << err.m_message << "\"");
 }
 catch (const ::jvmaccess::VirtualMachine::AttachGuard::CreationException &)
 {
diff --git a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/string_samples.cxx 
b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/string_samples.cxx
index b5b782353066..ecb21116a00a 100644
--- a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/string_samples.cxx
+++ b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/string_samples.cxx
@@ -46,7 +46,7 @@ using rtl::OString;
 
 SAL_IMPLEMENT_MAIN()
 {

[Libreoffice-commits] online.git: docker/l10n-docker-nightly.sh

[Andras Timar]

 docker/l10n-docker-nightly.sh |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit e53898bb061f154e06b951935ebb4b47a641a0af
Author: Andras Timar 
Date:   Thu Jan 25 08:07:35 2018 +0100

Online docker: add thesauri

Change-Id: Ifad39a3d5cceb009e1d0c449b4bd239449b30a9a

diff --git a/docker/l10n-docker-nightly.sh b/docker/l10n-docker-nightly.sh
index 51a1952a..b6629cc3 100755
--- a/docker/l10n-docker-nightly.sh
+++ b/docker/l10n-docker-nightly.sh
@@ -116,6 +116,7 @@ cp -a libreoffice/instdir "$INSTDIR"/opt/libreoffice
 mkdir -p "$INSTDIR"/usr/share/hunspell
 mkdir -p "$INSTDIR"/usr/share/hyphen
 mkdir -p "$INSTDIR"/opt/lool/systemplate/usr/share/hyphen
+mkdir -p "$INSTDIR"/usr/share/mythes
 for i in `find libreoffice/instdir/share/extensions/ -name hyph*.dic`;do cp -a 
$i "$INSTDIR"/opt/lool/systemplate/usr/share/hyphen;done
 for i in `find libreoffice/instdir/share/extensions/ -name hyph*.dic`;do cp -a 
$i "$INSTDIR"/usr/share/hyphen;done
 cp -a libreoffice/instdir/share/extensions/dict-en/en_US.* 
"$INSTDIR"/usr/share/hunspell
@@ -136,6 +137,7 @@ cp -a 
libreoffice/instdir/share/extensions/dict-de/de_CH_frami.dic "$INSTDIR"/us
 cp -a libreoffice/instdir/share/extensions/dict-de/de_CH_frami.aff 
"$INSTDIR"/usr/share/hunspell/de_CH.aff
 cp -a libreoffice/instdir/share/extensions/dict-de/de_DE_frami.dic 
"$INSTDIR"/usr/share/hunspell/de_DE.dic
 cp -a libreoffice/instdir/share/extensions/dict-de/de_DE_frami.aff 
"$INSTDIR"/usr/share/hunspell/de_DE.aff
+for i in de en fr it pl pt-PT ru;do cp -a 
libreoffice/instdir/share/extensions/dict-$i/th_* 
"$INSTDIR"/usr/share/mythes;done
 
 
 # loolwsd & loleaflet #
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini]

 filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl   |2 
+-
 filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl |2 
+-
 sc/source/ui/unoobj/chart2uno.cxx   |2 
+-
 sw/source/core/inc/anchoredobjectposition.hxx   |2 
+-
 sw/source/core/inc/flowfrm.hxx  |4 
++--
 sw/source/core/layout/flowfrm.cxx   |2 
+-
 sw/source/core/layout/laycache.cxx  |2 
+-
 sw/source/core/layout/trvlfrm.cxx   |4 
++--
 sw/source/core/objectpositioning/anchoredobjectposition.cxx |2 
+-
 9 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit f08828f26b19c486f074182833e2e674b681745c
Author: Andrea Gelmini 
Date:   Wed Jan 24 18:31:43 2018 +0100

Fix typos

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

diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
index 87c8744d2a0e..be331280ed72 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
@@ -807,7 +807,7 @@
 padding
 
 :
-
+
 
 
 
diff --git 
a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl 
b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
index 791a2bcd391b..da123b1e5146 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
@@ -94,7 +94,7 @@
 
 
 :
-
+
 
 
 
diff --git a/sc/source/ui/unoobj/chart2uno.cxx 
b/sc/source/ui/unoobj/chart2uno.cxx
index d5dce02cd4f7..96f527efca71 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -3113,7 +3113,7 @@ uno::Sequence< OUString > SAL_CALL 
ScChart2DataSequence::generateLabel(chart2::d
 SCCOL nCols = func.getCols();
 SCROW nRows = func.getRows();
 
-// Detemine whether this is column-major or row-major.
+// Determine whether this is column-major or row-major.
 bool bColumn = true;
 if ((eOrigin == chart2::data::LabelOrigin_SHORT_SIDE) ||
 (eOrigin == chart2::data::LabelOrigin_LONG_SIDE))
diff --git a/sw/source/core/inc/anchoredobjectposition.hxx 
b/sw/source/core/inc/anchoredobjectposition.hxx
index 382cb5a57591..74705465d54a 100644
--- a/sw/source/core/inc/anchoredobjectposition.hxx
+++ b/sw/source/core/inc/anchoredobjectposition.hxx
@@ -374,7 +374,7 @@ namespace objectpositioning
const bool _bEvenPage
  ) const;
 
-/** detemine, if object has to draw aside given fly frame
+/** determine, if object has to draw aside given fly frame
 
 method used by 
 
diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx
index e2963d859336..818f0fb4f597 100644
--- a/sw/source/core/inc/flowfrm.hxx
+++ b/sw/source/core/inc/flowfrm.hxx
@@ -96,14 +96,14 @@ class SwFlowFrame
 */
 const SwFrame* GetPrevFrameForUpperSpaceCalc_( const SwFrame* 
_pProposedPrevFrame = nullptr ) const;
 
-/** method to detemine the upper space amount, which is considered for
+/** method to determine the upper space amount, which is considered for
 the previous frame
 
 #i11860#
 */
 SwTwips GetUpperSpaceAmountConsideredForPrevFrame() const;
 
-/** method to detemine the upper space amount, which is considered for
+/** method to determine the upper space amount, which is considered for
 the page grid
 
 #i11860#
diff --git a/sw/source/core/layout/flowfrm.cxx 
b/sw/source/core/layout/flowfrm.cxx
index 30d92bb3fae4..75a064fa6e55 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -1529,7 +1529,7 @@ SwTwips SwFlowFrame::CalcUpperSpace( const SwBorderAttrs 
*pAttrs,
 return nUpper;
 }
 
-/** method to detemine the upper space amount, which is considered for
+/** method to determine the upper space amount, which is considered for
 the page grid
 
 OD 2004-03-12 #i11860#
diff --git a/sw/source/core/layout/laycache.cxx 
b/sw/source/core/layout/laycache.cxx
index e7ee8d1f21a0..ec13fdc99ea9 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -504,7 +504,7 @@ bool 

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

[Samuel Mehrbrodt]

 sc/source/core/data/column4.cxx |   32 +---
 1 file changed, 17 insertions(+), 15 deletions(-)

New commits:
commit cf847a7287148304afe98f0efe68cdf9617d4e44
Author: Samuel Mehrbrodt 
Date:   Tue Jan 23 10:11:16 2018 +0100

Updating images should not depend on unrelated condition

Instead update them unconditionally as it is done with comments.

The data range has been set beforehand (considering the option
to include boundary columns with images only) so at this point
the swapping should happen unconditionally.

Follow-up for 3a2a430ae8e2c1647c18d8904477949f6e2e7941

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

diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index a99a78564c7f..14a5e89c2b54 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -1087,6 +1087,23 @@ void ScColumn::Swap( ScColumn& rOther, SCROW nRow1, 
SCROW nRow2, bool bPattern )
 maCellNotes.swap(nRow1, nRow2, rOther.maCellNotes, nRow1);
 maBroadcasters.swap(nRow1, nRow2, rOther.maBroadcasters, nRow1);
 
+// Update draw object anchors
+ScDrawLayer* pDrawLayer = GetDoc()->GetDrawLayer();
+if (pDrawLayer)
+{
+for (SCROW nRow = nRow1; nRow <= nRow2; ++nRow)
+{
+ScAddress aThisCellPos(GetCol(), nRow, GetTab());
+ScAddress aOtherCellPos(rOther.GetCol(), nRow, GetTab());
+std::vector pThisColObjects = 
pDrawLayer->GetObjectsAnchoredToCell(aThisCellPos);
+std::vector pOtherColObjects = 
pDrawLayer->GetObjectsAnchoredToCell(aOtherCellPos);
+if (!pThisColObjects.empty())
+UpdateDrawObjectsForRow(pThisColObjects, rOther.GetCol(), 
nRow);
+if (!pOtherColObjects.empty())
+rOther.UpdateDrawObjectsForRow(pOtherColObjects, GetCol(), 
nRow);
+}
+}
+
 if (bPattern)
 {
 for (SCROW nRow = nRow1; nRow <= nRow2; ++nRow)
@@ -1098,21 +1115,6 @@ void ScColumn::Swap( ScColumn& rOther, SCROW nRow1, 
SCROW nRow2, bool bPattern )
 SetPattern(nRow, *pPat2);
 rOther.SetPattern(nRow, *pPat1);
 }
-
-// Update draw object anchors
-ScDrawLayer* pDrawLayer = GetDoc()->GetDrawLayer();
-if (pDrawLayer)
-{
-ScAddress aThisCellPos(GetCol(), nRow, GetTab());
-ScAddress aOtherCellPos(rOther.GetCol(), nRow, GetTab());
-std::vector pThisColObjects = 
pDrawLayer->GetObjectsAnchoredToCell(aThisCellPos);
-std::vector pOtherColObjects = 
pDrawLayer->GetObjectsAnchoredToCell(aOtherCellPos);
-if (!pThisColObjects.empty())
-UpdateDrawObjectsForRow(pThisColObjects, rOther.GetCol(), 
nRow);
-if (!pOtherColObjects.empty())
-rOther.UpdateDrawObjectsForRow(pOtherColObjects, GetCol(), 
nRow);
-
-}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

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

New commits:
commit f84c9164c5bfa438282c4264203163d4c6b7e689
Author: Samuel Mehrbrodt 
Date:   Tue Jan 23 10:10:11 2018 +0100

Assert that parameters are valid

Follow-up for 3a2a430ae8e2c1647c18d8904477949f6e2e7941

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

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index a9b074458af8..24d825901483 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1896,6 +1896,8 @@ void ScColumn::UpdateNoteCaptions( SCROW nRow1, SCROW 
nRow2 )
 
 void ScColumn::UpdateDrawObjects(std::vector>& 
pObjects, SCROW nRowStart, SCROW nRowEnd)
 {
+assert(static_cast(pObjects.size()) >= nRowEnd - nRowStart + 1);
+
 int nObj = 0;
 for (SCROW nCurrentRow = nRowStart; nCurrentRow <= nRowEnd; nCurrentRow++, 
nObj++)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Aron Budea]

 wsd/LOOLWSD.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8f2477816bef369e303b9160b04d16058914d5e2
Author: Aron Budea 
Date:   Wed Nov 8 17:39:18 2017 +0100

wsd: increase preinit timeout 5-fold

Change-Id: I08ab74498ef9396edba5311a7e31b75c5932bbd6
Reviewed-on: https://gerrit.libreoffice.org/44495
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 88b6f805..ca0ca6a5 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2721,7 +2721,7 @@ int LOOLWSD::innerMain()
 }
 else
 {
-const auto timeoutMs = CHILD_TIMEOUT_MS * (LOOLWSD::NoCapsForKit ? 
150 : 10);
+const auto timeoutMs = CHILD_TIMEOUT_MS * (LOOLWSD::NoCapsForKit ? 
150 : 50);
 const auto timeout = std::chrono::milliseconds(timeoutMs);
 LOG_TRC("Waiting for a new child for a max of " << timeoutMs << " 
ms.");
 if (!NewChildrenCV.wait_for(lock, timeout, []() { return 
!NewChildren.empty(); }))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 debian/control  |2 +-
 loolwsd.spec.in |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1acbcc26e681d9dcaf2ed285e3fab17fd9dc2d3c
Author: Andras Timar 
Date:   Tue Jan 23 23:33:43 2018 +0100

one dependency less for rpm/deb, we disabled XRandR in core

Change-Id: I7150298eb8fc672e0ced382c9312b369f6c788da
Reviewed-on: https://gerrit.libreoffice.org/48472
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/debian/control b/debian/control
index 70c3b78b..21879e8a 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.7
 Package: loolwsd
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, 
libxinerama1, libgl1-mesa-glx, libcups2, cpio, libcap2-bin, libxcb-render0, 
libxcb-shm0, libxrandr2, collaboraofficebasis5.3-calc (>= 5.3.10.37), 
collaboraofficebasis5.3-core (>= 5.3.10.37), 
collaboraofficebasis5.3-graphicfilter (>= 5.3.10.37), 
collaboraofficebasis5.3-images (>= 5.3.10.37), collaboraofficebasis5.3-impress 
(>= 5.3.10.37), collaboraofficebasis5.3-ooofonts (>= 5.3.10.37), 
collaboraofficebasis5.3-writer (>= 5.3.10.37), collaboraoffice5.3 (>= 
5.3.10.37), collaboraoffice5.3-ure (>= 5.3.10.37), 
collaboraofficebasis5.3-en-us (>= 5.3.10.37), 
collaboraofficebasis5.3-en-us-calc (>= 5.3.10.37), 
collaboraofficebasis5.3-en-us-res (>= 5.3.10.37), 
collaboraofficebasis5.3-noto-fonts (>= 5.3.10.37), collaboraofficebasis5.3-draw 
(>= 5.3.10.37), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.37), 
collaboraofficebasis5.3-filter-data (>= 5.3.10.37)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, 
libxinerama1, libgl1-mesa-glx, libcups2, cpio, libcap2-bin, libxcb-render0, 
libxcb-shm0, collaboraofficebasis5.3-calc (>= 5.3.10.37), 
collaboraofficebasis5.3-core (>= 5.3.10.37), 
collaboraofficebasis5.3-graphicfilter (>= 5.3.10.37), 
collaboraofficebasis5.3-images (>= 5.3.10.37), collaboraofficebasis5.3-impress 
(>= 5.3.10.37), collaboraofficebasis5.3-ooofonts (>= 5.3.10.37), 
collaboraofficebasis5.3-writer (>= 5.3.10.37), collaboraoffice5.3 (>= 
5.3.10.37), collaboraoffice5.3-ure (>= 5.3.10.37), 
collaboraofficebasis5.3-en-us (>= 5.3.10.37), 
collaboraofficebasis5.3-en-us-calc (>= 5.3.10.37), 
collaboraofficebasis5.3-en-us-res (>= 5.3.10.37), 
collaboraofficebasis5.3-noto-fonts (>= 5.3.10.37), collaboraofficebasis5.3-draw 
(>= 5.3.10.37), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.37), 
collaboraofficebasis5.3-filter-data (>= 5.3.10.37)
 Conflicts: collaboraofficebasis5.3-gnome-integration, 
collaboraofficebasis5.3-kde-integration
 Description: LibreOffice Online WebSocket Daemon
  LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 7d269f7f..e819709c 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -46,7 +46,7 @@ Requires(post): coreutils grep sed
 Requires:   keyutils-libs krb5-libs libattr libcap libcom_err libgcc 
libpng libselinux openssl pcre zlib
 Requires:   poco-crypto >= 1.7.8 poco-foundation >= 1.7.8 poco-json >= 
1.7.8 poco-net >= 1.7.8  poco-netssl >= 1.7.8  poco-util >= 1.7.8  poco-xml >= 
1.7.8
 # Collabora Office dependencies (unfortunately Collabora Office RPM packages 
do not have real dependencies)
-Requires:   avahi-libs cups-libs dbus-libs expat fontconfig freetype 
gnutls libdrm libgcc libgcrypt libgpg-error libICE libSM libtasn1 libuuid 
libX11 libXau libxcb libXdamage libXext libXfixes libXinerama libXrandr 
libXrender libXxf86vm mesa-dri-drivers mesa-libGL
+Requires:   avahi-libs cups-libs dbus-libs expat fontconfig freetype 
gnutls libdrm libgcc libgcrypt libgpg-error libICE libSM libtasn1 libuuid 
libX11 libXau libxcb libXdamage libXext libXfixes libXinerama libXrender 
libXxf86vm mesa-dri-drivers mesa-libGL
 %endif
 %if 0%{?fedora} || 0%{?rhel} >= 7
 # loolwsd dependencies
@@ -54,7 +54,7 @@ Requires:   systemd
 Requires:   expat keyutils-libs krb5-libs libattr libcap libcom_err libgcc 
libpng libselinux openssl-libs pcre xz-libs zlib
 Requires:   poco-crypto >= 1.7.5 poco-foundation >= 1.7.5 poco-json >= 
1.7.5 poco-net >= 1.7.5 poco-netssl >= 1.7.5 poco-util >= 1.7.5 poco-xml >= 
1.7.5
 # Collabora Office dependencies (unfortunately Collabora Office RPM packages 
do not have real dependencies)
-Requires:   avahi-libs cups-libs dbus-libs fontconfig freetype libdrm 
libICE libSM libuuid libX11 libXau libxcb libXdamage libXext libXfixes 
libXinerama libXrandr libXrender libxshmfence libXxf86vm mesa-libGL 
mesa-libglapi
+Requires:   avahi-libs cups-libs dbus-libs fontconfig freetype libdrm 
libICE libSM libuuid libX11 libXau libxcb libXdamage libXext libXfixes 
libXinerama libXrender libxshmfence libXxf86vm mesa-libGL mesa-libglapi
 %endif
 
 %if 0%{?suse_version}
@@ -179,7 +179,7 @@ getent 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 4685 
 1 file changed, 2619 insertions(+), 2066 deletions(-)

New commits:
commit 876fbffda1deda62d661c93cb8b2a4bb223d147b
Author: Christian Lohmaier 
Date:   Wed Jan 24 15:38:24 2018 +0100

update credits

Change-Id: I50973ddb45ec9269eac4954026ff25e28289dc5d
(cherry picked from commit 3475b95a18f1b1368bcfc20bd3d09b9c02ec33cb)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index f5718e9ee50a..e8ec085487aa 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 http://www.w3.org/1999/xlink; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:xforms="http://www.w3.org/2002/xforms; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#; 
xmlns:officeooo="http://openoffice.org/2009/office; 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.4.2$Linux_X86_64
 
LibreOffice_project/2524958677847fb3bb44820e40380acbe820f9602012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.4.2$Linux_X86_64
 
LibreOffice_project/2524958677847fb3bb44820e40380acbe820f9602012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   520
+   563
501
41965
21327
@@ -16,9 +16,9 @@
  3649
  3471
  501
- 520
+ 563
  42464
- 21846
+ 21888
  0
  0
  false
@@ -71,7 +71,7 @@
false
false
true
-   7422304
+   7433446
false
false
false
@@ -317,34 +317,34 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
-   
+   
   
   

   
   
-   
+   
   
   

@@ -376,7 +376,7 @@
   

   
-  
+  

   
   
@@ -398,16 +398,16 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -415,6 +415,9 @@
   

   
+  
+   
+  
   

   
@@ -1044,7 +1047,7 @@

   
  Credits
-1298 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-10-27 18:02:35.
+1309 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-01-23 23:15:28.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1071,10 +1074,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 23250Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 23451Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 15411Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 15697Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1082,16 +1085,16 @@
  
  
   
-   *Noel GrandinCommits: 
8479Joined: 2011-12-12
+   *Noel GrandinCommits: 
8646Joined: 2011-12-12
   
   
-   Tor 
LillqvistCommits: 8072Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 8091Joined: 
2010-03-23
   
   
-   Miklos 

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 4685 
 1 file changed, 2619 insertions(+), 2066 deletions(-)

New commits:
commit 3e701d9d00d8fda63e53a8244876a6c416625e49
Author: Christian Lohmaier 
Date:   Wed Jan 24 15:38:24 2018 +0100

update credits

Change-Id: I50973ddb45ec9269eac4954026ff25e28289dc5d
(cherry picked from commit 3475b95a18f1b1368bcfc20bd3d09b9c02ec33cb)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index f5718e9ee50a..e8ec085487aa 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 http://www.w3.org/1999/xlink; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:xforms="http://www.w3.org/2002/xforms; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#; 
xmlns:officeooo="http://openoffice.org/2009/office; 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.4.2$Linux_X86_64
 
LibreOffice_project/2524958677847fb3bb44820e40380acbe820f9602012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.4.2$Linux_X86_64
 
LibreOffice_project/2524958677847fb3bb44820e40380acbe820f9602012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   520
+   563
501
41965
21327
@@ -16,9 +16,9 @@
  3649
  3471
  501
- 520
+ 563
  42464
- 21846
+ 21888
  0
  0
  false
@@ -71,7 +71,7 @@
false
false
true
-   7422304
+   7433446
false
false
false
@@ -317,34 +317,34 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
-   
+   
   
   

   
   
-   
+   
   
   

@@ -376,7 +376,7 @@
   

   
-  
+  

   
   
@@ -398,16 +398,16 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -415,6 +415,9 @@
   

   
+  
+   
+  
   

   
@@ -1044,7 +1047,7 @@

   
  Credits
-1298 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-10-27 18:02:35.
+1309 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-01-23 23:15:28.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1071,10 +1074,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 23250Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 23451Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 15411Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 15697Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1082,16 +1085,16 @@
  
  
   
-   *Noel GrandinCommits: 
8479Joined: 2011-12-12
+   *Noel GrandinCommits: 
8646Joined: 2011-12-12
   
   
-   Tor 
LillqvistCommits: 8072Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 8091Joined: 
2010-03-23
   
   
-   Miklos 

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

[Jim Raykowski]

 cui/source/customize/CommandCategoryListBox.cxx |   13 ++---
 cui/source/customize/cfg.cxx|3 +++
 2 files changed, 5 insertions(+), 11 deletions(-)

New commits:
commit bf5739d70d2d4ae258592c3fd19ac18d8767c51a
Author: Jim Raykowski 
Date:   Sun Jan 21 21:44:38 2018 -0900

tdf#115129 change customize function tree expand collapse behavior

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

diff --git a/cui/source/customize/CommandCategoryListBox.cxx 
b/cui/source/customize/CommandCategoryListBox.cxx
index 1c93de9bd7cf..bc0d3d6c80b4 100644
--- a/cui/source/customize/CommandCategoryListBox.cxx
+++ b/cui/source/customize/CommandCategoryListBox.cxx
@@ -354,9 +354,7 @@ void CommandCategoryListBox::categorySelected(  const 
VclPtrInsertEntry(
-  sUIName,
-Image( 
BitmapEx(RID_CUIBMP_EXPANDED) ), Image( BitmapEx(RID_CUIBMP_COLLAPSED) ) );
+SvTreeListEntry* pMacroGroup = 
pFunctionListBox->InsertEntry( sUIName );
 m_aGroupInfo.push_back(
 o3tl::make_unique(
 SfxCfgKind::GROUP_SCRIPTCONTAINER, 0 ) );
@@ -393,9 +391,7 @@ void CommandCategoryListBox::categorySelected(  const 
VclPtrInsertEntry(
-pIt.sLabel, // Name of the style family
-Image( BitmapEx(RID_CUIBMP_EXPANDED) ), Image( 
BitmapEx(RID_CUIBMP_COLLAPSED) ) );
+SvTreeListEntry* pFuncEntry = pFunctionListBox->InsertEntry( 
pIt.sLabel ); // Name of the style family
 
 m_aGroupInfo.push_back( o3tl::make_unique( 
SfxCfgKind::GROUP_STYLES, 0 ) );
 SfxGroupInfo_Impl* pGrpInfo = m_aGroupInfo.back().get();
@@ -488,11 +484,6 @@ void CommandCategoryListBox::addChildren(
 m_aGroupInfo.push_back( 
o3tl::make_unique(SfxCfgKind::GROUP_SCRIPTCONTAINER,
  0, 
static_cast( child.get(;
 pNewEntry->SetUserData( m_aGroupInfo.back().get() );
-
-
-
-pFunctionListBox->SetExpandedEntryBmp(pNewEntry, Image( 
BitmapEx(RID_CUIBMP_EXPANDED) ) );
-pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, Image( 
BitmapEx(RID_CUIBMP_COLLAPSED) ) );
 pNewEntry->EnableChildrenOnDemand();
 
 addChildren(pNewEntry, child, pFunctionListBox, filterTerm);
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 5e4e6dffc7fb..2d41063947a6 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1177,6 +1177,9 @@ SvxConfigPage::SvxConfigPage(vcl::Window *pParent, const 
SfxItemSet& rSet)
 //  .ui file to get rid of the extra VCLContainer, and all these manual
 //  sizing and widget creation tricks.
 m_pFunctions->set_width_request(aSize.Width() * 1.45);
+m_pFunctions->SetNodeDefaultImages();
+m_pFunctions->SetStyle( m_pFunctions->GetStyle() | WB_HASBUTTONS | 
WB_HASBUTTONSATROOT |
+WB_HASLINES | WB_HASLINESATROOT | WB_CLIPCHILDREN 
| WB_HSCROLL );
 
 // Make the middle buttons bigger
 m_pAddCommandButton->set_height_request( 
m_pAddCommandButton->GetOptimalSize().Height() * 1.5 );
___
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' - distro-configs/CPLinux-LOKit.conf

[Andras Timar]

 distro-configs/CPLinux-LOKit.conf |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0e3441faba4c830a24036ada2c596c529c992e58
Author: Andras Timar 
Date:   Tue Jan 23 23:27:35 2018 +0100

CPLinux-LOKit.conf: --disable-xrandr

Change-Id: I2f863d0d41eb2081817a68b8f24dbb64d27e385a
Reviewed-on: https://gerrit.libreoffice.org/48471
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/distro-configs/CPLinux-LOKit.conf 
b/distro-configs/CPLinux-LOKit.conf
index 4a21d62e8095..6dcb823964b3 100644
--- a/distro-configs/CPLinux-LOKit.conf
+++ b/distro-configs/CPLinux-LOKit.conf
@@ -43,6 +43,7 @@
 --disable-firebird-sdbc
 --disable-gltf
 --disable-collada
+--disable-randr
 --enable-ext-numbertext
 --disable-ext-ct2n
 --enable-epm
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/BorderlineFix' - svx/Library_svxcore.mk svx/Library_svx.mk svx/source

[Armin Le Grand]

 svx/Library_svx.mk |1 
 svx/Library_svxcore.mk |1 
 svx/source/dialog/framelinkarray.cxx   |1 
 svx/source/table/viewcontactoftableobj.cxx |  197 +
 4 files changed, 92 insertions(+), 108 deletions(-)

New commits:
commit 5288db0d119ae36e712295cf911b690eb45aa1d0
Author: Armin Le Grand 
Date:   Wed Jan 24 15:25:40 2018 +0100

BorderlineFix: Use svx::frame::Array tooling in Draw/Impress

For creating the needed BorderPrimitives for TableCells for the
Tables used in Draw/Impress, adapt the ViewContactOfTableObj doing
this to use svx::frame::Array tooling now. This will correct the
error for not taking the neighboured connects for merged cells
into account and unify one more space to the same tooling.

Change-Id: I2e6f732985e9b963359f156628bd29ddfec1a80c

diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 6bdbadaf2e3b..ad1b1dc3a423 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -128,7 +128,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
 svx/source/dialog/fntctrl \
 svx/source/dialog/fontlb \
 svx/source/dialog/fontwork \
-svx/source/dialog/framelinkarray \
 svx/source/dialog/frmdirlbox \
 svx/source/dialog/frmsel \
 svx/source/dialog/graphctl \
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 5bfbf899034d..603860d7f11b 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -116,6 +116,7 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
 svx/source/dialog/dlgutil \
 svx/source/dialog/hexcolorcontrol \
 svx/source/dialog/framelink \
+svx/source/dialog/framelinkarray \
 svx/source/dialog/langbox \
 svx/source/dialog/pagenumberlistbox \
 svx/source/dialog/papersizelistbox \
diff --git a/svx/source/dialog/framelinkarray.cxx 
b/svx/source/dialog/framelinkarray.cxx
index bc8a50a3d3cf..7cd4b26027dc 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -21,6 +21,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/svx/source/table/viewcontactoftableobj.cxx 
b/svx/source/table/viewcontactoftableobj.cxx
index 448a0b407f2a..4a5741cd0545 100644
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -36,8 +36,10 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
+#include 
 
 #include 
 #include "tablelayouter.hxx"
@@ -196,42 +198,6 @@ namespace sdr
 return svx::frame::Style();
 }
 
-void createForVector(bool bHor, 
drawinglayer::primitive2d::Primitive2DContainer& rContainer, const 
basegfx::B2DPoint& rOrigin, const basegfx::B2DVector& rX,
-const svx::frame::Style& rLine,
-const svx::frame::Style& rLeftA, const svx::frame::Style& rLeftB, 
const svx::frame::Style& rLeftC,
-const svx::frame::Style& rRightA, const svx::frame::Style& 
rRightB, const svx::frame::Style& rRightC)
-{
-/// top-left and bottom-right Style Tables
-const basegfx::B2DVector 
aY(basegfx::getNormalizedPerpendicular(rX));
-
-/// Fill top-left Style Table
-svx::frame::StyleVectorTable aStart;
-
-aStart.add(rLeftA, rX, -aY, bHor); // bHor ? true : false));
-aStart.add(rLeftB, rX, -rX, true); // bHor ? true : true));
-aStart.add(rLeftC, rX, aY, !bHor); // bHor ? false : true));
-aStart.sort();
-
-/// Fill bottom-right Style Table
-svx::frame::StyleVectorTable aEnd;
-const basegfx::B2DVector aAxis(-rX);
-
-aEnd.add(rRightA, aAxis, -aY, bHor); // bHor ? true : false));
-aEnd.add(rRightB, aAxis, rX, false); // bHor ? false : false));
-aEnd.add(rRightC, aAxis, aY, !bHor); // bHor ? false : true));
-aEnd.sort();
-
-CreateBorderPrimitives(
-rContainer,
-rOrigin,
-rX,
-rLine,
-aStart,
-aEnd,
-nullptr
-);
-}
-
 drawinglayer::primitive2d::Primitive2DContainer 
ViewContactOfTableObj::createViewIndependentPrimitive2DSequence() const
 {
 const sdr::table::SdrTableObj& rTableObj = static_cast(GetSdrObject());
@@ -249,7 +215,7 @@ namespace sdr
 
 if(nAllCount)
 {
-const sdr::table::TableLayouter& rTableLayouter = 
rTableObj.getTableLayouter();
+const sdr::table::TableLayouter& 
rTableLayouter(rTableObj.getTableLayouter());
 const bool bIsRTL(css::text::WritingMode_RL_TB == 
rTableObj.GetWritingMode());
 sdr::table::CellPos aCellPos;
 sdr::table::CellRef xCurrentCell;
@@ -258,19 +224,59 @@ namespace sdr
 

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0-0' - readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 4685 
 1 file changed, 2619 insertions(+), 2066 deletions(-)

New commits:
commit aee49ed5a0a4ccb109e3da515bdd15406cbf63e6
Author: Christian Lohmaier 
Date:   Wed Jan 24 15:38:24 2018 +0100

update credits

Change-Id: I50973ddb45ec9269eac4954026ff25e28289dc5d
(cherry picked from commit 3475b95a18f1b1368bcfc20bd3d09b9c02ec33cb)
(cherry picked from commit 3e701d9d00d8fda63e53a8244876a6c416625e49)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index f5718e9ee50a..e8ec085487aa 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 http://www.w3.org/1999/xlink; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:xforms="http://www.w3.org/2002/xforms; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#; 
xmlns:officeooo="http://openoffice.org/2009/office; 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.4.2$Linux_X86_64
 
LibreOffice_project/2524958677847fb3bb44820e40380acbe820f9602012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.4.2$Linux_X86_64
 
LibreOffice_project/2524958677847fb3bb44820e40380acbe820f9602012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   520
+   563
501
41965
21327
@@ -16,9 +16,9 @@
  3649
  3471
  501
- 520
+ 563
  42464
- 21846
+ 21888
  0
  0
  false
@@ -71,7 +71,7 @@
false
false
true
-   7422304
+   7433446
false
false
false
@@ -317,34 +317,34 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
-   
+   
   
   

   
   
-   
+   
   
   

@@ -376,7 +376,7 @@
   

   
-  
+  

   
   
@@ -398,16 +398,16 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -415,6 +415,9 @@
   

   
+  
+   
+  
   

   
@@ -1044,7 +1047,7 @@

   
  Credits
-1298 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-10-27 18:02:35.
+1309 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-01-23 23:15:28.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1071,10 +1074,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 23250Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 23451Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 15411Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 15697Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1082,16 +1085,16 @@
  
  
   
-   *Noel GrandinCommits: 
8479Joined: 2011-12-12
+   *Noel GrandinCommits: 
8646Joined: 2011-12-12
   
   
-   Tor 
LillqvistCommits: 8072Joined: 
2010-03-23
+   Tor 

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

[Stephan Bergmann]

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

New commits:
commit 1bf5b5b76dc1e244c0cf871740c66794157561bd
Author: Stephan Bergmann 
Date:   Tue Jan 23 17:00:27 2018 +0100

This presumably always wanted to check for SAL_MAX_UINT16, not USHRT_MAX

The check against USHRT_MAX was introduced with
9c0344627f1767512ef5097c08e3ed7500d223da "INTEGRATION: CWS cmcfixes30: 
#i72614#
crash in loading corrupt .doc", apparently to ensure the 
static_cast
in the call to ShortToSVBT16 below (which already was that same
static_cast back tehn) is OK.

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

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 03696fb5208f..faa04a594f1a 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -2305,8 +2305,9 @@ void WW8PLCF::GeneratePLCF(SvStream& rSt, sal_Int32 nPN, 
sal_Int32 ncpN)
 
 if (!failure)
 {
+// Check arguments to ShortToSVBT16 in loop below will all be valid:
 sal_Int32 nResult;
-failure = o3tl::checked_add(nPN, ncpN, nResult) || nResult > USHRT_MAX;
+failure = o3tl::checked_add(nPN, ncpN, nResult) || nResult > 
SAL_MAX_UINT16;
 }
 
 if (!failure)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/filter/html/htmlsect.cxx |7 ++-
 sw/source/filter/html/swhtml.cxx   |1 +
 sw/source/filter/html/swhtml.hxx   |   11 +--
 3 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit 2f62f9ef28203c7f143fb55a3407af503e1e7d38
Author: Caolán McNamara 
Date:   Tue Jan 2 17:19:32 2018 +

ofz: assert on trying to insert footer when already inserting the footer

Reviewed-on: https://gerrit.libreoffice.org/47272
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 834cebd153573eea3cc321eca5bcb572b4776dec)

Reviewed-on: https://gerrit.libreoffice.org/48380
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 
(cherry picked from commit 6fde78f1904243a4121c75f7c96711ed54cf787f)

Change-Id: I1fd91cca4aec91700f7db233b420fe27752d659b
Reviewed-on: https://gerrit.libreoffice.org/48444
Reviewed-by: Caolán McNamara 
Reviewed-by: Miklos Vajna 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sw/source/filter/html/htmlsect.cxx 
b/sw/source/filter/html/htmlsect.cxx
index 436508a5e377..a63b788137fb 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -138,8 +138,11 @@ void SwHTMLParser::NewDivision( HtmlTokenId nToken )
 }
 }
 
-if( !bPositioned && (bHeader || bFooter) && IsNewDoc() )
+if (!bPositioned && (bHeader || bFooter) && IsNewDoc() && 
!m_bReadingHeaderOrFooter)
 {
+m_bReadingHeaderOrFooter = true;
+pCntxt->SetHeaderOrFooter(true);
+
 SwPageDesc *pPageDesc = m_pCSS1Parser->GetMasterPageDesc();
 SwFrameFormat& rPageFormat = pPageDesc->GetMaster();
 
@@ -402,6 +405,8 @@ void SwHTMLParser::EndDivision()
 // close attribute
 EndContext( pCntxt );
 SetAttr();  // set paragraph attributes really fast because of 
JavaScript
+if (pCntxt->IsHeaderOrFooter())
+m_bReadingHeaderOrFooter = false;
 
 delete pCntxt;
 }
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 057dc3ad4c04..3b18ef33328a 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -297,6 +297,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, 
SvStream& rIn,
 m_bIgnoreHTMLComments( bNoHTMLComments ),
 m_bRemoveHidden( false ),
 m_bBodySeen( false ),
+m_bReadingHeaderOrFooter( false ),
 m_pTempViewFrame(nullptr)
 {
 m_nEventId = nullptr;
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 66f7837704ae..450f7ddbde56 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -225,6 +225,7 @@ class HTMLAttrContext
 boolbRestartPRE : 1;
 boolbRestartXMP : 1;
 boolbRestartListing : 1;
+boolbHeaderOrFooter : 1;
 
 public:
 void ClearSaveDocContext();
@@ -249,7 +250,8 @@ public:
 bFinishPREListingXMP( false ),
 bRestartPRE( false ),
 bRestartXMP( false ),
-bRestartListing( false )
+bRestartListing( false ),
+bHeaderOrFooter( false )
 {}
 
 explicit HTMLAttrContext( HtmlTokenId nTokn ) :
@@ -270,7 +272,8 @@ public:
 bFinishPREListingXMP( false ),
 bRestartPRE( false ),
 bRestartXMP( false ),
-bRestartListing( false )
+bRestartListing( false ),
+bHeaderOrFooter( false )
 {}
 
 ~HTMLAttrContext() { ClearSaveDocContext(); }
@@ -320,6 +323,9 @@ public:
 void SetRestartListing( bool bSet ) { bRestartListing = bSet; }
 bool IsRestartListing() const { return bRestartListing; }
 
+void SetHeaderOrFooter( bool bSet ) { bHeaderOrFooter = bSet; }
+bool IsHeaderOrFooter() const { return bHeaderOrFooter; }
+
 void SetAppendMode( SwHTMLAppendMode eMode ) { eAppend = eMode; }
 SwHTMLAppendMode GetAppendMode() const { return eAppend; }
 };
@@ -473,6 +479,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
 bool m_bRemoveHidden : 1; // the filter implementation might set the 
hidden flag
 
 bool m_bBodySeen : 1;
+bool m_bReadingHeaderOrFooter : 1;
 
 /// the names corresponding to the DOCINFO field subtypes INFO[1-4]
 OUString m_InfoNames[4];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sw/source/filter/html/htmltab.cxx |3 +++
 sw/source/filter/html/swhtml.cxx  |   31 +++
 sw/source/filter/html/swhtml.hxx  |1 +
 3 files changed, 23 insertions(+), 12 deletions(-)

New commits:
commit 25d763d3bf87dd1435cf1e1cc43fc748f7547f2f
Author: Michael Stahl 
Date:   Mon Jan 22 19:48:06 2018 +0100

ofz#5566 sw: HTML import: ignore  in table structure elements

Looking at the HTML4 DTD https://www.w3.org/TR/html4/sgml/dtd.html,
inside TABLE only various elements defining the structure of the table
allowed, except inside cells (TD and TH elements).

DIV in a table but outside cells may cause cursor positions to go
off the rails, so better ignore such invalid DIV tags.

Reviewed-on: https://gerrit.libreoffice.org/48359
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 8b1a83bffe35ae0e71735569512c1586bcb37b25)

Change-Id: Ia6195d80670631669c252d572242874b13642b74
Reviewed-on: https://gerrit.libreoffice.org/48448
Reviewed-by: Caolán McNamara 
Reviewed-by: Miklos Vajna 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sw/source/filter/html/htmltab.cxx 
b/sw/source/filter/html/htmltab.cxx
index b6e1d5db18bf..b3f7ca1e663f 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -19,6 +19,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -3307,6 +3308,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, 
bool bReadOptions,
 if( !IsParserWorking() && !m_pPendStack )
 return;
 
+::comphelper::FlagRestorationGuard g(m_isInTableStructure, false);
 CellSaveStruct* pSaveStruct;
 
 HtmlTokenId nToken = HtmlTokenId::NONE;
@@ -4972,6 +4974,7 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust 
eParentAdjust,
 if( !IsParserWorking() && !m_pPendStack )
 return nullptr;
 
+::comphelper::FlagRestorationGuard g(m_isInTableStructure, true);
 HtmlTokenId nToken = HtmlTokenId::NONE;
 bool bPending = false;
 TableSaveStruct* pSaveStruct;
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 3b18ef33328a..e483f926ee04 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -298,6 +298,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, 
SvStream& rIn,
 m_bRemoveHidden( false ),
 m_bBodySeen( false ),
 m_bReadingHeaderOrFooter( false ),
+m_isInTableStructure(false),
 m_pTempViewFrame(nullptr)
 {
 m_nEventId = nullptr;
@@ -1544,26 +1545,32 @@ void SwHTMLParser::NextToken( HtmlTokenId nToken )
 // divisions
 case HtmlTokenId::DIVISION_ON:
 case HtmlTokenId::CENTER_ON:
-if( m_nOpenParaToken != HtmlTokenId::NONE )
+if (!m_isInTableStructure)
 {
-if( IsReadPRE() )
-m_nOpenParaToken = HtmlTokenId::NONE;
-else
-EndPara();
+if (m_nOpenParaToken != HtmlTokenId::NONE)
+{
+if (IsReadPRE())
+m_nOpenParaToken = HtmlTokenId::NONE;
+else
+EndPara();
+}
+NewDivision( nToken );
 }
-NewDivision( nToken );
 break;
 
 case HtmlTokenId::DIVISION_OFF:
 case HtmlTokenId::CENTER_OFF:
-if( m_nOpenParaToken != HtmlTokenId::NONE )
+if (!m_isInTableStructure)
 {
-if( IsReadPRE() )
-m_nOpenParaToken = HtmlTokenId::NONE;
-else
-EndPara();
+if (m_nOpenParaToken != HtmlTokenId::NONE)
+{
+if (IsReadPRE())
+m_nOpenParaToken = HtmlTokenId::NONE;
+else
+EndPara();
+}
+EndDivision();
 }
-EndDivision();
 break;
 
 case HtmlTokenId::MULTICOL_ON:
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 450f7ddbde56..6e84380cdfe1 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -480,6 +480,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
 
 bool m_bBodySeen : 1;
 bool m_bReadingHeaderOrFooter : 1;
+bool m_isInTableStructure;
 
 /// the names corresponding to the DOCINFO field subtypes INFO[1-4]
 OUString m_InfoNames[4];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sw/source/filter/html/htmlctxt.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit aac8f29ee75607882386f88ab22e4df657bf619b
Author: Michael Stahl 
Date:   Thu Jan 18 17:31:22 2018 +0100

ofz#4754 sw: HTML import: fix invalid tables being created

This 75-byte horror creates 2 nested tables, where one SwTableBox is in
the SwTableLine of the inner SwTable but in the SwSortBoxes of the outer
table, which is of course invalid.

The root cause is that in SwHTMLParser::SplitAttrTab(), we move the
m_pPam backward once and forward twice, moving it ouside the inner
table.

Change-Id: I63f6508afe1270ccdeb05da6f222b0aba5259889
(cherry picked from commit e1a4a8c180f98aac0ab21a22a6a03d2109c712be)
Reviewed-on: https://gerrit.libreoffice.org/48145
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit ee1ff57f901b976a1be12c57c800ca78a8427b81)
Reviewed-on: https://gerrit.libreoffice.org/48379
Reviewed-by: Miklos Vajna 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sw/source/filter/html/htmlctxt.cxx 
b/sw/source/filter/html/htmlctxt.cxx
index f93e5ffee1d0..e501ca63d00f 100644
--- a/sw/source/filter/html/htmlctxt.cxx
+++ b/sw/source/filter/html/htmlctxt.cxx
@@ -163,6 +163,7 @@ void SwHTMLParser::SplitAttrTab( const SwPosition& rNewPos )
 {
 m_pPam->Move( fnMoveForward );
 nOldEndCnt = m_pPam->GetPoint()->nContent.GetIndex();
+bMoveBack = false;
 }
 
 if( (RES_PARATR_BEGIN <= nWhich && bMoveBack) ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet]

 sw/qa/extras/odfimport/data/tdf115079.odt |binary
 sw/qa/extras/odfimport/odfimport.cxx  |5 +
 sw/source/core/layout/tabfrm.cxx  |9 -
 3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit e5f952e6bc6b0d0944cb9125b5aa243de5c742d7
Author: Julien Nabet 
Date:   Thu Jan 18 08:37:04 2018 +0100

tdf#115079: check that row frame belongs to table frame to avoid segfault

A row frame may not belong to a table frame, when it is being cut, e.g., in
lcl_PostprocessRowsInCells().
Its SwRowFrame::Cut() has been called; it in turn called 
SwLayoutFrame::Cut(),
which nullified row's upper in RemoveFromLayout(), and then called Shrink()
for its former upper.
Regardless of whether it will be pasted back, or destroyed, currently it's 
not
part of layout, and its height does not count.

See bt https://bugs.documentfoundation.org/attachment.cgi?id=139171

Change-Id: I4010e1f246a3ebb89b3f972a03619a2775146da4
Reviewed-on: https://gerrit.libreoffice.org/48089
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 
(cherry picked from commit daf1b10f4e266818b6e14f0f1dfddd66f0a3a2f0)
Reviewed-on: https://gerrit.libreoffice.org/48276
Reviewed-by: Christian Lohmaier 
Reviewed-by: Miklos Vajna 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sw/qa/extras/odfimport/data/tdf115079.odt 
b/sw/qa/extras/odfimport/data/tdf115079.odt
new file mode 100644
index ..6c1039e71ced
Binary files /dev/null and b/sw/qa/extras/odfimport/data/tdf115079.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index 032a4a5da574..a638dd818574 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -882,5 +882,10 @@ DECLARE_ODFIMPORT_TEST(testBlankBeforeFirstPage, 
"tdf94882.odt")
 );
 }
 
+DECLARE_ODFIMPORT_TEST(testTdf115079, "tdf115079.odt")
+{
+// This document caused segfault when layouting
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 491c3f3b2e52..859c78b9c50d 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -4093,7 +4093,14 @@ static SwTwips lcl_calcHeightOfRowBeforeThisFrame(const 
SwRowFrame& rRow)
 {
 // We've found another row frame that is part of the same table row
 const SwTabFrame* pCurTab = pCurRow->FindTabFrame();
-if (pCurTab->IsAnFollow(pTab))
+// A row frame may not belong to a table frame, when it is being 
cut, e.g., in
+// lcl_PostprocessRowsInCells().
+// Its SwRowFrame::Cut() has been called; it in turn called 
SwLayoutFrame::Cut(),
+// which nullified row's upper in RemoveFromLayout(), and then 
called Shrink()
+// for its former upper.
+// Regardless of whether it will be pasted back, or destroyed, 
currently it's not
+// part of layout, and its height does not count
+if (pCurTab && pCurTab->IsAnFollow(pTab))
 {
 // The found row frame belongs to a table frame that precedes
 // (above) this one in chain. So, include it in the sum
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/window/seleng.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a283847a95dd8935dec687d91709604d96636a34
Author: Caolán McNamara 
Date:   Wed Jan 24 17:18:35 2018 +

gtk3: single click with selection set doesn't unselect

this is a safe backportable fix, the unconditional

nFlags |= SelectionEngineFlags::CMDEVT

looks the real dubious thing to me, but only the gtk3 backend has swipe 
support
so just returning immediately on a swipe definitely ok

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

diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx
index c911a9059551..c545824436cd 100644
--- a/vcl/source/window/seleng.cxx
+++ b/vcl/source/window/seleng.cxx
@@ -342,7 +342,7 @@ void SelectionEngine::Reset()
 void SelectionEngine::Command( const CommandEvent& rCEvt )
 {
 // Timer aWTimer is active during enlarging a selection
-if ( !pFunctionSet || !pWin || aWTimer.IsActive() )
+if ( !pFunctionSet || !pWin || aWTimer.IsActive() || rCEvt.GetCommand() == 
CommandEventId::Swipe )
 return;
 aWTimer.Stop();
 nFlags |= SelectionEngineFlags::CMDEVT;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: New Volounteer for Testing

[Driss Ben Zoubeir]

Hi Markus,

happy to hear from you!
UI testing topic sounds for me very interessting. It will be great to know
how it works and how can I add more test.
The other issue is that I did not receive the response from Xisco in my
email. I saw it the mailing list archive after I read your message.

For Testlink I think an only Admin can  create an account for me.

[1] https://bugs.documentfoundation.org/  : Account is created and works

[2] https://wiki.documentfoundation.org/QA/GetInvolved : already read.

[3] https://wiki.documentfoundation.org/TestLink: account needed

[4] https://wiki.documentfoundation.org/Development/UITests: read

[5] http://dev-builds.libreoffice.org/daily/master/

[6] https://wiki.documentfoundation.org/QA: still going through the
topic under this page

[7]. https://wiki.documentfoundation.org/QA/IRC

[8]. https://t.me/LibreOffice_QA

[9]. https://wiki.documentfoundation.org/QA/Mailing_List

Regards

Driss


2018-01-22 23:41 GMT+01:00 Markus Mohrhard :

> Hello Driss,
>
> On Mon, Jan 22, 2018 at 10:06 AM, Driss Ben Zoubeir <
> driss.zoub...@gmail.com> wrote:
>
>> Hi libre office community,
>>
>> my name is Driss from Munich. I started before 3 years as Volounteer in
>> Open Office  community and successfully solved some bugs. Now I want to
>> contribute to libre office, but in Testing. I know this is the developer
>> mailing list, but according to the website of libre Office I have to
>> contact the devoloper list, if I want to help in programming automated
>> tests.
>>
>> I have about 3 to 6 hours or even more per Week to Help with Testing. I
>> already have some basic knowledge on Testing: Google Test, Unity, Google
>> Mock, CMock, Tessy, jenkins...
>>
>> I would appreciate if you can Help me to start contributing on Testing.
>>
>
> I see that you already have some experience with testing frameworks so I
> wanted to add a few more options to Xisco's answer. LibreOffice has a large
> automated testing framework based on cppunit that is run during the build.
> Most of these tests are unit and integration tests but many of them require
> quite some understanding of how the corresponding code works to be able to
> add a test. However if you have some area that you are especially
> interested we might be able to find ways that you can contribute to these
> tests without deep knowledge of the corresponding code.
>
> Additionally, we have as Xisco managed a new UI testing framework that is
> written in python and is built on top of the python unittest module. One of
> our volunteers has been quite active adding writer UI tests in the last few
> weeks (https://gerrit.libreoffice.org/#/q/owner:zcrhonek%
> 2540gmail.com+status:open). If you are interested we can give you some
> more background how these tests work, how to extend the test framework and
> how to add additional useful tests. As an example many of the test case in
> TestLink could be converted from manual tests to automated UI tests or
> integration tests.
>
> If you are still interested in a more coding related testing effort but
> none of the two above look that interesting to you I still have one or two
> ideas for automated testing that have not been started or not yet been
> ready. These mostly are python based testing concepts for problems that can
> not be tested with the existing frameworks.
>
> Regards,
> Markus
>
>
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann]

 editeng/source/uno/unofield.cxx |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 13a1a7e1f2851e465898631fc7cc567624cd7dcf
Author: Stephan Bergmann 
Date:   Tue Jan 23 11:09:51 2018 +0100

Avoid upcoming GCC 8 -Werror=class-memaccess on css::util::DateTime

...whose ctor already zero-initializes all members, so the first two 
memsets are
unnecessary.  And spell the third memset as explicit assignments.

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

diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 7cac637b05f5..29b84fd2833b 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -192,7 +192,6 @@ static SvxFileFormat setFileNameDisplayFormat( sal_Int16 
nFormat )
 static util::DateTime getDate( sal_Int32 nDate )
 {
 util::DateTime aDate;
-memset( , 0, sizeof( util::DateTime ) );
 
 Date aTempDate( nDate );
 
@@ -211,7 +210,6 @@ inline Date setDate( util::DateTime const & rDate )
 static util::DateTime getTime(sal_Int64 const nTime)
 {
 util::DateTime aTime;
-memset( , 0, sizeof( util::DateTime ) );
 
 tools::Time aTempTime( nTime );
 
@@ -259,7 +257,14 @@ SvxUnoTextField::SvxUnoTextField( sal_Int32 nServiceId ) 
throw()
 {
 mpPropSet = ImplGetFieldItemPropertySet(mnServiceId);
 
-memset( &(mpImpl->maDateTime), 0, sizeof( util::DateTime ) );
+mpImpl->maDateTime.NanoSeconds = 0;
+mpImpl->maDateTime.Seconds = 0;
+mpImpl->maDateTime.Minutes = 0;
+mpImpl->maDateTime.Hours = 0;
+mpImpl->maDateTime.Day = 0;
+mpImpl->maDateTime.Month = 0;
+mpImpl->maDateTime.Year = 0;
+mpImpl->maDateTime.IsUTC = false;
 
 switch( nServiceId )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/examples scripting/source

[Miklos Vajna]

 scripting/examples/python/Capitalise.py|2 ++
 scripting/examples/python/HelloWorld.py|2 ++
 scripting/examples/python/pythonSamples/TableSample.py |2 ++
 scripting/source/pyprov/mailmerge.py   |2 ++
 4 files changed, 8 insertions(+)

New commits:
commit a7d67762f116ca85181b4ae4053141ea68e6d6f8
Author: Miklos Vajna 
Date:   Tue Jan 23 14:57:30 2018 +0100

scripting: add missing vim modelines to python files

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

diff --git a/scripting/examples/python/Capitalise.py 
b/scripting/examples/python/Capitalise.py
index 3c5366589ef9..05e82a37ad32 100644
--- a/scripting/examples/python/Capitalise.py
+++ b/scripting/examples/python/Capitalise.py
@@ -76,3 +76,5 @@ def capitalisePython( ):
 # lists the scripts, that shall be visible inside OOo. Can be omitted, if
 # all functions shall be visible, however here getNewString shall be suppressed
 g_exportedScripts = capitalisePython,
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/scripting/examples/python/HelloWorld.py 
b/scripting/examples/python/HelloWorld.py
index 4cad8a8549ea..8c3c9a8141d2 100644
--- a/scripting/examples/python/HelloWorld.py
+++ b/scripting/examples/python/HelloWorld.py
@@ -34,3 +34,5 @@ def HelloWorldPython( ):
 #and set the string
 tRange.String = "Hello World (in Python)"
 return None
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/scripting/examples/python/pythonSamples/TableSample.py 
b/scripting/examples/python/pythonSamples/TableSample.py
index 12ea326343cc..a92c862c2674 100644
--- a/scripting/examples/python/pythonSamples/TableSample.py
+++ b/scripting/examples/python/pythonSamples/TableSample.py
@@ -112,3 +112,5 @@ def createTable():
 text.insertString( cursor, " That's all for now !!" , 0 )
 
 g_exportedScripts = createTable,
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/scripting/source/pyprov/mailmerge.py 
b/scripting/source/pyprov/mailmerge.py
index 6034a74f1b03..ca18c7b17227 100644
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -528,3 +528,5 @@ g_ImplementationHelper.addImplementation( \
 g_ImplementationHelper.addImplementation( \
PyMailMessage, g_messageImplName,
("com.sun.star.mail.MailMessage",),)
+
+# 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: dbaccess/source

[Caolán McNamara]

 dbaccess/source/ui/inc/browserids.hxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 897dd277d2ae418833835a2dbcb8cbdbc1676d49
Author: Caolán McNamara 
Date:   Tue Jan 23 20:48:51 2018 +

tdf#115080 menu id collision

21 collides with the pattern field menu id

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

diff --git a/dbaccess/source/ui/inc/browserids.hxx 
b/dbaccess/source/ui/inc/browserids.hxx
index 3864a3577175..51793bd8102d 100644
--- a/dbaccess/source/ui/inc/browserids.hxx
+++ b/dbaccess/source/ui/inc/browserids.hxx
@@ -47,11 +47,11 @@
 #define ID_BROWSER_REMOVEFILTER SID_FM_REMOVE_FILTER_SORT
 #define ID_BROWSER_FILTERED SID_FM_FORM_FILTERED
 #define ID_BROWSER_REFRESH  SID_FM_REFRESH
-#define ID_BROWSER_COLATTRSET   20  // column formatting
-#define ID_BROWSER_COLWIDTH 21  // column width
-#define ID_BROWSER_TABLEATTR22  // table format attributes
-#define ID_BROWSER_ROWHEIGHT23  // row height
-#define ID_BROWSER_COLUMNINFO   24  // copies the column 
description to insert it into the table design
+#define ID_BROWSER_COLATTRSET   10020  // column formatting
+#define ID_BROWSER_COLWIDTH 10021  // column width
+#define ID_BROWSER_TABLEATTR10022  // table format attributes
+#define ID_BROWSER_ROWHEIGHT10023  // row height
+#define ID_BROWSER_COLUMNINFO   10024  // copies the column 
description to insert it into the table design
 #define ID_BROWSER_ADDTABLE SID_FM_ADDTABLE
 #define ID_BROWSER_EXPLORER SID_DSBROWSER_EXPLORER
 #define ID_BROWSER_DOCUMENT_DATASOURCE  SID_DOCUMENT_DATA_SOURCE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 xmloff/source/draw/ximpshap.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f50e94a36bf21f9f1cef52be980a6bf92faf4f03
Author: Caolán McNamara 
Date:   Tue Jan 23 15:06:28 2018 +

ofz#5621 Integer-overflow

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

diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 02f1b2ec8108..5b6523a6ea5a 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -1083,9 +1083,9 @@ void SdXMLLineShapeContext::StartElement(const 
uno::Reference< xml::sax::XAttrib
 pOuterSequence->realloc(2);
 awt::Point* pInnerSequence = pOuterSequence->getArray();
 
-*pInnerSequence = awt::Point( mnX1 - aTopLeft.X, mnY1 - aTopLeft.Y);
+*pInnerSequence = awt::Point(o3tl::saturating_add(mnX1, -aTopLeft.X), 
o3tl::saturating_add(mnY1, -aTopLeft.Y));
 pInnerSequence++;
-*pInnerSequence = awt::Point( mnX2 - aTopLeft.X, mnY2 - aTopLeft.Y);
+*pInnerSequence = awt::Point(o3tl::saturating_add(mnX2, -aTopLeft.X), 
o3tl::saturating_add(mnY2, -aTopLeft.Y));
 
 xPropSet->setPropertyValue("Geometry", Any(aPolyPoly));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sw/source/core/unocore/unocoll.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1438c84a86e2101bd048adede737079ea37c53d0
Author: Stephan Bergmann 
Date:   Tue Jan 23 22:39:20 2018 +0100

This presumably always wanted to check for SAL_MAX_UINT16, not USHRT_MAX

...ever since 84a3db80b4fd66c6854b3135b5f69b61fd828e62 "initial import", 
where
the code read

+if( nIndex < USHRT_MAX)
+{
+const SwFmtRefMark* pMark = GetDoc()->GetRefMark( (sal_uInt16) 
nIndex );
+if(pMark)
+{
+xRef = SwXReferenceMarks::GetObject( GetDoc(), pMark );
+aRet.setValue(, 
::getCppuType((uno::Reference*)0));
+}
+}

and already contained the cast to sal_uInt16 in the call to GetRefMark

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

diff --git a/sw/source/core/unocore/unocoll.cxx 
b/sw/source/core/unocore/unocoll.cxx
index a74c3710b1e4..c1d8e417eb40 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -1872,7 +1872,7 @@ uno::Any SwXReferenceMarks::getByIndex(sal_Int32 nIndex)
 if(!IsValid())
 throw uno::RuntimeException();
 uno::Reference< XTextContent >  xRef;
-if(0 <= nIndex && nIndex < USHRT_MAX)
+if(0 <= nIndex && nIndex < SAL_MAX_UINT16)
 {
 SwFormatRefMark *const pMark = const_cast(
 GetDoc()->GetRefMark(static_cast(nIndex)));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: connectivity/source include/svtools svtools/qa sw/inc sw/qa sw/source

[Miklos Vajna]

 connectivity/source/drivers/writer/WConnection.cxx|2 -
 connectivity/source/drivers/writer/WTable.cxx |   15 --
 connectivity/source/drivers/writer/WTables.cxx|4 ---
 connectivity/source/inc/writer/WConnection.hxx|1 
 connectivity/source/inc/writer/WTable.hxx |1 
 include/svtools/parhtml.hxx   |1 
 svtools/qa/unit/testHtmlReader.cxx|1 
 sw/inc/AnnotationWin.hxx  |4 ---
 sw/inc/EnhancedPDFExportHelper.hxx|2 -
 sw/inc/IDocumentLayoutAccess.hxx  |3 --
 sw/inc/IDocumentLinksAdministration.hxx   |2 -
 sw/inc/IDocumentOutlineNodes.hxx  |1 
 sw/inc/IDocumentRedlineAccess.hxx |5 
 sw/inc/IDocumentSettingAccess.hxx |2 -
 sw/inc/IDocumentState.hxx |2 -
 sw/inc/PageColumnPopup.hxx|2 -
 sw/inc/PageMarginPopup.hxx|2 -
 sw/inc/PageOrientationPopup.hxx   |2 -
 sw/inc/PageSizePopup.hxx  |2 -
 sw/inc/doc.hxx|   10 +
 sw/qa/core/macros-test.cxx|1 
 sw/qa/core/uwriter.cxx|2 +
 sw/qa/extras/globalfilter/globalfilter.cxx|2 +
 sw/source/core/crsr/findfmt.cxx   |1 
 sw/source/core/crsr/swcrsr.cxx|1 
 sw/source/core/doc/DocumentFieldsManager.cxx  |2 +
 sw/source/core/doc/DocumentLayoutManager.cxx  |2 +
 sw/source/core/doc/DocumentLinksAdministrationManager.cxx |1 
 sw/source/core/docnode/ndcopy.cxx |1 
 sw/source/core/fields/reffld.cxx  |1 
 sw/source/core/layout/anchoredobject.cxx  |1 
 sw/source/core/layout/flowfrm.cxx |1 
 sw/source/core/layout/fly.cxx |2 +
 sw/source/core/layout/flycnt.cxx  |1 
 sw/source/core/layout/flylay.cxx  |2 +
 sw/source/core/layout/flypos.cxx  |1 
 sw/source/core/layout/ftnfrm.cxx  |2 +
 sw/source/core/layout/hffrm.cxx   |1 
 sw/source/core/layout/laycache.cxx|2 +
 sw/source/core/layout/newfrm.cxx  |1 
 sw/source/core/layout/pagedesc.cxx|1 
 sw/source/core/text/EnhancedPDFExportHelper.cxx   |1 
 sw/source/core/text/inftxt.cxx|1 
 sw/source/core/text/itrform2.cxx  |2 +
 sw/source/core/text/portxt.cxx|1 
 sw/source/core/tox/txmsrt.cxx |1 
 sw/source/core/txtnode/atrfld.cxx |1 
 sw/source/core/txtnode/modeltoviewhelper.cxx  |1 
 sw/source/core/undo/SwUndoField.cxx   |1 
 sw/source/core/unocore/unoobj2.cxx|1 
 sw/source/filter/basflt/fltshell.cxx  |1 
 sw/source/filter/html/htmlfly.cxx |2 +
 sw/source/filter/html/htmlgrin.cxx|1 
 sw/source/filter/html/htmltab.cxx |1 
 sw/source/filter/html/wrthtml.cxx |1 
 sw/source/filter/writer/writer.cxx|1 
 sw/source/filter/ww8/wrtw8nds.cxx |1 
 sw/source/filter/ww8/ww8par.cxx   |1 
 sw/source/filter/ww8/ww8par2.cxx  |1 
 sw/source/filter/ww8/ww8par3.cxx  |1 
 sw/source/filter/ww8/ww8par5.cxx  |1 
 sw/source/uibase/uno/unotxdoc.cxx |1 
 62 files changed, 60 insertions(+), 56 deletions(-)

New commits:
commit fc2d155f42db5949e68df54635acaa944aa980b9
Author: Miklos Vajna 
Date:   Tue Jan 23 22:11:20 2018 +0100

Fix some IWYU warnings

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

diff --git a/connectivity/source/drivers/writer/WConnection.cxx 
b/connectivity/source/drivers/writer/WConnection.cxx
index bbcd869f2271..cede7c409b0e 100644
--- a/connectivity/source/drivers/writer/WConnection.cxx
+++ b/connectivity/source/drivers/writer/WConnection.cxx
@@ -23,7 +23,6 @@
 #include 
 #include 
 #include 
-#include 
 

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

[Milian Wolff]

 include/osl/process.h |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit cca67d26b6d503ab7dcf3a05fb77fe648cd25f2c
Author: Milian Wolff 
Date:   Tue Jan 23 17:40:51 2018 +0100

Fix documentation for osl_executeProcess_WithRedirectedIO

The file handle arguments are out parameters, not input parameters.

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

diff --git a/include/osl/process.h b/include/osl/process.h
index a2c1eed4193c..f3aa86d2f6dc 100644
--- a/include/osl/process.h
+++ b/include/osl/process.h
@@ -203,17 +203,17 @@ SAL_DLLPUBLIC oslProcessError SAL_CALL osl_executeProcess(
 Pointer to a oslProcess variable, which receives the handle of the newly 
created process.
 This parameter must not be NULL.
 
-@param[in] pChildInputWrite
+@param[out] pChildInputWrite
 Pointer to a oslFileHandle variable that receives the handle which can be 
used to write
 to the child process standard input device. The returned handle is not 
random accessible.
 The handle has to be closed with osl_closeFile if no longer used. This 
parameter can be NULL.
 
-@param[in] pChildOutputRead
+@param[out] pChildOutputRead
 Pointer to a oslFileHandle variable that receives the handle which can be 
used to read from
 the child process standard output device. The returned handle is not 
random accessible.
 The Handle has to be closed with osl_closeFile if no longer used. This 
parameter can be NULL.
 
-@param[in] pChildErrorRead
+@param[out] pChildErrorRead
 Pointer to a oslFileHandle variable that receives the handle which can be 
used to read from
 the child process standard error device. The returned handle is not random 
accessible.
 The Handle has to be closed with osl_closeFile if no longer used. This 
parameter can be NULL.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

FOSDEM Hackfest

[Italo Vignoli]

People planning to attend the FOSDEM hackfest are kindly asked to
register on the wiki
(https://wiki.documentfoundation.org/Hackfest/FOSDEM2018) as I have to
provide to the location a rough number of attendees for room setup by
the end of this week. Thanks, Italo

-- 
Italo Vignoli - it...@italovignoli.com
mobile/signal +39.348.5653829 - skype italovignoli
hangout/jabber italo.vign...@gmail.com
GPG Key ID - 0xAAB8D5C0
DB75 1534 3FD0 EA5F 56B5 FDA6 DE82 934C AAB8 D5C0
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann]

 sw/source/core/unocore/unosett.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7e15b28bc60f85c449a7ac1f64d1c02d5b43399c
Author: Stephan Bergmann 
Date:   Tue Jan 23 22:44:15 2018 +0100

USHRT_MAX -> SAL_MAX_UINT16

...presumably forgotten when the following cast of nTmp in the 
SetPosFromLeft
call was changed from USHORT to sal_uInt16 in
7f33ed417b2e29e5470724ea76967f64699a2662 "removetooltypes01: #i112600# 
Remove
tools types from sw"

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

diff --git a/sw/source/core/unocore/unosett.cxx 
b/sw/source/core/unocore/unosett.cxx
index 8841f50de1db..6c607767c781 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -858,8 +858,8 @@ void SwXLineNumberingProperties::setPropertyValue(
 sal_Int32 nVal = 0;
 aValue >>= nVal;
 sal_Int32 nTmp = convertMm100ToTwip(nVal);
-if (nTmp > USHRT_MAX)
-nTmp = USHRT_MAX;
+if (nTmp > SAL_MAX_UINT16)
+nTmp = SAL_MAX_UINT16;
 aFontMetric.SetPosFromLeft( static_cast< sal_uInt16 >(nTmp) );
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth]

 writerfilter/source/dmapper/DomainMapper.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 9dfd46ef4b341a5dfed7d320696959402a549fdb
Author: Justin Luth 
Date:   Wed Jan 17 12:03:53 2018 +0300

writerfilter: use WW8 name for StyleId

The sStyleIdentifierD for the default style is "Normal".
FindStyleSheetByISTD uses sStyleIndentifierD for its comparison.
SetCurrentParaStyleId() is used to save the WW8 provided name.
Thus, the default style should do the same.

The SetCurrentParaStyleId was added here by
commit 4abb20ee162ff874cc143fd952f72d30ddc9d136
Author: Miklos Vajna
Date:   Tue Jun 19 17:36:28 2012 +0200

Also removing the static variable, since it serves no purpose.

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

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 32945c9d6bb4..35693db196ec 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2998,13 +2998,12 @@ void DomainMapper::lcl_startParagraphGroup()
 if (!(m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH) == 
m_pImpl->GetTopContext()))
 m_pImpl->PushProperties(CONTEXT_PARAGRAPH);
 
-static const char sDefault[] = "Standard";
 if (m_pImpl->GetTopContext())
 {
 if (!m_pImpl->IsInShape())
 {
-m_pImpl->GetTopContext()->Insert( PROP_PARA_STYLE_NAME, 
uno::makeAny( OUString(sDefault) ) );
-m_pImpl->SetCurrentParaStyleId(sDefault);
+m_pImpl->GetTopContext()->Insert( PROP_PARA_STYLE_NAME, 
uno::makeAny( OUString("Standard") ) ); //ConvertedStyleName
+m_pImpl->SetCurrentParaStyleId("Normal"); //WW8 name
 }
 if (m_pImpl->isBreakDeferred(PAGE_BREAK))
 m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, 
uno::makeAny(style::BreakType_PAGE_BEFORE));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

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

New commits:
commit 3bbf8d0a9b9e36299c889d8252d9a2b068f17ff6
Author: Stephan Bergmann 
Date:   Wed Jan 24 11:31:07 2018 +0100

Adapt solenv/flatpak-manifest.in

...to e1026e267b4b1b0b0bd645c6bc212d6fa71544f8 "pdfium: update to 3312"

Change-Id: I319b00d13d8657849967e08e605d6428f30c5c2e

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index fa95afa0a8e3..a954b3d639e8 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -38,10 +38,10 @@
 "type": "shell"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/pdfium-3235.tar.bz2;,
-"sha256": 
"7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f",
+"url": 
"https://dev-www.libreoffice.org/src/pdfium-3312.tar.bz2;,
+"sha256": 
"baa103ab9b72cf3be5ae80106e7ca56110a150fc60a9a3d897e5b26631355b0f",
 "type": "file",
-"dest-filename": "external/tarballs/pdfium-3235.tar.bz2"
+"dest-filename": "external/tarballs/pdfium-3312.tar.bz2"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz;,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 sw/source/uibase/shells/tabsh.cxx |   58 ++
 1 file changed, 35 insertions(+), 23 deletions(-)

New commits:
commit c3a085d22742f88e91ff92f319a26d6e8d1d9a98
Author: Jan Holesovsky 
Date:   Tue Jan 23 18:13:01 2018 +0100

lokdialog: Convert the Table -> Properties... to async exec.

Change-Id: Iac937f5032ddaa614f8364a85b0b8db2a0828cbd
Reviewed-on: https://gerrit.libreoffice.org/48454
Reviewed-by: Michael Meeks 
Tested-by: Jenkins 

diff --git a/sw/source/uibase/shells/tabsh.cxx 
b/sw/source/uibase/shells/tabsh.cxx
index 0d4d05993909..90457117d63d 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -578,7 +578,7 @@ void SwTableShell::Execute(SfxRequest )
 
 FieldUnit eMetric = ::GetDfltMetric(dynamic_cast( 
()) != nullptr );
 SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< 
sal_uInt16 >(eMetric)));
-std::unique_ptr pTableRep(::lcl_TableParamToItemSet( 
aCoreSet, rSh ));
+std::shared_ptr 
pTableRep(::lcl_TableParamToItemSet(aCoreSet, rSh));
 
 aCoreSet.Put(SfxUInt16Item(SID_HTML_MODE, 
::GetHtmlMode(GetView().GetDocShell(;
 rSh.GetTableAttr(aCoreSet);
@@ -589,37 +589,49 @@ void SwTableShell::Execute(SfxRequest )
 else
 aCoreSet.InvalidateItem( RES_BACKGROUND );
 
-ScopedVclPtr pDlg;
-{
-SwAbstractDialogFactory* pFact = 
SwAbstractDialogFactory::Create();
-OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
+SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
+OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
 
-
pDlg.disposeAndReset(pFact->CreateSwTableTabDlg(GetView().GetWindow(), 
, ));
-OSL_ENSURE(pDlg, "Dialog creation failed!");
+VclPtr 
pDlg(pFact->CreateSwTableTabDlg(GetView().GetWindow(), , ));
+OSL_ENSURE(pDlg, "Dialog creation failed!");
 
+if (pDlg)
+{
 if (pItem)
 pDlg->SetCurPageId(OUStringToOString(static_cast(pItem)->GetValue(), RTL_TEXTENCODING_UTF8));
-}
 
+std::shared_ptr pRequest(new SfxRequest(rReq));
+rReq.Ignore(); // the 'old' request is not relevant any more
 
-if ( (!pDlg && rReq.GetArgs()) || (pDlg && pDlg->Execute() == 
RET_OK) )
+pDlg->StartExecuteAsync([pDlg, pRequest, pTableRep, 
, ](sal_Int32 nResult){
+if (RET_OK == nResult)
+{
+const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
+
+//to record FN_INSERT_TABLE correctly
+pRequest->SetSlot(FN_FORMAT_TABLE_DLG);
+pRequest->Done(*pOutSet);
+
+ItemSetToTableParam(*pOutSet, rSh);
+}
+
+rBindings.Update(SID_RULER_BORDERS);
+rBindings.Update(SID_ATTR_TABSTOP);
+rBindings.Update(SID_RULER_BORDERS_VERTICAL);
+rBindings.Update(SID_ATTR_TABSTOP_VERTICAL);
+});
+}
+else
 {
-const SfxItemSet* pOutSet = pDlg ? pDlg->GetOutputItemSet() : 
rReq.GetArgs();
-if ( pDlg )
-{
-//to record FN_INSERT_TABLE correctly
-rReq.SetSlot(FN_FORMAT_TABLE_DLG);
-rReq.Done( *pOutSet );
-}
-ItemSetToTableParam( *pOutSet, rSh );
+if (rReq.GetArgs())
+ItemSetToTableParam(*rReq.GetArgs(), rSh);
+
+rBindings.Update(SID_RULER_BORDERS);
+rBindings.Update(SID_ATTR_TABSTOP);
+rBindings.Update(SID_RULER_BORDERS_VERTICAL);
+rBindings.Update(SID_ATTR_TABSTOP_VERTICAL);
 }
 
-pDlg.disposeAndClear();
-pTableRep.reset();
-rBindings.Update(SID_RULER_BORDERS);
-rBindings.Update(SID_ATTR_TABSTOP);
-rBindings.Update(SID_RULER_BORDERS_VERTICAL);
-rBindings.Update(SID_ATTR_TABSTOP_VERTICAL);
 break;
 }
 case SID_ATTR_BRUSH:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Armin Le Grand]

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

New commits:
commit 2a4c7855464632b37f5043415f632e1feae08fcc
Author: Armin Le Grand 
Date:   Wed Jan 24 12:05:19 2018 +0100

BorderlineFix: Corrected Draw/Impress TableStyle accesses

In Draw/Impress the indices for accessing the correct
neighbouring TableStyles were wrong and thus created wrong
visualizations, corrected that.

Change-Id: Iebc5f294adb62fa4c6358e2f8c27d29cc3163fbc

diff --git a/svx/source/table/viewcontactoftableobj.cxx 
b/svx/source/table/viewcontactoftableobj.cxx
index 7ca200fc0e6e..448a0b407f2a 100644
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -341,13 +341,13 @@ namespace sdr
 {
 // get the neighbor cells' borders
 const svx::frame::Style 
aLeftFromTLine(impGetLineStyle(rTableLayouter, nX, nY - 1, false, nColCount, 
nRowCount, bIsRTL));
-const svx::frame::Style 
aLeftFromBLine(impGetLineStyle(rTableLayouter, nX, nYBottom + 1, false, 
nColCount, nRowCount, bIsRTL));
+const svx::frame::Style 
aLeftFromBLine(impGetLineStyle(rTableLayouter, nX, nYBottom, false, nColCount, 
nRowCount, bIsRTL));
 const svx::frame::Style 
aRightFromTLine(impGetLineStyle(rTableLayouter, nXRight, nY - 1, false, 
nColCount, nRowCount, bIsRTL));
-const svx::frame::Style 
aRightFromBLine(impGetLineStyle(rTableLayouter, nXRight, nYBottom + 1, false, 
nColCount, nRowCount, bIsRTL));
+const svx::frame::Style 
aRightFromBLine(impGetLineStyle(rTableLayouter, nXRight, nYBottom, false, 
nColCount, nRowCount, bIsRTL));
 const svx::frame::Style 
aTopFromLLine(impGetLineStyle(rTableLayouter, nX - 1, nY, true, nColCount, 
nRowCount, bIsRTL));
-const svx::frame::Style 
aTopFromRLine(impGetLineStyle(rTableLayouter, nXRight + 1, nY, true, nColCount, 
nRowCount, bIsRTL));
+const svx::frame::Style 
aTopFromRLine(impGetLineStyle(rTableLayouter, nXRight, nY, true, nColCount, 
nRowCount, bIsRTL));
 const svx::frame::Style 
aBottomFromLLine(impGetLineStyle(rTableLayouter, nX - 1, nYBottom, true, 
nColCount, nRowCount, bIsRTL));
-const svx::frame::Style 
aBottomFromRLine(impGetLineStyle(rTableLayouter, nXRight + 1, nYBottom, true, 
nColCount, nRowCount, bIsRTL));
+const svx::frame::Style 
aBottomFromRLine(impGetLineStyle(rTableLayouter, nXRight, nYBottom, true, 
nColCount, nRowCount, bIsRTL));
 
 // get cell coordinate system
 const basegfx::B2DPoint 
aOrigin(aCellMatrix * basegfx::B2DPoint(0.0, 0.0));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - icon-themes/sifr icon-themes/sifr_dark

[Matthias Freund]

 dev/null   |binary
 icon-themes/sifr/cmd/32/exportto.png   |binary
 icon-themes/sifr/cmd/32/numberformatthousands.png  |binary
 icon-themes/sifr/cmd/32/splitcells.png |binary
 icon-themes/sifr/cmd/lc_exportto.png   |binary
 icon-themes/sifr/cmd/lc_numberformatthousands.png  |binary
 icon-themes/sifr/cmd/lc_splitcells.png |binary
 icon-themes/sifr/cmd/sc_exportto.png   |binary
 icon-themes/sifr/cmd/sc_numberformatthousands.png  |binary
 icon-themes/sifr/cmd/sc_splitcells.png |binary
 icon-themes/sifr_dark/cmd/32/exportto.png  |binary
 icon-themes/sifr_dark/cmd/32/numberformatthousands.png |binary
 icon-themes/sifr_dark/cmd/32/splitcells.png|binary
 icon-themes/sifr_dark/cmd/lc_exportdirecttopdf.png |binary
 icon-themes/sifr_dark/cmd/lc_exportto.png  |binary
 icon-themes/sifr_dark/cmd/lc_numberformatthousands.png |binary
 icon-themes/sifr_dark/cmd/lc_splitcells.png|binary
 icon-themes/sifr_dark/cmd/sc_exportdirecttopdf.png |binary
 icon-themes/sifr_dark/cmd/sc_exportto.png  |binary
 icon-themes/sifr_dark/cmd/sc_numberformatthousands.png |binary
 icon-themes/sifr_dark/cmd/sc_splitcells.png|binary
 21 files changed

New commits:
commit 4b960d5ec62fef32c116a679fbd63d0335012dd6
Author: Matthias Freund 
Date:   Sun Jan 21 23:58:45 2018 +0100

tdf#75256 Sifr update exportto numberformatthousands splitcells

Change-Id: Idb2b8e1234528cffcc54fd5a2e354ce3cb30a030
Reviewed-on: https://gerrit.libreoffice.org/48286
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/icon-themes/sifr/cmd/32/exportto.png 
b/icon-themes/sifr/cmd/32/exportto.png
new file mode 100644
index ..4d2fa21d2cdd
Binary files /dev/null and b/icon-themes/sifr/cmd/32/exportto.png differ
diff --git a/icon-themes/sifr/cmd/32/numberformatthousands.png 
b/icon-themes/sifr/cmd/32/numberformatthousands.png
index cf91bf722449..0da5b6ea6346 100644
Binary files a/icon-themes/sifr/cmd/32/numberformatthousands.png and 
b/icon-themes/sifr/cmd/32/numberformatthousands.png differ
diff --git a/icon-themes/sifr/cmd/32/splitcells.png 
b/icon-themes/sifr/cmd/32/splitcells.png
new file mode 100644
index ..9eeb4656f610
Binary files /dev/null and b/icon-themes/sifr/cmd/32/splitcells.png differ
diff --git a/icon-themes/sifr/cmd/lc_exportto.png 
b/icon-themes/sifr/cmd/lc_exportto.png
index a3a42355dc3b..40dcf8056f19 100644
Binary files a/icon-themes/sifr/cmd/lc_exportto.png and 
b/icon-themes/sifr/cmd/lc_exportto.png differ
diff --git a/icon-themes/sifr/cmd/lc_numberformatthousands.png 
b/icon-themes/sifr/cmd/lc_numberformatthousands.png
index 31fe85468611..a2e744374766 100644
Binary files a/icon-themes/sifr/cmd/lc_numberformatthousands.png and 
b/icon-themes/sifr/cmd/lc_numberformatthousands.png differ
diff --git a/icon-themes/sifr/cmd/lc_splitcells.png 
b/icon-themes/sifr/cmd/lc_splitcells.png
new file mode 100644
index ..7772fd09ddf7
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_splitcells.png differ
diff --git a/icon-themes/sifr/cmd/sc_exportto.png 
b/icon-themes/sifr/cmd/sc_exportto.png
index c0450d78c75b..5513420d8183 100644
Binary files a/icon-themes/sifr/cmd/sc_exportto.png and 
b/icon-themes/sifr/cmd/sc_exportto.png differ
diff --git a/icon-themes/sifr/cmd/sc_numberformatthousands.png 
b/icon-themes/sifr/cmd/sc_numberformatthousands.png
index 913403a2e71d..ee5e1dd65630 100644
Binary files a/icon-themes/sifr/cmd/sc_numberformatthousands.png and 
b/icon-themes/sifr/cmd/sc_numberformatthousands.png differ
diff --git a/icon-themes/sifr/cmd/sc_splitcells.png 
b/icon-themes/sifr/cmd/sc_splitcells.png
new file mode 100644
index ..a73db5d51d17
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_splitcells.png differ
diff --git a/icon-themes/sifr_dark/cmd/32/exportto.png 
b/icon-themes/sifr_dark/cmd/32/exportto.png
new file mode 100644
index ..b7eb55332f87
Binary files /dev/null and b/icon-themes/sifr_dark/cmd/32/exportto.png differ
diff --git a/icon-themes/sifr_dark/cmd/32/numberformatthousands.png 
b/icon-themes/sifr_dark/cmd/32/numberformatthousands.png
index 1231788dc700..890ea63f2306 100644
Binary files a/icon-themes/sifr_dark/cmd/32/numberformatthousands.png and 
b/icon-themes/sifr_dark/cmd/32/numberformatthousands.png differ
diff --git a/icon-themes/sifr_dark/cmd/32/splitcells.png 
b/icon-themes/sifr_dark/cmd/32/splitcells.png
new file mode 100644
index ..f698fb1fb975
Binary files /dev/null and b/icon-themes/sifr_dark/cmd/32/splitcells.png differ
diff --git a/icon-themes/sifr_dark/cmd/lc_exportdirecttopdf.png 
b/icon-themes/sifr_dark/cmd/lc_exportdirecttopdf.png
index 394aae9c62ff..af8178efad4e 100644
Binary files 

[Libreoffice-commits] core.git: bin/list-uitest.py

[Xisco Fauli]

 bin/list-uitest.py |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit a09958dd35bf29b99714e05c758ff0c71ca75870
Author: Xisco Fauli 
Date:   Tue Jan 23 16:21:07 2018 +0100

Add wiki header and footer to the output

Change-Id: Iec0be65f57cac06756f2e8101d3edb89b126e92f
Reviewed-on: https://gerrit.libreoffice.org/48430
Tested-by: Jenkins 
Reviewed-by: Xisco Faulí 

diff --git a/bin/list-uitest.py b/bin/list-uitest.py
index c5cabc3abdea..baecc41b89a0 100755
--- a/bin/list-uitest.py
+++ b/bin/list-uitest.py
@@ -53,6 +53,11 @@ def main():
 'Math': ['../uitest/math_tests/'],
 'Draw': ['']}
 
+print('{{TopMenu}}')
+print('{{Menu}}')
+print('{{Menu.Development}}')
+print('{{OrigLang|}}')
+print()
 print('Generated on ' + str(datetime.datetime.now()))
 for k,v in uitest_dirs.items():
 print('\n=== ' + k + ' ===')
@@ -66,6 +71,8 @@ def main():
 linkFormat(class_name),uitest_file[3:]))
 for m in method_names:
 print('**' + linkFormat(m))
+print()
+print('[[Category:QA]][[Category:Development]]')
 
 if __name__ == '__main__':
 main()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 writerperfect/source/common/DocumentHandler.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7ca9619dfe976e5c443956aefad4bb3635aa530d
Author: Stephan Bergmann 
Date:   Tue Jan 23 12:33:39 2018 +0100

-Werror=parentheses (upcoming GCC 8)

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

diff --git a/writerperfect/source/common/DocumentHandler.cxx 
b/writerperfect/source/common/DocumentHandler.cxx
index cba9a983aae9..43de86bfc879 100644
--- a/writerperfect/source/common/DocumentHandler.cxx
+++ b/writerperfect/source/common/DocumentHandler.cxx
@@ -145,12 +145,12 @@ void DocumentHandler::startElement(const char *psName, 
const librevenge::RVNGPro
 for (int j=0; j<9; ++j)
 {
 // list of the encoded attributes followed by their lengths
-static char const *(listEncoded[9])=
+static char const *listEncoded[9]=
 {
 "draw:name", "svg:font-family", "style:condition", 
"style:num-prefix", "style:num-suffix",
 "table:formula", "text:bullet-char", "text:label", 
"xlink:href"
 };
-static size_t const(listEncodedLength[9])= 
{9,15,15,16,16,13,16,10,10};
+static size_t const listEncodedLength[9]= 
{9,15,15,16,16,13,16,10,10};
 if (keyLength==listEncodedLength[j] && strncmp(i.key(), 
listEncoded[j], keyLength)==0)
 {
 librevenge::RVNGString decodedValue("");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - translations

[Christian Lohmaier]

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

New commits:
commit 0faff4af38d8dfc3af7ee207374dfd7c441ffa8f
Author: Christian Lohmaier 
Date:   Wed Jan 24 13:16:51 2018 +0100

Updated core
Project: translations  549b95a9fd9f426968821aa459e4d2f129504f65

update translations for 6.0.0 rc3

Change-Id: I4f1d4959997ff3e5522b8947985937a372cb96f0
(cherry picked from commit 5634878ae8bfcd66bdf403e9ae009eab7312c611)

diff --git a/translations b/translations
index ad7ce57f0c56..549b95a9fd9f 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit ad7ce57f0c563df9d03d61752178c60b52a6a53d
+Subproject commit 549b95a9fd9f426968821aa459e4d2f129504f65
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0-0' - translations

[Christian Lohmaier]

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

New commits:
commit 1d405519cfc343cd62f8e6a368dfbec9918da095
Author: Christian Lohmaier 
Date:   Wed Jan 24 13:16:51 2018 +0100

Updated core
Project: translations  98ef97b71cd1663016c4d3d6a1b962e305be5483

update translations for 6.0.0 rc3

Change-Id: I4f1d4959997ff3e5522b8947985937a372cb96f0
(cherry picked from commit 5634878ae8bfcd66bdf403e9ae009eab7312c611)
(cherry picked from commit 549b95a9fd9f426968821aa459e4d2f129504f65)

diff --git a/translations b/translations
index 23ece50ca9e1..98ef97b71cd1 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 23ece50ca9e191a0764683697c2d23bda6049ae5
+Subproject commit 98ef97b71cd1663016c4d3d6a1b962e305be5483
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry sc/inc sc/sdi sc/source sc/uiconfig

[Gulsah Kose]

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |5 ++
 sc/inc/document.hxx   |1 
 sc/inc/sc.hrc |1 
 sc/sdi/cellsh.sdi |1 
 sc/sdi/scalc.sdi  |   18 
++
 sc/source/core/data/document.cxx  |   12 ++
 sc/source/ui/view/cellsh.cxx  |6 ++-
 sc/source/ui/view/cellsh2.cxx |1 
 sc/uiconfig/scalc/popupmenu/cell.xml  |1 
 9 files changed, 45 insertions(+), 1 deletion(-)

New commits:
commit 844c92793c1399e2f14f671f964ea35e1bce24ac
Author: Gulsah Kose 
Date:   Wed Jan 17 19:09:13 2018 +0300

[Pardus] tdf#108989 Add contextual validity command.

When cursor is in a cell has following validity attributes
SC_VALID_WHOLE, SC_VALID_DECIMAL, SC_VALID_DATE,
SC_VALID_TIME,SC_VALID_TEXTLEN, SC_VALID_LIST,
SC_VALID_CUSTOM, Validity command appears on context
menu.

This patch is sponsored by ULAKBIM/Pardus project.

Change-Id: I47c0de7b62befdf02c343c1419cf32441d8f4df2
Signed-off-by: Gulsah Kose 
Reviewed-on: https://gerrit.libreoffice.org/48067
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index ff0052e97a4f..f87cc3f47f35 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -893,6 +893,11 @@
   ~Validity...
 
   
+  
+
+  Data ~Validation...
+
+  
   
 
   Delete Rows
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 77ad1046294a..c1c628fb451f 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1135,6 +1135,7 @@ public:
 
 /** Returns true, if there is any data to create a selection list for 
rPos. */
 boolHasSelectionData( SCCOL nCol, SCROW nRow, SCTAB nTab ) 
const;
+boolHasValidationData( SCCOL nCol, SCROW nRow, SCTAB nTab ) 
const;
 
 /**
  * Check if the specified range contains either: 1) one non-empty cell, 2)
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index ee3caa1d7e7c..b20f0680711f 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -549,6 +549,7 @@
 
 #define SID_OLE_SELECT  (SID_NEW_SLOTS+50)
 
+#define FID_CURRENTVALIDATION   (SID_NEW_SLOTS+51)
 #define SID_RANGE_NOTETEXT  (SID_NEW_SLOTS+52)
 #define FID_INSERT_FILE (SID_NEW_SLOTS+53)
 
diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index decb76cfc659..b21769d8d258 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -60,6 +60,7 @@ interface CellSelection
 SID_SUBTOTALS   [ ExecMethod = ExecuteDB; StateMethod = 
GetDBState; ]
 SID_PIVOT_TABLE [ ExecMethod = ExecuteDB; StateMethod = 
GetDBState; ]
 FID_VALIDATION  [ ExecMethod = ExecuteDB; StateMethod = 
GetBlockState; ]
+FID_CURRENTVALIDATION   [ ExecMethod = ExecuteDB; StateMethod = GetState; ]
 SID_TEXT_TO_COLUMNS [ ExecMethod = ExecuteDB; StateMethod = 
GetDBState; ]
 
 // } database operations
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 6db3054a7cf6..956bacaae8e3 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -5618,6 +5618,24 @@ SfxVoidItem Validation FID_VALIDATION
 ]
 
 
+SfxVoidItem CurrentValidation FID_CURRENTVALIDATION
+()
+[
+AutoUpdate = FALSE,
+FastCall = FALSE,
+ReadOnlyDoc = TRUE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+ToolBoxConfig = TRUE,
+GroupId = SfxGroupId::Data;
+]
+
+
 ScDoubleItem Value SID_RANGE_VALUE
 
 [
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index f4e2d98bb41c..44bef6c0310e 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -3820,6 +3820,18 @@ bool ScDocument::HasSelectionData( SCCOL nCol, SCROW 
nRow, SCTAB nTab ) const
 return HasStringCells( ScRange( nCol, 0, nTab, nCol, MAXROW, nTab ) );
 }
 
+bool ScDocument::HasValidationData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const
+{
+sal_uInt32 nValidation = static_cast< const SfxUInt32Item* >( GetAttr( 
nCol, nRow, nTab, ATTR_VALIDDATA ) )->GetValue();
+if( nValidation )
+{
+const ScValidationData* pData = GetValidationEntry( nValidation );
+if( pData && pData->GetDataMode() != ScValidationMode::SC_VALID_ANY )
+return true;
+}
+

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

[Michael Meeks]

 loleaflet/src/control/Control.Menubar.js |1 +
 loleaflet/unocommands.js |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 83cef0d0d7de8ee35ee8d34b6fd18c639ae5e940
Author: Michael Meeks 
Date:   Mon Jan 22 16:40:15 2018 +

Add the Thesaurus dialog.

Change-Id: I976ffd46e95dfa675150ee66650f211b2c9f5cdc

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 55347ad5..13338925 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -187,6 +187,7 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:ToolsMenu', 'text'), id: 'tools', 
type: 'menu', menu: [
{uno: '.uno:SpellingAndGrammarDialog'},
{uno: '.uno:SpellOnline'},
+   {uno: '.uno:ThesaurusDialog'},
{name: _UNO('.uno:LanguageMenu'), type: 'menu', 
menu: [
{name: 
_UNO('.uno:SetLanguageSelectionMenu', 'text'), type: 'menu', menu: [
{name: _('None (Do not check 
spelling)'), id: 'noneselection', uno: 
'.uno:LanguageStatus?Language:string=Current_LANGUAGE_NONE'}]},
diff --git a/loleaflet/unocommands.js b/loleaflet/unocommands.js
index 8ed093ad..2de09ee6 100644
--- a/loleaflet/unocommands.js
+++ b/loleaflet/unocommands.js
@@ -210,6 +210,7 @@ var unoCommandsArray = {
TableSelectMenu:{text:{menu:_('~Select'),},},
TaskPaneInsertPage:{presentation:{menu:_('Insert Slide'),},},
TextAlign:{global:{menu:_('Alig~n'),},},
+   
ThesaurusDialog:{global:{menu:_('~Thesaurus...'),},text:{menu:_('~Thesaurus...'),},},
ToggleMergeCells:{spreadsheet:{menu:_('M~erge and Center Cells'),},},
ToolsMenu:{global:{menu:_('~Tools'),},},
TrackChanges:{text:{menu:_('~Record'),},},
___
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' - desktop/source

[Jan Holesovsky]

 desktop/source/lib/init.cxx |   19 ---
 1 file changed, 16 insertions(+), 3 deletions(-)

New commits:
commit ca86867d21bc9ef423ecdbf7931eaffd06ef1bab
Author: Jan Holesovsky 
Date:   Wed Jan 24 13:32:24 2018 +0100

lok: Preload thesauri too.

Change-Id: If2bfd3a024fc61900d3c12ff976df136d4e61bf6
Reviewed-on: https://gerrit.libreoffice.org/48503
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index a6e40937de00..6961cca8e29c 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3538,13 +3538,13 @@ static void lo_status_indicator_callback(void *data, 
comphelper::LibreOfficeKit:
 /// Used only by LibreOfficeKit when used by Online to pre-initialize
 static void preloadData()
 {
-// First: sit down and read all dictionaries: yum.
+// preload all available dictionaries
 css::uno::Reference xLngSvcMgr =
 
css::linguistic2::LinguServiceManager::create(comphelper::getProcessComponentContext());
 css::uno::Reference 
xSpellChecker(xLngSvcMgr->getSpellChecker());
 
-css::uno::Reference 
xLocales(xSpellChecker, css::uno::UNO_QUERY_THROW);
-uno::Sequence< css::lang::Locale > aLocales = xLocales->getLocales();
+css::uno::Reference 
xSpellLocales(xSpellChecker, css::uno::UNO_QUERY_THROW);
+uno::Sequence< css::lang::Locale > aLocales = xSpellLocales->getLocales();
 std::cerr << "Preloading dictionaries: ";
 for (auto  : aLocales)
 {
@@ -3554,6 +3554,19 @@ static void preloadData()
 }
 std::cerr << "\n";
 
+// preload all available thesauri
+css::uno::Reference 
xThesaurus(xLngSvcMgr->getThesaurus());
+css::uno::Reference 
xThesLocales(xSpellChecker, css::uno::UNO_QUERY_THROW);
+aLocales = xThesLocales->getLocales();
+std::cerr << "Preloading thesauri: ";
+for (auto  : aLocales)
+{
+std::cerr << it.Language << "_" << it.Country << " ";
+css::beans::PropertyValues aNone;
+xThesaurus->queryMeanings("forcefed", it, aNone);
+}
+std::cerr << "\n";
+
 css::uno::Reference< css::ui::XAcceleratorConfiguration > xGlobalCfg;
 xGlobalCfg = css::ui::GlobalAcceleratorConfiguration::create(
 comphelper::getProcessComponentContext());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/vs

[Mike Kaganski]

 solenv/vs/LibreOffice.natvis |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 59ef7485c42ee04179e0891bfd3f3b9c801a58ae
Author: Mike Kaganski 
Date:   Wed Jan 24 12:42:33 2018 +0100

Natvis: update SfxItemSet visualizer (m_pItems is now unique_ptr)

Change-Id: I862f6399a9a065ef725211b44f77400927db9a8f
Reviewed-on: https://gerrit.libreoffice.org/48496
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/solenv/vs/LibreOffice.natvis b/solenv/vs/LibreOffice.natvis
index 04a705c5f010..d1b2b8938b11 100644
--- a/solenv/vs/LibreOffice.natvis
+++ b/solenv/vs/LibreOffice.natvis
@@ -314,7 +314,7 @@
 {{size={m_nCount,d}}}
 
   
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 vcl/unx/generic/app/saldisp.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit dc9e271c130a14e1f8446227238397ddcb34028a
Author: Stephan Bergmann 
Date:   Tue Jan 23 12:30:24 2018 +0100

Use a more conventional way of zero-initializing class members

...to avoid upcoming GCC 8 -Werror=class-memaccess ("clearing an object of 
non-
trivial type ‘class SalVisual’")

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

diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 767cf81aa239..edf8ca53246f 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -2374,10 +2374,10 @@ bool SalDisplay::XIfEventWithTimeout( XEvent* o_pEvent, 
XPointer i_pPredicateDat
 return bRet;
 }
 
-SalVisual::SalVisual()
-{
-memset( this, 0, sizeof( SalVisual ) );
-}
+SalVisual::SalVisual():
+eRGBMode_(RGB), nRedShift_(0), nGreenShift_(0), nBlueShift_(0), 
nRedBits_(0), nGreenBits_(0),
+nBlueBits_(0)
+{}
 
 SalVisual::SalVisual( const XVisualInfo* pXVI )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sw/source/core/unocore/unotbl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 06cfd5a962f9d8d9462fc270f1b1f730c90bddfe
Author: Stephan Bergmann 
Date:   Tue Jan 23 23:15:28 2018 +0100

Remove presumably dead < USHRT_MAX checks

...which are proably obsolete since 17e2497b6c679c89af84f586b79194cf4e18f2ab
"INTEGRATION: CWS tl39: #i77024# chart2 with more than 26 columns" changed 
the
members of SwRangeDescriptor from sal_uInt16 to sal_Int32.

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

diff --git a/sw/source/core/unocore/unotbl.cxx 
b/sw/source/core/unocore/unotbl.cxx
index 34d9e8766039..96cea290242c 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -2263,7 +2263,7 @@ uno::Reference  
SwXTextTable::getCellRangeByPosition(sal_Int3
 {
 SolarMutexGuard aGuard;
 SwFrameFormat* pFormat(GetFrameFormat());
-if(pFormat && nRight < USHRT_MAX && nBottom < USHRT_MAX &&
+if(pFormat &&
 nLeft <= nRight && nTop <= nBottom &&
 nLeft >= 0 && nRight >= 0 && nTop >= 0 && nBottom >= 0 )
 {
___
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' - include/sfx2 include/vcl sfx2/source vcl/source

[Henry Castro]

 include/sfx2/basedlgs.hxx   |1 -
 include/vcl/dialog.hxx  |1 +
 include/vcl/window.hxx  |2 +-
 sfx2/source/dialog/basedlgs.cxx |   24 
 sfx2/source/dialog/tabdlg.cxx   |   21 -
 sfx2/source/view/viewfrm.cxx|3 +++
 sfx2/source/view/viewsh.cxx |9 +
 vcl/source/window/dialog.cxx|   37 +
 vcl/source/window/window.cxx|   19 ++-
 9 files changed, 61 insertions(+), 56 deletions(-)

New commits:
commit 20459ed3996781788ca7581d21d8c25b0c2b85d0
Author: Henry Castro 
Date:   Thu Jan 11 13:31:36 2018 -0400

lok dialog: enable MessageDialog tunneling

(cherry picked from commit 18dcf1dca74123659a9fe786921915f7307da147)
Change-Id: I344530471c650b3b70c5c9900d86df735c09a09d
Reviewed-on: https://gerrit.libreoffice.org/48122
Reviewed-by: pranavk 
Tested-by: pranavk 
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index 88b20c6d87a1..2cf08407d3be 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -72,7 +72,6 @@ public:
 virtual ~SfxModalDialog() override;
 virtual void dispose() override;
 
-virtual short   Execute() override;
 const SfxItemSet*   GetOutputItemSet() const { return pOutputSet; }
 const SfxItemSet*   GetInputItemSet() const { return pInputSet; }
 voidStateChanged( StateChangedType nStateChange ) override;
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 7a69b6c48618..92bf603400f6 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -53,6 +53,7 @@ private:
 SAL_DLLPRIVATE voidRemoveFromDlgList();
 SAL_DLLPRIVATE voidImplInitDialogData();
 SAL_DLLPRIVATE voidImplInitSettings();
+SAL_DLLPRIVATE inline  void ImplLOKNotifier(vcl::Window* pParent);
 
 virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
 
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index a46e7569e74f..7f15b5dac267 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1205,7 +1205,7 @@ public:
 voidSetComponentInterface( css::uno::Reference< 
css::awt::XWindowPeer > const & xIFace );
 
 /// Interface to register for dialog / window tunneling.
-voidSetLOKNotifier(const 
vcl::ILibreOfficeKitNotifier* pNotifier);
+voidSetLOKNotifier(const 
vcl::ILibreOfficeKitNotifier* pNotifier, bool bParent = false);
 const vcl::ILibreOfficeKitNotifier* GetLOKNotifier() const;
 vcl::LOKWindowIdGetLOKWindowId() const;
 
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 41db15950eb4..729e1fbbdb97 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -167,33 +167,9 @@ void SfxModalDialog::dispose()
 SetDialogData_Impl();
 delete pOutputSet;
 
-if (comphelper::LibreOfficeKit::isActive() && GetLOKNotifier())
-{
-SfxViewShell::Current()->notifyWindow(GetLOKWindowId(), "close");
-ReleaseLOKNotifier();
-}
-
 ModalDialog::dispose();
 }
 
-short SfxModalDialog::Execute()
-{
-SfxViewShell* pViewShell = SfxViewShell::Current();
-if (comphelper::LibreOfficeKit::isActive() && pViewShell && 
!GetLOKNotifier())
-{
-SetLOKNotifier(pViewShell);
-const Size aSize = GetOptimalSize();
-std::vector aItems;
-aItems.emplace_back("type", "dialog");
-aItems.emplace_back("size", aSize.toString());
-if (!GetText().isEmpty())
-aItems.emplace_back("title", GetText().toUtf8());
-pViewShell->notifyWindow(GetLOKWindowId(), "created", aItems);
-}
-
-return ModalDialog::Execute();
-}
-
 void SfxModalDialog::CreateOutputItemSet( SfxItemPool& rPool )
 {
 DBG_ASSERT( !pOutputSet, "Double creation of OutputSet!" );
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index c2228856465b..28dff535463c 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -405,13 +405,6 @@ void SfxTabDialog::dispose()
 m_pBaseFmtBtn.clear();
 m_pActionArea.clear();
 
-SfxViewShell* pViewShell = SfxViewShell::Current();
-if (comphelper::LibreOfficeKit::isActive() && pViewShell)
-{
-pViewShell->notifyWindow(GetLOKWindowId(), "close");
-ReleaseLOKNotifier();
-}
-
 TabDialog::dispose();
 }
 
@@ -589,20 +582,6 @@ void SfxTabDialog::Start_Impl()
 
 m_pTabCtrl->SetCurPageId( nActPage );
 ActivatePageHdl( m_pTabCtrl );
-
-SfxViewShell* pViewShell = SfxViewShell::Current();
-
-if (comphelper::LibreOfficeKit::isActive() && pViewShell && 

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

[Dennis Francis]

 sc/qa/unit/parallelism.cxx   |   23 +++
 sc/source/core/tool/formulagroup.cxx |   16 +---
 2 files changed, 36 insertions(+), 3 deletions(-)

New commits:
commit 1c6244f1faaefb6a5198c79c00849924ac2e91c2
Author: Dennis Francis 
Date:   Tue Jan 23 19:53:19 2018 +0530

tdf#115093 : Do not reuse singleref tokens...

...in formula group computation if the formula contains
only a single reference besides any ocOpen/ocClose pairs
wrapping it as the sole content.

In such a case the "result" formula token
returned by ScInterpreter::GetResultToken() is the same
as the original singleref token, so for each row of the
formulagroup, we need to use a separate singleref token.

Also added a unit test in sc/qa/unit/parallelism.cxx

Change-Id: I6032efc5be9b51ca1e9daf9bdd19997a949d2f43
Reviewed-on: https://gerrit.libreoffice.org/48449
Reviewed-by: Michael Meeks 
Tested-by: Jenkins 
(cherry picked from commit ff166845fa5ed178a97b54bb2deef4beb0cf3bdf)
Reviewed-on: https://gerrit.libreoffice.org/48478
Tested-by: Michael Meeks 

diff --git a/sc/qa/unit/parallelism.cxx b/sc/qa/unit/parallelism.cxx
index 428d65a20bec..896b7c1d8382 100644
--- a/sc/qa/unit/parallelism.cxx
+++ b/sc/qa/unit/parallelism.cxx
@@ -46,12 +46,14 @@ public:
 void testDivision();
 void testVLOOKUP();
 void testVLOOKUPSUM();
+void testSingleRef();
 
 CPPUNIT_TEST_SUITE(ScParallelismTest);
 CPPUNIT_TEST(testSUMIFS);
 CPPUNIT_TEST(testDivision);
 CPPUNIT_TEST(testVLOOKUP);
 CPPUNIT_TEST(testVLOOKUPSUM);
+CPPUNIT_TEST(testSingleRef);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -296,6 +298,27 @@ void ScParallelismTest::testVLOOKUPSUM()
 m_pDoc->DeleteTab(0);
 }
 
+void ScParallelismTest::testSingleRef()
+{
+m_pDoc->InsertTab(0, "1");
+
+const size_t nNumRows = 200;
+for (size_t i = 0; i < nNumRows; ++i)
+{
+m_pDoc->SetValue(0, i, 0, static_cast(i));
+m_pDoc->SetFormula(ScAddress(1, i, 0), "=A" + OUString::number(i+1), 
formula::FormulaGrammar::GRAM_NATIVE_UI);
+}
+
+m_xDocShell->DoHardRecalc();
+
+for (size_t i = 0; i < nNumRows; ++i)
+{
+OString aMsg = "At row " + OString::number(i);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(aMsg.getStr(), i, 
static_cast(m_pDoc->GetValue(1, i, 0)));
+}
+m_pDoc->DeleteTab(0);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(ScParallelismTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/core/tool/formulagroup.cxx 
b/sc/source/core/tool/formulagroup.cxx
index d763d15d2f1c..38b9c2a327ee 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -177,6 +177,7 @@ public:
 ScTokenArray aCode2;
 
 ScInterpreterContext aContext(mrDoc, mpFormatter);
+sal_uInt16 nNumNonOpenClose = mrCode.GetLen();
 
 for (SCROW i = mnIdx; i <= mnLastIdx; ++i, maBatchTopPos.IncRow())
 {
@@ -212,7 +213,7 @@ public:
 aCode2.AddString(rPool.intern(OUString(pStr)));
 else
 {
-if ( pTargetTok->GetType() == 
formula::svString )
+if ( ( pTargetTok->GetType() == 
formula::svString ) && ( nNumNonOpenClose > 1 ) )
 
pTargetTok->SetString(rPool.intern(OUString(pStr)));
 else
 {
@@ -226,7 +227,7 @@ public:
 // Value of NaN represents an empty cell.
 if ( !pTargetTok )
 aCode2.AddToken(ScEmptyCellToken(false, 
false));
-else if ( pTargetTok->GetType() != 
formula::svEmptyCell )
+else if ( ( pTargetTok->GetType() != 
formula::svEmptyCell ) || ( nNumNonOpenClose == 1 ) )
 {
 ScEmptyCellToken* pEmptyTok = new 
ScEmptyCellToken(false, false);
 aCode2.ReplaceToken(nTokIdx, pEmptyTok, 
formula::FormulaTokenArray::CODE_ONLY);
@@ -239,7 +240,7 @@ public:
 aCode2.AddDouble(fVal);
 else
 {
-if ( pTargetTok->GetType() == 
formula::svDouble )
+if ( ( pTargetTok->GetType() == 
formula::svDouble ) && ( nNumNonOpenClose > 1 ) )
 pTargetTok->GetDoubleAsReference() = fVal;
 else
 {
@@ -291,7 +292,16 @@ public:
 break;
 default:
 if ( !pTargetTok )
+{
+ 

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

[Stephan Bergmann]

 sw/source/core/unocore/unotbl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1dcc7efc6f60084c80c4d7b0a5caf42c23f3be99
Author: Stephan Bergmann 
Date:   Tue Jan 23 23:10:25 2018 +0100

Remove presumably dead < USHRT_MAX checks

...which are probably obsolete since 
93cb1f8bb13e25586f61ba108e959376d90e91ed
"INTEGRATION: CWS swwarnings" changed the parameters of lcl_CreateXCell from
sal_Int16 to sal_Int32 (even though the < vs. <= and unsigned USHRT_MAX vs.
signed sal_Int16 inconsistencies are suspicious).

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

diff --git a/sw/source/core/unocore/unotbl.cxx 
b/sw/source/core/unocore/unotbl.cxx
index db6e6e6bbd76..34d9e8766039 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -2218,7 +2218,7 @@ uno::Reference  
SwXTextTable::getCellByPosition(sal_Int32 nColumn,
 SolarMutexGuard aGuard;
 SwFrameFormat* pFormat(GetFrameFormat());
 // sheet is unimportant
-if(nColumn >= 0 && nRow >= 0 && nColumn < USHRT_MAX && nRow < USHRT_MAX && 
pFormat)
+if(nColumn >= 0 && nRow >= 0 && pFormat)
 {
 auto pXCell = lcl_CreateXCell(pFormat, nColumn, nRow);
 if(pXCell)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 vcl/source/gdi/impvect.cxx |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 797ae3d3431ac497d71676f6124010777377e794
Author: Stephan Bergmann 
Date:   Tue Jan 23 12:21:29 2018 +0100

Make ImplColorSet default ctor zero-initialize all members

...allowing to simplify creating the pColorSet array (which might want to be
improved even further, turning it into a unique_ptr or vector)

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

diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index 841f1895a970..b94886a841b1 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.cxx
@@ -95,8 +95,8 @@ static const ChainMove aImplMoveOuter[ 8 ] =  {
 struct ImplColorSet
 {
 BitmapColor maColor;
-sal_uInt16  mnIndex;
-boolmbSet;
+sal_uInt16  mnIndex = 0;
+boolmbSet = false;
 };
 
 extern "C" int ImplColorSetCmpFnc( const void* p1, const void* p2 )
@@ -644,9 +644,8 @@ bool ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& 
rMtf,
 const long  nHeight = pRAcc->Height();
 const sal_uInt16nColorCount = pRAcc->GetPaletteEntryCount();
 sal_uInt16  n;
-ImplColorSet*   pColorSet = reinterpret_cast(new 
sal_uInt8[ 256 * sizeof( ImplColorSet ) ]);
+ImplColorSet*   pColorSet = new ImplColorSet[ 256 ];
 
-memset( pColorSet, 0, 256 * sizeof( ImplColorSet ) );
 rMtf.Clear();
 
 // get used palette colors and sort them from light to dark colors
@@ -703,7 +702,7 @@ bool ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& 
rMtf,
 VECT_PROGRESS( pProgress, FRound( fPercent += fPercentStep_2 ) );
 }
 
-delete[] reinterpret_cast(pColorSet);
+delete[] pColorSet;
 
 if( rMtf.GetActionSize() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: translations

[Christian Lohmaier]

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

New commits:
commit 2adf811370116cfb0e6280d74abdd733e078e8ff
Author: Christian Lohmaier 
Date:   Wed Jan 24 13:16:51 2018 +0100

Updated core
Project: translations  5634878ae8bfcd66bdf403e9ae009eab7312c611

update translations for 6.0.0 rc3

Change-Id: I4f1d4959997ff3e5522b8947985937a372cb96f0

diff --git a/translations b/translations
index 4c9058997dff..5634878ae8bf 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 4c9058997dff2f568d90ead5d9b50fc92b1281cc
+Subproject commit 5634878ae8bfcd66bdf403e9ae009eab7312c611
___
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' - distro-configs/CPLinux-LOKit.conf

[Andras Timar]

 distro-configs/CPLinux-LOKit.conf |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c9bc703e83c1ed5fe6de25d4ffb516fb82b709d2
Author: Andras Timar 
Date:   Wed Jan 24 13:43:39 2018 +0100

CPLinux-LOKit.conf: we need galaxy theme as fallback

Change-Id: I56f44272c6d0cf644ace1d2e1c48e4dab23b1b0d
Reviewed-on: https://gerrit.libreoffice.org/48504
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/distro-configs/CPLinux-LOKit.conf 
b/distro-configs/CPLinux-LOKit.conf
index 45e8e0deef76..4a21d62e8095 100644
--- a/distro-configs/CPLinux-LOKit.conf
+++ b/distro-configs/CPLinux-LOKit.conf
@@ -18,7 +18,7 @@
 --with-fonts
 --enable-noto-font
 --with-galleries=no
---with-theme=tango
+--with-theme=galaxy tango
 --with-external-thes-dir=/usr/share/mythes
 --with-external-hyph-dir=/usr/share/hyphen
 --with-external-dict-dir=/usr/share/hunspell
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 i18nlangtag/source/isolang/langid.pl |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 31531796bd0f8ab3ef73cc7b5baf323df0ce4aeb
Author: Eike Rathke 
Date:   Wed Jan 24 14:03:33 2018 +0100

Remove old comment left over

Change-Id: I5f6d47afc2f27b1033201b3fa280359a215f38b5

diff --git a/i18nlangtag/source/isolang/langid.pl 
b/i18nlangtag/source/isolang/langid.pl
index ace514a839b3..ffb29ddb64b8 100755
--- a/i18nlangtag/source/isolang/langid.pl
+++ b/i18nlangtag/source/isolang/langid.pl
@@ -425,7 +425,6 @@ sub main()
 my $module = "svtools";
 my $name = "inc/langtab.hrc";
 #{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Afrikaans (South Africa)") , 
LANGUAGE_AFRIKAANS },
-# < "Afrikaans" ; LANGUAGE_AFRIKAANS ; > ;
 # lookup define
 @resultlist = grepFile(
 $modifier . '^\s*\{\s*NC_\(\s*"[^"]*"\s*,\s*".*"\s*\)\s*,.*' . 
$grepdef . '.*\}',
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Maxim Monastirsky]

 vcl/source/control/ctrl.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit af274d8b6e819dc089239553811a6bd19a48df49
Author: Maxim Monastirsky 
Date:   Sat Jan 20 19:51:34 2018 +0200

tdf#115023 Check mpControlData for nullptr

Control::ImplClearLayoutData happens to be called post
dispose, but Control::dispose already destroyed
mpControlData. So put back the nullptr check that was
removed in e8b49f09074fe184374bee5062715357427ae044
("new loplugin: useuniqueptr: vcl").

(But IMHO it's odd that we even try to send lose focus
events to disposing windows. So maybe it would make sense
to replace the "! pOldFocusWindow->IsDisposed()" check
inside Window::ImplGrabFocus with "isDisposed()" which
comes from VclReferenceBase, and set much earlier?)

Change-Id: Iddaf7e05d6cb56c28a34884876770753fcf7179e
Reviewed-on: https://gerrit.libreoffice.org/48246
Reviewed-by: Noel Grandin 
Tested-by: Jenkins 
Reviewed-by: Maxim Monastirsky 
(cherry picked from commit 2a2b37202a735b34da914c03b2f6e1495f833b51)
Reviewed-on: https://gerrit.libreoffice.org/48275
Reviewed-by: Caolán McNamara 
Reviewed-by: Michael Stahl 
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index b62c90563d46..5f3d23901b0a 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -328,7 +328,8 @@ void Control::SetLayoutDataParent( const Control* pParent ) 
const
 
 void Control::ImplClearLayoutData() const
 {
-mpControlData->mpLayoutData.reset();
+if (mpControlData)
+mpControlData->mpLayoutData.reset();
 }
 
 void Control::ImplDrawFrame( OutputDevice* pDev, tools::Rectangle& rRect )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

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

New commits:
commit 987a50f3a70cf6ece9245b9a3e6d353c15cb1fdf
Author: Stephan Bergmann 
Date:   Wed Jan 24 12:02:50 2018 +0100

Adapt solenv/flatpak-manifest.in

...to libreoffice-6-0 26c4a36cad9aca8e07abcbfeddf744ae112a4bc0 "tdf#113532 
Add
Arabic fonts into default installation" (picking the relevant parts of 
master
cf1dcd1475a22f10c35105a59e6d02dc342ccb16 "Adapt solenv/flatpak-manifest.in 
to
recent download.lst changes and recently added fonts")

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

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 0f212badf2a2..6bad9afc6e78 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -380,6 +380,12 @@
 "dest-filename": 
"external/tarballs/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"
 },
 {
+"url": 
"https://dev-www.libreoffice.org/src/ReemKufi-0.6.tar.gz;,
+"sha256": 
"4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b",
+"type": "file",
+"dest-filename": "external/tarballs/ReemKufi-0.6.tar.gz"
+},
+{
 "url": 
"https://dev-www.libreoffice.org/src/libepubgen-0.1.0.tar.bz2;,
 "sha256": 
"730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633",
 "type": "file",
@@ -398,6 +404,12 @@
 "dest-filename": "external/tarballs/alef-1.001.tar.gz"
 },
 {
+"url": 
"https://dev-www.libreoffice.org/src/amiri-0.109.zip;,
+"sha256": 
"97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6",
+"type": "file",
+"dest-filename": "external/tarballs/amiri-0.109.zip"
+},
+{
 "url": 
"https://dev-www.libreoffice.org/src/culmus-0.131.tar.gz;,
 "sha256": 
"dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b",
 "type": "file",
@@ -410,6 +422,18 @@
 "dest-filename": 
"external/tarballs/libre-hebrew-1.0.tar.gz"
 },
 {
+"url": 
"https://dev-www.libreoffice.org/src/Scheherazade-2.100.zip;,
+"sha256": 
"251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5",
+"type": "file",
+"dest-filename": "external/tarballs/Scheherazade-2.100.zip"
+},
+{
+"url": 
"https://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz;,
+"sha256": 
"dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56",
+"type": "file",
+"dest-filename": 
"external/tarballs/ttf-kacst_2.01+mry.tar.gz"
+},
+{
 "url": 
"https://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip;,
 "sha256": 
"9e93c73e23aff644b17dfff65674c14150e7f3b38b19635e622235e01c96",
 "type": "file",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sal/qa/rtl/digest/rtl_digest.cxx |   92 +++
 sal/rtl/digest.cxx   |2 
 2 files changed, 93 insertions(+), 1 deletion(-)

New commits:
commit 977ef4449aa82e9b542fae402a32f1faeb3e619f
Author: Michael Stahl 
Date:   Tue Jan 16 21:59:01 2018 +0100

tdf#114939 sal: fix endMD5() off-by-one

Because of the odd non-standard rtl_digest_rawMD5() API that
is apparently necessary for MS Office interop, and there not
being any good reason for bug-compatibility here, just fix the bug.

Change-Id: Iaa0f0af4e24a5ddb9113c1ebd126f9822b5af1f6
(cherry picked from commit 18b022cadfa590df9dbefe0433b58838bcc3d2af)
Reviewed-on: https://gerrit.libreoffice.org/48019
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 17e01d692bf1ff13f3c2f5af599c688d52a911b6)
Reviewed-on: https://gerrit.libreoffice.org/48030
Reviewed-by: Eike Rathke 
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx
index 6b693067785f..59e57cefcf41 100644
--- a/sal/qa/rtl/digest/rtl_digest.cxx
+++ b/sal/qa/rtl/digest/rtl_digest.cxx
@@ -415,6 +415,97 @@ public:
 }
 }
 
+void testMD5()
+{
+unsigned char const data[] = {
+0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+};
+OString const expected[] = {
+"d41d8cd98f00b204e9800998ecf8427e",
+"cfcd208495d565ef66e7dff9f98764da",
+"b4b147bc522828731f1a016bfa72c073",
+"c6f057b86584942e415435ffb1fa93d4",
+"4a7d1ed414474e4033ac29ccb8653d9b",
+"dcddb75469b4b4875094e14561e573d8",
+"670b14728ad9902aecba32e22fa4f6bd",
+"29c3eea3f305d6b823f562ac4be35217",
+"dd4b21e9ef71e1291183a46b913ae6f2",
+"4c93008615c2d041e33ebac605d14b5b",
+"f1b708bba17f1ce948dc979f4d7092bc",
+"645a8aca5a5b84527c57ee2f153f1946",
+"35b9ab5a36f3234dd26db357fd4a0dc1",
+"4aad0d9ff11812ebdd5e376fdbef6222",
+"c47532bbb1e2883c902071591ae1ec9b",
+"5284047f4ffb4e04824a2fd1d1f0cd62",
+"1e4a1b03d1b6cd8a174a826f76e009f4",
+"0e7b9f29a828b6f953b482fc299e536b",
+"3ea032bf79e8c116b05f4698d5a8e044",
+"15f47c8a3e5e9685307dd65a653b8dc0",
+"cc545187d0745132de1e9941db0ef6ce",
+"0585e303e79acd837c3a3e2a2bec8b18",
+"b28ccfdee4b9f39ba18b58a4f61a03d1",
+"d018229b1183c926c10ea688350afec8",
+"660719b4a7591769583a7c8d20c6dfa4",
+"1e2432adacf481836265fcc62ee8f3e3",
+"6e88e2af74c1d9d7d7d652b90d03751e",
+"780ca685003cec1d617beaa6f346e1be",
+"7f2e1dcfd6e2a3f5c38f31e640136ff6",
+"1a3dee46117aeb8010cf365b8653faa8",
+"1d0064395af3c745f6c3194e92373d7a",
+"b52582043219f2deb2d3c9cb05d6448a",
+"cd9e459ea708a948d5c2f5a6ca8838cf",
+"00de800ecd7a4fb2813986c987e46d51",
+"15336d4b38561a82bd24c9398b781aed",
+"5fe699d3c461ab5a795505f59d5adf15",
+"c5e0eb03cbb4bea95ce3f8f48fca77d5",
+"355c1410373ef02fff2b03844d72c7d4",
+"02df97da8207de2b3afa69c151ca8958",
+"82c66dbf3e73f87ffc9564b2098d6a4f",
+"b373e3ddc3438d7c10c76f3ad9d4c401",
+"fac901a4a3dbc4461541731a33a31d15",
+"f573e011b414bf3f9dd284f7dad29592",
+"11694570cc5dda099669f2ba3660a70d",
+"60997cc8aef7fedd9995e6b3ca89ce26",
+"63c5fcf83c2275fe64e880dd8dfc5cd6",
+"c7a0a100057ebbfc63ee169562026aea",
+"42c2dec247919384edece38033458627",
+"b505acf9fc996902b0c547a2abfc62b2",
+"2fa7a1321d6b5fa0e04ad46785f574f3",
+"86d2bfc0bab44eecf21e1432be7b3efc",
+"7ca318f12a0955a3e637dc5645a2f96e",
+"3eda02765b8fb8bb9b20c735f4537827",
+"26dead12262c9a5c115b01e0a3c805b6",
+"978b0444e93c5f7d714575f28a77dca1",
+"d7fe636bd28e2ee2ba4d6c5898318699",
+"ce992c2ad906967c63c3f9ab0c2294a9",
+"1f3b814e9d417e9fd8750299982feb1f",
+"1a2f42174eaa78ce6a67d75e98a59cb6",
+"17c772c45c9a09f6e56b7228ddd161a7",
+  

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

[Michael Stahl]

 sw/qa/extras/rtfimport/data/tdf115153.rtf |9 +
 1 file changed, 9 insertions(+)

New commits:
commit b7f12d8fd7493a7201ae5fd97e80e0296538f136
Author: Michael Stahl 
Date:   Wed Jan 24 17:19:20 2018 +0100

tdf#115153 the missing test document

Change-Id: I74724ba61aadfad19501a87ab548219ea0a1f236

diff --git a/sw/qa/extras/rtfimport/data/tdf115153.rtf 
b/sw/qa/extras/rtfimport/data/tdf115153.rtf
new file mode 100644
index ..b80487072e54
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf115153.rtf
@@ -0,0 +1,9 @@
+{\rtf\ansi\ansicpg1251
+{\info {\author Oracle Reports} }
+\paperw11340\paperh16840\margl0\margr0\margt460\margb1240
+
+
+{\do \dobxpage\dobypage \dpline \dplinew0 \dpptx0 \dppty728 \dpptx0 \dppty0 
\dpx1436 \dpy1208 \dpxsize0 \dpysize728
+}
+
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Paul Trojahn]

 oox/source/drawingml/textparagraph.cxx |   11 +++
 sd/qa/unit/data/pptx/tdf114913.pptx|binary
 sd/qa/unit/import-tests.cxx|   14 ++
 3 files changed, 21 insertions(+), 4 deletions(-)

New commits:
commit 1fe4f041aeef2fcabd90bc07ab6a5ee5aba1dd59
Author: Paul Trojahn 
Date:   Sat Jan 20 18:08:58 2018 +0100

tdf#114913 Use master if char size wasn't set

The size returned by insertAt falls back to the master size if needed.

Change-Id: I741b48616c6c848fc641c597cc72bf8b17e3cad4
Reviewed-on: https://gerrit.libreoffice.org/48456
Tested-by: Jenkins 
Reviewed-by: Tamás Zolnai 

diff --git a/oox/source/drawingml/textparagraph.cxx 
b/oox/source/drawingml/textparagraph.cxx
index 8f1e5d1b061c..e1fe50b31f1b 100644
--- a/oox/source/drawingml/textparagraph.cxx
+++ b/oox/source/drawingml/textparagraph.cxx
@@ -93,6 +93,7 @@ void TextParagraph::insertAt(
 }
 
 sal_Int32 nCharHeight = 0;
+sal_Int32 nCharHeightFirst = 0;
 if ( maRuns.empty() )
 {
 PropertySet aPropSet( xAt );
@@ -100,7 +101,7 @@ void TextParagraph::insertAt(
 TextCharacterProperties aTextCharacterProps( aTextCharacterStyle );
 aTextCharacterProps.assignUsed( maEndProperties );
 if ( aTextCharacterProps.moHeight.has() )
-nCharHeight = aTextCharacterProps.moHeight.get();
+nCharHeight = nCharHeightFirst = 
aTextCharacterProps.moHeight.get();
 aTextCharacterProps.pushToPropSet( aPropSet, rFilterBase );
 }
 else
@@ -112,7 +113,10 @@ void TextParagraph::insertAt(
 // This is currently applied to only empty runs
 if( !nLen && ( ( aIt + 1 ) == aEnd ) )
 (*aIt)->getTextCharacterProperties().assignUsed( 
maEndProperties );
-nCharHeight = std::max< sal_Int32 >( nCharHeight, 
(*aIt)->insertAt( rFilterBase, xText, xAt, aTextCharacterStyle, 
nDefaultCharHeight ) );
+sal_Int32 nCharHeightCurrent = (*aIt)->insertAt( rFilterBase, 
xText, xAt, aTextCharacterStyle, nDefaultCharHeight );
+if(aIt == maRuns.begin())
+nCharHeightFirst = nCharHeightCurrent;
+nCharHeight = std::max< sal_Int32 >( nCharHeight, 
nCharHeightCurrent);
 nParagraphSize += nLen;
 }
 }
@@ -137,8 +141,7 @@ void TextParagraph::insertAt(
 if( !aioBulletList.hasProperty( PROP_GraphicSize ) && 
maRuns.size() > 0
 && aParaProp.getBulletList().maGraphic.hasValue())
 {
-float fFirstCharHeight = 
maRuns.front()->getTextCharacterProperties().getCharHeightPoints(12);
-long nFirstCharHeightMm = TransformMetric(fFirstCharHeight * 
100.f, FUNIT_POINT, FUNIT_MM);
+long nFirstCharHeightMm = TransformMetric(nCharHeightFirst > 0 
? nCharHeightFirst : 1200, FUNIT_POINT, FUNIT_MM);
 float fBulletSizeRel = 1.f;
 if( aParaProp.getBulletList().mnSize.hasValue() )
 fBulletSizeRel = 
aParaProp.getBulletList().mnSize.get() / 100.f;
diff --git a/sd/qa/unit/data/pptx/tdf114913.pptx 
b/sd/qa/unit/data/pptx/tdf114913.pptx
new file mode 100644
index ..cf031aba0614
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf114913.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index b3730014a4fa..8210711ee906 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -171,6 +171,7 @@ public:
 void testTdf100065();
 void testTdf90626();
 void testTdf114488();
+void testTdf114913();
 
 bool checkPattern(sd::DrawDocShellRef const & rDocRef, int nShapeNumber, 
std::vector& rExpected);
 void testPatternImport();
@@ -246,6 +247,7 @@ public:
 CPPUNIT_TEST(testTdf100065);
 CPPUNIT_TEST(testTdf90626);
 CPPUNIT_TEST(testTdf114488);
+CPPUNIT_TEST(testTdf114913);
 
 CPPUNIT_TEST_SUITE_END();
 };
@@ -2316,6 +2318,18 @@ void SdImportTest::testTdf114488()
 CPPUNIT_ASSERT_EQUAL(OUString("image/x-wmf"), sMimeType);
 }
 
+void SdImportTest::testTdf114913()
+{
+sd::DrawDocShellRef xDocShRef = 
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf114913.pptx"), 
PPTX);
+SdrTextObj *pTxtObj = dynamic_cast(GetPage(1, 
xDocShRef)->GetObj(1));
+CPPUNIT_ASSERT_MESSAGE("No text object", pTxtObj != nullptr);
+const SvxNumBulletItem *pItem = 
pTxtObj->GetOutlinerParaObject()->GetTextObject().GetParaAttribs(0).GetItem(EE_PARA_NUMBULLET);
+CPPUNIT_ASSERT(pItem);
+CPPUNIT_ASSERT_EQUAL(long(691), 
pItem->GetNumRule()->GetLevel(0).GetGraphicSize().getHeight());
+
+xDocShRef->DoClose();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits 

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

[Jan Holesovsky]

 sw/source/uibase/uiview/viewling.cxx |   23 ---
 1 file changed, 16 insertions(+), 7 deletions(-)

New commits:
commit e0487fc331b02b5145dd11a9d786409800f5e780
Author: Jan Holesovsky 
Date:   Wed Jan 24 12:47:20 2018 +0100

lokdialog: Convert the Tools -> Thesaurus... to async exec.

Change-Id: Iee25e3fa970e5e28a14a95cfc8804ce944d4f762
Reviewed-on: https://gerrit.libreoffice.org/48498
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/sw/source/uibase/uiview/viewling.cxx 
b/sw/source/uibase/uiview/viewling.cxx
index d1c2054d95b1..b0a596ce2210 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -563,8 +564,9 @@ void SwView::StartThesaurus()
 }
 
 SwViewOption* pVOpt = 
const_cast(m_pWrtShell->GetViewOptions());
-bool bOldIdle = pVOpt->IsIdle();
+const bool bOldIdle = pVOpt->IsIdle();
 pVOpt->SetIdle( false );
+comphelper::ScopeGuard guard([&]() { pVOpt->SetIdle(bOldIdle); }); // 
restore when leaving scope
 
 // get initial LookUp text
 const bool bSelection = 
static_cast(m_pWrtShell)->HasSelection();
@@ -576,20 +578,27 @@ void SwView::StartThesaurus()
 SpellError( eLang );
 else
 {
-ScopedVclPtr pDlg;
+VclPtr pDlg;
 // create dialog
 {   //Scope for SwWait-Object
 SwWait aWait( *GetDocShell(), true );
 // load library with dialog only on demand ...
 SvxAbstractDialogFactory* pFact = 
SvxAbstractDialogFactory::Create();
-pDlg.disposeAndReset(pFact->CreateThesaurusDialog( (), 
xThes, aTmp, eLang ));
+pDlg.reset(pFact->CreateThesaurusDialog((), xThes, 
aTmp, eLang));
 }
 
-if ( pDlg->Execute()== RET_OK )
-InsertThesaurusSynonym( pDlg->GetWord(), aTmp, bSelection );
-}
+if (pDlg)
+{
+guard.dismiss(); // ignore, we'll call SetIdle() explictly after 
the dialog ends
 
-pVOpt->SetIdle( bOldIdle );
+pDlg->StartExecuteAsync([=](sal_Int32 nResult){
+if (nResult == RET_OK )
+InsertThesaurusSynonym(pDlg->GetWord(), aTmp, bSelection);
+
+pVOpt->SetIdle(bOldIdle);
+});
+}
+}
 }
 
 // Offer online suggestions
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 4685 
 1 file changed, 2619 insertions(+), 2066 deletions(-)

New commits:
commit 3475b95a18f1b1368bcfc20bd3d09b9c02ec33cb
Author: Christian Lohmaier 
Date:   Wed Jan 24 15:38:24 2018 +0100

update credits

Change-Id: I50973ddb45ec9269eac4954026ff25e28289dc5d

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index f5718e9ee50a..e8ec085487aa 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 http://www.w3.org/1999/xlink; 
xmlns:dc="http://purl.org/dc/elements/1.1/; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office; 
xmlns:ooow="http://openoffice.org/2004/writer; 
xmlns:oooc="http://openoffice.org/2004/calc; 
xmlns:dom="http://www.w3.org/2001/xml-events; 
xmlns:xforms="http://www.w3.org/2002/xforms; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xmlns:rpt="http://openoffice.org/2005/report; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#; 
xmlns:officeooo="http://openoffice.org/2009/office; 
xmlns:tableooo="http://openoffice.org/2009/table; 
xmlns:drawooo="http://openoffice.org/2010/draw; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.4.2$Linux_X86_64
 
LibreOffice_project/2524958677847fb3bb44820e40380acbe820f9602012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.4.2$Linux_X86_64
 
LibreOffice_project/2524958677847fb3bb44820e40380acbe820f9602012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   520
+   563
501
41965
21327
@@ -16,9 +16,9 @@
  3649
  3471
  501
- 520
+ 563
  42464
- 21846
+ 21888
  0
  0
  false
@@ -71,7 +71,7 @@
false
false
true
-   7422304
+   7433446
false
false
false
@@ -317,34 +317,34 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
-   
+   
   
   

   
   
-   
+   
   
   

@@ -376,7 +376,7 @@
   

   
-  
+  

   
   
@@ -398,16 +398,16 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -415,6 +415,9 @@
   

   
+  
+   
+  
   

   
@@ -1044,7 +1047,7 @@

   
  Credits
-1298 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-10-27 18:02:35.
+1309 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-01-23 23:15:28.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1071,10 +1074,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 23250Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 23451Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 15411Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 15697Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1082,16 +1085,16 @@
  
  
   
-   *Noel GrandinCommits: 
8479Joined: 2011-12-12
+   *Noel GrandinCommits: 
8646Joined: 2011-12-12
   
   
-   Tor 
LillqvistCommits: 8072Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 8091Joined: 
2010-03-23
   
   
-   Miklos 
VajnaCommits: 6713Joined: 
2010-07-29
+   Miklos 
VajnaCommits: 

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0-0' - 3 commits - filter/source include/rtl package/inc package/source

[Michael Stahl]

 filter/source/msfilter/mscodec.cxx |   14 +++--
 include/rtl/digest.h   |   63 +
 package/inc/ZipPackageStream.hxx   |4 -
 package/source/zippackage/ZipPackage.cxx   |2 
 package/source/zippackage/ZipPackageStream.cxx |6 +-
 5 files changed, 79 insertions(+), 10 deletions(-)

New commits:
commit 36b39bb10da8d1887ee1bab755a71180909a84cf
Author: Michael Stahl 
Date:   Fri Jan 12 18:34:04 2018 +0100

tdf#114939 package: change ODF 1.1 export to use real SHA1

Change-Id: I20d4965cc467df56536ca03b773b3f0f61b1f2a3
(cherry picked from commit 50382b9e9256d7361e3770daa654fb8d09448635)
Reviewed-on: https://gerrit.libreoffice.org/48002
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 0fbc3a1a90a649bc6353aca9fe3332556961f1a5)
Reviewed-on: https://gerrit.libreoffice.org/48090
Reviewed-by: Eike Rathke 
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx
index 4abb74a684da..3fc124973704 100644
--- a/package/inc/ZipPackageStream.hxx
+++ b/package/inc/ZipPackageStream.hxx
@@ -84,9 +84,9 @@ public:
 void SetFromManifest( bool bValue ) { m_bFromManifest = bValue; }
 
 enum class Bugs { None, WinEncodingWrongSHA1, WrongSHA1 };
-::rtl::Reference GetEncryptionData(Bugs bugs = 
Bugs::WrongSHA1);
+::rtl::Reference GetEncryptionData(Bugs bugs = Bugs::None);
 
-css::uno::Sequence GetEncryptionKey(Bugs bugs = Bugs::WrongSHA1);
+css::uno::Sequence GetEncryptionKey(Bugs bugs = Bugs::None);
 
 sal_Int32 GetStartKeyGenID();
 
diff --git a/package/source/zippackage/ZipPackage.cxx 
b/package/source/zippackage/ZipPackage.cxx
index 9a4853f439c6..087a77461d90 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -1625,7 +1625,7 @@ const uno::Sequence< sal_Int8 > 
ZipPackage::GetEncryptionKey()
 if ( m_nStartKeyGenerationID == xml::crypto::DigestID::SHA256 )
 aNameToFind = PACKAGE_ENCRYPTIONDATA_SHA256UTF8;
 else if ( m_nStartKeyGenerationID == xml::crypto::DigestID::SHA1 )
-aNameToFind = PACKAGE_ENCRYPTIONDATA_SHA1UTF8;
+aNameToFind = PACKAGE_ENCRYPTIONDATA_SHA1CORRECT;
 else
 throw uno::RuntimeException(THROW_WHERE "No expected key is 
provided!" );
 
diff --git a/package/source/zippackage/ZipPackageStream.cxx 
b/package/source/zippackage/ZipPackageStream.cxx
index 59efbcc33ad8..2bcdb073bf3c 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -1011,7 +1011,7 @@ uno::Reference< io::XInputStream > SAL_CALL 
ZipPackageStream::getDataStream()
 uno::Reference< io::XInputStream > xResult;
 try
 {
-xResult = m_rZipPackage.getZipFile().getDataStream( aEntry, 
GetEncryptionData(Bugs::WrongSHA1), m_bIsEncrypted, 
m_rZipPackage.GetSharedMutexRef() );
+xResult = m_rZipPackage.getZipFile().getDataStream( aEntry, 
GetEncryptionData(Bugs::None), m_bIsEncrypted, 
m_rZipPackage.GetSharedMutexRef() );
 }
 catch( const packages::WrongPasswordException& )
 {
@@ -1019,8 +1019,8 @@ uno::Reference< io::XInputStream > SAL_CALL 
ZipPackageStream::getDataStream()
 {
 SAL_WARN("package", "ZipPackageStream::getDataStream(): SHA1 
mismatch, trying fallbacks...");
 try
-{   // tdf#114939 try without legacy StarOffice SHA1 bug
-xResult = m_rZipPackage.getZipFile().getDataStream( 
aEntry, GetEncryptionData(Bugs::None), m_bIsEncrypted, 
m_rZipPackage.GetSharedMutexRef() );
+{   // tdf#114939 try with legacy StarOffice SHA1 bug
+xResult = m_rZipPackage.getZipFile().getDataStream( 
aEntry, GetEncryptionData(Bugs::WrongSHA1), m_bIsEncrypted, 
m_rZipPackage.GetSharedMutexRef() );
 return xResult;
 }
 catch (const packages::WrongPasswordException&)
commit 2fe6bfe0fe270a8cc45c52b95e94b87ce672a4a7
Author: Michael Stahl 
Date:   Thu Jan 11 10:28:42 2018 +0100

tdf#114939 filter: don't use StarOffice SHA1 in MS Office filters

Always use real SHA1 here, to avoid interop issues.

Change-Id: I28388db34f923bfc476a7eae526934b14d4473b5
(cherry picked from commit f66fbd947f70f6be6b22ab372facaeb9e2fb63ae)
Reviewed-on: https://gerrit.libreoffice.org/47998
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit