sw/source/core/layout/atrfrm.cxx | 5 ++---
sw/source/core/txtnode/thints.cxx | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 9472ed3fe6e46e18bad88e9e388af6c342436a32
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Aug 31 16:02:58 2016 +0100
fix non-debug enable-assert-always-abort build
Change-Id: Ie120e56339d263ef7e2e7f1bdd04da62726d046c
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 42a876f..7fa9c73 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -2546,12 +2546,11 @@ void SwFrameFormat::SetName( const OUString& rNewName,
bool bBroadcast )
SwStringMsgPoolItem aOld( RES_NAME_CHANGED, m_aFormatName );
// As it's a non-unique list, rename should never fail!
-#if OSL_DEBUG_LEVEL > 0
- bool renamed =
-#endif
+ bool const renamed =
m_ffList->m_PosIndex.modify( it,
change_name( rNewName ), change_name( m_aFormatName ) );
assert(renamed);
+ (void)renamed; // unused in NDEBUG
if (bBroadcast) {
SwStringMsgPoolItem aNew( RES_NAME_CHANGED, rNewName );
ModifyNotification( &aOld, &aNew );
diff --git a/sw/source/core/txtnode/thints.cxx
b/sw/source/core/txtnode/thints.cxx
index b53efe5..8afc3ba 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -3296,7 +3296,7 @@ void SwpHints::DeleteAtPos( const size_t nPos )
bool const done = m_HintsByEnd.erase(pHt);
assert(done);
- (void) done; // unused in NDEBUG
+ (void)done; // unused in NDEBUG
if( pHint->Which() == RES_TXTATR_FIELD )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
