connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx | 4 ++--
sc/source/core/data/dptabres.cxx | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit ddd75bed757652e5e2348165c70c2eae893e3aa4
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Tue Feb 7 19:50:37 2012 +0100
fix dbgutil build
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index 4f780cd..9428bfa 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -3566,7 +3566,7 @@ void ScDPDataDimension::FillDataRow( const
ScDPResultDimension* pRefDim,
long nCol, long nMeasure, sal_Bool
bIsSubTotalRow,
const ScDPSubTotalState& rSubState ) const
{
- OSL_ENSURE( pRefDim && pRefDim->GetMemberCount() == maMembers.Count(),
"dimensions don't match" );
+ OSL_ENSURE( pRefDim && pRefDim->GetMemberCount() == maMembers.size(),
"dimensions don't match" );
OSL_ENSURE( pRefDim == pResultDimension, "wrong dim" );
const ScMemberSortOrder& rMemberOrder = pRefDim->GetMemberOrder();
@@ -3601,7 +3601,7 @@ void ScDPDataDimension::UpdateDataRow( const
ScDPResultDimension* pRefDim,
long nMeasure, sal_Bool bIsSubTotalRow,
const ScDPSubTotalState& rSubState ) const
{
- OSL_ENSURE( pRefDim && pRefDim->GetMemberCount() == maMembers.Count(),
"dimensions don't match" );
+ OSL_ENSURE( pRefDim && pRefDim->GetMemberCount() == maMembers.size(),
"dimensions don't match" );
OSL_ENSURE( pRefDim == pResultDimension, "wrong dim" );
long nMemberMeasure = nMeasure;
@@ -3644,7 +3644,7 @@ void ScDPDataDimension::SortMembers( ScDPResultDimension*
pRefDim )
// handle children
- OSL_ENSURE( pRefDim && pRefDim->GetMemberCount() == maMembers.Count(),
"dimensions don't match" );
+ OSL_ENSURE( pRefDim && pRefDim->GetMemberCount() == maMembers.size(),
"dimensions don't match" );
OSL_ENSURE( pRefDim == pResultDimension, "wrong dim" );
// for data layout, call only once - sorting measure is always taken from
settings
@@ -3666,7 +3666,7 @@ void ScDPDataDimension::DoAutoShow( ScDPResultDimension*
pRefDim )
// handle children first, before changing the visible state
- OSL_ENSURE( pRefDim && pRefDim->GetMemberCount() == maMembers.Count(),
"dimensions don't match" );
+ OSL_ENSURE( pRefDim && pRefDim->GetMemberCount() == maMembers.size(),
"dimensions don't match" );
OSL_ENSURE( pRefDim == pResultDimension, "wrong dim" );
// for data layout, call only once - sorting measure is always taken from
settings
@@ -3755,7 +3755,7 @@ void ScDPDataDimension::UpdateRunningTotals( const
ScDPResultDimension* pRefDim,
const ScDPSubTotalState& rSubState,
ScDPRunningTotalState& rRunning,
ScDPRowTotals& rTotals, const
ScDPResultMember& rRowParent ) const
{
- OSL_ENSURE( pRefDim && pRefDim->GetMemberCount() == maMembers.Count(),
"dimensions don't match" );
+ OSL_ENSURE( pRefDim && pRefDim->GetMemberCount() == maMembers.size(),
"dimensions don't match" );
OSL_ENSURE( pRefDim == pResultDimension, "wrong dim" );
long nMemberMeasure = nMeasure;
commit 6fcd9f49df84fd32c5a888493ceddbcda186e049
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Thu Feb 2 00:54:35 2012 +0100
increase the sleep time of the Mozilla UI Thread
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
index d80ac4e..e9d8222 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
@@ -231,8 +231,8 @@ void MNS_XPCOM_EventLoop()
if (NS_FAILED(rv))
return ;
if (event)
- eventQ->HandleEvent(event);
- }while ( PR_SUCCESS == PR_Sleep( PR_MillisecondsToInterval(1)) && aLive );
+ eventQ->HandleEvent(event);
+ }while ( PR_SUCCESS == PR_Sleep( PR_MillisecondsToInterval(20)) && aLive );
eventQ->ProcessPendingEvents();
OSL_TRACE( "OUT : MNS_XPCOM_EventLoop()" );
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
