summaryrefslogtreecommitdiff
path: root/starmath
diff options
context:
space:
mode:
authorArkadiy Illarionov <qarkai@gmail.com>2019-09-22 18:20:39 +0300
committerArkadiy Illarionov <qarkai@gmail.com>2019-09-23 15:47:12 +0200
commit1d398fb983d8f8b53a78e7c47b588fc1f1e7f748 (patch)
tree89e11384ea13d73b3c1dc198c5fee8675036abbe /starmath
parentcd6780aae1392d4c1af0b15b311a4966834a9602 (diff)
tdf#39593 use getUnoTunnelImplementation
Change-Id: I78eb67913a568c610e38e5002f914773c4906dfd Reviewed-on: https://gerrit.libreoffice.org/79350 Tested-by: Jenkins Reviewed-by: Arkadiy Illarionov <qarkai@gmail.com>
Diffstat (limited to 'starmath')
-rw-r--r--starmath/source/mathmlexport.cxx21
-rw-r--r--starmath/source/mathmlimport.cxx17
-rw-r--r--starmath/source/view.cxx13
3 files changed, 13 insertions, 38 deletions
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 3c0d3ff891c4..bfeab01c6284 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -98,9 +98,7 @@ bool SmXMLExportWrapper::Export(SfxMedium &rMedium)
uno::Reference< lang::XComponent > xModelComp = xModel;
bool bEmbedded = false;
- uno::Reference <lang::XUnoTunnel> xTunnel(xModel,uno::UNO_QUERY);
- SmModel *pModel = reinterpret_cast<SmModel *>
- (xTunnel->getSomething(SmModel::getUnoTunnelId()));
+ SmModel *pModel = comphelper::getUnoTunnelImplementation<SmModel>(xModel);
SmDocShell *pDocShell = pModel ?
static_cast<SmDocShell*>(pModel->GetObjectShell()) : nullptr;
@@ -285,10 +283,7 @@ bool SmXMLExportWrapper::WriteThroughComponent(
uno::Sequence< PropertyValue > aProps(0);
xFilter->filter( aProps );
- uno::Reference<lang::XUnoTunnel> xFilterTunnel( xFilter, uno::UNO_QUERY );
- SmXMLExport *pFilter = reinterpret_cast< SmXMLExport * >(
- sal::static_int_cast< sal_uIntPtr >(
- xFilterTunnel->getSomething( SmXMLExport::getUnoTunnelId() )));
+ auto pFilter = comphelper::getUnoTunnelImplementation<SmXMLExport>(xFilter);
return pFilter == nullptr || pFilter->GetSuccess();
}
@@ -413,9 +408,7 @@ ErrCode SmXMLExport::exportDoc(enum XMLTokenEnum eClass)
else
{
uno::Reference <frame::XModel> xModel = GetModel();
- uno::Reference <lang::XUnoTunnel> xTunnel(xModel,uno::UNO_QUERY);
- SmModel *pModel = reinterpret_cast<SmModel *>
- (xTunnel->getSomething(SmModel::getUnoTunnelId()));
+ SmModel *pModel = comphelper::getUnoTunnelImplementation<SmModel>(xModel);
if (pModel)
{
@@ -451,9 +444,7 @@ ErrCode SmXMLExport::exportDoc(enum XMLTokenEnum eClass)
void SmXMLExport::ExportContent_()
{
uno::Reference <frame::XModel> xModel = GetModel();
- uno::Reference <lang::XUnoTunnel> xTunnel(xModel,uno::UNO_QUERY);
- SmModel *pModel = reinterpret_cast<SmModel *>
- (xTunnel->getSomething(SmModel::getUnoTunnelId()));
+ SmModel *pModel = comphelper::getUnoTunnelImplementation<SmModel>(xModel);
SmDocShell *pDocShell = pModel ?
static_cast<SmDocShell*>(pModel->GetObjectShell()) : nullptr;
OSL_ENSURE( pDocShell, "doc shell missing" );
@@ -504,9 +495,7 @@ void SmXMLExport::GetViewSettings( Sequence < PropertyValue >& aProps)
if ( !xModel.is() )
return;
- uno::Reference <lang::XUnoTunnel> xTunnel(xModel,uno::UNO_QUERY);
- SmModel *pModel = reinterpret_cast<SmModel *>
- (xTunnel->getSomething(SmModel::getUnoTunnelId()));
+ SmModel *pModel = comphelper::getUnoTunnelImplementation<SmModel>(xModel);
if ( !pModel )
return;
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 946c8e240a7c..808a235b96b8 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -107,9 +107,7 @@ ErrCode SmXMLImportWrapper::Import(SfxMedium &rMedium)
uno::Reference<task::XStatusIndicator> xStatusIndicator;
bool bEmbedded = false;
- uno::Reference <lang::XUnoTunnel> xTunnel(xModel,uno::UNO_QUERY);
- SmModel *pModel = reinterpret_cast<SmModel *>
- (xTunnel->getSomething(SmModel::getUnoTunnelId()));
+ SmModel *pModel = comphelper::getUnoTunnelImplementation<SmModel>(xModel);
SmDocShell *pDocShell = pModel ?
static_cast<SmDocShell*>(pModel->GetObjectShell()) : nullptr;
@@ -298,10 +296,7 @@ ErrCode SmXMLImportWrapper::ReadThroughComponent(
else
xParser->parseStream( aParserInput );
- uno::Reference<lang::XUnoTunnel> xFilterTunnel( xFilter, uno::UNO_QUERY );
- SmXMLImport *pFilter = reinterpret_cast< SmXMLImport * >(
- sal::static_int_cast< sal_uIntPtr >(
- xFilterTunnel->getSomething( SmXMLImport::getUnoTunnelId() )));
+ auto pFilter = comphelper::getUnoTunnelImplementation<SmXMLImport>(xFilter);
if ( pFilter && pFilter->GetSuccess() )
nError = ERRCODE_NONE;
}
@@ -471,9 +466,7 @@ void SmXMLImport::endDocument()
if (pTree && pTree->GetType() == SmNodeType::Table)
{
uno::Reference <frame::XModel> xModel = GetModel();
- uno::Reference <lang::XUnoTunnel> xTunnel(xModel,uno::UNO_QUERY);
- SmModel *pModel = reinterpret_cast<SmModel *>
- (xTunnel->getSomething(SmModel::getUnoTunnelId()));
+ SmModel *pModel = comphelper::getUnoTunnelImplementation<SmModel>(xModel);
if (pModel)
{
@@ -3063,9 +3056,7 @@ void SmXMLImport::SetViewSettings(const Sequence<PropertyValue>& aViewProps)
if ( !xModel.is() )
return;
- uno::Reference <lang::XUnoTunnel> xTunnel(xModel,uno::UNO_QUERY);
- SmModel *pModel = reinterpret_cast<SmModel *>
- (xTunnel->getSomething(SmModel::getUnoTunnelId()));
+ SmModel *pModel = comphelper::getUnoTunnelImplementation<SmModel>(xModel);
if ( !pModel )
return;
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 3a513cd87aad..68a4368d1e04 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -24,6 +24,7 @@
#include <com/sun/star/container/XChild.hpp>
#include <comphelper/processfactory.hxx>
+#include <comphelper/servicehelper.hxx>
#include <comphelper/storagehelper.hxx>
#include <comphelper/string.hxx>
#include <i18nutil/unicode.hxx>
@@ -1446,15 +1447,9 @@ void SmViewShell::Execute(SfxRequest& rReq)
Reference< datatransfer::XTransferable > xTrans( GetDoc()->GetModel(), uno::UNO_QUERY );
if( xTrans.is() )
{
- Reference< lang::XUnoTunnel> xTnnl( xTrans, uno::UNO_QUERY);
- if( xTnnl.is() )
- {
- TransferableHelper* pTrans = reinterpret_cast< TransferableHelper * >(
- sal::static_int_cast< sal_uIntPtr >(
- xTnnl->getSomething( TransferableHelper::getUnoTunnelId() )));
- if( pTrans )
- pTrans->CopyToClipboard(GetEditWindow());
- }
+ auto pTrans = comphelper::getUnoTunnelImplementation<TransferableHelper>(xTrans);
+ if( pTrans )
+ pTrans->CopyToClipboard(GetEditWindow());
}
}
break;