Kaydet (Commit) eec4e120 authored tarafından Laurent Godard's avatar Laurent Godard Kaydeden (comit) Markus Mohrhard

avoid Tabs size calculation in loops

üst 443a7229
...@@ -656,7 +656,8 @@ bool ScDocument::HasSheetEventScript( SCTAB nTab, sal_Int32 nEvent, bool bWithVb ...@@ -656,7 +656,8 @@ bool ScDocument::HasSheetEventScript( SCTAB nTab, sal_Int32 nEvent, bool bWithVb
bool ScDocument::HasAnySheetEventScript( sal_Int32 nEvent, bool bWithVbaEvents ) const bool ScDocument::HasAnySheetEventScript( sal_Int32 nEvent, bool bWithVbaEvents ) const
{ {
for (SCTAB nTab = 0; nTab < static_cast<SCTAB>(maTabs.size()); nTab++) SCTAB nSize = static_cast<SCTAB>(maTabs.size());
for (SCTAB nTab = 0; nTab < nSize; nTab++)
if (HasSheetEventScript( nTab, nEvent, bWithVbaEvents )) if (HasSheetEventScript( nTab, nEvent, bWithVbaEvents ))
return true; return true;
return false; return false;
...@@ -664,7 +665,8 @@ bool ScDocument::HasAnySheetEventScript( sal_Int32 nEvent, bool bWithVbaEvents ) ...@@ -664,7 +665,8 @@ bool ScDocument::HasAnySheetEventScript( sal_Int32 nEvent, bool bWithVbaEvents )
bool ScDocument::HasAnyCalcNotification() const bool ScDocument::HasAnyCalcNotification() const
{ {
for (SCTAB nTab = 0; nTab < static_cast<SCTAB>(maTabs.size()); nTab++) SCTAB nSize = static_cast<SCTAB>(maTabs.size());
for (SCTAB nTab = 0; nTab < nSize; nTab++)
if (maTabs[nTab] && maTabs[nTab]->GetCalcNotification()) if (maTabs[nTab] && maTabs[nTab]->GetCalcNotification())
return true; return true;
return false; return false;
...@@ -686,7 +688,8 @@ void ScDocument::SetCalcNotification( SCTAB nTab ) ...@@ -686,7 +688,8 @@ void ScDocument::SetCalcNotification( SCTAB nTab )
void ScDocument::ResetCalcNotifications() void ScDocument::ResetCalcNotifications()
{ {
for (SCTAB nTab = 0; nTab < static_cast<SCTAB>(maTabs.size()); nTab++) SCTAB nSize = static_cast<SCTAB>(maTabs.size());
for (SCTAB nTab = 0; nTab < nSize; nTab++)
if (maTabs[nTab] && maTabs[nTab]->GetCalcNotification()) if (maTabs[nTab] && maTabs[nTab]->GetCalcNotification())
maTabs[nTab]->SetCalcNotification(false); maTabs[nTab]->SetCalcNotification(false);
} }
......
...@@ -133,7 +133,8 @@ void ScDocument::UpdateAllCharts() ...@@ -133,7 +133,8 @@ void ScDocument::UpdateAllCharts()
size_t nDataCount = pChartCollection->size(); size_t nDataCount = pChartCollection->size();
for (SCTAB nTab=0; nTab< static_cast<SCTAB>(maTabs.size()); nTab++) SCTAB nSize = static_cast<SCTAB>(maTabs.size());
for (SCTAB nTab=0; nTab< nSize; nTab++)
{ {
if (maTabs[nTab]) if (maTabs[nTab])
{ {
...@@ -247,7 +248,8 @@ uno::Reference< chart2::XChartDocument > ScDocument::GetChartByName( const rtl:: ...@@ -247,7 +248,8 @@ uno::Reference< chart2::XChartDocument > ScDocument::GetChartByName( const rtl::
if (pDrawLayer) if (pDrawLayer)
{ {
sal_uInt16 nCount = pDrawLayer->GetPageCount(); sal_uInt16 nCount = pDrawLayer->GetPageCount();
for (sal_uInt16 nTab=0; nTab<nCount&& nTab < static_cast<SCTAB>(maTabs.size()); nTab++) SCTAB nSize = static_cast<SCTAB>(maTabs.size());
for (sal_uInt16 nTab=0; nTab<nCount && nTab < nSize; nTab++)
{ {
SdrPage* pPage = pDrawLayer->GetPage(nTab); SdrPage* pPage = pDrawLayer->GetPage(nTab);
OSL_ENSURE(pPage,"Page ?"); OSL_ENSURE(pPage,"Page ?");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment