Kaydet (Commit) 8e94ac21 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

use a as prefix for local variables

Change-Id: Id4652eb986c02044e27cd4e91863d5ed97465860
üst c5d4e2cf
...@@ -428,13 +428,13 @@ void XMLTableStyleContext::ApplyCondFormat( uno::Sequence<table::CellRangeAddres ...@@ -428,13 +428,13 @@ void XMLTableStyleContext::ApplyCondFormat( uno::Sequence<table::CellRangeAddres
if(!mpCondFormat || GetScImport().HasNewCondFormatData()) if(!mpCondFormat || GetScImport().HasNewCondFormatData())
return; return;
ScRangeList rRange; ScRangeList aRangeList;
sal_Int32 nRanges = xCellRanges.getLength(); sal_Int32 nRanges = xCellRanges.getLength();
for(sal_Int32 i = 0; i < nRanges; ++i) for(sal_Int32 i = 0; i < nRanges; ++i)
{ {
table::CellRangeAddress aAddress = xCellRanges[i]; table::CellRangeAddress aAddress = xCellRanges[i];
ScRange aRange( aAddress.StartColumn, aAddress.StartRow, aAddress.Sheet, aAddress.EndColumn, aAddress.EndRow, aAddress.Sheet ); ScRange aRange( aAddress.StartColumn, aAddress.StartRow, aAddress.Sheet, aAddress.EndColumn, aAddress.EndRow, aAddress.Sheet );
rRange.Join( aRange, false ); aRangeList.Join( aRange, false );
} }
ScDocument* pDoc = GetScImport().GetDocument(); ScDocument* pDoc = GetScImport().GetDocument();
...@@ -447,17 +447,17 @@ void XMLTableStyleContext::ApplyCondFormat( uno::Sequence<table::CellRangeAddres ...@@ -447,17 +447,17 @@ void XMLTableStyleContext::ApplyCondFormat( uno::Sequence<table::CellRangeAddres
{ {
ScRangeList& rRangeList = itr->GetRangeList(); ScRangeList& rRangeList = itr->GetRangeList();
sal_uInt32 nCondId = itr->GetKey(); sal_uInt32 nCondId = itr->GetKey();
size_t n = rRange.size(); size_t n = aRangeList.size();
for(size_t i = 0; i < n; ++i) for(size_t i = 0; i < n; ++i)
{ {
const ScRange* pRange = rRange[i]; const ScRange* pRange = aRangeList[i];
rRangeList.Join(*pRange); rRangeList.Join(*pRange);
} }
ScPatternAttr aPattern( pDoc->GetPool() ); ScPatternAttr aPattern( pDoc->GetPool() );
aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_CONDITIONAL, nCondId ) ); aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_CONDITIONAL, nCondId ) );
ScMarkData aMarkData; ScMarkData aMarkData;
aMarkData.MarkFromRangeList(rRange, true); aMarkData.MarkFromRangeList(aRangeList, true);
pDoc->ApplySelectionPattern( aPattern , aMarkData); pDoc->ApplySelectionPattern( aPattern , aMarkData);
break; break;
...@@ -469,12 +469,12 @@ void XMLTableStyleContext::ApplyCondFormat( uno::Sequence<table::CellRangeAddres ...@@ -469,12 +469,12 @@ void XMLTableStyleContext::ApplyCondFormat( uno::Sequence<table::CellRangeAddres
mbDeleteCondFormat = false; mbDeleteCondFormat = false;
sal_uLong nIndex = pDoc->AddCondFormat(mpCondFormat, nTab ); sal_uLong nIndex = pDoc->AddCondFormat(mpCondFormat, nTab );
mpCondFormat->SetKey(nIndex); mpCondFormat->SetKey(nIndex);
mpCondFormat->AddRange(rRange); mpCondFormat->AddRange(aRangeList);
ScPatternAttr aPattern( pDoc->GetPool() ); ScPatternAttr aPattern( pDoc->GetPool() );
aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_CONDITIONAL, nIndex ) ); aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_CONDITIONAL, nIndex ) );
ScMarkData aMarkData; ScMarkData aMarkData;
aMarkData.MarkFromRangeList(rRange, true); aMarkData.MarkFromRangeList(aRangeList, true);
pDoc->ApplySelectionPattern( aPattern , aMarkData); pDoc->ApplySelectionPattern( aPattern , aMarkData);
} }
......
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