diff options
Diffstat (limited to 'sc/source/ui')
-rw-r--r-- | sc/source/ui/Accessibility/AccessibleDocument.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/app/transobj.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/unoobj/afmtuno.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/unoobj/cellsuno.cxx | 38 | ||||
-rw-r--r-- | sc/source/ui/unoobj/docuno.cxx | 16 | ||||
-rw-r--r-- | sc/source/ui/unoobj/funcuno.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/unoobj/shapeuno.cxx | 12 | ||||
-rw-r--r-- | sc/source/ui/unoobj/styleuno.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/unoobj/textuno.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/unoobj/viewuno.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/vba/excelvbahelper.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/vba/vbaeventshelper.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/vba/vbaformat.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/vba/vbarange.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/vba/vbasheetobject.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/drawview.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/tabview.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/tabview3.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/tabview5.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/tabvwsh4.cxx | 2 |
21 files changed, 64 insertions, 64 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 565de0e65fec..d6ccb9ea32cc 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1087,7 +1087,7 @@ boost::optional<ScAddress> ScChildrenShapes::GetAnchor(const uno::Reference<draw { if (mpViewShell) { - SvxShape* pShapeImp = SvxShape::getImplementation(xShape); + SvxShape* pShapeImp = comphelper::getUnoTunnelImplementation<SvxShape>(xShape); uno::Reference<beans::XPropertySet> xShapeProp(xShape, uno::UNO_QUERY); if (pShapeImp && xShapeProp.is()) { diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 3a9faa1bcae3..c78e8ae9e859 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -620,7 +620,7 @@ ScDocument* ScTransferObj::GetSourceDocument() ScDocShell* ScTransferObj::GetSourceDocShell() { - ScCellRangesBase* pRangesObj = ScCellRangesBase::getImplementation( m_xDragSourceRanges ); + ScCellRangesBase* pRangesObj = comphelper::getUnoTunnelImplementation<ScCellRangesBase>( m_xDragSourceRanges ); if (pRangesObj) return pRangesObj->GetDocShell(); @@ -630,7 +630,7 @@ ScDocShell* ScTransferObj::GetSourceDocShell() ScMarkData ScTransferObj::GetSourceMarkData() { ScMarkData aMarkData; - ScCellRangesBase* pRangesObj = ScCellRangesBase::getImplementation( m_xDragSourceRanges ); + ScCellRangesBase* pRangesObj = comphelper::getUnoTunnelImplementation<ScCellRangesBase>( m_xDragSourceRanges ); if (pRangesObj) { const ScRangeList& rRanges = pRangesObj->GetRangeList(); diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index 2ca01d150496..bdfc277ab911 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -212,7 +212,7 @@ void SAL_CALL ScAutoFormatsObj::insertByName( const OUString& aName, const uno:: uno::Reference< uno::XInterface > xInterface(aElement, uno::UNO_QUERY); if ( xInterface.is() ) { - ScAutoFormatObj* pFormatObj = ScAutoFormatObj::getImplementation( xInterface ); + ScAutoFormatObj* pFormatObj = comphelper::getUnoTunnelImplementation<ScAutoFormatObj>( xInterface ); if ( pFormatObj && !pFormatObj->IsInserted() ) { ScAutoFormat* pFormats = ScGlobal::GetOrCreateAutoFormat(); diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index fe61b8b6b5b6..46455f1793a1 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -1568,7 +1568,7 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint ) { if ( rRef.GetMode() == URM_INSDEL && aRanges.size() == 1 - && ScTableSheetObj::getImplementation(xThis) + && comphelper::getUnoTunnelImplementation<ScTableSheetObj>(xThis) ) { // #101755#; the range size of a sheet does not change @@ -2363,7 +2363,7 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE if ( !aRanges.empty() && xInterface.is() ) // empty = nothing to do { ScTableConditionalFormat* pFormat = - ScTableConditionalFormat::getImplementation( xInterface ); + comphelper::getUnoTunnelImplementation<ScTableConditionalFormat>( xInterface ); if (pFormat) { ScDocument& rDoc = pDocShell->GetDocument(); @@ -2410,7 +2410,7 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE if ( !aRanges.empty() && xInterface.is() ) // empty = nothing to do { ScTableValidationObj* pValidObj = - ScTableValidationObj::getImplementation( xInterface ); + comphelper::getUnoTunnelImplementation<ScTableValidationObj>( xInterface ); if (pValidObj) { ScDocument& rDoc = pDocShell->GetDocument(); @@ -3869,7 +3869,7 @@ uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangesBase::findAll( uno::Reference<container::XIndexAccess> xRet; if ( pDocShell && xDesc.is() ) { - ScCellSearchObj* pSearch = ScCellSearchObj::getImplementation( xDesc ); + ScCellSearchObj* pSearch = comphelper::getUnoTunnelImplementation<ScCellSearchObj>( xDesc ); if (pSearch) { SvxSearchItem* pSearchItem = pSearch->GetSearchItem(); @@ -3907,7 +3907,7 @@ uno::Reference<uno::XInterface> ScCellRangesBase::Find_Impl( uno::Reference<uno::XInterface> xRet; if ( pDocShell && xDesc.is() ) { - ScCellSearchObj* pSearch = ScCellSearchObj::getImplementation( xDesc ); + ScCellSearchObj* pSearch = comphelper::getUnoTunnelImplementation<ScCellSearchObj>( xDesc ); if (pSearch) { SvxSearchItem* pSearchItem = pSearch->GetSearchItem(); @@ -3960,7 +3960,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScCellRangesBase::findNext( SolarMutexGuard aGuard; if ( xStartAt.is() ) { - ScCellRangesBase* pRangesImp = ScCellRangesBase::getImplementation( xStartAt ); + ScCellRangesBase* pRangesImp = comphelper::getUnoTunnelImplementation<ScCellRangesBase>( xStartAt ); if ( pRangesImp && pRangesImp->GetDocShell() == pDocShell ) { const ScRangeList& rStartRanges = pRangesImp->GetRangeList(); @@ -3988,7 +3988,7 @@ sal_Int32 SAL_CALL ScCellRangesBase::replaceAll( const uno::Reference<util::XSea sal_Int32 nReplaced = 0; if ( pDocShell && xDesc.is() ) { - ScCellSearchObj* pSearch = ScCellSearchObj::getImplementation( xDesc ); + ScCellSearchObj* pSearch = comphelper::getUnoTunnelImplementation<ScCellSearchObj>( xDesc ); if (pSearch) { SvxSearchItem* pSearchItem = pSearch->GetSearchItem(); @@ -4323,7 +4323,7 @@ void SAL_CALL ScCellRangesObj::insertByName( const OUString& aName, const uno::A uno::Reference<uno::XInterface> xInterface(aElement, uno::UNO_QUERY); if ( pDocSh && xInterface.is() ) { - ScCellRangesBase* pRangesImp = ScCellRangesBase::getImplementation( xInterface ); + ScCellRangesBase* pRangesImp = comphelper::getUnoTunnelImplementation<ScCellRangesBase>( xInterface ); if ( pRangesImp && pRangesImp->GetDocShell() == pDocSh ) { // if explicit name is given and already existing, throw exception @@ -4953,7 +4953,7 @@ void ScCellRangeObj::SetArrayFormula_Impl(const OUString& rFormula, { if ( !rFormula.isEmpty() ) { - if ( ScTableSheetObj::getImplementation( static_cast<cppu::OWeakObject*>(this) ) ) + if ( comphelper::getUnoTunnelImplementation<ScTableSheetObj>( static_cast<cppu::OWeakObject*>(this) ) ) { // don't set array formula for sheet object throw uno::RuntimeException(); @@ -5022,7 +5022,7 @@ void SAL_CALL ScCellRangeObj::setArrayTokens( const uno::Sequence<sheet::Formula { if ( rTokens.hasElements() ) { - if ( ScTableSheetObj::getImplementation( static_cast<cppu::OWeakObject*>(this) ) ) + if ( comphelper::getUnoTunnelImplementation<ScTableSheetObj>( static_cast<cppu::OWeakObject*>(this) ) ) { throw uno::RuntimeException(); } @@ -5053,7 +5053,7 @@ uno::Sequence< uno::Sequence<uno::Any> > SAL_CALL ScCellRangeObj::getDataArray() { SolarMutexGuard aGuard; - if ( ScTableSheetObj::getImplementation( static_cast<cppu::OWeakObject*>(this) ) ) + if ( comphelper::getUnoTunnelImplementation<ScTableSheetObj>( static_cast<cppu::OWeakObject*>(this) ) ) { // don't create a data array for the sheet throw uno::RuntimeException(); @@ -5098,7 +5098,7 @@ uno::Sequence< uno::Sequence<OUString> > SAL_CALL ScCellRangeObj::getFormulaArra { SolarMutexGuard aGuard; - if ( ScTableSheetObj::getImplementation( static_cast<cppu::OWeakObject*>(this) ) ) + if ( comphelper::getUnoTunnelImplementation<ScTableSheetObj>( static_cast<cppu::OWeakObject*>(this) ) ) { // don't create a data array for the sheet throw uno::RuntimeException(); @@ -5656,7 +5656,7 @@ void SAL_CALL ScCellRangeObj::applySubTotals( ScDocShell* pDocSh = GetDocShell(); ScSubTotalDescriptorBase* pImp = - ScSubTotalDescriptorBase::getImplementation( xDescriptor ); + comphelper::getUnoTunnelImplementation<ScSubTotalDescriptorBase>( xDescriptor ); if (pDocSh && pImp) { @@ -6090,12 +6090,12 @@ uno::Reference<text::XTextCursor> SAL_CALL ScCellObj::createTextCursorByRange( SvxUnoTextCursor* pCursor = new ScCellTextCursor( *this ); uno::Reference<text::XTextCursor> xCursor(pCursor); - SvxUnoTextRangeBase* pRange = SvxUnoTextRangeBase::getImplementation( aTextPosition ); + SvxUnoTextRangeBase* pRange = comphelper::getUnoTunnelImplementation<SvxUnoTextRangeBase>( aTextPosition ); if(pRange) pCursor->SetSelection( pRange->GetSelection() ); else { - ScCellTextCursor* pOther = ScCellTextCursor::getImplementation( aTextPosition ); + ScCellTextCursor* pOther = comphelper::getUnoTunnelImplementation<ScCellTextCursor>( aTextPosition ); if(!pOther) throw uno::RuntimeException(); @@ -6147,8 +6147,8 @@ void SAL_CALL ScCellObj::insertTextContent( const uno::Reference<text::XTextRang ScDocShell* pDocSh = GetDocShell(); if ( pDocSh && xContent.is() ) { - ScEditFieldObj* pCellField = ScEditFieldObj::getImplementation(xContent); - SvxUnoTextRangeBase* pTextRange = ScCellTextCursor::getImplementation( xRange ); + ScEditFieldObj* pCellField = comphelper::getUnoTunnelImplementation<ScEditFieldObj>(xContent); + SvxUnoTextRangeBase* pTextRange = comphelper::getUnoTunnelImplementation<ScCellTextCursor>( xRange ); if ( pCellField && !pCellField->IsInserted() && pTextRange ) { @@ -6197,7 +6197,7 @@ void SAL_CALL ScCellObj::removeTextContent( const uno::Reference<text::XTextCont SolarMutexGuard aGuard; if ( xContent.is() ) { - ScEditFieldObj* pCellField = ScEditFieldObj::getImplementation(xContent); + ScEditFieldObj* pCellField = comphelper::getUnoTunnelImplementation<ScEditFieldObj>(xContent); if ( pCellField && pCellField->IsInserted() ) { //! Check if field is in this cell @@ -6829,7 +6829,7 @@ uno::Reference<sheet::XSheetCellCursor> SAL_CALL ScTableSheetObj::createCursorBy ScDocShell* pDocSh = GetDocShell(); if ( pDocSh && xCellRange.is() ) { - ScCellRangesBase* pRangesImp = ScCellRangesBase::getImplementation( xCellRange ); + ScCellRangesBase* pRangesImp = comphelper::getUnoTunnelImplementation<ScCellRangesBase>( xCellRange ); if (pRangesImp) { const ScRangeList& rRanges = pRangesImp->GetRangeList(); diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 119683f8a9a2..4ceb2c03f711 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -1228,7 +1228,7 @@ void ScModelObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) if (xNumberAgg.is()) { SvNumberFormatsSupplierObj* pNumFmt = - SvNumberFormatsSupplierObj::getImplementation( + comphelper::getUnoTunnelImplementation<SvNumberFormatsSupplierObj>( uno::Reference<util::XNumberFormatsSupplier>(xNumberAgg, uno::UNO_QUERY) ); if ( pNumFmt ) pNumFmt->SetNumberFormatter( nullptr ); @@ -1314,7 +1314,7 @@ static OutputDevice* lcl_GetRenderDevice( const uno::Sequence<beans::PropertyVal uno::Reference<awt::XDevice> xRenderDevice(rProp.Value, uno::UNO_QUERY); if ( xRenderDevice.is() ) { - VCLXDevice* pDevice = VCLXDevice::getImplementation( xRenderDevice ); + VCLXDevice* pDevice = comphelper::getUnoTunnelImplementation<VCLXDevice>( xRenderDevice ); if ( pDevice ) { pRet = pDevice->GetOutputDevice().get(); @@ -1469,11 +1469,11 @@ bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection, uno::Reference<uno::XInterface> xInterface(aSelection, uno::UNO_QUERY); if ( xInterface.is() ) { - ScCellRangesBase* pSelObj = ScCellRangesBase::getImplementation( xInterface ); + ScCellRangesBase* pSelObj = comphelper::getUnoTunnelImplementation<ScCellRangesBase>( xInterface ); uno::Reference< drawing::XShapes > xShapes( xInterface, uno::UNO_QUERY ); if ( pSelObj && pSelObj->GetDocShell() == pDocShell ) { - bool bSheet = ( ScTableSheetObj::getImplementation( xInterface ) != nullptr ); + bool bSheet = ( comphelper::getUnoTunnelImplementation<ScTableSheetObj>( xInterface ) != nullptr ); bool bCursor = pSelObj->IsCursorOnly(); const ScRangeList& rRanges = pSelObj->GetRangeList(); @@ -1515,7 +1515,7 @@ bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection, { // multi selection isn't supported yet uno::Reference< drawing::XShape > xShape( xIndexAccess->getByIndex(0), uno::UNO_QUERY ); - SvxShape* pShape = SvxShape::getImplementation( xShape ); + SvxShape* pShape = comphelper::getUnoTunnelImplementation<SvxShape>( xShape ); if( pShape ) { SdrObject *pSdrObj = pShape->GetSdrObject(); @@ -3332,7 +3332,7 @@ uno::Reference<drawing::XDrawPage> SAL_CALL ScDrawPagesObj::insertNewByIndex( sa void SAL_CALL ScDrawPagesObj::remove( const uno::Reference<drawing::XDrawPage>& xPage ) { SolarMutexGuard aGuard; - SvxDrawPage* pImp = SvxDrawPage::getImplementation( xPage ); + SvxDrawPage* pImp = comphelper::getUnoTunnelImplementation<SvxDrawPage>( xPage ); if ( pDocShell && pImp ) { SdrPage* pPage = pImp->GetSdrPage(); @@ -3488,7 +3488,7 @@ void SAL_CALL ScTableSheetsObj::insertByName( const OUString& aName, const uno:: uno::Reference<uno::XInterface> xInterface(aElement, uno::UNO_QUERY); if ( xInterface.is() ) { - ScTableSheetObj* pSheetObj = ScTableSheetObj::getImplementation( xInterface ); + ScTableSheetObj* pSheetObj = comphelper::getUnoTunnelImplementation<ScTableSheetObj>( xInterface ); if ( pSheetObj && !pSheetObj->GetDocShell() ) // not inserted yet? { ScDocument& rDoc = pDocShell->GetDocument(); @@ -3534,7 +3534,7 @@ void SAL_CALL ScTableSheetsObj::replaceByName( const OUString& aName, const uno: uno::Reference<uno::XInterface> xInterface(aElement, uno::UNO_QUERY); if ( xInterface.is() ) { - ScTableSheetObj* pSheetObj = ScTableSheetObj::getImplementation( xInterface ); + ScTableSheetObj* pSheetObj = comphelper::getUnoTunnelImplementation<ScTableSheetObj>( xInterface ); if ( pSheetObj && !pSheetObj->GetDocShell() ) // not inserted yet? { SCTAB nPosition; diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index 5d9495b3199e..6fe460bf478e 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -544,7 +544,7 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName, // currently, only our own cell ranges are supported uno::Reference<table::XCellRange> xRange(rArg, uno::UNO_QUERY); - ScCellRangesBase* pImpl = ScCellRangesBase::getImplementation( xRange ); + ScCellRangesBase* pImpl = comphelper::getUnoTunnelImplementation<ScCellRangesBase>( xRange ); if ( pImpl ) { ScDocument* pSrcDoc = pImpl->GetDocument(); diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 592f612608fa..fbb8a173aa96 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -102,7 +102,7 @@ ScShapeObj::ScShapeObj( uno::Reference<drawing::XShape>& xShape ) : xShape.set(uno::Reference<drawing::XShape>( mxShapeAgg, uno::UNO_QUERY )); - bIsTextShape = ( SvxUnoTextBase::getImplementation( mxShapeAgg ) != nullptr ); + bIsTextShape = ( comphelper::getUnoTunnelImplementation<SvxUnoTextBase>( mxShapeAgg ) != nullptr ); } { @@ -1093,7 +1093,7 @@ void SAL_CALL ScShapeObj::insertTextContent( const uno::Reference<text::XTextRan uno::Reference<text::XTextContent> xEffContent; - ScEditFieldObj* pCellField = ScEditFieldObj::getImplementation( xContent ); + ScEditFieldObj* pCellField = comphelper::getUnoTunnelImplementation<ScEditFieldObj>( xContent ); if ( pCellField ) { // createInstance("TextField.URL") from the document creates a ScCellFieldObj. @@ -1136,7 +1136,7 @@ uno::Reference<text::XTextCursor> SAL_CALL ScShapeObj::createTextCursor() { // ScDrawTextCursor must be used to ensure the ScShapeObj is returned by getText - SvxUnoTextBase* pText = SvxUnoTextBase::getImplementation( mxShapeAgg ); + SvxUnoTextBase* pText = comphelper::getUnoTunnelImplementation<SvxUnoTextBase>( mxShapeAgg ); if (pText) return new ScDrawTextCursor( this, *pText ); } @@ -1153,8 +1153,8 @@ uno::Reference<text::XTextCursor> SAL_CALL ScShapeObj::createTextCursorByRange( { // ScDrawTextCursor must be used to ensure the ScShapeObj is returned by getText - SvxUnoTextBase* pText = SvxUnoTextBase::getImplementation( mxShapeAgg ); - SvxUnoTextRangeBase* pRange = SvxUnoTextRangeBase::getImplementation( aTextPosition ); + SvxUnoTextBase* pText = comphelper::getUnoTunnelImplementation<SvxUnoTextBase>( mxShapeAgg ); + SvxUnoTextRangeBase* pRange = comphelper::getUnoTunnelImplementation<SvxUnoTextRangeBase>( aTextPosition ); if ( pText && pRange ) { SvxUnoTextCursor* pCursor = new ScDrawTextCursor( this, *pText ); @@ -1312,7 +1312,7 @@ SdrObject* ScShapeObj::GetSdrObject() const throw() { if(mxShapeAgg.is()) { - SvxShape* pShape = SvxShape::getImplementation( mxShapeAgg ); + SvxShape* pShape = comphelper::getUnoTunnelImplementation<SvxShape>( mxShapeAgg ); if(pShape) return pShape->GetSdrObject(); } diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index 6ef7d575aeb2..1e6f5abbe675 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -668,7 +668,7 @@ void SAL_CALL ScStyleFamilyObj::insertByName( const OUString& aName, const uno:: uno::Reference< uno::XInterface > xInterface(aElement, uno::UNO_QUERY); if ( xInterface.is() ) { - ScStyleObj* pStyleObj = ScStyleObj::getImplementation( xInterface ); + ScStyleObj* pStyleObj = comphelper::getUnoTunnelImplementation<ScStyleObj>( xInterface ); if ( pStyleObj && pStyleObj->GetFamily() == eFamily && !pStyleObj->IsInserted() ) // not yet inserted? { diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index fd35986dcda8..252a0bfee513 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -398,10 +398,10 @@ void SAL_CALL ScHeaderFooterTextObj::insertTextContent( SolarMutexGuard aGuard; if ( xContent.is() && xRange.is() ) { - ScEditFieldObj* pHeaderField = ScEditFieldObj::getImplementation( xContent ); + ScEditFieldObj* pHeaderField = comphelper::getUnoTunnelImplementation<ScEditFieldObj>( xContent ); SvxUnoTextRangeBase* pTextRange = - ScHeaderFooterTextCursor::getImplementation( xRange ); + comphelper::getUnoTunnelImplementation<ScHeaderFooterTextCursor>( xRange ); if ( pHeaderField && !pHeaderField->IsInserted() && pTextRange ) { @@ -468,7 +468,7 @@ void SAL_CALL ScHeaderFooterTextObj::removeTextContent( SolarMutexGuard aGuard; if ( xContent.is() ) { - ScEditFieldObj* pHeaderField = ScEditFieldObj::getImplementation(xContent); + ScEditFieldObj* pHeaderField = comphelper::getUnoTunnelImplementation<ScEditFieldObj>(xContent); if ( pHeaderField && pHeaderField->IsInserted() ) { //! check if the field is in this cell diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 080d70d4f75b..e9654f90e147 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -681,10 +681,10 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection ) if (bRet) return bRet; - ScCellRangesBase* pRangesImp = ScCellRangesBase::getImplementation( xInterface ); + ScCellRangesBase* pRangesImp = comphelper::getUnoTunnelImplementation<ScCellRangesBase>( xInterface ); uno::Reference<drawing::XShapes> xShapeColl( xInterface, uno::UNO_QUERY ); uno::Reference<drawing::XShape> xShapeSel( xInterface, uno::UNO_QUERY ); - SvxShape* pShapeImp = SvxShape::getImplementation( xShapeSel ); + SvxShape* pShapeImp = comphelper::getUnoTunnelImplementation<SvxShape>( xShapeSel ); if (pRangesImp) // Cell ranges { @@ -779,7 +779,7 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection ) uno::Reference<drawing::XShape> xShapeInt(xShapeColl->getByIndex(i), uno::UNO_QUERY); if (xShapeInt.is()) { - SvxShape* pShape = SvxShape::getImplementation( xShapeInt ); + SvxShape* pShape = comphelper::getUnoTunnelImplementation<SvxShape>( xShapeInt ); if (pShape) { SdrObject *pObj = pShape->GetSdrObject(); @@ -1057,7 +1057,7 @@ void SAL_CALL ScTabViewObj::setActiveSheet( const uno::Reference<sheet::XSpreads { // XSpreadsheet and ScCellRangesBase -> has to be the same sheet - ScCellRangesBase* pRangesImp = ScCellRangesBase::getImplementation( xActiveSheet ); + ScCellRangesBase* pRangesImp = comphelper::getUnoTunnelImplementation<ScCellRangesBase>( xActiveSheet ); if ( pRangesImp && pViewSh->GetViewData().GetDocShell() == pRangesImp->GetDocShell() ) { const ScRangeList& rRanges = pRangesImp->GetRangeList(); diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index ebfda3fc7942..4528c7fa8013 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -85,7 +85,7 @@ GetAutoFiltRange( const ScDocShell* pShell, sal_Int16 nSheet ) ScDocShell* GetDocShellFromRange( const uno::Reference< uno::XInterface >& xRange ) { - ScCellRangesBase* pScCellRangesBase = ScCellRangesBase::getImplementation( xRange ); + ScCellRangesBase* pScCellRangesBase = comphelper::getUnoTunnelImplementation<ScCellRangesBase>( xRange ); if ( !pScCellRangesBase ) { throw uno::RuntimeException("Failed to access underlying doc shell uno range object" ); diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index 2b48c47b3c10..a8a0ea59865e 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -846,8 +846,8 @@ bool ScVbaEventsHelper::isSelectionChanged( const uno::Sequence< uno::Any >& rAr { uno::Reference< uno::XInterface > xOldSelection( maOldSelection, uno::UNO_QUERY ); uno::Reference< uno::XInterface > xNewSelection = getXSomethingFromArgs< uno::XInterface >( rArgs, nIndex, false ); - ScCellRangesBase* pOldCellRanges = ScCellRangesBase::getImplementation( xOldSelection ); - ScCellRangesBase* pNewCellRanges = ScCellRangesBase::getImplementation( xNewSelection ); + ScCellRangesBase* pOldCellRanges = comphelper::getUnoTunnelImplementation<ScCellRangesBase>( xOldSelection ); + ScCellRangesBase* pNewCellRanges = comphelper::getUnoTunnelImplementation<ScCellRangesBase>( xNewSelection ); bool bChanged = !pOldCellRanges || !pNewCellRanges || lclSelectionChanged( pOldCellRanges->GetRangeList(), pNewCellRanges->GetRangeList() ); maOldSelection <<= xNewSelection; return bChanged; diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx index 206163306f45..47ddfcaaefad 100644 --- a/sc/source/ui/vba/vbaformat.cxx +++ b/sc/source/ui/vba/vbaformat.cxx @@ -795,7 +795,7 @@ template< typename... Ifc > ScCellRangesBase* ScVbaFormat< Ifc... >::getCellRangesBase() { - return ScCellRangesBase::getImplementation( mxPropertySet ); + return comphelper::getUnoTunnelImplementation<ScCellRangesBase>( mxPropertySet ); } template< typename... Ifc > diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index dfe74c5f694e..1836cbdd5088 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -258,9 +258,9 @@ static uno::Reference< excel::XRange > lcl_makeXRangeFromSheetCellRanges( const ScCellRangesBase* ScVbaRange::getCellRangesBase() { if( mxRanges.is() ) - return ScCellRangesBase::getImplementation( mxRanges ); + return comphelper::getUnoTunnelImplementation<ScCellRangesBase>( mxRanges ); if( mxRange.is() ) - return ScCellRangesBase::getImplementation( mxRange ); + return comphelper::getUnoTunnelImplementation<ScCellRangesBase>( mxRange ); throw uno::RuntimeException("General Error creating range - Unknown" ); } @@ -391,7 +391,7 @@ ScVbaRangeAreas::createCollectionObject( const uno::Any& aSource ) static ScDocShell* getDocShellFromIf( const uno::Reference< uno::XInterface >& xIf ) { - ScCellRangesBase* pUno = ScCellRangesBase::getImplementation( xIf ); + ScCellRangesBase* pUno = comphelper::getUnoTunnelImplementation<ScCellRangesBase>( xIf ); if ( !pUno ) throw uno::RuntimeException("Failed to access underlying uno range object" ); return pUno->GetDocShell(); @@ -536,7 +536,7 @@ public: OUString getNumberFormatString() { uno::Reference< uno::XInterface > xIf( mxRangeProps, uno::UNO_QUERY_THROW ); - ScCellRangesBase* pUnoCellRange = ScCellRangesBase::getImplementation( xIf ); + ScCellRangesBase* pUnoCellRange = comphelper::getUnoTunnelImplementation<ScCellRangesBase>( xIf ); if ( pUnoCellRange ) { diff --git a/sc/source/ui/vba/vbasheetobject.cxx b/sc/source/ui/vba/vbasheetobject.cxx index 28d55a14c4e5..d371bf2ed35b 100644 --- a/sc/source/ui/vba/vbasheetobject.cxx +++ b/sc/source/ui/vba/vbasheetobject.cxx @@ -232,7 +232,7 @@ sal_Int32 SAL_CALL ScVbaSheetObjectBase::getPlacement() { sal_Int32 const nRet = excel::XlPlacement::xlMoveAndSize; #if 0 // TODO: not working at the moment. - SvxShape* pShape = SvxShape::getImplementation( mxShape ); + SvxShape* pShape = comphelper::getUnoTunnelImplementation<SvxShape>( mxShape ); if(pShape) { SdrObject* pObj = pShape->GetSdrObject(); @@ -250,7 +250,7 @@ sal_Int32 SAL_CALL ScVbaSheetObjectBase::getPlacement() void SAL_CALL ScVbaSheetObjectBase::setPlacement( sal_Int32 /*nPlacement*/ ) { #if 0 // TODO: not working at the moment. - SvxShape* pShape = SvxShape::getImplementation( mxShape ); + SvxShape* pShape = comphelper::getUnoTunnelImplementation<SvxShape>( mxShape ); if(pShape) { SdrObject* pObj = pShape->GetSdrObject(); diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 544644341a6b..b16ba1b75f5b 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -531,7 +531,7 @@ void ScDrawView::MarkListHasChanged() uno::Reference<frame::XController> xController = rFrame.GetController(); if (xController.is()) { - ScTabViewObj* pImp = ScTabViewObj::getImplementation( xController ); + ScTabViewObj* pImp = comphelper::getUnoTunnelImplementation<ScTabViewObj>( xController ); if (pImp) pImp->SelectionChanged(); } @@ -579,7 +579,7 @@ bool ScDrawView::SdrBeginTextEdit( uno::Reference< frame::XController > xController = rFrame.GetController(); if (xController.is()) { - ScTabViewObj* pImp = ScTabViewObj::getImplementation( xController ); + ScTabViewObj* pImp = comphelper::getUnoTunnelImplementation<ScTabViewObj>( xController ); if (pImp) pImp->SelectionChanged(); } @@ -603,7 +603,7 @@ SdrEndTextEditKind ScDrawView::SdrEndTextEdit( bool bDontDeleteReally ) uno::Reference< frame::XController > xController = rFrame.GetController(); if (xController.is()) { - ScTabViewObj* pImp = ScTabViewObj::getImplementation( xController ); + ScTabViewObj* pImp = comphelper::getUnoTunnelImplementation<ScTabViewObj>( xController ); if (pImp) pImp->SelectionChanged(); } diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index e043cfc4d857..85b2caa970b3 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -2584,7 +2584,7 @@ bool ScGridWindow::PreNotify( NotifyEvent& rNEvt ) css::uno::Reference<css::frame::XController> xController = pViewFrame->GetFrame().GetController(); if (xController.is()) { - ScTabViewObj* pImp = ScTabViewObj::getImplementation( xController ); + ScTabViewObj* pImp = comphelper::getUnoTunnelImplementation<ScTabViewObj>( xController ); if (pImp && pImp->IsMouseListening()) { css::awt::MouseEvent aEvent; diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 95d0b9a4e876..b13234bd2adb 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -2178,7 +2178,7 @@ void ScTabView::SetNewVisArea() css::uno::Reference<css::frame::XController> xController = rFrame.GetController(); if (xController.is()) { - ScTabViewObj* pImp = ScTabViewObj::getImplementation( xController ); + ScTabViewObj* pImp = comphelper::getUnoTunnelImplementation<ScTabViewObj>( xController ); if (pImp) pImp->VisAreaChanged(); } diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index bfdc208bf128..03f1067638a2 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -529,7 +529,7 @@ void ScTabView::SelectionChanged() uno::Reference<frame::XController> xController = pViewFrame->GetFrame().GetController(); if (xController.is()) { - ScTabViewObj* pImp = ScTabViewObj::getImplementation( xController ); + ScTabViewObj* pImp = comphelper::getUnoTunnelImplementation<ScTabViewObj>( xController ); if (pImp) pImp->SelectionChanged(); } diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index 560c4b584e5e..fcf4e9b91f43 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -314,7 +314,7 @@ void ScTabView::TabChanged( bool bSameTabButMoved ) uno::Reference<frame::XController> xController = pViewFrame->GetFrame().GetController(); if (xController.is()) { - ScTabViewObj* pImp = ScTabViewObj::getImplementation( xController ); + ScTabViewObj* pImp = comphelper::getUnoTunnelImplementation<ScTabViewObj>( xController ); if (pImp) pImp->SheetChanged( bSameTabButMoved ); } diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index b1a24d27df93..fce0a758df33 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -1099,7 +1099,7 @@ static ScTabViewObj* lcl_GetViewObj( const ScTabViewShell& rShell ) SfxFrame& rFrame = pViewFrame->GetFrame(); uno::Reference<frame::XController> xController = rFrame.GetController(); if (xController.is()) - pRet = ScTabViewObj::getImplementation( xController ); + pRet = comphelper::getUnoTunnelImplementation<ScTabViewObj>( xController ); } return pRet; } |