libcmis/ExternalLib_libcmis.mk | 4 +++- ooo.lst.in | 2 +- sw/source/ui/docvw/FrameControlsManager.cxx | 8 ++++---- sw/source/ui/inc/FrameControlsManager.hxx | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-)
New commits: commit fadb5d1dcd78f5ceb79863381d52964c3f054434 Author: Cédric Bosdonnat <cedric.bosdonnat....@free.fr> Date: Tue Oct 4 13:11:50 2011 +0200 Page Break: fixed crasher due to bad removal of frame controls diff --git a/sw/source/ui/docvw/FrameControlsManager.cxx b/sw/source/ui/docvw/FrameControlsManager.cxx index 4a07636..6fe07e2 100644 --- a/sw/source/ui/docvw/FrameControlsManager.cxx +++ b/sw/source/ui/docvw/FrameControlsManager.cxx @@ -68,7 +68,7 @@ SwFrameControlsManager::~SwFrameControlsManager() m_aControls.clear(); } -std::vector< SwFrameControlPtr > SwFrameControlsManager::GetControls( FrameControlType eType ) +std::vector< SwFrameControlPtr >& SwFrameControlsManager::GetControls( FrameControlType eType ) { return m_aControls[eType]; } @@ -84,7 +84,7 @@ void SwFrameControlsManager::RemoveControls( const SwFrm* pFrm ) while ( pIt != m_aControls.end() ) { - vector< SwFrameControlPtr > aVect = pIt->second; + vector< SwFrameControlPtr >& aVect = pIt->second; aVect.erase( remove_if( aVect.begin(), aVect.end(), FramePredicate( pFrm ) ), aVect.end() ); @@ -124,7 +124,7 @@ void SwFrameControlsManager::SetHeaderFooterControl( const SwPageFrm* pPageFrm, // Check if we already have the control SwFrameControlPtr pControl; - vector< SwFrameControlPtr > aControls = m_aControls[HeaderFooter]; + vector< SwFrameControlPtr >& aControls = m_aControls[HeaderFooter]; vector< SwFrameControlPtr >::iterator pIt = aControls.begin(); while ( pIt != aControls.end() && !pControl.get() ) @@ -159,7 +159,7 @@ void SwFrameControlsManager::SetPageBreakControl( const SwPageFrm* pPageFrm ) // Check if we already have the control SwFrameControlPtr pControl; - vector< SwFrameControlPtr > aControls = m_aControls[PageBreak]; + vector< SwFrameControlPtr >& aControls = m_aControls[PageBreak]; vector< SwFrameControlPtr >::iterator pIt = aControls.begin(); while ( pIt != aControls.end() && !pControl.get() ) diff --git a/sw/source/ui/inc/FrameControlsManager.hxx b/sw/source/ui/inc/FrameControlsManager.hxx index c3e91ee..b79843f 100644 --- a/sw/source/ui/inc/FrameControlsManager.hxx +++ b/sw/source/ui/inc/FrameControlsManager.hxx @@ -57,7 +57,7 @@ class SwFrameControlsManager SwFrameControlsManager( SwEditWin* pEditWin ); ~SwFrameControlsManager( ); - std::vector< SwFrameControlPtr > GetControls( FrameControlType eType ); + std::vector< SwFrameControlPtr >& GetControls( FrameControlType eType ); void AddControl( FrameControlType eType, SwFrameControlPtr pControl ); void RemoveControls( const SwFrm* pFrm ); void HideControls( FrameControlType eType ); commit 5f1a277f2e7fc2d32673d2a917d6775d5276d481 Author: Cédric Bosdonnat <cedric.bosdonnat....@free.fr> Date: Tue Oct 4 13:10:55 2011 +0200 libcmis: disable unit tests and static lib as they aren't used diff --git a/libcmis/ExternalLib_libcmis.mk b/libcmis/ExternalLib_libcmis.mk index 12f6b74..797dea5 100644 --- a/libcmis/ExternalLib_libcmis.mk +++ b/libcmis/ExternalLib_libcmis.mk @@ -28,9 +28,11 @@ $(eval $(call gb_ExternalLib_ExternalLib,libcmis,autotools)) -$(eval $(call gb_ExternalLib_set_src_package,libcmis,d821b3cdeba34db1d084b9bd709b3a52-libcmis-0.1.0.tar.gz)) +$(eval $(call gb_ExternalLib_set_src_package,libcmis,7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz)) $(eval $(call gb_ExternalLib_add_conf_arg,libcmis,--disable-client)) $(eval $(call gb_ExternalLib_add_patch,libcmis,libcmis/libcmis-0.1.0-autotools.patch)) +$(eval $(call gb_ExternalLib_add_conf_arg,libcmis,--disable-tests)) +$(eval $(call gb_ExternalLib_add_conf_arg,libcmis,--disable-static)) ifneq ($(filter $(OS),MACOSX ANDROID),) diff --git a/ooo.lst.in b/ooo.lst.in index 1595a8b..04f3661 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -90,7 +90,7 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz cfb4259665fa96874deaa1b233d0b9c2-libvisio-0.0.7.tar.bz2 30c468d0c27ae4784195b53f78bc6f64-LinLibertineG-20110922.zip -d821b3cdeba34db1d084b9bd709b3a52-libcmis-0.1.0.tar.gz +7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz @GOOGLE_DOCS_EXTENSION_PACK@ http://dev-www.libreoffice.org/extern 185d60944ea767075d27247c3162b3bc-unowinreg.dll
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits