commit 9950aab9f02ab6aff71feca820575ed5a4e215d5
author Arkadiy Illarionov <qarkai@gmail.com> Wed Jun 19 23:37:31 2019 +0300
committer Stephan Bergmann <sbergman@redhat.com> Thu Jun 20 08:04:47 2019 +0200
tree 253cac9fc072b7fc62029b4ed37442ec04944278
parent 9e1fa327b161c24c3d588563d6a91aced50b85dd

tdf#39593 Remove xforms::Model::getModel

Replace with comphelper::getUnoTunnelImplementation.

Change-Id: I52f780059be7626a03bf79044cfc580bb33f3fd3
Reviewed-on: https://gerrit.libreoffice.org/74383
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

forms/source/xforms/binding.cxx

diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx
index 378cd39..0601bab 100644
--- a/forms/source/xforms/binding.cxx
+++ b/forms/source/xforms/binding.cxx
@@ -462,7 +462,7 @@
    Reference<XUnoTunnel> xTunnel( xModel, UNO_QUERY );
    Model* pModel = xTunnel.is()
        ? reinterpret_cast<Model*>(
            xTunnel->getSomething( Model::getUnoTunnelID() ) )
            xTunnel->getSomething( Model::getUnoTunnelId() ) )
        : nullptr;
    return pModel;
}

forms/source/xforms/model.cxx

diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx
index 7fc703a..2bddfea 100644
--- a/forms/source/xforms/model.cxx
+++ b/forms/source/xforms/model.cxx
@@ -108,20 +108,6 @@
{
}

static Model* lcl_getModel( const Reference<XUnoTunnel>& xTunnel )
{
    Model* pModel = nullptr;
    if( xTunnel.is() )
        pModel = reinterpret_cast<Model*>(
            xTunnel->getSomething( Model::getUnoTunnelID() ) );
    return pModel;
}

Model* Model::getModel( const Reference<XModel>& xModel )
{
    return lcl_getModel( Reference<XUnoTunnel>( xModel, UNO_QUERY ) );
}

EvaluationContext Model::getEvaluationContext()
{
    // the default context is the top-level element node. A default
@@ -144,7 +130,7 @@
}


css::uno::Sequence<sal_Int8> Model::getUnoTunnelID()
css::uno::Sequence<sal_Int8> Model::getUnoTunnelId()
{
    static cppu::OImplementationId aImplementationId;
    return aImplementationId.getImplementationId();
@@ -604,7 +590,7 @@

sal_Int64 Model::getSomething( const css::uno::Sequence<sal_Int8>& xId )
{
    return reinterpret_cast<sal_Int64>( ( xId == getUnoTunnelID() ) ? this : nullptr );
    return reinterpret_cast<sal_Int64>( ( xId == getUnoTunnelId() ) ? this : nullptr );
}

Sequence<sal_Int8> Model::getImplementationId()

forms/source/xforms/model.hxx

diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx
index 6d95657..a56554c 100644
--- a/forms/source/xforms/model.hxx
+++ b/forms/source/xforms/model.hxx
@@ -113,13 +113,10 @@
    Model();
    virtual ~Model() throw() override;

    // get Model implementation from API object
    static Model* getModel( const css::uno::Reference<css::xforms::XModel>& );

    xforms::EvaluationContext getEvaluationContext();


    static css::uno::Sequence<sal_Int8> getUnoTunnelID();
    static css::uno::Sequence<sal_Int8> getUnoTunnelId();


    // get/set that part of the schema, that we can't interpret as data types

forms/source/xforms/submission.cxx

diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx
index 32066cd..c4d7868 100644
--- a/forms/source/xforms/submission.cxx
+++ b/forms/source/xforms/submission.cxx
@@ -216,12 +216,12 @@
    else if( !maRef.getExpression().isEmpty() )
    {
        aExpression.setExpression( maRef.getExpression() );
        aEvalContext = Model::getModel( mxModel )->getEvaluationContext();
        aEvalContext = comphelper::getUnoTunnelImplementation<Model>( mxModel )->getEvaluationContext();
    }
    else
    {
        aExpression.setExpression( "/" );
        aEvalContext = Model::getModel( mxModel )->getEvaluationContext();
        aEvalContext = comphelper::getUnoTunnelImplementation<Model>( mxModel )->getEvaluationContext();
    }
    aExpression.evaluate( aEvalContext );
    Reference<XXPathObject> xResult = aExpression.getXPath();
@@ -283,7 +283,7 @@
{
    Model* pModel = nullptr;
    if( mxModel.is() )
        pModel = Model::getModel( mxModel );
        pModel = comphelper::getUnoTunnelImplementation<Model>( mxModel );
    return pModel;
}

@@ -401,7 +401,7 @@
                *this
              );

    Model* pModel = Model::getModel( xModel );
    Model* pModel = comphelper::getUnoTunnelImplementation<Model>( xModel );
    OSL_ENSURE( pModel != nullptr, "illegal model?" );

    // #i36765# #i47248# warning on submission of illegal data