[Libreoffice-commits] .: 2 commits - svl/inc sw/source

[Michael Stahl]

 svl/inc/svl/svdde.hxx              |    2 +-
 sw/source/core/txtnode/ndhints.cxx |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 68303dee45ff6c81f5eb396df9c6805b7874cdd7
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jul 31 22:01:45 2012 +0200

    DdeServices has forward declarations so can't be typedef'd
    
    Change-Id: I1455d380cbb8b096255a0d3cb402ff0dc4d35996

diff --git a/svl/inc/svl/svdde.hxx b/svl/inc/svl/svdde.hxx
index 0895a81..825e899 100644
--- a/svl/inc/svl/svdde.hxx
+++ b/svl/inc/svl/svdde.hxx
@@ -44,7 +44,7 @@ struct DdeImp;
 class DdeItemImp;
 struct Conversation;
 
-typedef ::std::vector< DdeService* > DdeServices;
+class DdeServices : public ::std::vector< DdeService* > {};
 typedef ::std::vector< long > DdeFormats;
 typedef ::std::vector< Conversation* > ConvList;
 
commit 0f618909d348f6ff26a34367b0d57b21c1b85a01
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jul 31 21:55:51 2012 +0200

    SwpHintsArray::DeleteAtPos: Apple GCC unused variable warning
    
    Change-Id: Idc56569da52554a5478fc23548b8d3395648a2bf

diff --git a/sw/source/core/txtnode/ndhints.cxx b/sw/source/core/txtnode/ndhints.cxx
index 29efd9f..af2a032 100644
--- a/sw/source/core/txtnode/ndhints.cxx
+++ b/sw/source/core/txtnode/ndhints.cxx
@@ -148,6 +148,7 @@ void SwpHintsArray::DeleteAtPos( const sal_uInt16 nPos )
 
     bool const done = m_HintEnds.erase(pHt);
     assert(done);
+    (void) done; // unused in NDEBUG
 }
 
 sal_uInt16 SwpHintsArray::GetPos( const SwTxtAttr *pHt ) const