diff options
Diffstat (limited to 'sc')
48 files changed, 133 insertions, 133 deletions
diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx index b9476b018c06..7b8bffdf069d 100644 --- a/sc/qa/unit/copy_paste_test.cxx +++ b/sc/qa/unit/copy_paste_test.cxx @@ -250,7 +250,7 @@ void ScCopyPasteTest::testTdf84411() // 3. Disable OpenCL - ScModelObj* pModel = comphelper::getUnoTunnelImplementation<ScModelObj>(pFoundShell->GetModel()); + ScModelObj* pModel = comphelper::getFromUnoTunnel<ScModelObj>(pFoundShell->GetModel()); CPPUNIT_ASSERT(pModel != nullptr); bool bOpenCLState = ScCalcConfig::isOpenCLEnabled(); pModel->enableOpenCL(false); diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 419b1145cc4d..02148af2fdbd 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -692,7 +692,7 @@ void ScDocument::RepaintRange( const ScRange& rRange ) { if ( bIsVisible && mpShell ) { - ScModelObj* pModel = comphelper::getUnoTunnelImplementation<ScModelObj>( mpShell->GetModel() ); + ScModelObj* pModel = comphelper::getFromUnoTunnel<ScModelObj>( mpShell->GetModel() ); if ( pModel ) pModel->RepaintRange( rRange ); // locked repaints are checked there } @@ -702,7 +702,7 @@ void ScDocument::RepaintRange( const ScRangeList& rRange ) { if ( bIsVisible && mpShell ) { - ScModelObj* pModel = comphelper::getUnoTunnelImplementation<ScModelObj>( mpShell->GetModel() ); + ScModelObj* pModel = comphelper::getFromUnoTunnel<ScModelObj>( mpShell->GetModel() ); if ( pModel ) pModel->RepaintRange( rRange ); // locked repaints are checked there } diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index eda21d7baca5..87567274e700 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -581,7 +581,7 @@ bool ScDocument::InsertTab( if (comphelper::LibreOfficeKit::isActive() && GetDrawLayer()) { - ScModelObj* pModel = comphelper::getUnoTunnelImplementation<ScModelObj>(this->GetDocumentShell()->GetModel()); + ScModelObj* pModel = comphelper::getFromUnoTunnel<ScModelObj>(this->GetDocumentShell()->GetModel()); SfxLokHelper::notifyDocumentSizeChangedAllViews(pModel); } } @@ -747,7 +747,7 @@ bool ScDocument::DeleteTab( SCTAB nTab ) if (comphelper::LibreOfficeKit::isActive()) { - ScModelObj* pModel = comphelper::getUnoTunnelImplementation<ScModelObj>(this->GetDocumentShell()->GetModel()); + ScModelObj* pModel = comphelper::getFromUnoTunnel<ScModelObj>(this->GetDocumentShell()->GetModel()); SfxLokHelper::notifyDocumentSizeChangedAllViews(pModel); } @@ -839,7 +839,7 @@ bool ScDocument::DeleteTabs( SCTAB nTab, SCTAB nSheets ) if (comphelper::LibreOfficeKit::isActive()) { - ScModelObj* pModel = comphelper::getUnoTunnelImplementation<ScModelObj>(this->GetDocumentShell()->GetModel()); + ScModelObj* pModel = comphelper::getFromUnoTunnel<ScModelObj>(this->GetDocumentShell()->GetModel()); SfxLokHelper::notifyDocumentSizeChangedAllViews(pModel); } @@ -886,7 +886,7 @@ bool ScDocument::RenameTab( SCTAB nTab, const OUString& rName, bool bExternalDoc if (comphelper::LibreOfficeKit::isActive() && GetDrawLayer()) { - ScModelObj* pModel = comphelper::getUnoTunnelImplementation<ScModelObj>(this->GetDocumentShell()->GetModel()); + ScModelObj* pModel = comphelper::getFromUnoTunnel<ScModelObj>(this->GetDocumentShell()->GetModel()); SfxLokHelper::notifyDocumentSizeChangedAllViews(pModel); } } diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx index 59a1f7fd887f..8c0097b720b9 100644 --- a/sc/source/filter/excel/xlroot.cxx +++ b/sc/source/filter/excel/xlroot.cxx @@ -287,7 +287,7 @@ SfxObjectShell* XclRoot::GetDocShell() const ScModelObj* XclRoot::GetDocModelObj() const { SfxObjectShell* pDocShell = GetDocShell(); - return pDocShell ? comphelper::getUnoTunnelImplementation<ScModelObj>( pDocShell->GetModel() ) : nullptr; + return pDocShell ? comphelper::getFromUnoTunnel<ScModelObj>( pDocShell->GetModel() ) : nullptr; } OutputDevice* XclRoot::GetPrinter() const diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx index 46d8075197db..712a2dcb37ac 100644 --- a/sc/source/filter/oox/pivottablebuffer.cxx +++ b/sc/source/filter/oox/pivottablebuffer.cxx @@ -1237,7 +1237,7 @@ void PivotTable::finalizeImport() mxDPDescriptor->setTag( maDefModel.maTag ); // TODO: This is a hack. Eventually we need to convert the whole thing to the internal API. - auto pImpl = comphelper::getUnoTunnelImplementation<ScDataPilotDescriptorBase>(mxDPDescriptor); + auto pImpl = comphelper::getFromUnoTunnel<ScDataPilotDescriptorBase>(mxDPDescriptor); if (!pImpl) return; diff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxx index 02d4eca32f24..69be949247ed 100644 --- a/sc/source/filter/xml/XMLConverter.cxx +++ b/sc/source/filter/xml/XMLConverter.cxx @@ -35,7 +35,7 @@ ScDocument* ScXMLConverter::GetScDocument( const uno::Reference< frame::XModel > { if (xModel.is()) { - ScModelObj* pDocObj = comphelper::getUnoTunnelImplementation<ScModelObj>( xModel ); + ScModelObj* pDocObj = comphelper::getFromUnoTunnel<ScModelObj>( xModel ); return pDocObj ? pDocObj->GetDocument() : nullptr; } return nullptr; diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx index e6066acebc85..51b35a2d70a4 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx @@ -222,7 +222,7 @@ void XMLTableShapeImportHelper::finishShape( if (!bNote) { // any shape other than a note prevents copying the sheet - ScSheetSaveData* pSheetData = comphelper::getUnoTunnelImplementation<ScModelObj>(mrImporter.GetModel())->GetSheetSaveData(); + ScSheetSaveData* pSheetData = comphelper::getFromUnoTunnel<ScModelObj>(mrImporter.GetModel())->GetSheetSaveData(); pSheetData->BlockSheet( rTables.GetCurrentSheet() ); } diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx index 817dcea890be..2234f569746c 100644 --- a/sc/source/filter/xml/xmlbodyi.cxx +++ b/sc/source/filter/xml/xmlbodyi.cxx @@ -121,7 +121,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLBodyContext::createFastChildContext( sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList ) { - ScSheetSaveData* pSheetData = comphelper::getUnoTunnelImplementation<ScModelObj>(GetScImport().GetModel())->GetSheetSaveData(); + ScSheetSaveData* pSheetData = comphelper::getFromUnoTunnel<ScModelObj>(GetScImport().GetModel())->GetSheetSaveData(); if ( pSheetData && pSheetData->HasStartPos() ) { // stream part to copy ends before the next child element @@ -195,7 +195,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL void SAL_CALL ScXMLBodyContext::characters(const OUString &) { - ScSheetSaveData* pSheetData = comphelper::getUnoTunnelImplementation<ScModelObj>(GetScImport().GetModel())->GetSheetSaveData(); + ScSheetSaveData* pSheetData = comphelper::getFromUnoTunnel<ScModelObj>(GetScImport().GetModel())->GetSheetSaveData(); if ( pSheetData && pSheetData->HasStartPos() ) { // stream part to copy ends before any content (whitespace) within the spreadsheet element @@ -207,7 +207,7 @@ void SAL_CALL ScXMLBodyContext::characters(const OUString &) void SAL_CALL ScXMLBodyContext::endFastElement(sal_Int32 nElement) { - ScSheetSaveData* pSheetData = comphelper::getUnoTunnelImplementation<ScModelObj>(GetScImport().GetModel())->GetSheetSaveData(); + ScSheetSaveData* pSheetData = comphelper::getFromUnoTunnel<ScModelObj>(GetScImport().GetModel())->GetSheetSaveData(); if ( pSheetData && pSheetData->HasStartPos() ) { // stream part to copy ends before the closing tag of spreadsheet element diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index 19ba725036b9..238befc186a5 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -374,7 +374,7 @@ void ScXMLTableRowCellContext::PushFormat(sal_Int32 nBegin, sal_Int32 nEnd, cons rFmt.maSelection.nEndPos = nEnd; // Store the used text styles for export. - ScSheetSaveData* pSheetData = comphelper::getUnoTunnelImplementation<ScModelObj>(rXMLImport.GetModel())->GetSheetSaveData(); + ScSheetSaveData* pSheetData = comphelper::getFromUnoTunnel<ScModelObj>(rXMLImport.GetModel())->GetSheetSaveData(); ScAddress aCellPos = rXMLImport.GetTables().GetCurrentCellPos(); pSheetData->AddTextStyle(rStyleName, aCellPos, rFmt.maSelection); @@ -812,7 +812,7 @@ void ScXMLTableRowCellContext::SetContentValidation( const ScRange& rScRange ) // is the below still needed? // For now, any sheet with validity is blocked from stream-copying. // Later, the validation names could be stored along with the style names. - ScSheetSaveData* pSheetData = comphelper::getUnoTunnelImplementation<ScModelObj>(GetImport().GetModel())->GetSheetSaveData(); + ScSheetSaveData* pSheetData = comphelper::getFromUnoTunnel<ScModelObj>(GetImport().GetModel())->GetSheetSaveData(); pSheetData->BlockSheet( GetScImport().GetTables().GetCurrentSheet() ); } @@ -925,7 +925,7 @@ void ScXMLTableRowCellContext::SetAnnotation(const ScAddress& rPos) } // store the style names for stream copying - ScSheetSaveData* pSheetData = comphelper::getUnoTunnelImplementation<ScModelObj>(rXMLImport.GetModel())->GetSheetSaveData(); + ScSheetSaveData* pSheetData = comphelper::getFromUnoTunnel<ScModelObj>(rXMLImport.GetModel())->GetSheetSaveData(); pSheetData->HandleNoteStyles( mxAnnotationData->maStyleName, mxAnnotationData->maTextStyle, rPos ); for (const auto& rContentStyle : mxAnnotationData->maContentStyles) diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx index 8bec39546541..09224bb757a3 100644 --- a/sc/source/filter/xml/xmlcoli.cxx +++ b/sc/source/filter/xml/xmlcoli.cxx @@ -112,7 +112,7 @@ void SAL_CALL ScXMLTableColContext::endFastElement( sal_Int32 /*nElement*/ ) if ( nSheet != pStyle->GetLastSheet() ) { - ScSheetSaveData* pSheetData = comphelper::getUnoTunnelImplementation<ScModelObj>(rXMLImport.GetModel())->GetSheetSaveData(); + ScSheetSaveData* pSheetData = comphelper::getFromUnoTunnel<ScModelObj>(rXMLImport.GetModel())->GetSheetSaveData(); pSheetData->AddColumnStyle( sStyleName, ScAddress( static_cast<SCCOL>(nCurrentColumn), 0, nSheet ) ); pStyle->SetLastSheet(nSheet); } diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 1821eefbbd53..79ea4631d5ac 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -458,7 +458,7 @@ void ScXMLExport::SetSourceStream( const uno::Reference<io::XInputStream>& xNewS // keep track of the bytes already read nSourceStreamPos = nRead; - const ScSheetSaveData* pSheetData = comphelper::getUnoTunnelImplementation<ScModelObj>(GetModel())->GetSheetSaveData(); + const ScSheetSaveData* pSheetData = comphelper::getFromUnoTunnel<ScModelObj>(GetModel())->GetSheetSaveData(); if (pSheetData) { // add the loaded namespaces to the name space map @@ -1849,7 +1849,7 @@ const ScXMLEditAttributeMap& ScXMLExport::GetEditAttributeMap() const void ScXMLExport::RegisterDefinedStyleNames( const uno::Reference< css::sheet::XSpreadsheetDocument > & xSpreadDoc ) { - ScFormatSaveData* pFormatData = comphelper::getUnoTunnelImplementation<ScModelObj>(xSpreadDoc)->GetFormatSaveData(); + ScFormatSaveData* pFormatData = comphelper::getFromUnoTunnel<ScModelObj>(xSpreadDoc)->GetFormatSaveData(); auto xAutoStylePool = GetAutoStylePool(); for (const auto& rFormatInfo : pFormatData->maIDToName) { @@ -1877,7 +1877,7 @@ void ScXMLExport::ExportContent_() if ( !xSpreadDoc.is() ) return; - ScSheetSaveData* pSheetData = comphelper::getUnoTunnelImplementation<ScModelObj>(xSpreadDoc)->GetSheetSaveData(); + ScSheetSaveData* pSheetData = comphelper::getFromUnoTunnel<ScModelObj>(xSpreadDoc)->GetSheetSaveData(); if (pSheetData) pSheetData->ResetSaveEntries(); @@ -2078,7 +2078,7 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& x if (nKey) { uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( GetModel(), uno::UNO_QUERY ); - ScFormatSaveData* pFormatData = comphelper::getUnoTunnelImplementation<ScModelObj>(xSpreadDoc)->GetFormatSaveData(); + ScFormatSaveData* pFormatData = comphelper::getFromUnoTunnel<ScModelObj>(xSpreadDoc)->GetFormatSaveData(); auto itr = pFormatData->maIDToName.find(nKey); if (itr != pFormatData->maIDToName.end()) { @@ -2243,7 +2243,7 @@ void ScXMLExport::collectAutoStyles() RegisterDefinedStyleNames( xSpreadDoc); // re-create automatic styles with old names from stored data - ScSheetSaveData* pSheetData = comphelper::getUnoTunnelImplementation<ScModelObj>(xSpreadDoc)->GetSheetSaveData(); + ScSheetSaveData* pSheetData = comphelper::getFromUnoTunnel<ScModelObj>(xSpreadDoc)->GetSheetSaveData(); if (pSheetData && pDoc) { // formulas have to be calculated now, to detect changed results @@ -2422,7 +2422,7 @@ void ScXMLExport::collectAutoStyles() SdrCaptionObj* pDrawObj = pNote->GetOrCreateCaption( aPos ); uno::Reference<text::XSimpleText> xCellText(pDrawObj->getUnoShape(), uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xCursorProp(xCellText->createTextCursor(), uno::UNO_QUERY); - ScDrawTextCursor* pCursor = comphelper::getUnoTunnelImplementation<ScDrawTextCursor>( xCursorProp ); + ScDrawTextCursor* pCursor = comphelper::getFromUnoTunnel<ScDrawTextCursor>( xCursorProp ); if (pCursor) { pCursor->SetSelection( rNoteTextEntry.maSelection ); @@ -2463,7 +2463,7 @@ void ScXMLExport::collectAutoStyles() uno::Reference<text::XSimpleText> xCellText(xCellRange->getCellByPosition(aPos.Col(), aPos.Row()), uno::UNO_QUERY); xCursorProp.set(xCellText->createTextCursor(), uno::UNO_QUERY); } - ScCellTextCursor* pCursor = comphelper::getUnoTunnelImplementation<ScCellTextCursor>( xCursorProp ); + ScCellTextCursor* pCursor = comphelper::getFromUnoTunnel<ScCellTextCursor>( xCursorProp ); if (!pCursor) continue; pCursor->SetSelection( rTextEntry.maSelection ); @@ -5170,7 +5170,7 @@ void ScXMLExport::GetViewSettings(uno::Sequence<beans::PropertyValue>& rProps) { rProps.realloc(4); beans::PropertyValue* pProps(rProps.getArray()); - ScModelObj* pDocObj(comphelper::getUnoTunnelImplementation<ScModelObj>( GetModel() )); + ScModelObj* pDocObj(comphelper::getFromUnoTunnel<ScModelObj>( GetModel() )); if (pDocObj) { SfxObjectShell* pEmbeddedObj = pDocObj->GetEmbeddedObject(); @@ -5322,7 +5322,7 @@ ErrCode ScXMLExport::exportDoc( enum XMLTokenEnum eClass ) uno::Reference< frame::XModel > xModel = GetModel(); if ( xModel.is() ) { - auto pFoundShell = comphelper::getUnoTunnelImplementation<SfxObjectShell>(xModel); + auto pFoundShell = comphelper::getFromUnoTunnel<SfxObjectShell>(xModel); if ( pFoundShell && ooo::vba::isAlienExcelDoc( *pFoundShell ) ) { xRowStylesPropertySetMapper = new XMLPropertySetMapper(aXMLScFromXLSRowStylesProperties, xScPropHdlFactory, true); diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 967f1049f811..f4cafc7cf264 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -724,7 +724,7 @@ void ScXMLImport::SetViewSettings(const uno::Sequence<beans::PropertyValue>& aVi if (!(nHeight && nWidth && GetModel().is())) return; - ScModelObj* pDocObj(comphelper::getUnoTunnelImplementation<ScModelObj>( GetModel() )); + ScModelObj* pDocObj(comphelper::getFromUnoTunnel<ScModelObj>( GetModel() )); if (!pDocObj) return; @@ -1001,7 +1001,7 @@ void ScXMLImport::SetStyleToRanges() sal_uInt64 nKey = 0; if ((aAny >>= nKey) && nKey) { - ScFormatSaveData* pFormatSaveData = comphelper::getUnoTunnelImplementation<ScModelObj>(GetModel())->GetFormatSaveData(); + ScFormatSaveData* pFormatSaveData = comphelper::getFromUnoTunnel<ScModelObj>(GetModel())->GetFormatSaveData(); pFormatSaveData->maIDToName.insert(std::pair<sal_uInt64, OUString>(nKey, sPrevStyleName)); } @@ -1013,7 +1013,7 @@ void ScXMLImport::SetStyleToRanges() const table::CellRangeAddress& rRange = aAddresses[0]; if ( rRange.Sheet != pStyle->GetLastSheet() ) { - ScSheetSaveData* pSheetData = comphelper::getUnoTunnelImplementation<ScModelObj>(GetModel())->GetSheetSaveData(); + ScSheetSaveData* pSheetData = comphelper::getFromUnoTunnel<ScModelObj>(GetModel())->GetSheetSaveData(); pSheetData->AddCellStyle( sPrevStyleName, ScAddress( static_cast<SCCOL>(rRange.StartColumn), static_cast<SCROW>(rRange.StartRow), static_cast<SCTAB>(rRange.Sheet) ) ); pStyle->SetLastSheet(rRange.Sheet); @@ -1145,7 +1145,7 @@ void SAL_CALL ScXMLImport::startDocument() SvXMLImport::startDocument(); if (pDoc && !pDoc->IsImportingXML()) { - comphelper::getUnoTunnelImplementation<ScModelObj>(GetModel())->BeforeXMLLoading(); + comphelper::getFromUnoTunnel<ScModelObj>(GetModel())->BeforeXMLLoading(); bSelfImportingXMLSet = true; } @@ -1160,7 +1160,7 @@ void SAL_CALL ScXMLImport::startDocument() if (GetModel().is()) { // store initial namespaces, to find the ones that were added from the file later - ScSheetSaveData* pSheetData = comphelper::getUnoTunnelImplementation<ScModelObj>(GetModel())->GetSheetSaveData(); + ScSheetSaveData* pSheetData = comphelper::getFromUnoTunnel<ScModelObj>(GetModel())->GetSheetSaveData(); const SvXMLNamespaceMap& rNamespaces = GetNamespaceMap(); pSheetData->StoreInitialNamespaces(rNamespaces); } @@ -1408,7 +1408,7 @@ void SAL_CALL ScXMLImport::endDocument() { // set "valid stream" flags after loading (before UpdateRowHeights, so changed formula results // in UpdateRowHeights can already clear the flags again) - ScSheetSaveData* pSheetData = comphelper::getUnoTunnelImplementation<ScModelObj>(GetModel())->GetSheetSaveData(); + ScSheetSaveData* pSheetData = comphelper::getFromUnoTunnel<ScModelObj>(GetModel())->GetSheetSaveData(); SCTAB nTabCount = pDoc->GetTableCount(); for (SCTAB nTab=0; nTab<nTabCount; ++nTab) @@ -1484,7 +1484,7 @@ void SAL_CALL ScXMLImport::endDocument() } if(pDoc && bSelfImportingXMLSet) - comphelper::getUnoTunnelImplementation<ScModelObj>(GetModel())->AfterXMLLoading(); + comphelper::getFromUnoTunnel<ScModelObj>(GetModel())->AfterXMLLoading(); } // XEventListener diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx index 585eaa4cfe9f..7bfee20239ee 100644 --- a/sc/source/filter/xml/xmlrowi.cxx +++ b/sc/source/filter/xml/xmlrowi.cxx @@ -179,7 +179,7 @@ void SAL_CALL ScXMLTableRowContext::endFastElement(sal_Int32 /*nElement*/) if ( nSheet != pStyle->GetLastSheet() ) { - ScSheetSaveData* pSheetData = comphelper::getUnoTunnelImplementation<ScModelObj>(rXMLImport.GetModel())->GetSheetSaveData(); + ScSheetSaveData* pSheetData = comphelper::getFromUnoTunnel<ScModelObj>(rXMLImport.GetModel())->GetSheetSaveData(); pSheetData->AddRowStyle( sStyleName, ScAddress( 0, static_cast<SCROW>(nFirstRow), nSheet ) ); pStyle->SetLastSheet(nSheet); } diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index 34a24a81f68e..08e2d94538ba 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -1004,7 +1004,7 @@ void ScCellTextStyleContext::FillPropertySet( const uno::Reference<beans::XPrope ScXMLImport& rXMLImport = GetScImport(); - ScCellTextCursor* pCellImp = comphelper::getUnoTunnelImplementation<ScCellTextCursor>( xPropSet ); + ScCellTextCursor* pCellImp = comphelper::getFromUnoTunnel<ScCellTextCursor>( xPropSet ); if (pCellImp) { ScAddress aPos = pCellImp->GetCellObj().GetPosition(); @@ -1012,7 +1012,7 @@ void ScCellTextStyleContext::FillPropertySet( const uno::Reference<beans::XPrope { ESelection aSel = pCellImp->GetSelection(); - ScSheetSaveData* pSheetData = comphelper::getUnoTunnelImplementation<ScModelObj>(GetImport().GetModel())->GetSheetSaveData(); + ScSheetSaveData* pSheetData = comphelper::getFromUnoTunnel<ScModelObj>(GetImport().GetModel())->GetSheetSaveData(); pSheetData->AddTextStyle( GetName(), aPos, aSel ); nLastSheet = aPos.Tab(); @@ -1020,7 +1020,7 @@ void ScCellTextStyleContext::FillPropertySet( const uno::Reference<beans::XPrope } else if ( rXMLImport.GetTables().GetCurrentSheet() != nLastSheet ) { - ScDrawTextCursor* pDrawImp = comphelper::getUnoTunnelImplementation<ScDrawTextCursor>( xPropSet ); + ScDrawTextCursor* pDrawImp = comphelper::getFromUnoTunnel<ScDrawTextCursor>( xPropSet ); if (pDrawImp) { XMLTableShapeImportHelper* pTableShapeImport = static_cast<XMLTableShapeImportHelper*>(GetScImport().GetShapeImport().get()); diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx index 1b8ce5ae575c..a446f4371275 100644 --- a/sc/source/filter/xml/xmlsubti.cxx +++ b/sc/source/filter/xml/xmlsubti.cxx @@ -155,7 +155,7 @@ void ScMyTables::SetTableStyle(const OUString& sStyleName) { pStyle->FillPropertySet(xProperties); - ScSheetSaveData* pSheetData = comphelper::getUnoTunnelImplementation<ScModelObj>(rImport.GetModel())->GetSheetSaveData(); + ScSheetSaveData* pSheetData = comphelper::getFromUnoTunnel<ScModelObj>(rImport.GetModel())->GetSheetSaveData(); pSheetData->AddTableStyle( sStyleName, ScAddress( 0, 0, maCurrentCellPos.Tab() ) ); } } diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx index cab64260f9c0..ddec732b01c0 100644 --- a/sc/source/filter/xml/xmltabi.cxx +++ b/sc/source/filter/xml/xmltabi.cxx @@ -396,7 +396,7 @@ void SAL_CALL ScXMLTableContext::endFastElement(sal_Int32 /*nElement*/) // store stream positions if (!pExternalRefInfo && nStartOffset >= 0 /* && nEndOffset >= 0 */) { - ScSheetSaveData* pSheetData = comphelper::getUnoTunnelImplementation<ScModelObj>(rImport.GetModel())->GetSheetSaveData(); + ScSheetSaveData* pSheetData = comphelper::getFromUnoTunnel<ScModelObj>(rImport.GetModel())->GetSheetSaveData(); SCTAB nTab = rTables.GetCurrentSheet(); // pSheetData->AddStreamPos( nTab, nStartOffset, nEndOffset ); pSheetData->StartStreamPos( nTab, nStartOffset ); diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 006d33bc0861..1b275ea828d9 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -663,7 +663,7 @@ bool ScXMLImportWrapper::ExportToComponent(const uno::Reference<uno::XComponentC if ( xFilter.is() ) { - ScXMLExport* pExport = static_cast<ScXMLExport*>(comphelper::getUnoTunnelImplementation<SvXMLExport>(xFilter)); + ScXMLExport* pExport = static_cast<ScXMLExport*>(comphelper::getFromUnoTunnel<SvXMLExport>(xFilter)); pExport->SetSharedData(std::move(pSharedData)); // if there are sheets to copy, get the source stream @@ -678,7 +678,7 @@ bool ScXMLImportWrapper::ExportToComponent(const uno::Reference<uno::XComponentC // #i108978# If an embedded object is saved and no events are notified, don't use the stream // because without the ...DONE events, stream positions aren't updated. - ScSheetSaveData* pSheetData = comphelper::getUnoTunnelImplementation<ScModelObj>(xModel)->GetSheetSaveData(); + ScSheetSaveData* pSheetData = comphelper::getFromUnoTunnel<ScModelObj>(xModel)->GetSheetSaveData(); if (pSheetData && pSheetData->IsInSupportedSave()) { try diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 19081a32e067..ed18de670554 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -737,14 +737,14 @@ void ScDrawTransferObj::InitDocShell() const css::uno::Sequence< sal_Int8 >& ScDrawTransferObj::getUnoTunnelId() { - static const UnoTunnelIdInit theScDrawTransferObjUnoTunnelId; + static const comphelper::UnoIdInit theScDrawTransferObjUnoTunnelId; return theScDrawTransferObjUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL ScDrawTransferObj::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) { sal_Int64 nRet; - if( isUnoTunnelId<ScDrawTransferObj>(rId) ) + if( comphelper::isUnoTunnelId<ScDrawTransferObj>(rId) ) { nRet = reinterpret_cast< sal_Int64 >( this ); } diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 7d1c50594e4c..a9bc88b03e83 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -648,7 +648,7 @@ ScDocument* ScTransferObj::GetSourceDocument() ScDocShell* ScTransferObj::GetSourceDocShell() { - ScCellRangesBase* pRangesObj = comphelper::getUnoTunnelImplementation<ScCellRangesBase>( m_xDragSourceRanges ); + ScCellRangesBase* pRangesObj = comphelper::getFromUnoTunnel<ScCellRangesBase>( m_xDragSourceRanges ); if (pRangesObj) return pRangesObj->GetDocShell(); @@ -658,7 +658,7 @@ ScDocShell* ScTransferObj::GetSourceDocShell() ScMarkData ScTransferObj::GetSourceMarkData() const { ScMarkData aMarkData(m_pDoc->GetSheetLimits()); - ScCellRangesBase* pRangesObj = comphelper::getUnoTunnelImplementation<ScCellRangesBase>( m_xDragSourceRanges ); + ScCellRangesBase* pRangesObj = comphelper::getFromUnoTunnel<ScCellRangesBase>( m_xDragSourceRanges ); if (pRangesObj) { const ScRangeList& rRanges = pRangesObj->GetRangeList(); @@ -922,14 +922,14 @@ void ScTransferObj::StripRefs( ScDocument& rDoc, const css::uno::Sequence< sal_Int8 >& ScTransferObj::getUnoTunnelId() { - static const UnoTunnelIdInit theScTransferUnoTunnelId; + static const comphelper::UnoIdInit theScTransferUnoTunnelId; return theScTransferUnoTunnelId.getSeq(); } sal_Int64 SAL_CALL ScTransferObj::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) { sal_Int64 nRet; - if( isUnoTunnelId<ScTransferObj>(rId) ) + if( comphelper::isUnoTunnelId<ScTransferObj>(rId) ) { nRet = reinterpret_cast< sal_Int64 >( this ); } diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 47d8adc1843b..d6bb0d9f5f6f 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -793,7 +793,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) // check if shared flag is set in shared file bool bShared = false; - ScModelObj* pDocObj = comphelper::getUnoTunnelImplementation<ScModelObj>( xModel ); + ScModelObj* pDocObj = comphelper::getFromUnoTunnel<ScModelObj>( xModel ); ScDocShell* pSharedDocShell = ( pDocObj ? dynamic_cast< ScDocShell* >( pDocObj->GetObjectShell() ) : nullptr ); if ( pSharedDocShell ) { diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 9d7a5170fade..8120aba0662f 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -175,7 +175,7 @@ void ScDocShell::PostPaint( const ScRangeList& rRanges, PaintPartFlags nPart, sa // the document size too - cell size affects that, obviously) if ((nPart & (PaintPartFlags::Top | PaintPartFlags::Left)) && comphelper::LibreOfficeKit::isActive()) { - ScModelObj* pModel = comphelper::getUnoTunnelImplementation<ScModelObj>(this->GetModel()); + ScModelObj* pModel = comphelper::getFromUnoTunnel<ScModelObj>(this->GetModel()); SfxLokHelper::notifyDocumentSizeChangedAllViews(pModel); } } diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 8be67a6e0461..cba881387d26 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -1042,7 +1042,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) // check if shared flag is set in shared file bool bShared = false; - ScModelObj* pDocObj = comphelper::getUnoTunnelImplementation<ScModelObj>( xModel ); + ScModelObj* pDocObj = comphelper::getFromUnoTunnel<ScModelObj>( xModel ); if ( pDocObj ) { ScDocShell* pDocShell = dynamic_cast< ScDocShell* >( pDocObj->GetEmbeddedObject() ); diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index f32249d4ff3e..b59059786d69 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -519,7 +519,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) if ( bCopy && pPage ) { ScDocShell* pDocShell = rViewData.GetDocShell(); - ScModelObj* pModelObj = ( pDocShell ? comphelper::getUnoTunnelImplementation<ScModelObj>( pDocShell->GetModel() ) : nullptr ); + ScModelObj* pModelObj = ( pDocShell ? comphelper::getFromUnoTunnel<ScModelObj>( pDocShell->GetModel() ) : nullptr ); if ( pModelObj ) { SCTAB nTab = rViewData.GetTabNo(); diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index c8267ef02222..8c353d0087c7 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -470,7 +470,7 @@ namespace HelperNotifyChanges { inline ScModelObj* getMustPropagateChangesModel(const ScDocShell &rDocShell) { - ScModelObj* pModelObj = comphelper::getUnoTunnelImplementation<ScModelObj>(rDocShell.GetModel()); + ScModelObj* pModelObj = comphelper::getFromUnoTunnel<ScModelObj>(rDocShell.GetModel()); if (pModelObj && pModelObj->HasChangesListeners()) return pModelObj; return nullptr; diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index 5880cfe875e8..3dff452b5859 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -192,7 +192,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 = comphelper::getUnoTunnelImplementation<ScAutoFormatObj>( xInterface ); + ScAutoFormatObj* pFormatObj = comphelper::getFromUnoTunnel<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 5062daaee85c..0d9e076269bc 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -2243,7 +2243,7 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertyMapEntry* pEntr if ( !aRanges.empty() && xInterface.is() ) // empty = nothing to do { ScTableConditionalFormat* pFormat = - comphelper::getUnoTunnelImplementation<ScTableConditionalFormat>( xInterface ); + comphelper::getFromUnoTunnel<ScTableConditionalFormat>( xInterface ); if (pFormat) { ScDocument& rDoc = pDocShell->GetDocument(); @@ -2290,7 +2290,7 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertyMapEntry* pEntr if ( !aRanges.empty() && xInterface.is() ) // empty = nothing to do { ScTableValidationObj* pValidObj = - comphelper::getUnoTunnelImplementation<ScTableValidationObj>( xInterface ); + comphelper::getFromUnoTunnel<ScTableValidationObj>( xInterface ); if (pValidObj) { ScDocument& rDoc = pDocShell->GetDocument(); @@ -3749,7 +3749,7 @@ uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangesBase::findAll( uno::Reference<container::XIndexAccess> xRet; if ( pDocShell && xDesc.is() ) { - ScCellSearchObj* pSearch = comphelper::getUnoTunnelImplementation<ScCellSearchObj>( xDesc ); + ScCellSearchObj* pSearch = comphelper::getFromUnoTunnel<ScCellSearchObj>( xDesc ); if (pSearch) { SvxSearchItem* pSearchItem = pSearch->GetSearchItem(); @@ -3787,7 +3787,7 @@ uno::Reference<uno::XInterface> ScCellRangesBase::Find_Impl( uno::Reference<uno::XInterface> xRet; if ( pDocShell && xDesc.is() ) { - ScCellSearchObj* pSearch = comphelper::getUnoTunnelImplementation<ScCellSearchObj>( xDesc ); + ScCellSearchObj* pSearch = comphelper::getFromUnoTunnel<ScCellSearchObj>( xDesc ); if (pSearch) { SvxSearchItem* pSearchItem = pSearch->GetSearchItem(); @@ -3840,7 +3840,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScCellRangesBase::findNext( SolarMutexGuard aGuard; if ( xStartAt.is() ) { - ScCellRangesBase* pRangesImp = comphelper::getUnoTunnelImplementation<ScCellRangesBase>( xStartAt ); + ScCellRangesBase* pRangesImp = comphelper::getFromUnoTunnel<ScCellRangesBase>( xStartAt ); if ( pRangesImp && pRangesImp->GetDocShell() == pDocShell ) { const ScRangeList& rStartRanges = pRangesImp->GetRangeList(); @@ -3868,7 +3868,7 @@ sal_Int32 SAL_CALL ScCellRangesBase::replaceAll( const uno::Reference<util::XSea sal_Int32 nReplaced = 0; if ( pDocShell && xDesc.is() ) { - ScCellSearchObj* pSearch = comphelper::getUnoTunnelImplementation<ScCellSearchObj>( xDesc ); + ScCellSearchObj* pSearch = comphelper::getFromUnoTunnel<ScCellSearchObj>( xDesc ); if (pSearch) { SvxSearchItem* pSearchItem = pSearch->GetSearchItem(); @@ -4185,7 +4185,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 = comphelper::getUnoTunnelImplementation<ScCellRangesBase>( xInterface ); + ScCellRangesBase* pRangesImp = comphelper::getFromUnoTunnel<ScCellRangesBase>( xInterface ); if ( pRangesImp && pRangesImp->GetDocShell() == pDocSh ) { // if explicit name is given and already existing, throw exception @@ -4815,7 +4815,7 @@ void ScCellRangeObj::SetArrayFormula_Impl(const OUString& rFormula, if ( !rFormula.isEmpty() ) { - if ( comphelper::getUnoTunnelImplementation<ScTableSheetObj>( static_cast<cppu::OWeakObject*>(this) ) ) + if ( comphelper::getFromUnoTunnel<ScTableSheetObj>( static_cast<cppu::OWeakObject*>(this) ) ) { // don't set array formula for sheet object throw uno::RuntimeException(); @@ -4884,7 +4884,7 @@ void SAL_CALL ScCellRangeObj::setArrayTokens( const uno::Sequence<sheet::Formula if ( rTokens.hasElements() ) { - if ( comphelper::getUnoTunnelImplementation<ScTableSheetObj>( static_cast<cppu::OWeakObject*>(this) ) ) + if ( comphelper::getFromUnoTunnel<ScTableSheetObj>( static_cast<cppu::OWeakObject*>(this) ) ) { throw uno::RuntimeException(); } @@ -4914,7 +4914,7 @@ uno::Sequence< uno::Sequence<uno::Any> > SAL_CALL ScCellRangeObj::getDataArray() { SolarMutexGuard aGuard; - if ( comphelper::getUnoTunnelImplementation<ScTableSheetObj>( static_cast<cppu::OWeakObject*>(this) ) ) + if ( comphelper::getFromUnoTunnel<ScTableSheetObj>( static_cast<cppu::OWeakObject*>(this) ) ) { // don't create a data array for the sheet throw uno::RuntimeException(); @@ -4959,7 +4959,7 @@ uno::Sequence< uno::Sequence<OUString> > SAL_CALL ScCellRangeObj::getFormulaArra { SolarMutexGuard aGuard; - if ( comphelper::getUnoTunnelImplementation<ScTableSheetObj>( static_cast<cppu::OWeakObject*>(this) ) ) + if ( comphelper::getFromUnoTunnel<ScTableSheetObj>( static_cast<cppu::OWeakObject*>(this) ) ) { // don't create a data array for the sheet throw uno::RuntimeException(); @@ -5520,7 +5520,7 @@ void SAL_CALL ScCellRangeObj::applySubTotals( ScDocShell* pDocSh = GetDocShell(); ScSubTotalDescriptorBase* pImp = - comphelper::getUnoTunnelImplementation<ScSubTotalDescriptorBase>( xDescriptor ); + comphelper::getFromUnoTunnel<ScSubTotalDescriptorBase>( xDescriptor ); if (!(pDocSh && pImp)) return; @@ -5953,12 +5953,12 @@ uno::Reference<text::XTextCursor> SAL_CALL ScCellObj::createTextCursorByRange( SolarMutexGuard aGuard; rtl::Reference<SvxUnoTextCursor> pCursor = new ScCellTextCursor( *this ); - SvxUnoTextRangeBase* pRange = comphelper::getUnoTunnelImplementation<SvxUnoTextRangeBase>( aTextPosition ); + SvxUnoTextRangeBase* pRange = comphelper::getFromUnoTunnel<SvxUnoTextRangeBase>( aTextPosition ); if(pRange) pCursor->SetSelection( pRange->GetSelection() ); else { - ScCellTextCursor* pOther = comphelper::getUnoTunnelImplementation<ScCellTextCursor>( aTextPosition ); + ScCellTextCursor* pOther = comphelper::getFromUnoTunnel<ScCellTextCursor>( aTextPosition ); if(!pOther) throw uno::RuntimeException(); @@ -6010,8 +6010,8 @@ void SAL_CALL ScCellObj::insertTextContent( const uno::Reference<text::XTextRang ScDocShell* pDocSh = GetDocShell(); if ( pDocSh && xContent.is() ) { - ScEditFieldObj* pCellField = comphelper::getUnoTunnelImplementation<ScEditFieldObj>(xContent); - SvxUnoTextRangeBase* pTextRange = comphelper::getUnoTunnelImplementation<ScCellTextCursor>( xRange ); + ScEditFieldObj* pCellField = comphelper::getFromUnoTunnel<ScEditFieldObj>(xContent); + SvxUnoTextRangeBase* pTextRange = comphelper::getFromUnoTunnel<ScCellTextCursor>( xRange ); if ( pCellField && !pCellField->IsInserted() && pTextRange ) { @@ -6060,7 +6060,7 @@ void SAL_CALL ScCellObj::removeTextContent( const uno::Reference<text::XTextCont SolarMutexGuard aGuard; if ( xContent.is() ) { - ScEditFieldObj* pCellField = comphelper::getUnoTunnelImplementation<ScEditFieldObj>(xContent); + ScEditFieldObj* pCellField = comphelper::getFromUnoTunnel<ScEditFieldObj>(xContent); if ( pCellField && pCellField->IsInserted() ) { //! Check if field is in this cell @@ -6701,7 +6701,7 @@ uno::Reference<sheet::XSheetCellCursor> SAL_CALL ScTableSheetObj::createCursorBy ScDocShell* pDocSh = GetDocShell(); if ( pDocSh && xCellRange.is() ) { - ScCellRangesBase* pRangesImp = comphelper::getUnoTunnelImplementation<ScCellRangesBase>( xCellRange ); + ScCellRangesBase* pRangesImp = comphelper::getFromUnoTunnel<ScCellRangesBase>( xCellRange ); if (pRangesImp) { const ScRangeList& rRanges = pRangesImp->GetRangeList(); diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index ff370151ff3c..1ce82e6bc1d0 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -415,7 +415,7 @@ void SAL_CALL ScDataPilotTablesObj::insertNewByName( const OUString& aNewName, if (!pDocShell) throw RuntimeException("DocShell is null", static_cast<cppu::OWeakObject*>(this)); - auto pImp = comphelper::getUnoTunnelImplementation<ScDataPilotDescriptorBase>( xDescriptor ); + auto pImp = comphelper::getFromUnoTunnel<ScDataPilotDescriptorBase>( xDescriptor ); if (!pImp) throw RuntimeException("Failed to get ScDataPilotDescriptor", static_cast<cppu::OWeakObject*>(this)); @@ -980,7 +980,7 @@ Reference< XDataPilotField > SAL_CALL ScDataPilotDescriptorBase::getDataLayoutFi sal_Int64 SAL_CALL ScDataPilotDescriptorBase::getSomething( const Sequence<sal_Int8 >& rId ) { - if ( isUnoTunnelId<ScDataPilotDescriptorBase>(rId) ) + if ( comphelper::isUnoTunnelId<ScDataPilotDescriptorBase>(rId) ) { return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(this)); } @@ -989,7 +989,7 @@ sal_Int64 SAL_CALL ScDataPilotDescriptorBase::getSomething( const Sequence<sal_Int8>& ScDataPilotDescriptorBase::getUnoTunnelId() { - static const UnoTunnelIdInit theScDataPilotDescriptorBaseUnoTunnelId; + static const comphelper::UnoIdInit theScDataPilotDescriptorBaseUnoTunnelId; return theScDataPilotDescriptorBaseUnoTunnelId.getSeq(); } diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 40d2b639738f..2f814cd37f3e 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -1328,7 +1328,7 @@ void ScModelObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) if (xNumberAgg.is()) { SvNumberFormatsSupplierObj* pNumFmt = - comphelper::getUnoTunnelImplementation<SvNumberFormatsSupplierObj>( + comphelper::getFromUnoTunnel<SvNumberFormatsSupplierObj>( uno::Reference<util::XNumberFormatsSupplier>(xNumberAgg, uno::UNO_QUERY) ); if ( pNumFmt ) pNumFmt->SetNumberFormatter( nullptr ); @@ -1411,7 +1411,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 = comphelper::getUnoTunnelImplementation<VCLXDevice>( xRenderDevice ); + VCLXDevice* pDevice = comphelper::getFromUnoTunnel<VCLXDevice>( xRenderDevice ); if ( pDevice ) { pRet = pDevice->GetOutputDevice().get(); @@ -1570,11 +1570,11 @@ bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection, uno::Reference<uno::XInterface> xInterface(aSelection, uno::UNO_QUERY); if ( xInterface.is() ) { - ScCellRangesBase* pSelObj = comphelper::getUnoTunnelImplementation<ScCellRangesBase>( xInterface ); + ScCellRangesBase* pSelObj = comphelper::getFromUnoTunnel<ScCellRangesBase>( xInterface ); uno::Reference< drawing::XShapes > xShapes( xInterface, uno::UNO_QUERY ); if ( pSelObj && pSelObj->GetDocShell() == pDocShell ) { - bool bSheet = ( comphelper::getUnoTunnelImplementation<ScTableSheetObj>( xInterface ) != nullptr ); + bool bSheet = ( comphelper::getFromUnoTunnel<ScTableSheetObj>( xInterface ) != nullptr ); bool bCursor = pSelObj->IsCursorOnly(); const ScRangeList& rRanges = pSelObj->GetRangeList(); @@ -1629,7 +1629,7 @@ bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection, } } } - else if ( comphelper::getUnoTunnelImplementation<ScModelObj>( xInterface ) == this ) + else if ( comphelper::getFromUnoTunnel<ScModelObj>( xInterface ) == this ) { // render the whole document // -> no selection, all sheets @@ -3092,12 +3092,12 @@ uno::Sequence<OUString> SAL_CALL ScModelObj::getSupportedServiceNames() sal_Int64 SAL_CALL ScModelObj::getSomething( const uno::Sequence<sal_Int8 >& rId ) { - if ( isUnoTunnelId<ScModelObj>(rId) ) + if ( comphelper::isUnoTunnelId<ScModelObj>(rId) ) { return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(this)); } - if ( isUnoTunnelId<SfxObjectShell>(rId) ) + if ( comphelper::isUnoTunnelId<SfxObjectShell>(rId) ) { return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(pDocShell )); } @@ -3125,7 +3125,7 @@ sal_Int64 SAL_CALL ScModelObj::getSomething( const uno::Sequence<sal_Int8>& ScModelObj::getUnoTunnelId() { - static const UnoTunnelIdInit theScModelObjUnoTunnelId; + static const comphelper::UnoIdInit theScModelObjUnoTunnelId; return theScModelObjUnoTunnelId.getSeq(); } @@ -3527,7 +3527,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 = comphelper::getUnoTunnelImplementation<SvxDrawPage>( xPage ); + SvxDrawPage* pImp = comphelper::getFromUnoTunnel<SvxDrawPage>( xPage ); if ( pDocShell && pImp ) { SdrPage* pPage = pImp->GetSdrPage(); @@ -3683,7 +3683,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 = comphelper::getUnoTunnelImplementation<ScTableSheetObj>( xInterface ); + ScTableSheetObj* pSheetObj = comphelper::getFromUnoTunnel<ScTableSheetObj>( xInterface ); if ( pSheetObj && !pSheetObj->GetDocShell() ) // not inserted yet? { ScDocument& rDoc = pDocShell->GetDocument(); @@ -3729,7 +3729,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 = comphelper::getUnoTunnelImplementation<ScTableSheetObj>( xInterface ); + ScTableSheetObj* pSheetObj = comphelper::getFromUnoTunnel<ScTableSheetObj>( xInterface ); if ( pSheetObj && !pSheetObj->GetDocShell() ) // not inserted yet? { SCTAB nPosition; @@ -3790,7 +3790,7 @@ sal_Int32 ScTableSheetsObj::importSheet( // Source document docShell if ( !xDocSrc.is() ) throw uno::RuntimeException(); - ScModelObj* pObj = comphelper::getUnoTunnelImplementation<ScModelObj>(xDocSrc); + ScModelObj* pObj = comphelper::getFromUnoTunnel<ScModelObj>(xDocSrc); ScDocShell* pDocShellSrc = static_cast<ScDocShell*>(pObj->GetEmbeddedObject()); // SourceSheet Position and does srcName exists ? diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index bdd4752d4cd6..e9b57ddb3e63 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -548,7 +548,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 = comphelper::getUnoTunnelImplementation<ScCellRangesBase>( xRange ); + ScCellRangesBase* pImpl = comphelper::getFromUnoTunnel<ScCellRangesBase>( xRange ); if ( pImpl ) { ScDocument* pSrcDoc = pImpl->GetDocument(); diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index c09361754372..f1b439cb54cb 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -426,7 +426,7 @@ uno::Sequence<OUString> SAL_CALL ScNamedRangeObj::getSupportedServiceNames() sal_Int64 SAL_CALL ScNamedRangeObj::getSomething( const uno::Sequence<sal_Int8 >& rId ) { - if ( isUnoTunnelId<ScNamedRangeObj>(rId) ) + if ( comphelper::isUnoTunnelId<ScNamedRangeObj>(rId) ) { return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(this)); } @@ -435,7 +435,7 @@ sal_Int64 SAL_CALL ScNamedRangeObj::getSomething( const uno::Sequence<sal_Int8>& ScNamedRangeObj::getUnoTunnelId() { - static const UnoTunnelIdInit theScNamedRangeObjUnoTunnelId; + static const comphelper::UnoIdInit theScNamedRangeObjUnoTunnelId; return theScNamedRangeObjUnoTunnelId.getSeq(); } diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 0de4d26c075f..97fcb17b01b7 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -101,7 +101,7 @@ ScShapeObj::ScShapeObj( uno::Reference<drawing::XShape>& xShape ) : xShape.set(uno::Reference<drawing::XShape>( mxShapeAgg, uno::UNO_QUERY )); - bIsTextShape = ( comphelper::getUnoTunnelImplementation<SvxUnoTextBase>( mxShapeAgg ) != nullptr ); + bIsTextShape = ( comphelper::getFromUnoTunnel<SvxUnoTextBase>( mxShapeAgg ) != nullptr ); } { @@ -1090,7 +1090,7 @@ void SAL_CALL ScShapeObj::insertTextContent( const uno::Reference<text::XTextRan uno::Reference<text::XTextContent> xEffContent; - ScEditFieldObj* pCellField = comphelper::getUnoTunnelImplementation<ScEditFieldObj>( xContent ); + ScEditFieldObj* pCellField = comphelper::getFromUnoTunnel<ScEditFieldObj>( xContent ); if ( pCellField ) { // createInstance("TextField.URL") from the document creates a ScCellFieldObj. @@ -1133,7 +1133,7 @@ uno::Reference<text::XTextCursor> SAL_CALL ScShapeObj::createTextCursor() { // ScDrawTextCursor must be used to ensure the ScShapeObj is returned by getText - SvxUnoTextBase* pText = comphelper::getUnoTunnelImplementation<SvxUnoTextBase>( mxShapeAgg ); + SvxUnoTextBase* pText = comphelper::getFromUnoTunnel<SvxUnoTextBase>( mxShapeAgg ); if (pText) return new ScDrawTextCursor( this, *pText ); } @@ -1150,8 +1150,8 @@ uno::Reference<text::XTextCursor> SAL_CALL ScShapeObj::createTextCursorByRange( { // ScDrawTextCursor must be used to ensure the ScShapeObj is returned by getText - SvxUnoTextBase* pText = comphelper::getUnoTunnelImplementation<SvxUnoTextBase>( mxShapeAgg ); - SvxUnoTextRangeBase* pRange = comphelper::getUnoTunnelImplementation<SvxUnoTextRangeBase>( aTextPosition ); + SvxUnoTextBase* pText = comphelper::getFromUnoTunnel<SvxUnoTextBase>( mxShapeAgg ); + SvxUnoTextRangeBase* pRange = comphelper::getFromUnoTunnel<SvxUnoTextRangeBase>( aTextPosition ); if ( pText && pRange ) { rtl::Reference<SvxUnoTextCursor> pCursor = new ScDrawTextCursor( this, *pText ); diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index e6f0eb1661ad..58924e653e46 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -681,7 +681,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 = comphelper::getUnoTunnelImplementation<ScStyleObj>( xInterface ); + ScStyleObj* pStyleObj = comphelper::getFromUnoTunnel<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 27c46f7513c2..bb1135ac3d87 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -135,7 +135,7 @@ uno::Reference<text::XText> SAL_CALL ScHeaderFooterContentObj::getRightText() sal_Int64 SAL_CALL ScHeaderFooterContentObj::getSomething( const uno::Sequence<sal_Int8 >& rId ) { - if ( isUnoTunnelId<ScHeaderFooterContentObj>(rId) ) + if ( comphelper::isUnoTunnelId<ScHeaderFooterContentObj>(rId) ) { return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(this)); } @@ -144,14 +144,14 @@ sal_Int64 SAL_CALL ScHeaderFooterContentObj::getSomething( const uno::Sequence<sal_Int8>& ScHeaderFooterContentObj::getUnoTunnelId() { - static const UnoTunnelIdInit theScHeaderFooterContentObjUnoTunnelId; + static const comphelper::UnoIdInit theScHeaderFooterContentObjUnoTunnelId; return theScHeaderFooterContentObjUnoTunnelId.getSeq(); } rtl::Reference<ScHeaderFooterContentObj> ScHeaderFooterContentObj::getImplementation( const uno::Reference<sheet::XHeaderFooterContent>& rObj) { - return comphelper::getUnoTunnelImplementation<ScHeaderFooterContentObj>(rObj); + return comphelper::getFromUnoTunnel<ScHeaderFooterContentObj>(rObj); } void ScHeaderFooterContentObj::Init( const EditTextObject* pLeft, @@ -379,10 +379,10 @@ void SAL_CALL ScHeaderFooterTextObj::insertTextContent( SolarMutexGuard aGuard; if ( xContent.is() && xRange.is() ) { - ScEditFieldObj* pHeaderField = comphelper::getUnoTunnelImplementation<ScEditFieldObj>( xContent ); + ScEditFieldObj* pHeaderField = comphelper::getFromUnoTunnel<ScEditFieldObj>( xContent ); SvxUnoTextRangeBase* pTextRange = - comphelper::getUnoTunnelImplementation<ScHeaderFooterTextCursor>( xRange ); + comphelper::getFromUnoTunnel<ScHeaderFooterTextCursor>( xRange ); if ( pHeaderField && !pHeaderField->IsInserted() && pTextRange ) { @@ -446,7 +446,7 @@ void SAL_CALL ScHeaderFooterTextObj::removeTextContent( SolarMutexGuard aGuard; if ( xContent.is() ) { - ScEditFieldObj* pHeaderField = comphelper::getUnoTunnelImplementation<ScEditFieldObj>(xContent); + ScEditFieldObj* pHeaderField = comphelper::getFromUnoTunnel<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 e75e522af786..3d2df9af72df 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -678,10 +678,10 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection ) if (bRet) return bRet; - ScCellRangesBase* pRangesImp = comphelper::getUnoTunnelImplementation<ScCellRangesBase>( xInterface ); + ScCellRangesBase* pRangesImp = comphelper::getFromUnoTunnel<ScCellRangesBase>( xInterface ); uno::Reference<drawing::XShapes> xShapeColl( xInterface, uno::UNO_QUERY ); uno::Reference<drawing::XShape> xShapeSel( xInterface, uno::UNO_QUERY ); - SvxShape* pShapeImp = comphelper::getUnoTunnelImplementation<SvxShape>( xShapeSel ); + SvxShape* pShapeImp = comphelper::getFromUnoTunnel<SvxShape>( xShapeSel ); if (pRangesImp) // Cell ranges { @@ -1051,7 +1051,7 @@ void SAL_CALL ScTabViewObj::setActiveSheet( const uno::Reference<sheet::XSpreads // XSpreadsheet and ScCellRangesBase -> has to be the same sheet - ScCellRangesBase* pRangesImp = comphelper::getUnoTunnelImplementation<ScCellRangesBase>( xActiveSheet ); + ScCellRangesBase* pRangesImp = comphelper::getFromUnoTunnel<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 aa2c16378700..0453f6b4bb44 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -82,7 +82,7 @@ GetAutoFiltRange( const ScDocShell* pShell, sal_Int16 nSheet ) ScDocShell* GetDocShellFromRange( const uno::Reference< uno::XInterface >& xRange ) { - ScCellRangesBase* pScCellRangesBase = comphelper::getUnoTunnelImplementation<ScCellRangesBase>( xRange ); + ScCellRangesBase* pScCellRangesBase = comphelper::getFromUnoTunnel<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 760d1002c868..8eec39dca899 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -844,8 +844,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 = comphelper::getUnoTunnelImplementation<ScCellRangesBase>( xOldSelection ); - ScCellRangesBase* pNewCellRanges = comphelper::getUnoTunnelImplementation<ScCellRangesBase>( xNewSelection ); + ScCellRangesBase* pOldCellRanges = comphelper::getFromUnoTunnel<ScCellRangesBase>( xOldSelection ); + ScCellRangesBase* pNewCellRanges = comphelper::getFromUnoTunnel<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 8db4a9b1c4ff..f3fd768f16e3 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 comphelper::getUnoTunnelImplementation<ScCellRangesBase>( mxPropertySet ); + return comphelper::getFromUnoTunnel<ScCellRangesBase>( mxPropertySet ); } template< typename... Ifc > diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 9aa5213a3bce..1ad91d3b811c 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -225,9 +225,9 @@ static uno::Reference< excel::XRange > lcl_makeXRangeFromSheetCellRanges( const ScCellRangesBase* ScVbaRange::getCellRangesBase() { if( mxRanges.is() ) - return comphelper::getUnoTunnelImplementation<ScCellRangesBase>( mxRanges ); + return comphelper::getFromUnoTunnel<ScCellRangesBase>( mxRanges ); if( mxRange.is() ) - return comphelper::getUnoTunnelImplementation<ScCellRangesBase>( mxRange ); + return comphelper::getFromUnoTunnel<ScCellRangesBase>( mxRange ); throw uno::RuntimeException("General Error creating range - Unknown" ); } @@ -362,7 +362,7 @@ ScVbaRangeAreas::createCollectionObject( const uno::Any& aSource ) static ScDocShell* getDocShellFromIf( const uno::Reference< uno::XInterface >& xIf ) { - ScCellRangesBase* pUno = comphelper::getUnoTunnelImplementation<ScCellRangesBase>( xIf ); + ScCellRangesBase* pUno = comphelper::getFromUnoTunnel<ScCellRangesBase>( xIf ); if ( !pUno ) throw uno::RuntimeException("Failed to access underlying uno range object" ); return pUno->GetDocShell(); @@ -509,7 +509,7 @@ public: OUString getNumberFormatString() { uno::Reference< uno::XInterface > xIf( mxRangeProps, uno::UNO_QUERY_THROW ); - ScCellRangesBase* pUnoCellRange = comphelper::getUnoTunnelImplementation<ScCellRangesBase>( xIf ); + ScCellRangesBase* pUnoCellRange = comphelper::getFromUnoTunnel<ScCellRangesBase>( xIf ); if ( pUnoCellRange ) { diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx index d5fbb6b0e070..07e35344a371 100644 --- a/sc/source/ui/vba/vbaworkbook.cxx +++ b/sc/source/ui/vba/vbaworkbook.cxx @@ -408,7 +408,7 @@ ScVbaWorkbook::getCodeName() sal_Int64 ScVbaWorkbook::getSomething(const uno::Sequence<sal_Int8 >& rId ) { - if (isUnoTunnelId<ScVbaWorksheet>(rId)) + if (comphelper::isUnoTunnelId<ScVbaWorksheet>(rId)) { return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(this)); } diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index f4ec5ca04e04..ef5c851ed938 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -172,7 +172,7 @@ ScVbaWorksheet::~ScVbaWorksheet() const uno::Sequence<sal_Int8>& ScVbaWorksheet::getUnoTunnelId() { - static const UnoTunnelIdInit theScVbaWorksheetUnoTunnelId; + static const comphelper::UnoIdInit theScVbaWorksheetUnoTunnelId; return theScVbaWorksheetUnoTunnelId.getSeq(); } @@ -1039,7 +1039,7 @@ ScVbaWorksheet::PrintOut( const uno::Any& From, const uno::Any& To, const uno::A sal_Int64 SAL_CALL ScVbaWorksheet::getSomething(const uno::Sequence<sal_Int8 > & rId) { - if (isUnoTunnelId<ScVbaWorksheet>(rId)) + if (comphelper::isUnoTunnelId<ScVbaWorksheet>(rId)) { return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(this)); } diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 6e500e84b142..0fffffa0661b 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -528,7 +528,7 @@ void ScDrawView::MarkListHasChanged() uno::Reference<frame::XController> xController = rFrame.GetController(); if (xController.is()) { - ScTabViewObj* pImp = comphelper::getUnoTunnelImplementation<ScTabViewObj>( xController ); + ScTabViewObj* pImp = comphelper::getFromUnoTunnel<ScTabViewObj>( xController ); if (pImp) pImp->SelectionChanged(); } @@ -578,7 +578,7 @@ bool ScDrawView::SdrBeginTextEdit( uno::Reference< frame::XController > xController = rFrame.GetController(); if (xController.is()) { - ScTabViewObj* pImp = comphelper::getUnoTunnelImplementation<ScTabViewObj>( xController ); + ScTabViewObj* pImp = comphelper::getFromUnoTunnel<ScTabViewObj>( xController ); if (pImp) pImp->SelectionChanged(); } @@ -602,7 +602,7 @@ SdrEndTextEditKind ScDrawView::SdrEndTextEdit( bool bDontDeleteReally ) uno::Reference< frame::XController > xController = rFrame.GetController(); if (xController.is()) { - ScTabViewObj* pImp = comphelper::getUnoTunnelImplementation<ScTabViewObj>( xController ); + ScTabViewObj* pImp = comphelper::getFromUnoTunnel<ScTabViewObj>( xController ); if (pImp) pImp->SelectionChanged(); } diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 662ba153c4d6..877da1760bd4 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -2713,7 +2713,7 @@ bool ScGridWindow::PreNotify( NotifyEvent& rNEvt ) css::uno::Reference<css::frame::XController> xController = pViewFrame->GetFrame().GetController(); if (xController.is()) { - ScTabViewObj* pImp = comphelper::getUnoTunnelImplementation<ScTabViewObj>( xController ); + ScTabViewObj* pImp = comphelper::getFromUnoTunnel<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 8f885ccfc26a..530d78ec81ed 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -2157,7 +2157,7 @@ void ScTabView::SetNewVisArea() css::uno::Reference<css::frame::XController> xController = rFrame.GetController(); if (xController.is()) { - ScTabViewObj* pImp = comphelper::getUnoTunnelImplementation<ScTabViewObj>( xController ); + ScTabViewObj* pImp = comphelper::getFromUnoTunnel<ScTabViewObj>( xController ); if (pImp) pImp->VisAreaChanged(); } @@ -2554,7 +2554,7 @@ void lcl_ExtendTiledDimension(bool bColumn, const SCCOLROW nEnd, const SCCOLROW ScDocShell* pDocSh = rViewData.GetDocShell(); ScModelObj* pModelObj = pDocSh ? - comphelper::getUnoTunnelImplementation<ScModelObj>( pDocSh->GetModel() ) : nullptr; + comphelper::getFromUnoTunnel<ScModelObj>( pDocSh->GetModel() ) : nullptr; Size aOldSize(0, 0); if (pModelObj) aOldSize = pModelObj->getDocumentSize(); @@ -2593,7 +2593,7 @@ void lcl_ExtendTiledDimension(bool bColumn, const SCCOLROW nEnd, const SCCOLROW std::stringstream ss; ss << aNewSize.Width() << ", " << aNewSize.Height(); OString sSize = ss.str().c_str(); - ScModelObj* pModel = comphelper::getUnoTunnelImplementation<ScModelObj>( + ScModelObj* pModel = comphelper::getFromUnoTunnel<ScModelObj>( rViewData.GetViewShell()->GetCurrentDocument()); SfxLokHelper::notifyDocumentSizeChanged(rViewData.GetViewShell(), sSize, pModel, false); } diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index 6133b506c955..c44db32ce716 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -403,7 +403,7 @@ void ScTabView::SetCursor( SCCOL nPosX, SCROW nPosY, bool bNew ) ScDocument& rDoc = aViewData.GetDocument(); ScDocShell* pDocSh = aViewData.GetDocShell(); - ScModelObj* pModelObj = pDocSh ? comphelper::getUnoTunnelImplementation<ScModelObj>( pDocSh->GetModel() ) : nullptr; + ScModelObj* pModelObj = pDocSh ? comphelper::getFromUnoTunnel<ScModelObj>( pDocSh->GetModel() ) : nullptr; Size aOldSize(0, 0); if (pModelObj) aOldSize = pModelObj->getDocumentSize(); @@ -445,7 +445,7 @@ void ScTabView::SetCursor( SCCOL nPosX, SCROW nPosY, bool bNew ) std::stringstream ss; ss << aNewSize.Width() << ", " << aNewSize.Height(); OString sSize = ss.str().c_str(); - ScModelObj* pModel = comphelper::getUnoTunnelImplementation<ScModelObj>(aViewData.GetViewShell()->GetCurrentDocument()); + ScModelObj* pModel = comphelper::getFromUnoTunnel<ScModelObj>(aViewData.GetViewShell()->GetCurrentDocument()); SfxLokHelper::notifyDocumentSizeChanged(aViewData.GetViewShell(), sSize, pModel, false); } @@ -538,7 +538,7 @@ void ScTabView::SelectionChanged(bool bFromPaste) uno::Reference<frame::XController> xController = pViewFrame->GetFrame().GetController(); if (xController.is()) { - ScTabViewObj* pImp = comphelper::getUnoTunnelImplementation<ScTabViewObj>( xController ); + ScTabViewObj* pImp = comphelper::getFromUnoTunnel<ScTabViewObj>( xController ); if (pImp) pImp->SelectionChanged(); } diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index bfb2f6c82ed1..fc5bd4ccf6f0 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 = comphelper::getUnoTunnelImplementation<ScTabViewObj>( xController ); + ScTabViewObj* pImp = comphelper::getFromUnoTunnel<ScTabViewObj>( xController ); if (pImp) pImp->SheetChanged( bSameTabButMoved ); } @@ -334,7 +334,7 @@ void ScTabView::TabChanged( bool bSameTabButMoved ) return; ScDocShell* pDocSh = GetViewData().GetDocShell(); - ScModelObj* pModelObj = pDocSh ? comphelper::getUnoTunnelImplementation<ScModelObj>( pDocSh->GetModel()) : nullptr; + ScModelObj* pModelObj = pDocSh ? comphelper::getFromUnoTunnel<ScModelObj>( pDocSh->GetModel()) : nullptr; if (!pModelObj) return; @@ -350,7 +350,7 @@ void ScTabView::TabChanged( bool bSameTabButMoved ) OString sPayload = aRectangle.toString() + ", " + OString::number(aViewData.GetTabNo()); pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_INVALIDATE_TILES, sPayload.getStr()); - ScModelObj* pModel = comphelper::getUnoTunnelImplementation<ScModelObj>(pViewShell->GetCurrentDocument()); + ScModelObj* pModel = comphelper::getFromUnoTunnel<ScModelObj>(pViewShell->GetCurrentDocument()); SfxLokHelper::notifyDocumentSizeChanged(pViewShell, sRect, pModel, false); } diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 169b5e9b1348..e32bc217b090 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -1098,7 +1098,7 @@ static ScTabViewObj* lcl_GetViewObj( const ScTabViewShell& rShell ) SfxFrame& rFrame = pViewFrame->GetFrame(); uno::Reference<frame::XController> xController = rFrame.GetController(); if (xController.is()) - pRet = comphelper::getUnoTunnelImplementation<ScTabViewObj>( xController ); + pRet = comphelper::getFromUnoTunnel<ScTabViewObj>( xController ); } return pRet; } diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index b4e8744cfe0d..1b4efb7cea77 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -1453,7 +1453,7 @@ bool ScViewFunc::PasteFromClip( InsertDeleteFlags nFlags, ScDocument* pClipDoc, if ( nFlags & InsertDeleteFlags::OBJECTS ) { - ScModelObj* pModelObj = comphelper::getUnoTunnelImplementation<ScModelObj>( pDocSh->GetModel() ); + ScModelObj* pModelObj = comphelper::getFromUnoTunnel<ScModelObj>( pDocSh->GetModel() ); if ( pPage && pModelObj ) { bool bSameDoc = ( rClipParam.getSourceDocID() == rDoc.GetDocumentID() ); diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx index 9dafd25a64a1..d83d6867fd87 100644 --- a/sc/source/ui/view/viewfun7.cxx +++ b/sc/source/ui/view/viewfun7.cxx @@ -178,7 +178,7 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel, ScDocument& rDocument = GetViewData().GetDocument(); ScDocShell* pDocShell = GetViewData().GetDocShell(); - ScModelObj* pModelObj = ( pDocShell ? comphelper::getUnoTunnelImplementation<ScModelObj>( pDocShell->GetModel() ) : nullptr ); + ScModelObj* pModelObj = ( pDocShell ? comphelper::getFromUnoTunnel<ScModelObj>( pDocShell->GetModel() ) : nullptr ); if ( pDestPage && pModelObj && pDrawTrans ) { const ScRangeListVector& rProtectedChartRangesVector( pDrawTrans->GetProtectedChartRangesVector() ); @@ -247,7 +247,7 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel, ScDocument& rDocument = GetViewData().GetDocument(); ScDocShell* pDocShell = GetViewData().GetDocShell(); - ScModelObj* pModelObj = ( pDocShell ? comphelper::getUnoTunnelImplementation<ScModelObj>( pDocShell->GetModel() ) : nullptr ); + ScModelObj* pModelObj = ( pDocShell ? comphelper::getFromUnoTunnel<ScModelObj>( pDocShell->GetModel() ) : nullptr ); const ScDrawTransferObj* pTransferObj = ScDrawTransferObj::GetOwnClipboard(ScTabViewShell::GetClipData(GetViewData().GetActiveWin())); if ( pPage && pModelObj && ( pTransferObj || pDrawTrans ) ) { |