diff options
| author | Noel Grandin <noel@peralex.com> | 2013-05-02 10:36:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2013-05-22 10:44:29 +0000 |
| commit | 6a043e9c0acff20e1618ca8ec15c21d5d0fd0d37 (patch) | |
| tree | 2746468845d6f1159e3759ee2cf7a620fca15b6e /sc/source/filter/oox/worksheetbuffer.cxx | |
| parent | 697a007c61b9cabceb9767fad87cd5822b300452 (diff) | |
Use the new type-checking Reference constructor to reduce code noise
Also create a Clang compiler plugin to detect such cases.
Change-Id: I61ad1a1d6b1c017eeb51f226d2dde0e9bb7f1752
Reviewed-on: https://gerrit.libreoffice.org/4001
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sc/source/filter/oox/worksheetbuffer.cxx')
| -rw-r--r-- | sc/source/filter/oox/worksheetbuffer.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sc/source/filter/oox/worksheetbuffer.cxx b/sc/source/filter/oox/worksheetbuffer.cxx index 1a0bcb1df172..b589f849e041 100644 --- a/sc/source/filter/oox/worksheetbuffer.cxx +++ b/sc/source/filter/oox/worksheetbuffer.cxx @@ -174,7 +174,6 @@ WorksheetBuffer::IndexNamePair WorksheetBuffer::createSheet( const OUString& rPr { Reference< XSpreadsheets > xSheets( getDocument()->getSheets(), UNO_QUERY_THROW ); Reference< XIndexAccess > xSheetsIA( xSheets, UNO_QUERY_THROW ); - Reference< XNameAccess > xSheetsNA( xSheets, UNO_QUERY_THROW ); sal_Int16 nCalcSheet = -1; OUString aSheetName = rPreferredName.isEmpty() ? "Sheet" : rPreferredName; PropertySet aPropSet; @@ -185,7 +184,7 @@ WorksheetBuffer::IndexNamePair WorksheetBuffer::createSheet( const OUString& rPr Reference< XNamed > xSheetName( xSheetsIA->getByIndex( nSheetPos ), UNO_QUERY_THROW ); if( xSheetName->getName() != aSheetName ) { - aSheetName = ContainerHelper::getUnusedName( xSheetsNA, aSheetName, ' ' ); + aSheetName = ContainerHelper::getUnusedName( xSheets, aSheetName, ' ' ); xSheetName->setName( aSheetName ); } aPropSet.set( xSheetName ); @@ -194,7 +193,7 @@ WorksheetBuffer::IndexNamePair WorksheetBuffer::createSheet( const OUString& rPr { nCalcSheet = static_cast< sal_Int16 >( xSheetsIA->getCount() ); // new sheet - insert with unused name - aSheetName = ContainerHelper::getUnusedName( xSheetsNA, aSheetName, ' ' ); + aSheetName = ContainerHelper::getUnusedName( xSheets, aSheetName, ' ' ); xSheets->insertNewByName( aSheetName, nCalcSheet ); aPropSet.set( xSheetsIA->getByIndex( nCalcSheet ) ); } |