diff options
Diffstat (limited to 'sc/source')
-rw-r--r-- | sc/source/filter/excel/xecontent.cxx | 7 | ||||
-rw-r--r-- | sc/source/filter/excel/xichart.cxx | 5 | ||||
-rw-r--r-- | sc/source/filter/oox/stylesbuffer.cxx | 3 | ||||
-rw-r--r-- | sc/source/filter/oox/viewsettings.cxx | 3 | ||||
-rw-r--r-- | sc/source/filter/oox/workbookhelper.cxx | 3 | ||||
-rw-r--r-- | sc/source/filter/oox/worksheetbuffer.cxx | 5 |
6 files changed, 10 insertions, 16 deletions
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index 63a4e907ffb0..5ee12cc0e5bd 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -1905,12 +1905,11 @@ XclExpWebQueryBuffer::XclExpWebQueryBuffer( const XclExpRoot& rRoot ) Reference< XAreaLinks > xAreaLinks; aModelProp.GetProperty( xAreaLinks, SC_UNO_AREALINKS ); - Reference< XIndexAccess > xLinksIA( xAreaLinks, UNO_QUERY ); - if( !xLinksIA.is() ) return; + if( !xAreaLinks.is() ) return; - for( sal_Int32 nIndex = 0, nCount = xLinksIA->getCount(); nIndex < nCount; ++nIndex ) + for( sal_Int32 nIndex = 0, nCount = xAreaLinks->getCount(); nIndex < nCount; ++nIndex ) { - Reference< XAreaLink > xAreaLink( xLinksIA->getByIndex( nIndex ), UNO_QUERY ); + Reference< XAreaLink > xAreaLink( xAreaLinks->getByIndex( nIndex ), UNO_QUERY ); if( xAreaLink.is() ) { CellRangeAddress aDestRange( xAreaLink->getDestArea() ); diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index cb85b90d4f9c..d5cd1310e3e3 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -262,9 +262,8 @@ void XclImpChRoot::InitConversion( const Reference<XChartDocument>& xChartDoc, c mxChData->InitConversion( GetRoot(), xChartDoc, rChartRect ); // lock the model to suppress any internal updates - Reference< XModel > xModel( xChartDoc, UNO_QUERY ); - if( xModel.is() ) - xModel->lockControllers(); + if( xChartDoc.is() ) + xChartDoc->lockControllers(); SfxObjectShell* pDocShell = GetDocShell(); Reference< XDataReceiver > xDataRec( xChartDoc, UNO_QUERY ); diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 4d4a205239a7..0d0467d5139b 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -2837,9 +2837,8 @@ void CellStyleBuffer::finalizeImport() Reference< XStyle > xStyle( xStyleFamilyIA->getByIndex( nIndex ), UNO_QUERY_THROW ); if( bReserveAll || !xStyle->isUserDefined() ) { - Reference< XNamed > xStyleName( xStyle, UNO_QUERY_THROW ); // create an empty entry by using ::std::map<>::operator[] - aCellStyles[ xStyleName->getName() ]; + aCellStyles[ xStyle->getName() ]; } } } diff --git a/sc/source/filter/oox/viewsettings.cxx b/sc/source/filter/oox/viewsettings.cxx index ba92331a65a4..960708329f9e 100644 --- a/sc/source/filter/oox/viewsettings.cxx +++ b/sc/source/filter/oox/viewsettings.cxx @@ -614,9 +614,8 @@ void ViewSettings::finalizeImport() aPropMap[ PROP_IsOutlineSymbolsSet ] <<= rxActiveSheetView->mbShowOutline; xContainer->insertByIndex( 0, Any( aPropMap.makePropertyValueSequence() ) ); - Reference< XIndexAccess > xIAccess( xContainer, UNO_QUERY_THROW ); Reference< XViewDataSupplier > xViewDataSuppl( getDocument(), UNO_QUERY_THROW ); - xViewDataSuppl->setViewData( xIAccess ); + xViewDataSuppl->setViewData( xContainer ); } catch( Exception& ) { diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index 09c6947c1477..6ab4ecab8450 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -449,8 +449,7 @@ Reference< XDatabaseRange > WorkbookGlobals::createDatabaseRangeObject( OUString // find an unused name PropertySet aDocProps( mxDoc ); Reference< XDatabaseRanges > xDatabaseRanges( aDocProps.getAnyProperty( PROP_DatabaseRanges ), UNO_QUERY_THROW ); - Reference< XNameAccess > xNameAccess( xDatabaseRanges, UNO_QUERY_THROW ); - orName = ContainerHelper::getUnusedName( xNameAccess, orName, '_' ); + orName = ContainerHelper::getUnusedName( xDatabaseRanges, orName, '_' ); // create the database range xDatabaseRanges->addNewByName( orName, aDestRange ); xDatabaseRange.set( xDatabaseRanges->getByName( orName ), UNO_QUERY ); 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 ) ); } |