strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tdf#39593 Drop ScDataPilotDescriptorBase::getImplementation

Browse source 
Replace with comphelper::getUnoTunnelImplementation.

Change-Id: Ice068fcce262014a812a9e0a5d92b8bac173fa39
Reviewed-on: https://gerrit.libreoffice.org/79112
Tested-by: Jenkins
Reviewed-by: Arkadiy Illarionov <qarkai@gmail.com>
This commit is contained in:
Arkadiy Illarionov 2019-09-19 00:08:37 +03:00
parent 4b49aaf56d
commit 4342aaef0c
3 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sc/inc/dapiuno.hxx
View file

@ -202,8 +202,7 @@ public:
virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<
sal_Int8 >& aIdentifier ) override;
static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
SC_DLLPUBLIC static ScDataPilotDescriptorBase* getImplementation(const css::uno::Reference<css::sheet::XDataPilotDescriptor>& rObj);
SC_DLLPUBLIC static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
// XTypeProvider (override in ScDataPilotTableObj)
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;

2
sc/source/filter/oox/pivottablebuffer.cxx
View file

@ -1230,7 +1230,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.
ScDataPilotDescriptorBase* pImpl = ScDataPilotDescriptorBase::getImplementation(mxDPDescriptor);
auto pImpl = comphelper::getUnoTunnelImplementation<ScDataPilotDescriptorBase>(mxDPDescriptor);
if (!pImpl)
return;

11
sc/source/ui/unoobj/dapiuno.cxx
View file

@ -417,7 +417,7 @@ void SAL_CALL ScDataPilotTablesObj::insertNewByName( const OUString& aNewName,
if (!pDocShell)
throw RuntimeException("DocShell is null", static_cast<cppu::OWeakObject*>(this));
ScDataPilotDescriptorBase* pImp = ScDataPilotDescriptorBase::getImplementation( xDescriptor );
auto pImp = comphelper::getUnoTunnelImplementation<ScDataPilotDescriptorBase>( xDescriptor );
if (!pImp)
throw RuntimeException("Failed to get ScDataPilotDescriptor", static_cast<cppu::OWeakObject*>(this));
@ -1041,15 +1041,6 @@ const Sequence<sal_Int8>& ScDataPilotDescriptorBase::getUnoTunnelId()
return theScDataPilotDescriptorBaseUnoTunnelId::get().getSeq();
}
ScDataPilotDescriptorBase* ScDataPilotDescriptorBase::getImplementation(const Reference<XDataPilotDescriptor>& rObj )
{
ScDataPilotDescriptorBase* pRet = nullptr;
Reference<lang::XUnoTunnel> xUT(rObj, UNO_QUERY);
if (xUT.is())
pRet = reinterpret_cast<ScDataPilotDescriptorBase*>(sal::static_int_cast<sal_IntPtr>(xUT->getSomething(getUnoTunnelId())));
return pRet;
}
ScDataPilotTableObj::ScDataPilotTableObj(ScDocShell* pDocSh, SCTAB nT, const OUString& rN) :
ScDataPilotDescriptorBase( pDocSh ),
nTab( nT ),