diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-06-07 05:04:57 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-06-07 05:04:57 +0200 |
| commit | 4c5e30555d20f17614f31c34a0b06fbca5f3fb02 (patch) | |
| tree | f8b529e975eb61531468c63044ab932f2350789f /sc/source/filter/xml/xmlstyli.cxx | |
| parent | Useful error message when DDE link update fails. (diff) | |
| parent | fix selection problem (diff) | |
| download | core-4c5e30555d20f17614f31c34a0b06fbca5f3fb02.tar.gz core-4c5e30555d20f17614f31c34a0b06fbca5f3fb02.zip | |
Merge branch 'feature/unlimited-number-of-sheets'
Conflicts:
sc/source/core/data/dociter.cxx
sc/source/core/data/table1.cxx
sc/source/ui/view/preview.cxx
Diffstat (limited to 'sc/source/filter/xml/xmlstyli.cxx')
| -rw-r--r-- | sc/source/filter/xml/xmlstyli.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index 97eb77dd8d0a..487d484a259a 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -1059,14 +1059,14 @@ void ScCellTextStyleContext::FillPropertySet( const uno::Reference<beans::XPrope if (pCellImp) { ScAddress aPos = pCellImp->GetCellObj().GetPosition(); - if ( static_cast<sal_Int32>(aPos.Tab()) != nLastSheet ) + if ( aPos.Tab() != nLastSheet ) { ESelection aSel = pCellImp->GetSelection(); ScSheetSaveData* pSheetData = ScModelObj::getImplementation(GetImport().GetModel())->GetSheetSaveData(); pSheetData->AddTextStyle( GetName(), aPos, aSel ); - nLastSheet = static_cast<sal_Int32>(aPos.Tab()); + nLastSheet = aPos.Tab(); } } else if ( rXMLImport.GetTables().GetCurrentSheet() != nLastSheet ) |