[ooo-build-commit] .: patches/dev300
Fridrich Strba
fridrich at kemper.freedesktop.org
Wed Jul 28 06:18:32 PDT 2010
patches/dev300/apply | 8 +-
patches/dev300/valgrind-fixes.diff | 115 -------------------------------------
2 files changed, 6 insertions(+), 117 deletions(-)
New commits:
commit acf46e3782bc5ba8843d9e38c3b857cb87fa50d4
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Jul 28 15:17:55 2010 +0200
Massage some more patches to apply
* patches/dev300/apply:
* patches/dev300/valgrind-fixes.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index ddb21cf..5d060fe 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3506,7 +3506,7 @@ evaluation-row-limit.diff
[ Fixes ]
# TODO: split up into the original patches were this belongs
-# FIXME dev300-m77 valgrind-fixes.diff, thorsten #fixme
+valgrind-fixes.diff, thorsten
framework-menubar-fix.diff, thorsten
[ Fixes < dev300-m84 ]
@@ -3518,11 +3518,11 @@ sd-bitmapex-static-pointer.diff, i#112758
oowintool-java6.diff, fridrich
# make python build properly on win32
-# FIXME dev300-m77 python-win32-buildfix.diff, thorsten
+python-win32-buildfix.diff, thorsten
# force WINVER when using non-std win api
-# FIXME dev300-m77 win32-force-version-fix.diff, thorsten
+win32-force-version-fix.diff, thorsten
# workaround a few VS8.0 compat problems
-# FIXME dev300-m77 win32-vs2005-compat.diff, thorsten
+win32-vs2005-compat.diff, thorsten
# hard disabling of certain vista-sdk-only things
#win32-vs2005-oldsdk.diff, thorsten
diff --git a/patches/dev300/valgrind-fixes.diff b/patches/dev300/valgrind-fixes.diff
index 3ce252d..d204255 100644
--- a/patches/dev300/valgrind-fixes.diff
+++ b/patches/dev300/valgrind-fixes.diff
@@ -1,68 +1,5 @@
-From d65fa0f84f5994b7d61d2efeeb92782794a6c1cb Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky <kendy at suse.cz>
-Date: Fri, 14 May 2010 17:08:38 +0200
-Subject: [PATCH 826/878] valgrind-fixes.diff
-
----
- framework/source/layoutmanager/layoutmanager.cxx | 39 ++++++++++++----------
- sc/source/core/data/sortparam.cxx | 14 +++++---
- sc/source/ui/view/viewdata.cxx | 17 ++++++++-
- 3 files changed, 45 insertions(+), 25 deletions(-)
-
-diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
-index 1059669..e38c49e 100644
---- a/framework/source/layoutmanager/layoutmanager.cxx
-+++ b/framework/source/layoutmanager/layoutmanager.cxx
-@@ -246,24 +246,27 @@ bool LayoutManager::UIElement::operator< ( const LayoutManager::UIElement& aUIEl
-
- LayoutManager::UIElement& LayoutManager::UIElement::operator= ( const LayoutManager::UIElement& rUIElement )
- {
-- m_aType = rUIElement.m_aType;
-- m_aName = rUIElement.m_aName;
-- m_aUIName = rUIElement.m_aUIName;
-- m_xUIElement = rUIElement.m_xUIElement;
-- m_bFloating = rUIElement.m_bFloating;
-- m_bVisible = rUIElement.m_bVisible;
-- m_bUserActive = rUIElement.m_bUserActive;
-- m_bCreateNewRowCol0 = rUIElement.m_bCreateNewRowCol0;
-- m_bDeactiveHide = rUIElement.m_bDeactiveHide;
-- m_bMasterHide = rUIElement.m_bMasterHide;
-- m_bContextSensitive = rUIElement.m_bContextSensitive;
-- m_bContextActive = rUIElement.m_bContextActive;
-- m_bNoClose = rUIElement.m_bNoClose;
-- m_bSoftClose = rUIElement.m_bSoftClose;
-- m_bStateRead = rUIElement.m_bStateRead;
-- m_nStyle = rUIElement.m_nStyle;
-- m_aDockedData = rUIElement.m_aDockedData;
-- m_aFloatingData = rUIElement.m_aFloatingData;
-+ if (&rUIElement != this)
-+ {
-+ m_aType = rUIElement.m_aType;
-+ m_aName = rUIElement.m_aName;
-+ m_aUIName = rUIElement.m_aUIName;
-+ m_xUIElement = rUIElement.m_xUIElement;
-+ m_bFloating = rUIElement.m_bFloating;
-+ m_bVisible = rUIElement.m_bVisible;
-+ m_bUserActive = rUIElement.m_bUserActive;
-+ m_bCreateNewRowCol0 = rUIElement.m_bCreateNewRowCol0;
-+ m_bDeactiveHide = rUIElement.m_bDeactiveHide;
-+ m_bMasterHide = rUIElement.m_bMasterHide;
-+ m_bContextSensitive = rUIElement.m_bContextSensitive;
-+ m_bContextActive = rUIElement.m_bContextActive;
-+ m_bNoClose = rUIElement.m_bNoClose;
-+ m_bSoftClose = rUIElement.m_bSoftClose;
-+ m_bStateRead = rUIElement.m_bStateRead;
-+ m_nStyle = rUIElement.m_nStyle;
-+ m_aDockedData = rUIElement.m_aDockedData;
-+ m_aFloatingData = rUIElement.m_aFloatingData;
-+ }
- return *this;
- }
-
-diff --git a/sc/source/core/data/sortparam.cxx b/sc/source/core/data/sortparam.cxx
-index 6d99001..e03989c 100644
---- a/sc/source/core/data/sortparam.cxx
-+++ b/sc/source/core/data/sortparam.cxx
+--- sc/source/core/data/sortparam.cxx
++++ sc/source/core/data/sortparam.cxx
@@ -52,7 +52,8 @@ ScSortParam::ScSortParam( const ScSortParam& r ) :
bUserDef(r.bUserDef),nUserIndex(r.nUserIndex),bIncludePattern(r.bIncludePattern),
bInplace(r.bInplace),
@@ -120,51 +57,3 @@ index 6d99001..e03989c 100644
{
bDoSort[0] = TRUE;
nField[0] = nCol;
-diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
-index 790f818..36309c0 100644
---- a/sc/source/ui/view/viewdata.cxx
-+++ b/sc/source/ui/view/viewdata.cxx
-@@ -664,10 +664,17 @@ void ScViewData::SetZoomType( SvxZoomType eNew, std::vector< SCTAB >& tabs )
-
- std::vector< SCTAB >::iterator it_end = tabs.end();
- std::vector< SCTAB >::iterator it = tabs.begin();
-- for ( SCTAB i = ( bAll ? 0 : *it ); ( bAll ? i <= MAXTAB : it != it_end ); ++i , ++it )
-+
-+ SCTAB i = ( bAll ? 0 : *it );
-+ while ( bAll ? i <= MAXTAB : it != it_end )
- {
- if ( pTabData[i] )
- pTabData[i]->eZoomType = eNew;
-+
-+ if (bAll)
-+ ++i;
-+ else
-+ ++it, i = *it;
- }
-
- if ( bAll )
-@@ -712,7 +719,8 @@ void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, std::vec
- std::vector< SCTAB >::iterator it_end = tabs.end();
- std::vector< SCTAB >::iterator it = tabs.begin();
-
-- for ( SCTAB i = ( bAll ? 0 : *it ); ( bAll ? i <= MAXTAB : it != it_end ); ++i , ++it )
-+ SCTAB i = ( bAll ? 0 : *it );
-+ while ( bAll ? i <= MAXTAB : it != it_end )
- {
- if ( pTabData[i] )
- {
-@@ -727,6 +735,11 @@ void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, std::vec
- pTabData[i]->aZoomY = aValidY;
- }
- }
-+
-+ if (bAll)
-+ ++i;
-+ else
-+ ++it, i = *it;
- }
- RefreshZoom();
- }
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list