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

[Libreoffice Gerrit user]

 include/unoidl/unoidl.hxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit a887c42095d5749e896a8e8ee41e9e07f4e65557
Author: Stephan Bergmann 
AuthorDate: Thu Sep 27 08:47:42 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Sep 27 08:47:42 2018 +0200

Blind fix for error with old Clang


:

> In file included from 
/home/tdf/lode/jenkins/workspace/lo_ubsan/codemaker/source/codemaker/exceptiontree.cxx:28:
> 
/home/tdf/lode/jenkins/workspace/lo_ubsan/include/unoidl/unoidl.hxx:507:9: 
error: constructor for 'unoidl::SingleInterfaceBasedServiceEntity::Constructor' 
must explicitly initialize the const member 'annotations'
> Constructor(): defaultConstructor(true) {}
> ^
> 
/home/tdf/lode/jenkins/workspace/lo_ubsan/include/unoidl/unoidl.hxx:524:44: 
note: 'annotations' declared here
> std::vector< rtl::OUString > const annotations;
   ^
1 error generated.

Change-Id: I041a67599b48959bcca136bab646f6943d071bed

diff --git a/include/unoidl/unoidl.hxx b/include/unoidl/unoidl.hxx
index 711b220f7e0a..9450ebf83bf0 100644
--- a/include/unoidl/unoidl.hxx
+++ b/include/unoidl/unoidl.hxx
@@ -15,6 +15,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -504,7 +505,11 @@ public:
 bool const rest;
 };
 
-Constructor(): defaultConstructor(true) {}
+Constructor(): defaultConstructor(true)
+#if defined __clang__ && CLANG_VERSION == 30800
+   , annotations()
+#endif
+{}
 
 Constructor(
 rtl::OUString const & theName,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sd/source/core/CustomAnimationEffect.cxx|9 +++--
 sd/source/ui/animations/CustomAnimationPane.hxx |   39 
 2 files changed, 26 insertions(+), 22 deletions(-)

New commits:
commit 1fb688b2e13da39b8099a3f4ba58dc9aeef8d723
Author: Brian Fraser 
AuthorDate: Wed Sep 26 10:19:11 2018 -0700
Commit: Noel Grandin 
CommitDate: Thu Sep 27 08:38:23 2018 +0200

tdf#118065 Fix slow Impress custom animation sidebar update

Timer MainSequence::maTimer dropped from 500ms to 50ms.
Reorder declarations of UI elements in CustomAnimationPane.hxx
to be more intuitive and reflect order shown in UI.

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

diff --git a/sd/source/core/CustomAnimationEffect.cxx 
b/sd/source/core/CustomAnimationEffect.cxx
index f10210ca9c72..1b35a3a48a97 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -2969,7 +2969,7 @@ void MainSequence::init()
 mnSequenceType = EffectNodeType::MAIN_SEQUENCE;
 
 maTimer.SetInvokeHandler( LINK(this, MainSequence, onTimerHdl) );
-maTimer.SetTimeout(500);
+maTimer.SetTimeout(50);
 
 mxChangesListener.set( new AnimationChangeListener( this ) );
 
@@ -3356,7 +3356,7 @@ IMPL_LINK_NOARG(MainSequence, onTimerHdl, Timer *, void)
 }
 }
 
-/** starts a timer that recreates the internal structure from the API core 
after 1 second */
+/** starts a timer that recreates the internal structure from the API core */
 void MainSequence::startRecreateTimer()
 {
 if( !mbRebuilding && (mbIgnoreChanges == 0) )
@@ -3366,7 +3366,10 @@ void MainSequence::startRecreateTimer()
 }
 }
 
-/** starts a timer that rebuilds the API core from the internal structure 
after 1 second */
+/**
+ * starts a timer that rebuilds the API core from the internal structure
+ * This is used to reduce the number of screen redraws due to animation 
changes.
+*/
 void MainSequence::startRebuildTimer()
 {
 mbTimerMode = true;
diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx 
b/sd/source/ui/animations/CustomAnimationPane.hxx
index f1aff2e25cdc..d1e1475b6a92 100644
--- a/sd/source/ui/animations/CustomAnimationPane.hxx
+++ b/sd/source/ui/animations/CustomAnimationPane.hxx
@@ -136,28 +136,29 @@ private:
 
 const CustomAnimationPresets* mpCustomAnimationPresets;
 
-VclPtr mpPBAddEffect;
-VclPtr mpPBRemoveEffect;
-VclPtr  mpFTEffect;
-VclPtr  mpFTStart;
-VclPtrmpLBStart;
-VclPtr  mpFTProperty;
-VclPtrmpPlaceholderBox;
-VclPtrmpLBProperty;
-VclPtr mpPBPropertyMore;
-VclPtr  mpFTDuration;
+// UI Elements
+VclPtr   mpFTAnimation;
+VclPtr mpCustomAnimationList;
+VclPtr  mpPBAddEffect;
+VclPtr  mpPBRemoveEffect;
+VclPtr  mpPBMoveUp;
+VclPtr  mpPBMoveDown;
+VclPtr   mpFTCategory;
+VclPtr mpLBCategory;
+VclPtr   mpFTEffect;
+VclPtr mpLBAnimation;
+VclPtr   mpFTStart;
+VclPtr mpLBStart;
+VclPtr   mpFTProperty;
+VclPtr mpLBProperty;
+VclPtr mpPlaceholderBox;
+VclPtr  mpPBPropertyMore;
+VclPtr   mpFTDuration;
 VclPtr   mpCBXDuration;
 VclPtr   mpFTStartDelay;
 VclPtr mpMFStartDelay;
-VclPtrmpCustomAnimationList;
-VclPtr mpPBMoveUp;
-VclPtr mpPBMoveDown;
-VclPtr mpPBPlay;
-VclPtr   mpCBAutoPreview;
-VclPtr mpFTCategory;
-VclPtrmpLBCategory;
-VclPtr mpFTAnimation;
-VclPtr mpLBAnimation;
+VclPtrmpCBAutoPreview;
+VclPtr  mpPBPlay;
 
 OUStringmaStrModify;
 OUStringmaStrProperty;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sfx2/source/sidebar/TabBar.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit e14c7fa64eff20bf5fc0a97600a0dd58531e1046
Author: Jim Raykowski 
AuthorDate: Tue Sep 25 23:30:40 2018 -0800
Commit: Noel Grandin 
CommitDate: Thu Sep 27 08:37:15 2018 +0200

tdf#120122 Fix key input being passed to doc view from floating sidebar

...tab bar

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

diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 9487e8079c7c..7930f98ebb72 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -229,7 +229,11 @@ void TabBar::DataChanged (const DataChangedEvent& 
rDataChangedEvent)
 
 bool TabBar::EventNotify(NotifyEvent& rEvent)
 {
-if(rEvent.GetType() == MouseNotifyEvent::COMMAND)
+MouseNotifyEvent nType = rEvent.GetType();
+if (MouseNotifyEvent::KEYINPUT == nType)
+return true;
+
+if(MouseNotifyEvent::COMMAND == nType)
 {
 const CommandEvent& rCommandEvent = *rEvent.GetCommandEvent();
 if(rCommandEvent.GetCommand() == CommandEventId::Wheel)
___
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

[Libreoffice Gerrit user]

 sw/source/core/layout/anchoreddrawobject.cxx |   25 +
 sw/source/core/layout/flycnt.cxx |   21 ++---
 sw/source/filter/basflt/shellio.cxx  |6 +++---
 3 files changed, 14 insertions(+), 38 deletions(-)

New commits:
commit ec2cc68a666b573e226fce94919041538345cd9b
Author: Noel Grandin 
AuthorDate: Wed Sep 26 15:27:01 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Sep 27 08:36:31 2018 +0200

loplugin:useuniqueptr in SwReader::Read

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

diff --git a/sw/source/filter/basflt/shellio.cxx 
b/sw/source/filter/basflt/shellio.cxx
index ccfd9d69c74e..c4bd839976fa 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -150,12 +150,12 @@ ErrCode SwReader::Read( const Reader& rOptions )
 
 mxDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( 
RedlineFlags::Ignore );
 
-SwPaM* pUndoPam = nullptr;
+std::unique_ptr pUndoPam;
 if( bDocUndo || pCursor )
 {
 // set Pam to the previous node, so that it is not also moved
 const SwNodeIndex& rTmp = pPam->GetPoint()->nNode;
-pUndoPam = new SwPaM( rTmp, rTmp, 0, -1 );
+pUndoPam.reset(new SwPaM( rTmp, rTmp, 0, -1 ));
 }
 
 // store for now all Fly's
@@ -316,7 +316,7 @@ ErrCode SwReader::Read( const Reader& rOptions )
 mxDoc->getIDocumentRedlineAccess().SetRedlineFlags_intern( 
RedlineFlags::Ignore );
 }
 
-delete pUndoPam;
+pUndoPam.reset();
 
 pPam = pPam->GetNext();
 if( pPam == pEnd )
commit 07e5c4381ac405b4379767f9735152b8f0314faa
Author: Noel Grandin 
AuthorDate: Wed Sep 26 14:08:43 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Sep 27 08:36:19 2018 +0200

loplugin:useuniqueptr in SwObjPosOscillationControl

Point is a small object, no need to store separately on the heap

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

diff --git a/sw/source/core/layout/anchoreddrawobject.cxx 
b/sw/source/core/layout/anchoreddrawobject.cxx
index 0a4292638342..88f9969a422f 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -137,11 +137,10 @@ class SwObjPosOscillationControl
 private:
 const SwAnchoredDrawObject* mpAnchoredDrawObj;
 
-std::vector maObjPositions;
+std::vector maObjPositions;
 
 public:
 explicit SwObjPosOscillationControl( const SwAnchoredDrawObject& 
_rAnchoredDrawObj );
-~SwObjPosOscillationControl();
 
 bool OscillationDetected();
 };
@@ -152,17 +151,6 @@ SwObjPosOscillationControl::SwObjPosOscillationControl(
 {
 }
 
-SwObjPosOscillationControl::~SwObjPosOscillationControl()
-{
-while ( !maObjPositions.empty() )
-{
-Point* pPos = maObjPositions.back();
-delete pPos;
-
-maObjPositions.pop_back();
-}
-}
-
 bool SwObjPosOscillationControl::OscillationDetected()
 {
 bool bOscillationDetected = false;
@@ -174,22 +162,19 @@ bool SwObjPosOscillationControl::OscillationDetected()
 }
 else
 {
-Point* pNewObjPos = new Point( mpAnchoredDrawObj->GetObjRect().Pos() );
-for ( std::vector::iterator aObjPosIter = 
maObjPositions.begin();
-  aObjPosIter != maObjPositions.end();
-  ++aObjPosIter )
+Point aNewObjPos = mpAnchoredDrawObj->GetObjRect().Pos();
+for ( auto const & pt : maObjPositions )
 {
-if ( *pNewObjPos == *(*aObjPosIter) )
+if ( aNewObjPos == pt )
 {
 // position already occurred -> oscillation
 bOscillationDetected = true;
-delete pNewObjPos;
 break;
 }
 }
 if ( !bOscillationDetected )
 {
-maObjPositions.push_back( pNewObjPos );
+maObjPositions.push_back( aNewObjPos );
 }
 }
 
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index 5d9f1ba2fce5..0b0de1ed1076 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -210,7 +210,7 @@ class SwOszControl
 static const SwFlyFrame *pStack5;
 
 const SwFlyFrame *pFly;
-std::vector maObjPositions;
+std::vector maObjPositions;
 
 public:
 explicit SwOszControl( const SwFlyFrame *pFrame );
@@ -253,13 +253,7 @@ SwOszControl::~SwOszControl()
 else if ( SwOszControl::pStack5 == pFly )
 SwOszControl::pStack5 = nullptr;
 // #i3317#
-while ( !maObjPositions.empty() )
-{
-Point* pPos = maObjPositions.back();
-delete pPos;
-
-maObjPositions.po

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

[Libreoffice Gerrit user]

 sc/source/core/data/table4.cxx|9 +--
 sc/source/ui/unoobj/chart2uno.cxx |   92 --
 2 files changed, 43 insertions(+), 58 deletions(-)

New commits:
commit 10f2196266dd3bb0fe6c8da0c5967f80815e9492
Author: Noel Grandin 
AuthorDate: Wed Sep 26 13:41:05 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Sep 27 08:34:38 2018 +0200

loplugin:useuniqueptr in ScTable::FillAuto

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

diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 61a818000980..a565ab8433a0 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -611,7 +611,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL 
nCol2, SCROW nRow2,
 const ScPatternAttr* pSrcPattern = nullptr;
 const ScStyleSheet* pStyleSheet = nullptr;
 SCCOLROW nAtSrc = nISrcStart;
-ScPatternAttr* pNewPattern = nullptr;
+std::unique_ptr pNewPattern;
 bool bGetPattern = true;
 rInner = nIStart;
 while (true)// #i53728# with "for (;;)" old solaris/x86 
compiler mis-optimizes
@@ -620,7 +620,6 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL 
nCol2, SCROW nRow2,
 {
 if ( bGetPattern )
 {
-delete pNewPattern;
 if (bVertical)  // rInner&:=nRow, rOuter&:=nCol
 pSrcPattern = 
aCol[nCol].GetPattern(static_cast(nAtSrc));
 else// rInner&:=nCol, rOuter&:=nRow
@@ -632,13 +631,13 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL 
nCol2, SCROW nRow2,
 if ( rSet.GetItemState(ATTR_MERGE, false) == 
SfxItemState::SET
 || rSet.GetItemState(ATTR_MERGE_FLAG, false) == 
SfxItemState::SET )
 {
-pNewPattern = new ScPatternAttr( *pSrcPattern );
+pNewPattern.reset( new ScPatternAttr( *pSrcPattern ));
 SfxItemSet& rNewSet = pNewPattern->GetItemSet();
 rNewSet.ClearItem(ATTR_MERGE);
 rNewSet.ClearItem(ATTR_MERGE_FLAG);
 }
 else
-pNewPattern = nullptr;
+pNewPattern.reset();
 }
 
 const ScCondFormatItem& rCondFormatItem = 
pSrcPattern->GetItem(ATTR_CONDITIONAL);
@@ -728,7 +727,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL 
nCol2, SCROW nRow2,
 if (rInner == nIEnd) break;
 if (bPositive) ++rInner; else --rInner;
 }
-delete pNewPattern;
+pNewPattern.reset();
 
 //  Analyse
 
commit 2d34c3c421cf8b43fd6601ca688e882f6d493bfc
Author: Noel Grandin 
AuthorDate: Wed Sep 26 13:15:24 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Sep 27 08:34:26 2018 +0200

loplugin:useuniqueptr in Chart2PositionMap

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

diff --git a/sc/source/ui/unoobj/chart2uno.cxx 
b/sc/source/ui/unoobj/chart2uno.cxx
index 74d79e7d7e04..79ec21b2596d 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -143,7 +143,7 @@ struct TokenTable
 {
 SCROW mnRowCount;
 SCCOL mnColCount;
-vector maTokens;
+vector> maTokens;
 
 // noncopyable
 TokenTable(const TokenTable&) = delete;
@@ -163,12 +163,13 @@ struct TokenTable
 }
 void clear()
 {
-std::for_each(maTokens.begin(), maTokens.end(), 
std::default_delete());
+for (auto & rToken : maTokens)
+rToken.reset();
 }
 
-void push_back( FormulaToken* pToken )
+void push_back( std::unique_ptr pToken )
 {
-maTokens.push_back( pToken );
+maTokens.push_back( std::move(pToken) );
 OSL_ENSURE( maTokens.size()<= static_cast( 
mnColCount*mnRowCount ), "too much tokens" );
 }
 
@@ -197,7 +198,7 @@ vector TokenTable::getColRanges(SCCOL nCol) 
const
 sal_uInt32 nLast = getIndex(nCol, mnRowCount-1);
 for (sal_uInt32 i = getIndex(nCol, 0); i <= nLast; ++i)
 {
-FormulaToken* p = maTokens[i];
+FormulaToken* p = maTokens[i].get();
 if (!p)
 continue;
 
@@ -218,7 +219,7 @@ vector TokenTable::getRowRanges(SCROW nRow) 
const
 sal_uInt32 nLast = getIndex(mnColCount-1, nRow);
 for (sal_uInt32 i = getIndex(0, nRow); i <= nLast; i += mnRowCount)
 {
-FormulaToken* p = maTokens[i];
+FormulaToken* p = maTokens[i].get();
 if (!p)
 continue;
 
@@ -234,7 +235,7 @@ vector TokenTable::getAllRanges() const
 sal_uInt32 nStop = mnColCount*mnRow

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

[Libreoffice Gerrit user]

 sc/source/core/data/global.cxx   |4 
 sc/source/core/inc/adiasync.hxx  |4 ++--
 sc/source/core/tool/adiasync.cxx |   22 --
 3 files changed, 14 insertions(+), 16 deletions(-)

New commits:
commit d1c74bda372044154b05c1a0863808ae838b1c42
Author: Noel Grandin 
AuthorDate: Wed Sep 26 12:55:27 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Sep 27 08:31:49 2018 +0200

loplugin:useuniqueptr in ScAddInAsyncs

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

diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 8cb867ace6bb..43bcb6c3cdb9 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -543,10 +543,6 @@ void ScGlobal::InitTextHeight(const SfxItemPool* pPool)
 void ScGlobal::Clear()
 {
 // Destroy asyncs _before_ ExitExternalFunc!
-for( ScAddInAsyncs::iterator it = theAddInAsyncTbl.begin(); it != 
theAddInAsyncTbl.end(); ++it )
-{
-delete *it;
-}
 theAddInAsyncTbl.clear();
 ExitExternalFunc();
 ClearAutoFormat();
diff --git a/sc/source/core/inc/adiasync.hxx b/sc/source/core/inc/adiasync.hxx
index 50e3924479a1..bc0a22ee3315 100644
--- a/sc/source/core/inc/adiasync.hxx
+++ b/sc/source/core/inc/adiasync.hxx
@@ -69,9 +69,9 @@ public:
 
 struct CompareScAddInAsync
 {
-  bool operator()( ScAddInAsync* const& lhs, ScAddInAsync* const& rhs ) const 
{ return (*lhs)<(*rhs); }
+  bool operator()( std::unique_ptr const& lhs, 
std::unique_ptr const& rhs ) const { return (*lhs)<(*rhs); }
 };
-using ScAddInAsyncs = std::set;
+using ScAddInAsyncs = std::set, 
CompareScAddInAsync>;
 
 extern ScAddInAsyncs theAddInAsyncTbl;  // in adiasync.cxx
 
diff --git a/sc/source/core/tool/adiasync.cxx b/sc/source/core/tool/adiasync.cxx
index e7070603c8c2..9a0770b7addb 100644
--- a/sc/source/core/tool/adiasync.cxx
+++ b/sc/source/core/tool/adiasync.cxx
@@ -50,7 +50,7 @@ ScAddInAsync::ScAddInAsync(sal_uLong nHandleP, 
LegacyFuncData* pFuncData, ScDocu
 {
 pDocs.reset(new ScAddInDocs);
 pDocs->insert( pDoc );
-theAddInAsyncTbl.insert( this );
+theAddInAsyncTbl.emplace( this );
 }
 
 ScAddInAsync::~ScAddInAsync()
@@ -65,26 +65,29 @@ ScAddInAsync::~ScAddInAsync()
 ScAddInAsync* ScAddInAsync::Get( sal_uLong nHandleP )
 {
 ScAddInAsync* pRet = nullptr;
-ScAddInAsyncs::iterator it = std::find_if(
+auto it = std::find_if(
 theAddInAsyncTbl.begin(), theAddInAsyncTbl.end(),
-[nHandleP](ScAddInAsync const * el)
+[nHandleP](std::unique_ptr const & el)
 { return el->nHandle == nHandleP; });
 if ( it != theAddInAsyncTbl.end() )
-pRet = *it;
+pRet = it->get();
 return pRet;
 }
 
 void ScAddInAsync::CallBack( sal_uLong nHandleP, void* pData )
 {
-ScAddInAsync* p;
-if ( (p = Get( nHandleP )) == nullptr )
+auto asyncIt = std::find_if(
+theAddInAsyncTbl.begin(), theAddInAsyncTbl.end(),
+[nHandleP](std::unique_ptr const & el)
+{ return el->nHandle == nHandleP; });
+if ( asyncIt == theAddInAsyncTbl.end() )
 return;
+ScAddInAsync* p = asyncIt->get();
 
 if ( !p->HasListeners() )
 {
 // not in dTor because of theAddInAsyncTbl.DeleteAndDestroy in 
ScGlobal::Clear
-theAddInAsyncTbl.erase( p );
-delete p;
+theAddInAsyncTbl.erase( asyncIt );
 return ;
 }
 switch ( p->meType )
@@ -122,7 +125,7 @@ void ScAddInAsync::RemoveDocument( ScDocument* pDocumentP )
 {
 for( ScAddInAsyncs::reverse_iterator iter1 = 
theAddInAsyncTbl.rbegin(); iter1 != theAddInAsyncTbl.rend(); ++iter1 )
 {   // backwards because of pointer-movement in array
-ScAddInAsync* pAsync = *iter1;
+ScAddInAsync* pAsync = iter1->get();
 ScAddInDocs* p = pAsync->pDocs.get();
 ScAddInDocs::iterator iter2 = p->find( pDocumentP );
 if( iter2 != p->end() )
@@ -131,7 +134,6 @@ void ScAddInAsync::RemoveDocument( ScDocument* pDocumentP )
 if ( p->empty() )
 {   // this AddIn is not used anymore
 theAddInAsyncTbl.erase( --(iter1.base()) );
-delete pAsync;
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 include/toolkit/controls/eventcontainer.hxx  |2 +-
 toolkit/inc/helper/msgbox.hxx|2 +-
 toolkit/source/awt/asynccallback.cxx |2 +-
 toolkit/source/awt/stylesettings.cxx |2 +-
 toolkit/source/awt/vclxtoolkit.cxx   |   10 +-
 toolkit/source/awt/vclxwindow.cxx|2 +-
 toolkit/source/controls/geometrycontrolmodel.cxx |2 +-
 toolkit/source/controls/unocontrol.cxx   |2 +-
 toolkit/source/controls/unocontrolcontainer.cxx  |2 +-
 toolkit/source/helper/vclunohelper.cxx   |6 +++---
 10 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 175834ce6a3ba707a6d34aa8de7351574381f481
Author: Noel Grandin 
AuthorDate: Wed Sep 26 13:52:39 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Sep 27 08:30:01 2018 +0200

loplugin:constfields in toolkit

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

diff --git a/include/toolkit/controls/eventcontainer.hxx 
b/include/toolkit/controls/eventcontainer.hxx
index 65d0418bdc27..cc1d20493e4c 100644
--- a/include/toolkit/controls/eventcontainer.hxx
+++ b/include/toolkit/controls/eventcontainer.hxx
@@ -38,7 +38,7 @@ class ScriptEventContainer : public ::cppu::WeakImplHelper<
 {
 std::unordered_map< OUString, css::uno::Any>
mHashMap;
-css::uno::Type mType;
+css::uno::Type const mType;
 
 ContainerListenerMultiplexer maContainerListeners;
 
diff --git a/toolkit/inc/helper/msgbox.hxx b/toolkit/inc/helper/msgbox.hxx
index 0fc7631d93de..f353b2ff9d57 100644
--- a/toolkit/inc/helper/msgbox.hxx
+++ b/toolkit/inc/helper/msgbox.hxx
@@ -50,7 +50,7 @@ class MessBox : public ButtonDialog
 VclPtr mpFixedImage;
 Image maImage;
 bool mbHelpBtn;
-MessBoxStyle mnMessBoxStyle;
+MessBoxStyle const mnMessBoxStyle;
 
 protected:
 OUString maMessText;
diff --git a/toolkit/source/awt/asynccallback.cxx 
b/toolkit/source/awt/asynccallback.cxx
index e9cc75f5f462..c37b20930a71 100644
--- a/toolkit/source/awt/asynccallback.cxx
+++ b/toolkit/source/awt/asynccallback.cxx
@@ -57,7 +57,7 @@ private:
 xCallback( rCallback ), aData( rAny ) {}
 
 css::uno::Reference< css::awt::XCallback > xCallback;
-css::uno::Any  aData;
+css::uno::Any constaData;
 };
 
 DECL_STATIC_LINK( AsyncCallback, Notify_Impl, void*, void );
diff --git a/toolkit/source/awt/stylesettings.cxx 
b/toolkit/source/awt/stylesettings.cxx
index 556fa8040371..22cce1247cc6 100644
--- a/toolkit/source/awt/stylesettings.cxx
+++ b/toolkit/source/awt/stylesettings.cxx
@@ -87,7 +87,7 @@ namespace toolkit
 }
 
 private:
-SolarMutexGuard  m_aGuard;
+SolarMutexGuard const  m_aGuard;
 };
 
 
diff --git a/toolkit/source/awt/vclxtoolkit.cxx 
b/toolkit/source/awt/vclxtoolkit.cxx
index 5e7c9e823c39..737bdc529554 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -415,7 +415,7 @@ public:
 delete this;
 }
 
-sal_Int32 m_nPauseMilliseconds;
+sal_Int32 const m_nPauseMilliseconds;
 };
 
 class VCLXToolkitMutexHelper
@@ -439,8 +439,8 @@ class VCLXToolkit : public VCLXToolkitMutexHelper,
 ::comphelper::OInterfaceContainerHelper2 m_aTopWindowListeners;
 ::comphelper::OInterfaceContainerHelper2 m_aKeyHandlers;
 ::comphelper::OInterfaceContainerHelper2 m_aFocusListeners;
-::Link m_aEventListenerLink;
-::Link m_aKeyListenerLink;
+::Link const m_aEventListenerLink;
+::Link const m_aKeyListenerLink;
 bool m_bEventListener;
 bool m_bKeyListener;
 
@@ -801,9 +801,9 @@ WindowType ImplGetComponentType( const OUString& 
rServiceName )
 
 struct MessageBoxTypeInfo
 {
-css::awt::MessageBoxType eType;
+css::awt::MessageBoxType const eType;
 const sal_Char  *pName;
-sal_Int32nLen;
+sal_Int32 const  nLen;
 };
 
 static const MessageBoxTypeInfo aMessageBoxTypeInfo[] =
diff --git a/toolkit/source/awt/vclxwindow.cxx 
b/toolkit/source/awt/vclxwindow.cxx
index 9edf3ed9086c..eb3df832c972 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -118,7 +118,7 @@ public:
 boolmbDisposing : 1;
 boolmbDesignMode: 1;
 boolmbSynthesizingVCLEvent  : 1;
-boolmbWithDefaultProps  : 1;
+bool const  mbWithDefaultProps  : 1;
 
 sal_uLong   mnListenerLockLevel;
 sal_Int16   mnWritingMode;
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx 
b/toolkit/source/controls/geometrycontrolmodel.cxx
index d8f9045668fc.

[Libreoffice-commits] core.git: 2 commits - include/tools include/ucbhelper tools/source ucbhelper/source UnoControls/source

[Libreoffice Gerrit user]

 UnoControls/source/inc/OConnectionPointHelper.hxx |2 +-
 include/tools/multisel.hxx|   10 +-
 include/tools/stream.hxx  |2 +-
 include/tools/vcompat.hxx |2 +-
 include/tools/zcodec.hxx  |4 ++--
 include/ucbhelper/interactionrequest.hxx  |   18 +-
 include/ucbhelper/resultsethelper.hxx |2 +-
 include/ucbhelper/resultsetmetadata.hxx   |6 +-
 tools/source/fsys/urlobj.cxx  |   20 ++--
 tools/source/inet/inetmime.cxx|   14 +++---
 tools/source/reversemap/bestreversemap.cxx|2 +-
 tools/source/xml/XmlWriter.cxx|2 +-
 ucbhelper/source/client/proxydecider.cxx  |   13 +
 ucbhelper/source/provider/resultset.cxx   |6 +++---
 ucbhelper/source/provider/resultsetmetadata.cxx   |8 ++--
 15 files changed, 50 insertions(+), 61 deletions(-)

New commits:
commit 833c4965fc0941ea997852e3d99dcd7688e58c14
Author: Noel Grandin 
AuthorDate: Wed Sep 26 13:40:27 2018 +0200
Commit: Noel Grandin 
CommitDate: Thu Sep 27 08:29:49 2018 +0200

loplugin:constfields in tools

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

diff --git a/include/tools/multisel.hxx b/include/tools/multisel.hxx
index 3e06a3dce239..feb96abd2760 100644
--- a/include/tools/multisel.hxx
+++ b/include/tools/multisel.hxx
@@ -77,16 +77,16 @@ class SAL_WARN_UNUSED TOOLS_DLLPUBLIC StringRangeEnumerator
 {
 struct Range
 {
-sal_Int32   nFirst;
-sal_Int32   nLast;
+sal_Int32 const   nFirst;
+sal_Int32 const   nLast;
 
 Range( sal_Int32 i_nFirst, sal_Int32 i_nLast ) : nFirst( i_nFirst ), 
nLast( i_nLast ) {}
 };
 std::vector< StringRangeEnumerator::Range >maSequence;
 sal_Int32  mnCount;
-sal_Int32  mnMin;
-sal_Int32  mnMax;
-sal_Int32  mnOffset;
+sal_Int32 constmnMin;
+sal_Int32 constmnMax;
+sal_Int32 constmnOffset;
 bool   mbValidInput;
 
 bool setRange( const OUString& i_rNewRange );
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index ce6db9ac4217..86a29f8093ff 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -100,7 +100,7 @@ enum SvLockBytesStatFlag { SVSTATFLAG_DEFAULT };
 class TOOLS_DLLPUBLIC SvLockBytes: public virtual SvRefBase
 {
 SvStream * m_pStream;
-bool m_bOwner;
+bool const m_bOwner;
 bool m_bSync;
 
 protected:
diff --git a/include/tools/vcompat.hxx b/include/tools/vcompat.hxx
index 85e3b1d44240..ba4692f663e2 100644
--- a/include/tools/vcompat.hxx
+++ b/include/tools/vcompat.hxx
@@ -38,7 +38,7 @@ class TOOLS_DLLPUBLIC VersionCompat
 SvStream*   mpRWStm;
 sal_uInt32  mnCompatPos;
 sal_uInt32  mnTotalSize;
-StreamMode   mnStmMode;
+StreamMode const mnStmMode;
 sal_uInt16  mnVersion;
 
 VersionCompat( const VersionCompat& ) = delete;
diff --git a/include/tools/zcodec.hxx b/include/tools/zcodec.hxx
index 57af7c50c2a1..9f26d263adba 100644
--- a/include/tools/zcodec.hxx
+++ b/include/tools/zcodec.hxx
@@ -40,11 +40,11 @@ class SAL_WARN_UNUSED TOOLS_DLLPUBLIC ZCodec
 boolmbStatus;
 boolmbFinish;
 sal_uInt8*  mpInBuf;
-size_t  mnInBufSize;
+size_t constmnInBufSize;
 size_t  mnInToRead;
 SvStream*   mpOStm;
 sal_uInt8*  mpOutBuf;
-size_t  mnOutBufSize;
+size_t constmnOutBufSize;
 
 sal_uInt32  mnCRC;
 int mnCompressLevel;
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index f024fec558bf..6a53e29d9d03 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -290,14 +290,14 @@ struct INetURLObject::SchemeInfo
 {
 sal_Char const * m_pScheme;
 sal_Char const * m_pPrefix;
-bool m_bAuthority;
-bool m_bUser;
-bool m_bAuth;
-bool m_bPassword;
-bool m_bHost;
-bool m_bPort;
-bool m_bHierarchical;
-bool m_bQuery;
+bool const m_bAuthority;
+bool const m_bUser;
+bool const m_bAuth;
+bool const m_bPassword;
+bool const m_bHost;
+bool const m_bPort;
+bool const m_bHierarchical;
+bool const m_bQuery;
 };
 
 struct INetURLObject::PrefixInfo
@@ -306,8 +306,8 @@ struct INetURLObject::PrefixInfo
 
 sal_Char const * m_pPrefix;
 sal_C

Re: Intermittent Unit Test Failure: VclComplexTextTest::testArabic

[Noel Grandin]

On Thu, 27 Sep 2018 at 08:28, Noel Grandin  wrote:

>
>
> On Wed, 26 Sep 2018 at 23:58, Jan-Marek Glogowski 
> wrote:
>
>> For me it looks like a multi-threaded problem, where something isn't
>> correct processed in order. I can reproduce crashes when I run a very
>> parallel make check often, but never was able to get something in a
>> debugger...
>>
>>
>
Michael Stahl has had some success debugging rare stuff by running
everything under rr and then debugging those traces.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Intermittent Unit Test Failure: VclComplexTextTest::testArabic

[Noel Grandin]

On Wed, 26 Sep 2018 at 23:58, Jan-Marek Glogowski  wrote:

> For me it looks like a multi-threaded problem, where something isn't
> correct processed in order. I can reproduce crashes when I run a very
> parallel make check often, but never was able to get something in a
> debugger...
>
>
mst
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 editeng/source/items/borderline.cxx |   19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 850c575d67162a97c1b7acd4fb75c32d0884e7b9
Author: Justin Luth 
AuthorDate: Wed Sep 26 17:46:33 2018 +0300
Commit: Justin Luth 
CommitDate: Thu Sep 27 06:37:14 2018 +0200

editeng ConvertBorderWidthToWord ensure minimum width

If the border in LO has a width, then make sure that the
converted width is non-zero.

The specific fix intended is for the "Horizontal Line"
paragraph style (double, width =1) to export to .doc
format and retain the bottom border.

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

diff --git a/editeng/source/items/borderline.cxx 
b/editeng/source/items/borderline.cxx
index 5c9042f307fe..33cd0ca6de31 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -250,6 +250,9 @@ ConvertBorderWidthFromWord(SvxBorderLineStyle const eStyle, 
double const i_fWidt
 double
 ConvertBorderWidthToWord(SvxBorderLineStyle const eStyle, double const fWidth)
 {
+if ( !fWidth )
+return 0;
+
 switch (eStyle)
 {
 // Single lines
@@ -264,31 +267,31 @@ ConvertBorderWidthToWord(SvxBorderLineStyle const eStyle, 
double const fWidth)
 // Double lines
 case SvxBorderLineStyle::DOUBLE:
 case SvxBorderLineStyle::DOUBLE_THIN:
-return fWidth / 3.0;
+return std::max(1.0, fWidth / 3.0);
 
 case SvxBorderLineStyle::THINTHICK_MEDIUMGAP:
 case SvxBorderLineStyle::THICKTHIN_MEDIUMGAP:
 case SvxBorderLineStyle::EMBOSSED:
 case SvxBorderLineStyle::ENGRAVED:
-return fWidth / 2.0;
+return std::max(1.0, fWidth / 2.0);
 
 case SvxBorderLineStyle::THINTHICK_SMALLGAP:
-return fWidth - THINTHICK_SMALLGAP_line2 - THINTHICK_SMALLGAP_gap;
+return std::max(1.0, fWidth - THINTHICK_SMALLGAP_line2 - 
THINTHICK_SMALLGAP_gap);
 
 case SvxBorderLineStyle::THINTHICK_LARGEGAP:
-return fWidth - THINTHICK_LARGEGAP_line1 - 
THINTHICK_LARGEGAP_line2;
+return std::max(1.0, fWidth - THINTHICK_LARGEGAP_line1 - 
THINTHICK_LARGEGAP_line2);
 
 case SvxBorderLineStyle::THICKTHIN_SMALLGAP:
-return fWidth - THICKTHIN_SMALLGAP_line1 - THICKTHIN_SMALLGAP_gap;
+return std::max(1.0, fWidth - THICKTHIN_SMALLGAP_line1 - 
THICKTHIN_SMALLGAP_gap);
 
 case SvxBorderLineStyle::THICKTHIN_LARGEGAP:
-return fWidth - THICKTHIN_LARGEGAP_line1 - 
THICKTHIN_LARGEGAP_line2;
+return std::max(1.0, fWidth - THICKTHIN_LARGEGAP_line1 - 
THICKTHIN_LARGEGAP_line2);
 
 case SvxBorderLineStyle::OUTSET:
-return (fWidth - OUTSET_line1) / 2.0;
+return std::max(1.0, (fWidth - OUTSET_line1) / 2.0);
 
 case SvxBorderLineStyle::INSET:
-return (fWidth - INSET_line2) / 2.0;
+return std::max(1.0, (fWidth - INSET_line2) / 2.0);
 
 case SvxBorderLineStyle::NONE:
 return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/source/filter/ww8/rtfattributeoutput.cxx|   10 ++
 writerfilter/source/rtftok/rtfcontrolwords.cxx |4 +---
 writerfilter/source/rtftok/rtfcontrolwords.hxx |2 --
 writerfilter/source/rtftok/rtfdispatchflag.cxx |9 +
 4 files changed, 20 insertions(+), 5 deletions(-)

New commits:
commit 32ffb7b875ee229744f0b880a32817e948ff10a4
Author: Justin Luth 
AuthorDate: Wed Sep 26 15:08:33 2018 +0300
Commit: Justin Luth 
CommitDate: Thu Sep 27 06:21:53 2018 +0200

tdf#119037 rtf (im/ex)port: new borderlines

"new" borderlines (from 2012, 2014) defined in
offapi/com/sun/star/table/BorderLineStyle.idl
where no supported in export yet!!! Sad.
const short FINE_DASHED = 14; (rtf)
const short DOUBLE_THIN = 15; (rtf/doc/docx)
const short DASH_DOT = 16; (rtf/docx)
const short DASH_DOT_DOT = 17; (rtf/docx)

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

diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 49482a7a8c1f..c4e5e4f28498 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -120,6 +120,7 @@ static OString OutTBLBorderLine(RtfExport const& rExport, 
const editeng::SvxBord
 aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRDASH);
 break;
 case SvxBorderLineStyle::DOUBLE:
+case SvxBorderLineStyle::DOUBLE_THIN:
 aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRDB);
 break;
 case SvxBorderLineStyle::THINTHICK_SMALLGAP:
@@ -152,6 +153,15 @@ static OString OutTBLBorderLine(RtfExport const& rExport, 
const editeng::SvxBord
 case SvxBorderLineStyle::INSET:
 aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRINSET);
 break;
+case SvxBorderLineStyle::FINE_DASHED:
+aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRDASHSM);
+break;
+case SvxBorderLineStyle::DASH_DOT:
+aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRDASHD);
+break;
+case SvxBorderLineStyle::DASH_DOT_DOT:
+aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRDASHDD);
+break;
 case SvxBorderLineStyle::NONE:
 default:
 aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRNONE);
diff --git a/writerfilter/source/rtftok/rtfcontrolwords.cxx 
b/writerfilter/source/rtftok/rtfcontrolwords.cxx
index f1c39391fc6e..b49f356d4b0f 100644
--- a/writerfilter/source/rtftok/rtfcontrolwords.cxx
+++ b/writerfilter/source/rtftok/rtfcontrolwords.cxx
@@ -158,8 +158,6 @@ RTFSymbol aRTFControlWords[] = {
 { "brdrdash", CONTROL_FLAG, RTF_BRDRDASH, 0 },
 { "brdrdashd", CONTROL_FLAG, RTF_BRDRDASHD, 0 },
 { "brdrdashdd", CONTROL_FLAG, RTF_BRDRDASHDD, 0 },
-{ "brdrdashdot", CONTROL_FLAG, RTF_BRDRDASHDOT, 0 },
-{ "brdrdashdotdot", CONTROL_FLAG, RTF_BRDRDASHDOTDOT, 0 },
 { "brdrdashdotstr", CONTROL_FLAG, RTF_BRDRDASHDOTSTR, 0 },
 { "brdrdashsm", CONTROL_FLAG, RTF_BRDRDASHSM, 0 },
 { "brdrdb", CONTROL_FLAG, RTF_BRDRDB, 0 },
@@ -1908,4 +1906,4 @@ bool RTFMathSymbol::operator<(const RTFMathSymbol& 
rOther) const
 } // namespace rtftok
 } // namespace writerfilter
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfcontrolwords.hxx 
b/writerfilter/source/rtftok/rtfcontrolwords.hxx
index 849750888d1d..ddaf123b4a77 100644
--- a/writerfilter/source/rtftok/rtfcontrolwords.hxx
+++ b/writerfilter/source/rtftok/rtfcontrolwords.hxx
@@ -301,8 +301,6 @@ enum RTFKeyword
 RTF_BRDRDASH,
 RTF_BRDRDASHD,
 RTF_BRDRDASHDD,
-RTF_BRDRDASHDOT,
-RTF_BRDRDASHDOTDOT,
 RTF_BRDRDASHDOTSTR,
 RTF_BRDRDASHSM,
 RTF_BRDRDB,
diff --git a/writerfilter/source/rtftok/rtfdispatchflag.cxx 
b/writerfilter/source/rtftok/rtfdispatchflag.cxx
index d48893f38d4d..001e22bad455 100644
--- a/writerfilter/source/rtftok/rtfdispatchflag.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchflag.cxx
@@ -217,6 +217,15 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
 case RTF_BRDRINSET:
 nParam = NS_ooxml::LN_Value_ST_Border_inset;
 break;
+case RTF_BRDRDASHSM:
+nParam = NS_ooxml::LN_Value_ST_Border_dashSmallGap;
+break;
+case RTF_BRDRDASHD:
+nParam = NS_ooxml::LN_Value_ST_Border_dotDash;
+break;
+case RTF_BRDRDASHDD:
+nParam = NS_ooxml::LN_Value_ST_Border_dotDotDash;
+break;
 case RTF_BRDRNONE:
 nParam = NS_ooxml::LN_Value_ST_Border_none;
 break;
__

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst

[Libreoffice Gerrit user]

 external_deps.lst |   44 ++--
 1 file changed, 22 insertions(+), 22 deletions(-)

New commits:
commit f52278136a8c5d11a925f4a7f52b04d3e4df06a0
Author: Matthias Seidel 
AuthorDate: Wed Sep 26 22:20:04 2018 +
Commit: Matthias Seidel 
CommitDate: Wed Sep 26 22:20:04 2018 +

Deleted whitespace, added https for some URLs

diff --git a/external_deps.lst b/external_deps.lst
index c5b434e59383..69fdbc0b2e62 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -1,22 +1,22 @@
 # Format of this file:
 #
-# Comments start with '#' and are ignored.  Empty lines (only whitespace) are 
ignored.
+# Comments start with '#' and are ignored. Empty lines (only whitespace) are 
ignored.
 #
 # All other lines have one of two different formats:
-# 
-# if ()  
-# starts a block that specifies the download site(s) of an external 
library.
-# 
+#
+# if ()
+#starts a block that specifies the download site(s) of an external library.
+#
 # =
-#defines a variable.  A definition after an "if" statement is only valid 
up to the next
-#"if" statement.  Previous definitions are replaced.
+#defines a variable. A definition after an "if" statement is only valid up 
to the next
+#"if" statement. Previous definitions are replaced.
 # can contain references to other variables in the form 
$()
 #
 # Some variables have special names:
 #MD5 defines the MD5 check-sum of a library
-#URL1 to URL9 define alternative download sites.  The first one that 
provides the library
+#URL1 to URL9 define alternative download sites. The first one that 
provides the library
 #with matching MD5 wins.
-#name is the name under which the library tar-ball is stored.  It 
overrides the name of the
+#name is the name under which the library tar-ball is stored. It overrides 
the name of the
 #downloaded file.
 
 # Wherever possible the external tar-balls are loaded from their original 
distribution sites.
@@ -35,7 +35,7 @@ 
OOO_EXTRAS=https://sourceforge.net/projects/oooextras.mirror/files/
 if ( true )
 MD5 = 0168229624cfac409e766913506961a8
 name = ucpp-1.3.2.tar.gz
-URL1 =  
https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ucpp/ucpp-1.3.2.tar.gz
+URL1 = 
https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ucpp/ucpp-1.3.2.tar.gz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (ENABLE_UNIT_TESTS == YES)
@@ -55,7 +55,7 @@ if (SYSTEM_MDDS != YES)
 name = mdds_0.3.1.tar.bz2
 URL1 = 
https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/multidimalgorithm/mdds_0.3.1.tar.bz2
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
- 
+
 if (SYSTEM_LIBTEXTCAT != YES)
 MD5 = 128cfc86ed5953e57fe0f5ae98b62c2e
 name = libtextcat-2.2.tar.gz
@@ -76,7 +76,7 @@ if ( true )
 if (SOLAR_JAVA==TRUE && SYSTEM_LUCENE!=YES)
 MD5 = 17960f35b2239654ba608cf1f3e256b3
 name = lucene-2.9.4-src.tar.gz
-URL1 = 
http://archive.apache.org/dist/lucene/java/2.9.4/lucene-2.9.4-src.tar.gz
+URL1 = 
https://archive.apache.org/dist/lucene/java/2.9.4/lucene-2.9.4-src.tar.gz
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (ENABLE_NSS_MODULE!=NO && SYSTEM_NSS!=YES)
@@ -112,13 +112,13 @@ if (GUI!=UNX || SYSTEM_ZLIB!=YES)
 if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI==YES)
 MD5 = 2c9b0f83ed5890af02c0df1c1776f39b
 name = commons-httpclient-3.1-src.tar.gz
-URL1 = 
http://archive.apache.org/dist/httpcomponents/commons-httpclient/source/$(name)
+URL1 = 
https://archive.apache.org/dist/httpcomponents/commons-httpclient/source/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI==YES)
 MD5 = db87f7004cefc9d17f7ac841f86122bd
 name = commons-codec-1.9-src.tar.gz
-URL1 = http://archive.apache.org/dist/commons/codec/source/$(name)
+URL1 = https://archive.apache.org/dist/commons/codec/source/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if ( true )
@@ -136,7 +136,7 @@ if ( true )
 if (SOLAR_JAVA==TRUE && (ENABLE_MEDIAWIKI==YES || ENABLE_REPORTBUILDER==YES))
 MD5 = e8e197d628436490886d17cffa108fe3
 name = commons-logging-1.1.3-src.tar.gz
-URL1 = http://archive.apache.org/dist/commons/logging/source/$(name)
+URL1 = https://archive.apache.org/dist/commons/logging/source/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_JPEG != YES)
@@ -148,7 +148,7 @@ if (SYSTEM_JPEG != YES)
 if (SOLAR_JAVA==TRUE)
 MD5 = 4c8c505cc3cba4c467c479e3e0f09ba4
 name = commons-lang3-3.3-src.tar.gz
-URL1 = http://archive.apache.org/dist/commons/lang/source/$(name)
+URL1 = https://archive.apache.org/dist/commons/lang/source/$(name)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE)
@@ -160,13 +160,13 @@ if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE)
 if ( true )
 MD5 = 98492e965963f852ab29f9e61b2ad700
 name = apr-1.5.2.tar.gz
-URL1 = http://archive.apac

Re: Intermittent Unit Test Failure: VclComplexTextTest::testArabic

[Jan-Marek Glogowski]

Hi Luke,

failures for CppunitTest_vcl_complextext have been around for a few months. 
Nobody is able to reproduce them. IMHO they fail most time with loading of the 
wrong font.

Looking at the current state of 
https://tinderbox.libreoffice.org/MASTER/status.html, the master Jenkins 
Windows builds generally fail a lot.

For me it looks like a multi-threaded problem, where something isn't correct 
processed in order. I can reproduce crashes when I run a very parallel make 
check often, but never was able to get something in a debugger...

Not that any of this information will help solving the problem.

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

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

[Libreoffice Gerrit user]

 sd/source/ui/dlg/headerfooterdlg.cxx |   26 ++
 1 file changed, 26 insertions(+)

New commits:
commit d077b30dba618daace0373e9b7e7fe84f982c6aa
Author: Markus Mohrhard 
AuthorDate: Wed Sep 26 12:37:11 2018 +0200
Commit: Markus Mohrhard 
CommitDate: Wed Sep 26 23:27:44 2018 +0200

make the UI element IDs locally unique in impress header footer dlg

Change-Id: I368405acc7dfbd210cfc0115e58e993846ab9497
Reviewed-on: https://gerrit.libreoffice.org/60985
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 

diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx 
b/sd/source/ui/dlg/headerfooterdlg.cxx
index f876f3d54221..318688a8aec6 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -385,6 +385,27 @@ void HeaderFooterDialog::change( SdUndoGroup* pUndoGroup, 
SdPage* pPage, const H
 pPage->setHeaderFooterSettings( rNewSettings );
 }
 
+namespace {
+
+void recursive_rename_ui_element(vcl::Window& rWindow, const OUString& rPrefix)
+{
+OUString aID = rWindow.get_id();
+if (aID.isEmpty())
+{
+rWindow.set_id(rPrefix +  aID);
+}
+
+size_t nChildCount = rWindow.GetChildCount();
+for (size_t i = 0; i < nChildCount; ++i)
+{
+vcl::Window* pChild = rWindow.GetChild(i);
+if (pChild)
+recursive_rename_ui_element(*pChild, rPrefix);
+}
+}
+
+}
+
 HeaderFooterTabPage::HeaderFooterTabPage( vcl::Window* pWindow, 
SdDrawDocument* pDoc, SdPage* pActualPage, bool bHandoutMode ) :
 TabPage( pWindow, "HeaderFooterTab", 
"modules/simpress/ui/headerfootertab.ui" ),
 mpDoc(pDoc),
@@ -443,6 +464,11 @@ HeaderFooterTabPage::HeaderFooterTabPage( vcl::Window* 
pWindow, SdDrawDocument*
 mpCBDateTimeLanguage->SelectLanguage( meOldLanguage );
 
 FillFormatList(0);
+
+if (mbHandoutMode)
+recursive_rename_ui_element(*this, "handout");
+else
+recursive_rename_ui_element(*this, "slide");
 }
 
 HeaderFooterTabPage::~HeaderFooterTabPage()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/source/uitest/logger.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 4e02fee0022e2f05927eec69773ecb8ce519c19e
Author: Markus Mohrhard 
AuthorDate: Wed Sep 26 17:31:31 2018 +0200
Commit: Markus Mohrhard 
CommitDate: Wed Sep 26 23:27:08 2018 +0200

uitest: checking whether we have focus needs to be recursive

Change-Id: Id18a56cdf5b23433178882a953fd85954c0ccc1c
Reviewed-on: https://gerrit.libreoffice.org/61008
Reviewed-by: Markus Mohrhard 
Tested-by: Jenkins

diff --git a/vcl/source/uitest/logger.cxx b/vcl/source/uitest/logger.cxx
index 82da48256cc4..432a6af86b18 100644
--- a/vcl/source/uitest/logger.cxx
+++ b/vcl/source/uitest/logger.cxx
@@ -88,15 +88,18 @@ void UITestLogger::logCommand(const OUString& rAction, 
const css::uno::Sequence<
 namespace {
 
 // most likely this should be recursive
-bool child_windows_have_focus(VclPtr const & xUIElement)
+bool child_windows_have_focus(VclPtr const & xUIElement)
 {
 sal_Int32 nCount = xUIElement->GetChildCount();
 for (sal_Int32 i = 0; i < nCount; ++i)
 {
-if (xUIElement->GetChild(i)->HasFocus())
+vcl::Window* pChild = xUIElement->GetChild(i);
+if (pChild->HasFocus())
 {
 return true;
 }
+if (child_windows_have_focus(VclPtr(pChild)))
+return true;
 }
 return false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/ui/cellprotectionpage.ui |   24 +---
 1 file changed, 5 insertions(+), 19 deletions(-)

New commits:
commit b877f78f30400c6861f1fb371c827ae42c2a7484
Author: Caolán McNamara 
AuthorDate: Tue Sep 25 13:06:43 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 26 22:42:04 2018 +0200

fix positioning within cellprotectpage

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

diff --git a/sc/uiconfig/scalc/ui/cellprotectionpage.ui 
b/sc/uiconfig/scalc/ui/cellprotectionpage.ui
index eb7e117a944d..19f51e143b81 100644
--- a/sc/uiconfig/scalc/ui/cellprotectionpage.ui
+++ b/sc/uiconfig/scalc/ui/cellprotectionpage.ui
@@ -1,6 +1,7 @@
 
+
 
-  
+  
   
 True
 False
@@ -20,7 +21,6 @@
 True
 False
 True
-True
 6
 12
 
@@ -46,8 +46,6 @@
   
 0
 1
-1
-1
   
 
 
@@ -65,8 +63,6 @@
   
 0
 2
-1
-1
   
 
 
@@ -85,8 +81,6 @@
   
 0
 0
-1
-1
   
 
 
@@ -95,17 +89,16 @@
 False
 end
 True
-0
 Cell protection is only effective after the 
current sheet has been protected.
 
 Select 'Protect Sheet' from the 'Tools' menu.
 True
 52
+0
   
   
 1
 0
-1
 3
   
 
@@ -127,14 +120,13 @@ Select 'Protect Sheet' from the 'Tools' menu.
   
 0
 0
-1
-1
   
 
 
   
 True
 False
+start
 True
 0
 none
@@ -163,8 +155,6 @@ Select 'Protect Sheet' from the 'Tools' menu.
   
 0
 0
-1
-1
   
 
 
@@ -173,16 +163,14 @@ Select 'Protect Sheet' from the 'Tools' menu.
 False
 end
 True
-0
 The cells selected will be omitted when 
printing.
 True
 52
+0
   
   
 1
 0
-1
-1
   
 
   
@@ -203,8 +191,6 @@ Select 'Protect Sheet' from the 'Tools' menu.
   
 0
 1
-1
-1
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/source/filter/ww8/docxattributeoutput.cxx |7 +++
 sw/source/filter/ww8/ww8atr.cxx  |1 +
 2 files changed, 8 insertions(+)

New commits:
commit d55615f6c5f8adcb7157358a95329ceb1f9f7685
Author: Justin Luth 
AuthorDate: Wed Sep 26 14:54:14 2018 +0300
Commit: Justin Luth 
CommitDate: Wed Sep 26 21:19:48 2018 +0200

tdf#119037 doc/x export: new borderlines

"new" borderlines (from 2012, 2014) defined in
offapi/com/sun/star/table/BorderLineStyle.idl
were not supported in export yet!!! Sad.
const short FINE_DASHED = 14; (rtf)
const short DOUBLE_THIN = 15; (rtf/doc/docx)
const short DASH_DOT = 16; (rtf/docx)
const short DASH_DOT_DOT = 17; (rtf/docx)

Change-Id: I085bb4c70e53241fb59a4a3c97d7741cef841412
Reviewed-on: https://gerrit.libreoffice.org/60991
Reviewed-by: Justin Luth 
Tested-by: Justin Luth 

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 37d8e972a42c..b3e4df7a5f1a 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2932,6 +2932,7 @@ static void impl_borderLine( FSHelperPtr const & 
pSerializer, sal_Int32 elementT
 pVal = "dashed";
 break;
 case SvxBorderLineStyle::DOUBLE:
+case SvxBorderLineStyle::DOUBLE_THIN:
 pVal = "double";
 break;
 case SvxBorderLineStyle::THINTHICK_SMALLGAP:
@@ -2967,6 +2968,12 @@ static void impl_borderLine( FSHelperPtr const & 
pSerializer, sal_Int32 elementT
 case SvxBorderLineStyle::FINE_DASHED:
 pVal = "dashSmallGap";
 break;
+case SvxBorderLineStyle::DASH_DOT:
+pVal = "dotDash";
+break;
+case SvxBorderLineStyle::DASH_DOT_DOT:
+pVal = "dotDotDash";
+break;
 case SvxBorderLineStyle::NONE:
 default:
 break;
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index c331ab261f9d..393bae52f49f 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -4250,6 +4250,7 @@ WW8_BRCVer9 WW8Export::TranslateBorderLine(const 
SvxBorderLine& rLine,
 brcType = 7;
 break;
 case SvxBorderLineStyle::DOUBLE:
+case SvxBorderLineStyle::DOUBLE_THIN:
 brcType = 3;
 break;
 case SvxBorderLineStyle::THINTHICK_SMALLGAP:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/inc/bitmaps.hlst|2 +-
 sw/source/uibase/misc/redlndlg.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9a639b7130e98fb24d492ed03770bbe0a48cb3e6
Author: Andrea Gelmini 
AuthorDate: Fri Sep 21 11:41:13 2018 +0200
Commit: Julien Nabet 
CommitDate: Wed Sep 26 21:17:40 2018 +0200

Fix BMP_REDLINE_FORMATED -> BMP_REDLINE_FORMATTED

It passed "make check" on Linux.

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

diff --git a/sw/inc/bitmaps.hlst b/sw/inc/bitmaps.hlst
index 0b1b8c20d0c4..1a68eee6c1e2 100644
--- a/sw/inc/bitmaps.hlst
+++ b/sw/inc/bitmaps.hlst
@@ -23,7 +23,7 @@
 
 #define BMP_REDLINE_INSERTED"sw/res/redline_inserted.png"
 #define BMP_REDLINE_DELETED "sw/res/redline_deleted.png"
-#define BMP_REDLINE_FORMATED"sw/res/redline_inserted.png"
+#define BMP_REDLINE_FORMATTED   "sw/res/redline_inserted.png"
 #define BMP_REDLINE_TABLECHG"sw/res/redline_inserted.png"
 #define BMP_REDLINE_FMTCOLLSET  "sw/res/redline_inserted.png"
 
diff --git a/sw/source/uibase/misc/redlndlg.cxx 
b/sw/source/uibase/misc/redlndlg.cxx
index 90a96f5ed56d..cd1579496ef2 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -162,7 +162,7 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(vcl::Window 
*pParent, VclBuilderContainer
 , m_bInhibitActivate(false)
 , m_aInserted(BitmapEx(BMP_REDLINE_INSERTED))
 , m_aDeleted(BitmapEx(BMP_REDLINE_DELETED))
-, m_aFormated(BitmapEx(BMP_REDLINE_FORMATED))
+, m_aFormated(BitmapEx(BMP_REDLINE_FORMATTED))
 , m_aTableChgd(BitmapEx(BMP_REDLINE_TABLECHG))
 , m_aFormatCollSet(BitmapEx(BMP_REDLINE_FMTCOLLSET))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 lotuswordpro/inc/xfilter/xfindex.hxx   |2 +-
 lotuswordpro/source/filter/xfilter/xfindex.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 60296b288961e154c0828f61be23ab7f9c294e49
Author: Andrea Gelmini 
AuthorDate: Wed Sep 26 16:40:34 2018 +0200
Commit: Julien Nabet 
CommitDate: Wed Sep 26 21:16:42 2018 +0200

Fix typo

Not so sure, but anyway, let's see what the gods say.

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

diff --git a/lotuswordpro/inc/xfilter/xfindex.hxx 
b/lotuswordpro/inc/xfilter/xfindex.hxx
index ace8353be3f6..9cd469662916 100644
--- a/lotuswordpro/inc/xfilter/xfindex.hxx
+++ b/lotuswordpro/inc/xfilter/xfindex.hxx
@@ -55,7 +55,7 @@
  /
 /*
  * @file
- * Represente index source,index body and index index entry.
+ * Represents index source, index body and index entry.
  /
 #ifndef INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFINDEX_HXX
 #define INCLUDED_LOTUSWORDPRO_INC_XFILTER_XFINDEX_HXX
diff --git a/lotuswordpro/source/filter/xfilter/xfindex.cxx 
b/lotuswordpro/source/filter/xfilter/xfindex.cxx
index 8ef69ef6b70f..f141a0e46b10 100644
--- a/lotuswordpro/source/filter/xfilter/xfindex.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfindex.cxx
@@ -55,7 +55,7 @@
  /
 /*
  * @file
- * Represente index source,index body and index index entry.
+ * Represents index source, index body and index entry.
  /
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sfx2/qa/cppunit/test_misc.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 619cda0fce93dde1dcda9353270c1a001bf339a8
Author: Andrea Gelmini 
AuthorDate: Wed Sep 26 16:52:41 2018 +0200
Commit: Julien Nabet 
CommitDate: Wed Sep 26 21:16:29 2018 +0200

Fix typo

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

diff --git a/sfx2/qa/cppunit/test_misc.cxx b/sfx2/qa/cppunit/test_misc.cxx
index cf9fcdb3e0be..2f419103cbd8 100644
--- a/sfx2/qa/cppunit/test_misc.cxx
+++ b/sfx2/qa/cppunit/test_misc.cxx
@@ -187,7 +187,7 @@ void MiscTest::testHardLinks()
 // This failed: hard link count was 1, the hard link broke on store.
 CPPUNIT_ASSERT(buf.st_nlink > 1);
 
-// Test that symlinks are presreved as well.
+// Test that symlinks are preserved as well.
 nRet = remove(aNew.getStr());
 CPPUNIT_ASSERT_EQUAL(0, nRet);
 symlink(aOld.getStr(), aNew.getStr());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Intermittent Unit Test Failure: VclComplexTextTest::testArabic

[Luke Benes]

Over the years, I've probably done several hundred windows builds. Until now I 
have never been bitten an intermittent Unit Test failures. This month, I have 
started to see fairly regular failure of VclComplexTextTest::testArabic 3 out 
of ~15 builds.

Here are 2 separate examples of the Jenkins_Windows Tinderbox seeing the same 
failure in the past 2 days:

https://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTER&brief-log=1537871271.4910

https://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTER&brief-log=1537949563.7757

Has anyone investigated this? Is there any way to search Jenkins logs to see 
when this failure first occurred? 

-Luke


[build CUT] drawinglayer_border
`anonymous namespace'::CanvasBitmapTest::runTest finished in: 841ms
C:/core/vcl/qa/cppunit/complextext.cxx:98:VclComplexTextTest::testArabic
equality assertion failed
- Expected: 72
- Actual  : 75

VclComplexTextTest::testArabic finished in: 971ms
VclComplexTextTest::testTdf95650 finished in: 527ms
C:/core/vcl/qa/cppunit/complextext.cxx(98) : error : Assertion
Test name: VclComplexTextTest::testArabic
equality assertion failed
- Expected: 72
- Actual  : 75

Failures !!!
Run: 3   Failure total: 1   Failures: 1   Errors: 0

Error: a unit test failed, please do one of:
make CppunitTest_vcl_complextext CPPUNITTRACE=TRUE # which is a shortcut for 
the following line
make CppunitTest_vcl_complextext CPPUNITTRACE="'C:/Program Files 
(x86)/Microsoft Visual Studio/2017/Community/Common7/IDE/devenv.exe' /debugexe" 
# for interactive debugging in Visual Studio
make CppunitTest_vcl_complextext CPPUNITTRACE="drmemory -free_max_frames 20" # 
for memory checking (install Dr.Memory first, and put it to your PATH)

You can limit the execution to just one particular test by:

[build DEP] LNK:CppunitTest/test_writerperfect_calc.dll
make CppunitTest_vcl_complextext CPPUNIT_TEST_NAME="testXYZ" ...above mentioned 
params...

[build LNK] CppunitTest/test_writerperfect_calc.dll
make[1]: *** [C:/core/solenv/gbuild/CppunitTest.mk:120: 
C:/core/workdir/CppunitTest/vcl_complextext.test] Error 1
make[1]: *** Waiting for unfinished jobs
   Creating library 
C:/core/workdir/LinkTarget/CppunitTest/itest_xmloff_uxmloff.lib and object 
C:/core/workdir/LinkTarget/CppunitTest/itest_xmloff_uxmloff.exp
make: *** [Makefile:286: build] Error 2

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

[Libreoffice-commits] help.git: Branch 'libreoffice-6-1' - help3xsl/default.css

[Libreoffice Gerrit user]

 help3xsl/default.css |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit ee5dafa4c6e72f5d67db26257aeb1c7965f22c8e
Author: Adolfo Jayme Barrientos 
AuthorDate: Thu Aug 23 12:26:28 2018 -0500
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Sep 26 18:45:45 2018 +0200

Better placement of background color definitions & a new shadow

Change-Id: I8ad99f278cd1e4d96ae873627f2dfa2a5b827761
(cherry picked from commit c48b19bcf937b5b5689b08254208c935057b58e8)
Reviewed-on: https://gerrit.libreoffice.org/60729
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/help3xsl/default.css b/help3xsl/default.css
index 0f1967ceb..98b8e0561 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -85,7 +85,7 @@ h6,
 pointer-events: auto;
 }
 body {
-background-color: #FCFCFC;
+background-color: #F4F7F7;
 margin: 0;
 line-height: normal;
 }
@@ -334,10 +334,10 @@ h6 {
 border: solid 1px #148603;
 }
 #DisplayArea {
+background-color: #FCFCFC;
 overflow: auto;
 padding: 10px;
 grid-area: main;
-margin-bottom: 50px;
 }
 #DisplayArea > p {
 margin-bottom: 10px;
@@ -420,9 +420,8 @@ header {
 }
 footer {
 border-top: 2px solid #148603;
-background: linear-gradient(to bottom, rgba(0,0,0,0.025) 0%,rgba(0,0,0,0) 
100%);
 padding: 15px 10px 0 10px;
-margin: 25px 0 0 0;
+margin: 40px 0;
 }
 footer p {
 font-size: 0.98rem;
@@ -754,7 +753,6 @@ li.disabled a {
 }
 aside {
 background-color: #F4F7F7;
-border-right: 1px solid rgba(0,0,0,0.04);
 float: left;
 width: 320px;
 }
@@ -783,6 +781,8 @@ li.disabled a {
 border: none;
 }
 #DisplayArea {
+background-color: #FCFCFC;
+box-shadow: 0 2px 8px 0 rgba(0,0,0,.05);
 padding: 10px 50px;
 width: 800px;
 }
@@ -830,7 +830,6 @@ li.disabled a {
 .rightside {
 width: auto;
 border-right: none;
-border-left: 1px solid rgba(0,0,0,0.04);
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit 3ab472e718ea590a5c0dba572cf91e79ab916562
Author: Adolfo Jayme Barrientos 
AuthorDate: Thu Aug 23 12:26:28 2018 -0500
Commit: Gerrit Code Review 
CommitDate: Wed Sep 26 18:45:45 2018 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-6-1'
  - Better placement of background color definitions & a new shadow

Change-Id: I8ad99f278cd1e4d96ae873627f2dfa2a5b827761
(cherry picked from commit c48b19bcf937b5b5689b08254208c935057b58e8)
Reviewed-on: https://gerrit.libreoffice.org/60729
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 9e4081ac632a..ee5dafa4c6e7 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9e4081ac632a0fb39c92253899e6f22cb5336142
+Subproject commit ee5dafa4c6e72f5d67db26257aeb1c7965f22c8e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/source/core/docnode/ndtbl1.cxx |   21 +
 1 file changed, 9 insertions(+), 12 deletions(-)

New commits:
commit 32fc5661ba1da1c386e495c7b8141b2848afae47
Author: Justin Luth 
AuthorDate: Fri Sep 21 20:06:03 2018 +0300
Commit: Justin Luth 
CommitDate: Wed Sep 26 18:22:56 2018 +0200

sw AdjustCellWidth rewrite for clarity

This section has absolutely nothing to do with the previous
idea of a "wish" width. It is dealing with actual, current
cell width regardless of content.

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

diff --git a/sw/source/core/docnode/ndtbl1.cxx 
b/sw/source/core/docnode/ndtbl1.cxx
index a7568a0991f0..553a66407773 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -1507,30 +1507,27 @@ void SwDoc::AdjustCellWidth( const SwCursor& rCursor, 
bool bBalance )
 pEnd = pEnd->GetUpper();
 ::lcl_CalcColValues( aMins, aTabCols, pStart, pEnd, false );
 
+sal_uInt16 nSelectedWidth = 0, nCols = 0;
 if( bBalance )
 {
-// All Columns, which are now selected, have a desired value.
-// We add up the current values, divide the result by their
-// count and get a desired value for balancing.
-sal_uInt16 nWish = 0, nCnt = 0;
+// Find the combined size of the selected columns, and distribute 
evenly
 for ( size_t i = 0; i <= aTabCols.Count(); ++i )
 {
-int nDiff = aWish[i];
-if ( nDiff )
+if ( aWish[i] )
 {
 if ( i == 0 )
-nWish += aTabCols[i] - aTabCols.GetLeft();
+nSelectedWidth += aTabCols[i] - aTabCols.GetLeft();
 else if ( i == aTabCols.Count() )
-nWish += aTabCols.GetRight() - aTabCols[i-1];
+nSelectedWidth += aTabCols.GetRight() - aTabCols[i-1];
 else
-nWish += aTabCols[i] - aTabCols[i-1];
-++nCnt;
+nSelectedWidth += aTabCols[i] - aTabCols[i-1];
+++nCols;
 }
 }
-nWish /= nCnt;
+const sal_uInt16 nEqualWidth = nSelectedWidth / nCols;
 for (sal_uInt16 & rn : aWish)
 if ( rn )
-rn = nWish;
+rn = nEqualWidth;
 }
 
 const long nOldRight = aTabCols.GetRight();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Supplier Surveillance, Cristi Posea (CppUnit)---ID# 100580 to 100580

[Ralf Quint]

On 9/26/2018 7:04 AM, Eike Rathke wrote:

Toki, you shouldn't jump too quickly to conclusions.
The inquiry wasn't about LibreOffice but *CppUnit* (which apparently is
used by Lockheed in one of its processes) that is maintained by one of
the LibreOffice contributors and this mailing list is given as one of
the contacts.

However, CppUnit is Free and Open Source Software, there is no specific
support and no road map, the source code is freely available, so whether
it will be maintained in the future by whomever isn't really in the
scope of this mailing list.

   Eike
Sorry, but this is not the first time that pretty much the identically 
worded post appeared. Which had me flag the sender as junk, specially 
concerned with the attached .xlsx file.
Even if this would be a legitimate sender, (s)he has to be utterly 
clueless, no matter what.


Ralf

---
This email has been checked for viruses by Avast antivirus software.
https://www.avast.com/antivirus

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

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

[Libreoffice Gerrit user]

 chart2/IwyuFilter_chart2.yaml  
|  106 ++
 chart2/source/controller/chartapiwrapper/AreaWrapper.cxx   
|1 
 chart2/source/controller/chartapiwrapper/AreaWrapper.hxx   
|2 
 chart2/source/controller/chartapiwrapper/AxisWrapper.hxx   
|4 
 chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
|   27 +-
 chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx  
|1 
 chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx  
|3 
 chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
|4 
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
|1 
 chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
|   11 -
 chart2/source/controller/chartapiwrapper/GridWrapper.hxx   
|3 
 chart2/source/controller/chartapiwrapper/LegendWrapper.cxx 
|1 
 chart2/source/controller/chartapiwrapper/LegendWrapper.hxx 
|3 
 chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx 
|1 
 chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx 
|5 
 chart2/source/controller/chartapiwrapper/TitleWrapper.cxx  
|3 
 chart2/source/controller/chartapiwrapper/TitleWrapper.hxx  
|7 
 chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx  
|1 
 chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx  
|5 
 chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx  
|2 
 chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx  
|1 
 chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx  
|1 
 chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx  
|3 
 
chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx 
   |2 
 
chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx 
   |7 
 
chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
 |3 
 
chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.hxx
 |6 
 chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx  
|1 
 chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx  
|8 
 chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx   
|1 
 chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx   
|3 
 chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx   
|3 
 chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx   
|5 
 chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx  
|1 
 chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx  
|3 
 chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
|3 
 chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx
|8 
 chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx  
|1 
 chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx  
|3 
 chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
|3 
 chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx   
|3 
 chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx   
|8 
 chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
|3 
 chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx
|8 
 chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
|2 
 chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx
|8 
 chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx   
|8 
 47 files changed, 221 insertions(+), 76 deletions(-)

New commits:
commit 3bb54d3a046feabaa35df39b7a753c385c3c4101
Author: Gabor Kelemen 
AuthorDate: Mon Sep 24 07:29:16 2018 +0200
Commit: Miklos Vajna 
CommitDate: Wed Sep 26 17:59:57 2018 +0200

tdf#42949 Fix IWYU warnings in chart2/source/controller/chartapiwrapper/*hxx

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

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

diff --g

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

[Libreoffice Gerrit user]

 include/oox/ppt/pptfilterhelpers.hxx  |4 ++--
 oox/source/ppt/commontimenodecontext.cxx  |6 +++---
 sd/source/filter/eppt/pptexanimations.cxx |2 +-
 sd/source/filter/ppt/pptinanimations.cxx  |2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit d321b7dd08e2e9138efe925b86a502a6740e89ef
Author: Andrea Gelmini 
AuthorDate: Tue Sep 18 12:33:00 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 26 16:52:16 2018 +0200

Fix preset_maping -> preset_mapping

It passed "make check" on Linux

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

diff --git a/include/oox/ppt/pptfilterhelpers.hxx 
b/include/oox/ppt/pptfilterhelpers.hxx
index 926d5a77fcf5..9fdd943d87b5 100644
--- a/include/oox/ppt/pptfilterhelpers.hxx
+++ b/include/oox/ppt/pptfilterhelpers.hxx
@@ -69,13 +69,13 @@ namespace oox { namespace ppt {
 static const convert_subtype* getList();
 };
 
-struct OOX_DLLPUBLIC preset_maping
+struct OOX_DLLPUBLIC preset_mapping
 {
 sal_Int32   mnPresetClass;
 sal_Int32   mnPresetId;
 const sal_Char* mpStrPresetId;
 
-static const preset_maping* getList();
+static const preset_mapping* getList();
 };
 
 OOX_DLLPUBLIC OUString getConvertedSubType( sal_Int16 nPresetClass, 
sal_Int32 nPresetId, sal_Int32 nPresetSubType );
diff --git a/oox/source/ppt/commontimenodecontext.cxx 
b/oox/source/ppt/commontimenodecontext.cxx
index cae060f4ca22..178962340467 100644
--- a/oox/source/ppt/commontimenodecontext.cxx
+++ b/oox/source/ppt/commontimenodecontext.cxx
@@ -79,10 +79,10 @@ const convert_subtype* convert_subtype::getList()
 return aList;
 }
 
-const preset_maping* preset_maping::getList()
+const preset_mapping* preset_mapping::getList()
 {
 
-static const preset_maping aList[] =
+static const preset_mapping aList[] =
 {
 { css::presentation::EffectPresetClass::ENTRANCE, 1
,"ooo-entrance-appear" },
 { css::presentation::EffectPresetClass::ENTRANCE, 2
,"ooo-entrance-fly-in" },
@@ -528,7 +528,7 @@ OUString getConvertedSubType( sal_Int16 nPresetClass, 
sal_Int32 nPresetId, sal_I
 if( attribs.hasAttribute( XML_presetID ) )
 {
 sal_Int32 nPresetId = attribs.getInteger( XML_presetID, 0 );
-const preset_maping* p = preset_maping::getList();
+const preset_mapping* p = preset_mapping::getList();
 while( p->mpStrPresetId && ((p->mnPresetClass != 
nEffectPresetClass) || (p->mnPresetId != nPresetId )) )
 p++;
 
diff --git a/sd/source/filter/eppt/pptexanimations.cxx 
b/sd/source/filter/eppt/pptexanimations.cxx
index f0211dd9c728..4d3d2cf50535 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -924,7 +924,7 @@ sal_uInt32 AnimationExporter::GetPresetID( const OUString& 
rPreset, sal_uInt32 n
 }
 else
 {
-const oox::ppt::preset_maping* p = oox::ppt::preset_maping::getList();
+const oox::ppt::preset_mapping* p = 
oox::ppt::preset_mapping::getList();
 while( p->mpStrPresetId && ((p->mnPresetClass != 
static_cast(nAPIPresetClass)) || !rPreset.equalsAscii( 
p->mpStrPresetId )) )
 p++;
 
diff --git a/sd/source/filter/ppt/pptinanimations.cxx 
b/sd/source/filter/ppt/pptinanimations.cxx
index 5c600a3629f0..d40d7f7f9512 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -735,7 +735,7 @@ void AnimationImporter::fillNode( Reference< XAnimationNode 
> const & xNode, con
 aUserData.realloc(nSize+1);
 aUserData[nSize].Name = "preset-id";
 
-const oox::ppt::preset_maping* p = 
oox::ppt::preset_maping::getList();
+const oox::ppt::preset_mapping* p = 
oox::ppt::preset_mapping::getList();
 while( p->mpStrPresetId && ((p->mnPresetClass != 
nEffectPresetClass) || (p->mnPresetId != nPresetId )) )
 p++;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] cppunit.git: include/cppunit

[Libreoffice Gerrit user]

 include/cppunit/extensions/TestSuiteBuilderContext.h |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 4f5cd3b486afb9c7be1903252b4ae3787137a454
Author: Stephan Bergmann 
AuthorDate: Tue Aug 7 16:24:49 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 26 16:49:15 2018 +0200

Avoid GCC 9 -Wdeprecated-copy

...when an implicitly-defined copy function is used that may in a future C++
standard be defined as deleted because of the user-declared destructor.  
Just
declare all the four copy/move functions as defaulted for a consistent
interface.

(Originally addressed with LibreOffice commit
 "external/cppunit: silence
-Werror=deprecated-copy (GCC trunk towards GCC 9)".)

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

diff --git a/include/cppunit/extensions/TestSuiteBuilderContext.h 
b/include/cppunit/extensions/TestSuiteBuilderContext.h
index 72bfa70..12d157e 100644
--- a/include/cppunit/extensions/TestSuiteBuilderContext.h
+++ b/include/cppunit/extensions/TestSuiteBuilderContext.h
@@ -40,6 +40,11 @@ public:
 
   virtual ~TestSuiteBuilderContextBase();
 
+  TestSuiteBuilderContextBase(TestSuiteBuilderContextBase const &) = default;
+  TestSuiteBuilderContextBase(TestSuiteBuilderContextBase &&) = default;
+  TestSuiteBuilderContextBase & operator =(TestSuiteBuilderContextBase const 
&) = default;
+  TestSuiteBuilderContextBase & operator =(TestSuiteBuilderContextBase &&) = 
default;
+
   /*! \brief Adds a test to the fixture suite.
*
* \param test Test to add to the fixture suite. Must not be \c NULL.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 hwpfilter/source/formula.cxx |2 +-
 hwpfilter/source/grammar.cxx |4 ++--
 hwpfilter/source/nodes.h |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 7e248d3558fe8385a99629cd721e7c7feafd9974
Author: Andrea Gelmini 
AuthorDate: Mon Sep 17 19:10:44 2018 +0200
Commit: Julien Nabet 
CommitDate: Wed Sep 26 16:46:06 2018 +0200

Fix ID_DELIMETER->ID_DELIMITER

It passed "make check" on Linux

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

diff --git a/hwpfilter/source/formula.cxx b/hwpfilter/source/formula.cxx
index 5ab06f91dd9b..74eb9f90c068 100644
--- a/hwpfilter/source/formula.cxx
+++ b/hwpfilter/source/formula.cxx
@@ -233,7 +233,7 @@ void Formula::makeIdentifier(Node *res)
 #endif
   break;
  case ID_OPERATOR :
- case ID_DELIMETER :
+ case ID_DELIMITER :
 {
 #ifdef DEBUG
   inds; fprintf(stderr,"%s\n",tmp->value); indo;
diff --git a/hwpfilter/source/grammar.cxx b/hwpfilter/source/grammar.cxx
index fe8a11de80bd..1e20afc22729 100644
--- a/hwpfilter/source/grammar.cxx
+++ b/hwpfilter/source/grammar.cxx
@@ -771,10 +771,10 @@ case 11:
 { yyval.ptr = new Node(ID_IDENTIFIER); yyval.ptr->value = 
strdup(yyvsp[0].str); debug("Identifier : %s\n",yyvsp[0].str); 
nodelist.push_back(yyval.ptr);
 break;}
 case 12:
-{ yyval.ptr = new Node(ID_DELIMETER); yyval.ptr->value = strdup(yyvsp[0].str); 
debug("Identifier : %s\n",yyvsp[0].str); nodelist.push_back(yyval.ptr);
+{ yyval.ptr = new Node(ID_DELIMITER); yyval.ptr->value = strdup(yyvsp[0].str); 
debug("Identifier : %s\n",yyvsp[0].str); nodelist.push_back(yyval.ptr);
 break;}
 case 13:
-{ yyval.ptr = new Node(ID_DELIMETER); yyval.ptr->value = strdup(yyvsp[0].str); 
debug("Identifier : %s\n",yyvsp[0].str); nodelist.push_back(yyval.ptr);
+{ yyval.ptr = new Node(ID_DELIMITER); yyval.ptr->value = strdup(yyvsp[0].str); 
debug("Identifier : %s\n",yyvsp[0].str); nodelist.push_back(yyval.ptr);
 break;}
 case 14:
 { yyval.ptr = new Node(ID_IDENTIFIER); yyval.ptr->value = 
strdup(yyvsp[0].str); debug("Identifier : %s\n",yyvsp[0].str); 
nodelist.push_back(yyval.ptr);
diff --git a/hwpfilter/source/nodes.h b/hwpfilter/source/nodes.h
index 61db3a818137..048a1289d472 100644
--- a/hwpfilter/source/nodes.h
+++ b/hwpfilter/source/nodes.h
@@ -60,7 +60,7 @@ enum IDLIST {
  ID_NUMBER,
  ID_OPERATOR,
  ID_SPACE,
- ID_DELIMETER
+ ID_DELIMITER
 };
 
 class Node{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 reportdesign/source/ui/inc/DesignView.hxx|2 +-
 reportdesign/source/ui/report/DesignView.cxx |8 
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit faa2f029c16b8f25e88b054f22f69ef474fa289d
Author: Andrea Gelmini 
AuthorDate: Mon Sep 17 12:07:41 2018 +0200
Commit: Julien Nabet 
CommitDate: Wed Sep 26 16:38:26 2018 +0200

Fix _bToogleOn -> _bToggleOn

It passed "make check" on Linux

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

diff --git a/reportdesign/source/ui/inc/DesignView.hxx 
b/reportdesign/source/ui/inc/DesignView.hxx
index 07e01d0d2b79..fe9f7b20554e 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -172,7 +172,7 @@ namespace rptui
 */
 voidtoggleGrid(bool _bGridVisible);
 
-voidtogglePropertyBrowser(bool _bToogleOn);
+voidtogglePropertyBrowser(bool _bToggleOn);
 
 boolisAddFieldVisible() const;
 voidtoggleAddField();
diff --git a/reportdesign/source/ui/report/DesignView.cxx 
b/reportdesign/source/ui/report/DesignView.cxx
index 3c506a98a07d..be9bc4c63b52 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -418,21 +418,21 @@ void ODesignView::unmarkAllObjects()
 m_aScrollWindow->unmarkAllObjects();
 }
 
-void ODesignView::togglePropertyBrowser(bool _bToogleOn)
+void ODesignView::togglePropertyBrowser(bool _bToggleOn)
 {
-if ( !m_pPropWin && _bToogleOn )
+if ( !m_pPropWin && _bToggleOn )
 {
 m_pPropWin = VclPtr::Create(getController().getORB(), 
m_pTaskPane,this);
 m_pPropWin->Invalidate();
 
static_cast(m_pTaskPane.get())->setPropertyBrowser(m_pPropWin);
 
notifySystemWindow(this,m_pPropWin,::comphelper::mem_fun(&TaskPaneList::AddWindow));
 }
-if ( m_pPropWin && _bToogleOn != m_pPropWin->IsVisible() )
+if ( m_pPropWin && _bToggleOn != m_pPropWin->IsVisible() )
 {
 if ( !m_pCurrentView && !m_xReportComponent.is() )
 m_xReportComponent = getController().getReportDefinition();
 
-const bool bWillBeVisible = _bToogleOn;
+const bool bWillBeVisible = _bToggleOn;
 m_pPropWin->Show(bWillBeVisible);
 m_pTaskPane->Show(bWillBeVisible);
 m_pTaskPane->Invalidate();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Supplier Surveillance, Cristi Posea (CppUnit)---ID# 100580 to 100580

[Eike Rathke]

Hi toki,

On Tuesday, 2018-09-25 21:00:34 +, toki wrote:

> On 2018-09-24 7:16 p.m., Larrabee, Kevin P wrote:
> > I am a member of the Product Selection & Sustainment group at Lockheed 
> > Martin RMS. 
> 
> If you really are from Lockheed Martin, and your job really requires you
> to track product obsolescence, you wouldn't be sending something that
> looks like a badly crafting phishing attempt to a developer list.
> 
> What you'd do, is go to whoever provides LibreOffice support to
> Lockhead-Martin, and have them provide that information. If your support

Toki, you shouldn't jump too quickly to conclusions.
The inquiry wasn't about LibreOffice but *CppUnit* (which apparently is
used by Lockheed in one of its processes) that is maintained by one of
the LibreOffice contributors and this mailing list is given as one of
the contacts.

However, CppUnit is Free and Open Source Software, there is no specific
support and no road map, the source code is freely available, so whether
it will be maintained in the future by whomever isn't really in the
scope of this mailing list.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A


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

[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/elementary_svg

[Libreoffice Gerrit user]

 dev/null|binary
 icon-themes/elementary/Copyrights   |4 
 icon-themes/elementary/README.md|5 
 icon-themes/elementary/cmd/32/contourdialog.png |binary
 icon-themes/elementary/cmd/32/wrapcontour.png   |binary
 icon-themes/elementary/cmd/32/wrapideal.png |binary
 icon-themes/elementary/cmd/32/wrapleft.png  |binary
 icon-themes/elementary/cmd/32/wrapoff.png   |binary
 icon-themes/elementary/cmd/32/wrapon.png|binary
 icon-themes/elementary/cmd/32/wrapright.png |binary
 icon-themes/elementary/cmd/32/wrapthrough.png   |binary
 icon-themes/elementary/cmd/lc_contourdialog.png |binary
 icon-themes/elementary/cmd/lc_wrapcontour.png   |binary
 icon-themes/elementary/cmd/lc_wrapideal.png |binary
 icon-themes/elementary/cmd/lc_wrapleft.png  |binary
 icon-themes/elementary/cmd/lc_wrapoff.png   |binary
 icon-themes/elementary/cmd/lc_wrapon.png|binary
 icon-themes/elementary/cmd/lc_wrapright.png |binary
 icon-themes/elementary/cmd/lc_wrapthrough.png   |binary
 icon-themes/elementary/cmd/sc_contourdialog.png |binary
 icon-themes/elementary/cmd/sc_wrapcontour.png   |binary
 icon-themes/elementary/cmd/sc_wrapideal.png |binary
 icon-themes/elementary/cmd/sc_wrapleft.png  |binary
 icon-themes/elementary/cmd/sc_wrapoff.png   |binary
 icon-themes/elementary/cmd/sc_wrapon.png|binary
 icon-themes/elementary/cmd/sc_wrapright.png |binary
 icon-themes/elementary/cmd/sc_wrapthrough.png   |binary
 icon-themes/elementary/links.txt|   20 
 icon-themes/elementary/sw/res/wr010.png |binary
 icon-themes/elementary/sw/res/wr08.png  |binary
 icon-themes/elementary/sw/res/wr09.png  |binary
 icon-themes/elementary_svg/Copyrights   |4 
 icon-themes/elementary_svg/README.md|5 
 icon-themes/elementary_svg/cmd/32/contourdialog.svg |  346 ++
 icon-themes/elementary_svg/cmd/32/managebreakpoints.svg |  380 +++-
 icon-themes/elementary_svg/cmd/32/wrapcontour.svg   |  193 
 icon-themes/elementary_svg/cmd/32/wrapideal.svg |  369 +++
 icon-themes/elementary_svg/cmd/32/wrapleft.svg  |  193 
 icon-themes/elementary_svg/cmd/32/wrapoff.svg   |  144 ++
 icon-themes/elementary_svg/cmd/32/wrapon.svg|  271 +++
 icon-themes/elementary_svg/cmd/32/wrapright.svg |  221 +
 icon-themes/elementary_svg/cmd/32/wrapthrough.svg   |  192 
 icon-themes/elementary_svg/cmd/lc_contourdialog.svg |  356 ++
 icon-themes/elementary_svg/cmd/lc_wrapcontour.svg   |  232 +
 icon-themes/elementary_svg/cmd/lc_wrapideal.svg |  378 +++
 icon-themes/elementary_svg/cmd/lc_wrapleft.svg  |  231 +
 icon-themes/elementary_svg/cmd/lc_wrapoff.svg   |  193 
 icon-themes/elementary_svg/cmd/lc_wrapon.svg|  292 
 icon-themes/elementary_svg/cmd/lc_wrapright.svg |  235 +
 icon-themes/elementary_svg/cmd/lc_wrapthrough.svg   |  226 +
 icon-themes/elementary_svg/cmd/sc_contourdialog.svg |  183 +++
 icon-themes/elementary_svg/cmd/sc_wrapcontour.svg   |  157 ++
 icon-themes/elementary_svg/cmd/sc_wrapideal.svg |  192 
 icon-themes/elementary_svg/cmd/sc_wrapleft.svg  |   98 
 icon-themes/elementary_svg/cmd/sc_wrapmenu.svg  |1 
 icon-themes/elementary_svg/cmd/sc_wrapoff.svg   |  104 
 icon-themes/elementary_svg/cmd/sc_wrapon.svg|  112 
 icon-themes/elementary_svg/cmd/sc_wrapright.svg |  115 
 icon-themes/elementary_svg/cmd/sc_wrapthrough.svg   |  101 
 icon-themes/elementary_svg/links.txt|   20 
 icon-themes/elementary_svg/sw/res/wr01.svg  |1 
 icon-themes/elementary_svg/sw/res/wr010.svg |  303 
 icon-themes/elementary_svg/sw/res/wr011.svg |1 
 icon-themes/elementary_svg/sw/res/wr02.svg  |1 
 icon-themes/elementary_svg/sw/res/wr03.svg  |1 
 icon-themes/elementary_svg/sw/res/wr04.svg  |1 
 icon-themes/elementary_svg/sw/res/wr05.svg  |1 
 icon-themes/elementary_svg/sw/res/wr06.svg  |1 
 icon-themes/elementary_svg/sw/res/wr07.svg  |1 
 icon-themes/elementary_svg/sw/res/wr08.svg  |  194 
 icon-themes/elementary_svg/sw/res/wr09.svg  |  228 +
 71 files changed, 6257 insertions(+), 49 deletions(-)

New commits:
commit 7f16835c10435ddafdfe05921eac9b89e488ab8e
Author: Rizal

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

[Libreoffice Gerrit user]

 ucb/source/core/identify.hxx   |2 +-
 ucb/source/core/ucbprops.hxx   |2 +-
 ucb/source/core/ucbstore.cxx   |2 +-
 ucb/source/sorter/sortresult.cxx   |2 +-
 ucb/source/ucp/cmis/auth_provider.hxx  |4 ++--
 ucb/source/ucp/cmis/certvalidation_handler.hxx |2 +-
 ucb/source/ucp/cmis/cmis_content.hxx   |4 ++--
 ucb/source/ucp/cmis/cmis_datasupplier.hxx  |2 +-
 ucb/source/ucp/cmis/cmis_repo_content.hxx  |4 ++--
 ucb/source/ucp/cmis/cmis_resultset.hxx |2 +-
 ucb/source/ucp/file/bc.hxx |2 +-
 ucb/source/ucp/file/filinsreq.hxx  |4 ++--
 ucb/source/ucp/file/filrow.hxx |2 +-
 ucb/source/ucp/file/filrset.hxx|6 +++---
 ucb/source/ucp/file/filtask.hxx|   10 +-
 ucb/source/ucp/ftp/ftpcontent.hxx  |2 +-
 ucb/source/ucp/ftp/ftpcontentidentifier.hxx|2 +-
 ucb/source/ucp/ftp/ftpintreq.hxx   |4 ++--
 ucb/source/ucp/ftp/ftploaderthread.hxx |2 +-
 ucb/source/ucp/ftp/ftpresultsetbase.hxx|2 +-
 ucb/source/ucp/ftp/ftpresultsetfactory.hxx |4 ++--
 ucb/source/ucp/ftp/ftpurl.hxx  |2 +-
 ucb/source/ucp/gio/gio_content.hxx |2 +-
 ucb/source/ucp/gio/gio_datasupplier.hxx|4 ++--
 ucb/source/ucp/gio/gio_inputstream.hxx |2 +-
 ucb/source/ucp/gio/gio_outputstream.hxx|2 +-
 ucb/source/ucp/gio/gio_seekable.hxx|2 +-
 ucb/source/ucp/hierarchy/hierarchydatasource.cxx   |2 +-
 ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx |6 +++---
 ucb/source/ucp/package/pkgdatasupplier.cxx |2 +-
 ucb/source/ucp/package/pkgprovider.cxx |2 +-
 ucb/source/ucp/tdoc/tdoc_datasupplier.cxx  |2 +-
 ucb/source/ucp/tdoc/tdoc_stgelems.hxx  |2 +-
 ucb/source/ucp/webdav-neon/DAVTypes.hxx|6 +++---
 ucb/source/ucp/webdav-neon/NeonLockStore.hxx   |2 +-
 ucb/source/ucp/webdav-neon/NeonSession.hxx |4 ++--
 ucb/source/ucp/webdav-neon/webdavcontent.hxx   |2 +-
 ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx  |2 +-
 38 files changed, 56 insertions(+), 56 deletions(-)

New commits:
commit d8f8b4375998b62431c8605004e7c7d5c921ccc9
Author: Noel Grandin 
AuthorDate: Wed Sep 26 12:50:02 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Sep 26 14:50:19 2018 +0200

loplugin:constfields in ucb

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

diff --git a/ucb/source/core/identify.hxx b/ucb/source/core/identify.hxx
index 3dbf3ed380c1..560e2b81f463 100644
--- a/ucb/source/core/identify.hxx
+++ b/ucb/source/core/identify.hxx
@@ -37,7 +37,7 @@ public:
 virtual OUString SAL_CALL getContentProviderScheme() override;
 
 private:
-OUString m_aContentId;
+OUString const m_aContentId;
 OUString m_aProviderScheme;
 };
 
diff --git a/ucb/source/core/ucbprops.hxx b/ucb/source/core/ucbprops.hxx
index 03c26f70b410..74b1761841f4 100644
--- a/ucb/source/core/ucbprops.hxx
+++ b/ucb/source/core/ucbprops.hxx
@@ -39,7 +39,7 @@ class UcbPropertiesManager : public cppu::WeakImplHelper <
 css::lang::XServiceInfo,
 css::beans::XPropertySetInfo >
 {
-css::uno::Sequence< css::beans::Property > m_pProps;
+css::uno::Sequence< css::beans::Property > const m_pProps;
 
 private:
 bool queryProperty( const OUString& rName,
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index e4b13acaa379..74b4771b60ee 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -1059,7 +1059,7 @@ struct PersistentPropertySet_Impl
 {
 rtl::Reference  m_pCreator;
 rtl::Reference m_pInfo;
-OUStringm_aKey;
+OUString const  m_aKey;
 OUStringm_aFullKey;
 osl::Mutex  m_aMutex;
 std::unique_ptr  m_pDisposeEventListeners;
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 9aa77f91c608..147df9c760ee 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -71,7 +71,7 @@ struct SortListData
 {
 boolmbModified;
 sal_IntPtr  mnCurPos;
-sal_IntPtr  mnOldPos;
+sal_IntPtr const  mnOldPos;
 
 explicit SortListData( sal_IntPtr nPos );
 };
diff --git a/ucb/source/ucp/cmis/auth_provider.hxx 
b/ucb/source/ucp/cmis/auth_provider.hxx
index 77fe4366f2aa..90bc9fe584a1 100644
--- a/ucb/source/ucp/cmis/auth_provider.hxx
+++ b/ucb/source/ucp/cmis/auth_provider.hxx
@@ -28,8 +28,8 @@ namespace cmis
 {
 const css::uno::Reference< css::ucb::XCommandEnvi

[Libreoffice-commits] core.git: Changes to 'feature/window-iter'

[Libreoffice Gerrit user]

New branch 'feature/window-iter' available with the following commits:
commit a2dc12566b6a7925a15382330e67f2f225375357
Author: Jan-Marek Glogowski 
Date:   Wed Sep 26 14:17:20 2018 +0200

Debug infrastructure

commit 1186a8f6e47460c228940cf80c70aa53728ea6b0
Author: Jan-Marek Glogowski 
Date:   Wed Sep 26 14:16:09 2018 +0200

Initial vcl::Window iterator

Change-Id: I414d9eb3539d6a2a8844e24a7ef245fa99935f1b

commit 1f92cb74f62ae15124b77a3df450588b2813ddb4
Author: Jan-Marek Glogowski 
Date:   Wed Sep 26 14:09:59 2018 +0200

Don't iter over hidden tab pages

Change-Id: Ie8699dae8d08628b66b33e0704237b9e219874bc

commit a97d832f95bcb72f6c21ef454c3e3bcd930ee8bc
Author: Jan-Marek Glogowski 
Date:   Thu Aug 30 16:19:30 2018 +0200

Move TabPage lookup into extra function

Probably easier to review the follow up patch.

Change-Id: I42e8f78b69b4ed2cb28bf0f36496eb751e8cb433

commit 90b208aa07fd9b3f8f8ea67ae24716f27fec1b23
Author: Jan-Marek Glogowski 
Date:   Fri Aug 31 16:43:18 2018 +0200

Constify vcl::Window child lookup

Change-Id: I11425dc4aa372423fcf469ab1374159ce8b180e2

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

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

[Libreoffice Gerrit user]

 include/unoidl/unoidl.hxx|   82 +++
 unoidl/source/legacyprovider.cxx |2 
 unoidl/source/sourceprovider-scanner.hxx |   10 +--
 unoidl/source/sourcetreeprovider.hxx |2 
 unoidl/source/unoidl-check.cxx   |2 
 unoidl/source/unoidl-write.cxx   |4 -
 unoidl/source/unoidl.cxx |4 -
 unoidl/source/unoidlprovider.cxx |   10 +--
 8 files changed, 58 insertions(+), 58 deletions(-)

New commits:
commit c04a8576f07cb837439959b8bdbb8b620684d508
Author: Noel Grandin 
AuthorDate: Wed Sep 26 10:06:34 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Sep 26 14:07:55 2018 +0200

loplugin:constfields in unoidl

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

diff --git a/include/unoidl/unoidl.hxx b/include/unoidl/unoidl.hxx
index abc54029e6d7..711b220f7e0a 100644
--- a/include/unoidl/unoidl.hxx
+++ b/include/unoidl/unoidl.hxx
@@ -38,7 +38,7 @@ public:
 private:
 void operator =(NoSuchFileException) = delete;
 
-rtl::OUString uri_;
+rtl::OUString const uri_;
 };
 
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL FileFormatException final {
@@ -61,8 +61,8 @@ public:
 private:
 void operator =(FileFormatException) = delete;
 
-rtl::OUString uri_;
-rtl::OUString detail_;
+rtl::OUString const uri_;
+rtl::OUString const detail_;
 };
 
 struct AnnotatedReference {
@@ -74,7 +74,7 @@ struct AnnotatedReference {
 
 rtl::OUString name;
 
-std::vector< rtl::OUString > annotations;
+std::vector< rtl::OUString > const annotations;
 };
 
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL Entity: public 
salhelper::SimpleReferenceObject {
@@ -95,7 +95,7 @@ protected:
 virtual SAL_DLLPRIVATE ~Entity() throw () override;
 
 private:
-Sort sort_;
+Sort const sort_;
 };
 
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL MapCursor: public 
salhelper::SimpleReferenceObject {
@@ -140,9 +140,9 @@ protected:
 virtual SAL_DLLPRIVATE ~PublishableEntity() throw () override;
 
 private:
-bool published_;
+bool const published_;
 
-std::vector< rtl::OUString > annotations_;
+std::vector< rtl::OUString > const annotations_;
 };
 
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL EnumTypeEntity: public 
PublishableEntity {
@@ -158,7 +158,7 @@ public:
 
 sal_Int32 value;
 
-std::vector< rtl::OUString > annotations;
+std::vector< rtl::OUString > const annotations;
 };
 
 SAL_DLLPRIVATE EnumTypeEntity(
@@ -173,7 +173,7 @@ public:
 private:
 virtual SAL_DLLPRIVATE ~EnumTypeEntity() throw () override;
 
-std::vector< Member > members_;
+std::vector< Member > const members_;
 };
 
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL PlainStructTypeEntity: public 
PublishableEntity {
@@ -188,7 +188,7 @@ public:
 
 rtl::OUString type;
 
-std::vector< rtl::OUString > annotations;
+std::vector< rtl::OUString > const annotations;
 };
 
 SAL_DLLPRIVATE PlainStructTypeEntity(
@@ -207,8 +207,8 @@ public:
 private:
 virtual SAL_DLLPRIVATE ~PlainStructTypeEntity() throw () override;
 
-rtl::OUString directBase_;
-std::vector< Member > directMembers_;
+rtl::OUString const directBase_;
+std::vector< Member > const directMembers_;
 };
 
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL PolymorphicStructTypeTemplateEntity:
@@ -230,7 +230,7 @@ public:
 
 bool parameterized;
 
-std::vector< rtl::OUString > annotations;
+std::vector< rtl::OUString > const annotations;
 };
 
 SAL_DLLPRIVATE PolymorphicStructTypeTemplateEntity(
@@ -250,8 +250,8 @@ public:
 private:
 virtual SAL_DLLPRIVATE ~PolymorphicStructTypeTemplateEntity() throw () 
override;
 
-std::vector< rtl::OUString > typeParameters_;
-std::vector< Member > members_;
+std::vector< rtl::OUString > const typeParameters_;
+std::vector< Member > const members_;
 };
 
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL ExceptionTypeEntity: public 
PublishableEntity {
@@ -267,7 +267,7 @@ public:
 
 rtl::OUString type;
 
-std::vector< rtl::OUString > annotations;
+std::vector< rtl::OUString > const annotations;
 };
 
 SAL_DLLPRIVATE ExceptionTypeEntity(
@@ -286,8 +286,8 @@ public:
 private:
 virtual SAL_DLLPRIVATE ~ExceptionTypeEntity() throw () override;
 
-rtl::OUString directBase_;
-std::vector< Member > directMembers_;
+rtl::OUString const directBase_;
+std::vector< Member > const directMembers_;
 };
 
 class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL InterfaceTypeEntity: public 
PublishableEntity {
@@ -316,7 +316,7 @@ public:
 
 std::vector< rtl::OUString > setExceptions;
 
-std::vector< rtl::OUString > annotations;
+std::vector< rtl::OUString > const annotations;
 };
 
 struct Method {
@@ -353,7 +353,7 @@ public:
 
 std::vect

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

[Libreoffice Gerrit user]

 sc/inc/dbdata.hxx  |3 ++-
 sc/source/core/tool/dbdata.cxx |6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit cd81c31a6c5313c53269721749f7bcdc11a103ad
Author: Eike Rathke 
AuthorDate: Thu Sep 20 18:12:03 2018 +0200
Commit: Markus Mohrhard 
CommitDate: Wed Sep 26 12:46:31 2018 +0200

Resolves: tdf#119954 do not copy the old parent, init with new parent 
instead

The parent is always the ScDBCollection that contains the
ScDBCollection::NamedDBs container, not the one the
ScDBCollection::NamedDBs was copy-constructed from.

Change-Id: Ia409347f3aeb9ad7a5e68da7af727adfac98d6a2
Reviewed-on: https://gerrit.libreoffice.org/60833
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 7ea5d339dc4d8412f436f3affa589bfbd0b1ef68)
Reviewed-on: https://gerrit.libreoffice.org/60841
Tested-by: Eike Rathke 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index 4523bb64c206..ab0cf85b9cb4 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -240,7 +240,8 @@ public:
 DBsType m_DBs;
 ScDBCollection& mrParent;
 NamedDBs(ScDBCollection& rParent, ScDocument& rDoc);
-NamedDBs(const NamedDBs& r);
+NamedDBs(const NamedDBs& r, ScDBCollection& rParent);
+NamedDBs(const NamedDBs&) = delete;
 virtual ~NamedDBs() override;
 NamedDBs & operator=(NamedDBs const&) = delete;
 void initInserted( ScDBData* p );
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 4c331d839664..66a0d1922eee 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -1071,9 +1071,9 @@ ScRangeList& 
ScDBDataContainerBase::GetDirtyTableColumnNames()
 ScDBCollection::NamedDBs::NamedDBs(ScDBCollection& rParent, ScDocument& rDoc) :
 ScDBDataContainerBase(rDoc), mrParent(rParent) {}
 
-ScDBCollection::NamedDBs::NamedDBs(const NamedDBs& r)
+ScDBCollection::NamedDBs::NamedDBs(const NamedDBs& r, ScDBCollection& rParent)
 : ScDBDataContainerBase(r.mrDoc)
-, mrParent(r.mrParent)
+, mrParent(rParent)
 {
 for (auto const& it : r.m_DBs)
 {
@@ -1287,7 +1287,7 @@ ScDBCollection::ScDBCollection(ScDocument* pDocument) :
 pDoc(pDocument), nEntryIndex(1), maNamedDBs(*this, *pDocument) {}
 
 ScDBCollection::ScDBCollection(const ScDBCollection& r) :
-pDoc(r.pDoc), nEntryIndex(r.nEntryIndex), maNamedDBs(r.maNamedDBs), 
maAnonDBs(r.maAnonDBs) {}
+pDoc(r.pDoc), nEntryIndex(r.nEntryIndex), maNamedDBs(r.maNamedDBs, *this), 
maAnonDBs(r.maAnonDBs) {}
 
 const ScDBData* ScDBCollection::GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB 
nTab, ScDBDataPortion ePortion) const
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 chart2/source/tools/AxisHelper.cxx |5 -
 1 file changed, 5 deletions(-)

New commits:
commit 3708195d0c94cf1c50febc49fcfa6a9ff6855336
Author: Markus Mohrhard 
AuthorDate: Wed Sep 26 10:48:07 2018 +0200
Commit: Markus Mohrhard 
CommitDate: Wed Sep 26 12:42:05 2018 +0200

tdf#119882, don't change the chart model from the chart view

Change-Id: I1c909f6e1984bd4b09c3b67c19659dc276ac3229
Reviewed-on: https://gerrit.libreoffice.org/60984
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 

diff --git a/chart2/source/tools/AxisHelper.cxx 
b/chart2/source/tools/AxisHelper.cxx
index 9fc305abb5da..e0a6f4623d7e 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -154,8 +154,6 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis(
 xProp->getPropertyValue(CHART_UNONAME_LINK_TO_SRC_NUMFMT) >>= 
bLinkToSource;
 xProp->getPropertyValue(CHART_UNONAME_NUMFMT) >>= nNumberFormatKey;
 
-sal_Int32 nOldNumberFormat = nNumberFormatKey;
-
 if (bLinkToSource)
 {
 bool bFormatSet = false;
@@ -329,9 +327,6 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis(
 }
 }
 }
-
-if (nOldNumberFormat != nNumberFormatKey)
-xProp->setPropertyValue(CHART_UNONAME_NUMFMT, 
uno::Any(nNumberFormatKey));
 }
 
 return nNumberFormatKey;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

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

New commits:
commit 60eaa7d7b856bc17b2a49a510be6d3c50851cb92
Author: Miklos Vajna 
AuthorDate: Tue Sep 25 23:53:06 2018 +0200
Commit: Miklos Vajna 
CommitDate: Wed Sep 26 12:18:56 2018 +0200

sw: use auto when initializing with a template cast ...

... to avoid duplicating the type name.

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

diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 8fba8b326d63..49482a7a8c1f 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -731,12 +731,12 @@ void RtfAttributeOutput::TableBackgrounds(
 const SwTableLine* pTableLine = pTableBox->GetUpper();
 
 Color aColor = COL_AUTO;
-const SvxBrushItem* pTableColorProp
+auto pTableColorProp
 = 
pTable->GetFrameFormat()->GetAttrSet().GetItem(RES_BACKGROUND);
 if (pTableColorProp)
 aColor = pTableColorProp->GetColor();
 
-const SvxBrushItem* pRowColorProp
+auto pRowColorProp
 = 
pTableLine->GetFrameFormat()->GetAttrSet().GetItem(RES_BACKGROUND);
 if (pRowColorProp && pRowColorProp->GetColor() != COL_AUTO)
 aColor = pRowColorProp->GetColor();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 chart2/source/view/charttypes/Splines.cxx |   15 ++-
 1 file changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 8913a08423e732f27ae7645cad9570aadb5aaf2b
Author: Noel Grandin 
AuthorDate: Tue Sep 25 13:23:17 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Sep 26 09:53:00 2018 +0200

loplugin:useuniqueptr in SplineCalculater

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

diff --git a/chart2/source/view/charttypes/Splines.cxx 
b/chart2/source/view/charttypes/Splines.cxx
index d0b2389c550f..248954a387f5 100644
--- a/chart2/source/view/charttypes/Splines.cxx
+++ b/chart2/source/view/charttypes/Splines.cxx
@@ -584,8 +584,8 @@ void SplineCalculater::CalculateCubicSplines(
 
 // generate a spline for each coordinate. It holds the complete
 // information to calculate each point of the curve
-lcl_SplineCalculation* aSplineX;
-lcl_SplineCalculation* aSplineY;
+std::unique_ptr aSplineX;
+std::unique_ptr aSplineY;
 // lcl_SplineCalculation* aSplineZ; the z-coordinates of all points in
 // a data series are equal. No spline calculation needed, but copy
 // coordinate to output
@@ -595,8 +595,8 @@ void SplineCalculater::CalculateCubicSplines(
 pOldZ[ 0 ] == pOldZ[nMaxIndexPoints] &&
 nMaxIndexPoints >=2 )
 {   // periodic spline
-aSplineX = new lcl_SplineCalculation( aInputX) ;
-aSplineY = new lcl_SplineCalculation( aInputY) ;
+aSplineX.reset(new lcl_SplineCalculation( aInputX));
+aSplineY.reset(new lcl_SplineCalculation( aInputY));
 // aSplineZ = new lcl_SplineCalculation( aInputZ) ;
 }
 else // generate the kind "natural spline"
@@ -605,8 +605,8 @@ void SplineCalculater::CalculateCubicSplines(
 ::rtl::math::setInf( &fInfty, false );
 double fXDerivation = fInfty;
 double fYDerivation = fInfty;
-aSplineX = new lcl_SplineCalculation( aInputX, fXDerivation, 
fXDerivation );
-aSplineY = new lcl_SplineCalculation( aInputY, fYDerivation, 
fYDerivation );
+aSplineX.reset(new lcl_SplineCalculation( aInputX, fXDerivation, 
fXDerivation ));
+aSplineY.reset(new lcl_SplineCalculation( aInputY, fYDerivation, 
fYDerivation ));
 }
 
 // fill result polygon with calculated values
@@ -645,9 +645,6 @@ void SplineCalculater::CalculateCubicSplines(
 pNewX[nNewPointIndex] = pOldX[nMaxIndexPoints];
 pNewY[nNewPointIndex] = pOldY[nMaxIndexPoints];
 pNewZ[nNewPointIndex] = pOldZ[nMaxIndexPoints];
-delete aSplineX;
-delete aSplineY;
-// delete aSplineZ;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-3' - external/icu

[Libreoffice Gerrit user]

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

New commits:
commit 3bee5917569ca8e6ee3b086458f5b1a917b88ca1
Author: Eike Rathke 
AuthorDate: Wed Sep 13 13:42:29 2017 +0200
Commit: Michael Stahl 
CommitDate: Thu Sep 13 11:27:58 2018 +0200

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

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

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

...

And since glibc 2.26 it's gone.

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

(cherry picked from commit 9e399bc613bb4ea1470bd52c64af920d4e9bc39b)

Change-Id: I4c1f6130571f5d094cb35ce70e4d333763cee32a

diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index f1658a229586..eb3040185d0f 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
$(if $(filter-out 
ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.diff) \
$(if $(filter EMSCRIPTEN,$(OS)),external/icu/icu4c-emscripten.patch.1) \
external/icu/khmerbreakengine.patch \
+   external/icu/icu4c-59-icu13329-xlocale.patch.1 \
external/icu/icu4c-changeset-39671.patch.1 \
external/icu/icu4c-changeset-40324.patch.1 \
 ))
diff --git a/external/icu/icu4c-59-icu13329-xlocale.patch.1 
b/external/icu/icu4c-59-icu13329-xlocale.patch.1
new file mode 100644
index ..34d4eb56d884
--- /dev/null
+++ b/external/icu/icu4c-59-icu13329-xlocale.patch.1
@@ -0,0 +1,14 @@
+# xlocale.h is gone with glibc 2.26 and should never had been included.
+# https://ssl.icu-project.org/trac/ticket/13329
+diff -ur icu.org/source/i18n/digitlst.cpp icu/source/i18n/digitlst.cpp
+--- icu.org/source/i18n/digitlst.cpp   2017-01-20 01:20:31.0 +0100
 icu/source/i18n/digitlst.cpp   2017-09-13 13:25:59.980160603 +0200
+@@ -63,6 +63,8 @@
+ #if U_USE_STRTOD_L && !U_PLATFORM_USES_ONLY_WIN32_API
+ # if U_PLATFORM == U_PF_CYGWIN
+ #   include 
++# elif U_PLATFORM_IS_LINUX_BASED
++#   include// should be for all POSIX.2008 compliant platforms, 
but..
+ # else
+ #   include 
+ # endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 lotuswordpro/source/filter/lwptblformula.cxx |   42 ++-
 lotuswordpro/source/filter/lwptblformula.hxx |2 -
 2 files changed, 18 insertions(+), 26 deletions(-)

New commits:
commit 1140eccc9f620de227efe381980ea06e0b455aed
Author: Noel Grandin 
AuthorDate: Tue Sep 25 15:25:04 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Sep 26 09:00:21 2018 +0200

loplugin:useuniqueptr in LwpFormulaInfo

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

diff --git a/lotuswordpro/source/filter/lwptblformula.cxx 
b/lotuswordpro/source/filter/lwptblformula.cxx
index 4b8f56de0379..f539d16cf47d 100644
--- a/lotuswordpro/source/filter/lwptblformula.cxx
+++ b/lotuswordpro/source/filter/lwptblformula.cxx
@@ -67,6 +67,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 LwpFormulaArg::~LwpFormulaArg()
@@ -81,19 +82,13 @@ LwpFormulaArg::~LwpFormulaArg()
 
 LwpFormulaInfo::~LwpFormulaInfo()
 {
-while(m_aStack.size()>0)
-{
-LwpFormulaArg* pArg=m_aStack.back();
-m_aStack.pop_back();
-delete pArg; pArg=nullptr;
-}
 }
 
 void LwpFormulaInfo::ReadConst()
 {
 double Constant = m_pObjStrm->QuickReadDouble();
 
-m_aStack.push_back( new LwpFormulaConst(Constant) );
+m_aStack.push_back( o3tl::make_unique(Constant) );
 }
 
 /**
@@ -112,7 +107,7 @@ void LwpFormulaInfo::ReadText()
 aText += OUString(pBuf.get(), nStrLen, osl_getThreadTextEncoding());
 aText += "\"";
 
-m_aStack.push_back(new LwpFormulaText(aText));
+m_aStack.push_back(o3tl::make_unique(aText));
 }
 
 void LwpFormulaInfo::ReadCellID()
@@ -123,26 +118,24 @@ void LwpFormulaInfo::ReadCellID()
 RowSpecifier.QuickRead(m_pObjStrm.get());
 ColumnSpecifier.QuickRead(m_pObjStrm.get());
 
-m_aStack.push_back( new 
LwpFormulaCellAddr(ColumnSpecifier.ColumnID(cColumn),
+m_aStack.push_back( 
o3tl::make_unique(ColumnSpecifier.ColumnID(cColumn),
 
RowSpecifier.RowID(m_nFormulaRow)) );
 }
 
 void LwpFormulaInfo::ReadCellRange()
 {
 ReadCellID( ); // start
-LwpFormulaCellAddr* pStartCellAddr = 
static_cast(m_aStack.back());
+std::unique_ptr pStartCellAddr( 
static_cast(m_aStack.back().release()));
 m_aStack.pop_back();
 
 ReadCellID(); // end
-LwpFormulaCellAddr* pEndCellAddr = 
static_cast(m_aStack.back());
+std::unique_ptr 
pEndCellAddr(static_cast(m_aStack.back().release()));
 m_aStack.pop_back();
 
-m_aStack.push_back( new LwpFormulaCellRangeAddr(pStartCellAddr->GetCol(),
+m_aStack.push_back( 
o3tl::make_unique(pStartCellAddr->GetCol(),
 pStartCellAddr->GetRow(),
 pEndCellAddr->GetCol(),
 pEndCellAddr->GetRow()) );
-delete pStartCellAddr;
-delete pEndCellAddr;
 }
 
 /**
@@ -190,7 +183,7 @@ void LwpFormulaInfo::ReadExpression()
 {
 std::unique_ptr xFunc(new 
LwpFormulaFunc(TokenType));
 ReadArguments(*xFunc);
-m_aStack.push_back(xFunc.release());
+m_aStack.push_back(std::move(xFunc));
 }
 break;
 
@@ -211,18 +204,18 @@ void LwpFormulaInfo::ReadExpression()
 
 if (m_aStack.size() >= 2)
 {//binary operator
-LwpFormulaOp* pOp = new LwpFormulaOp(TokenType);
-
pOp->AddArg(std::unique_ptr(m_aStack.back())); 
m_aStack.pop_back();
-
pOp->AddArg(std::unique_ptr(m_aStack.back())); 
m_aStack.pop_back();
-m_aStack.push_back(pOp);
+std::unique_ptr pOp(new 
LwpFormulaOp(TokenType));
+pOp->AddArg(std::move(m_aStack.back())); 
m_aStack.pop_back();
+pOp->AddArg(std::move(m_aStack.back())); 
m_aStack.pop_back();
+m_aStack.push_back(std::move(pOp));
 }
 break;
 case TK_UNARY_MINUS:
 if (!m_aStack.empty())
 {
-LwpFormulaUnaryOp* pOp = new LwpFormulaUnaryOp(TokenType);
-
pOp->AddArg(std::unique_ptr(m_aStack.back())); 
m_aStack.pop_back();
-m_aStack.push_back(pOp);
+std::unique_ptr pOp(new 
LwpFormulaUnaryOp(TokenType));
+pOp->AddArg(std::move(m_aStack.back())); 
m_aStack.pop_back();
+m_aStack.push_back(std::move(pOp));
 }
 break;
 default:
@@ -293,7 +286,7 @@ void LwpFormulaInfo::ReadArguments(LwpFormulaFunc& aFunc)
 
 if (bArgument && !m_aStack.empty())
 {
-aFunc.AddArg(std::unique_ptr(m_aStack.back()));
+aFunc.AddArg(std::move(m_a

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

[Libreoffice Gerrit user]

 vbahelper/source/vbahelper/vbaapplicationbase.cxx |   18 ++
 1 file changed, 2 insertions(+), 16 deletions(-)

New commits:
commit fd84276cf31182c80fc07c88537f9524c4d80e8c
Author: Noel Grandin 
AuthorDate: Tue Sep 25 15:25:50 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Sep 26 08:59:39 2018 +0200

loplugin:useuniqueptr in VbaApplicationBase_Impl

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

diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx 
b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
index c10ce37aef61..a441653551e4 100644
--- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
+++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
@@ -145,7 +145,7 @@ struct VbaTimerInfoHash
 }
 };
 
-typedef std::unordered_map< VbaTimerInfo, VbaTimer*, VbaTimerInfoHash > 
VbaTimerHashMap;
+typedef std::unordered_map< VbaTimerInfo, std::unique_ptr, 
VbaTimerInfoHash > VbaTimerHashMap;
 
 struct VbaApplicationBase_Impl final
 {
@@ -154,18 +154,6 @@ struct VbaApplicationBase_Impl final
 OUString msCaption;
 
 VbaApplicationBase_Impl() : mbVisible( true ) {}
-
-~VbaApplicationBase_Impl()
-{
-// remove the remaining timers
-for ( VbaTimerHashMap::iterator aIter = m_aTimerHash.begin();
-  aIter != m_aTimerHash.end();
-  ++aIter )
-{
-delete aIter->second;
-aIter->second = nullptr;
-}
-}
 };
 
 VbaApplicationBase::VbaApplicationBase( const uno::Reference< 
uno::XComponentContext >& xContext )
@@ -395,15 +383,13 @@ void SAL_CALL VbaApplicationBase::OnTime( const uno::Any& 
aEarliestTime, const O
 VbaTimerHashMap::iterator aIter = m_pImpl->m_aTimerHash.find( aTimerIndex 
);
 if ( aIter != m_pImpl->m_aTimerHash.end() )
 {
-delete aIter->second;
-aIter->second = nullptr;
 m_pImpl->m_aTimerHash.erase( aIter );
 }
 
 if ( bSetTimer )
 {
 VbaTimer* pTimer = new VbaTimer;
-m_pImpl->m_aTimerHash[ aTimerIndex ] = pTimer;
+m_pImpl->m_aTimerHash[ aTimerIndex ].reset(pTimer);
 pTimer->Start( this, aFunction, nEarliestTime, nLatestTime );
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits