commit b883e3d58db404a92bee044091b6cfd3892311c2
author Arkadiy Illarionov <qarkai@gmail.com> Wed Sep 18 20:54:55 2019 +0300
committer Stephan Bergmann <sbergman@redhat.com> Wed Sep 18 21:53:27 2019 +0200
tree 1596be5acb0eee528ed01aabc43e7c97ee8311c0
parent 33d922ea07b6b20276471b19fd9c148ed90d7442

tdf#39593 use isUnoTunnelId in sd

Rename SdrModel::getUnoTunnelImplementationId()

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

include/svx/svdmodel.hxx

diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index f7ffa51..d5c14c0 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -585,7 +585,7 @@

    bool IsInDestruction() const { return mbInDestruction;}

    static const css::uno::Sequence< sal_Int8 >& getUnoTunnelImplementationId();
    static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();

    /** enables (true) or disables (false) recording of undo actions
        If undo actions are added while undo is disabled, they are deleted.

sd/source/ui/unoidl/unomodel.cxx

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 878db5a..cf31dfa 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -343,11 +343,8 @@
    if( isUnoTunnelId<SdXImpressDocument>(rIdentifier) )
        return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(this));

    if( (rIdentifier.getLength() == 16) &&
        (0 == memcmp( SdrModel::getUnoTunnelImplementationId().getConstArray(), rIdentifier.getConstArray(), 16 )))
    {
    if( isUnoTunnelId<SdrModel>(rIdentifier) )
        return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(mpDoc));
    }

    return SfxBaseModel::getSomething( rIdentifier );
}

svx/source/gallery2/galobj.cxx

diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index c08b848..23b1e3c 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -405,7 +405,7 @@
        if( xTunnel.is() )
        {
            mpFormModel = dynamic_cast< FmFormModel* >(
                reinterpret_cast<SdrModel*>(xTunnel->getSomething(SdrModel::getUnoTunnelImplementationId())));
                reinterpret_cast<SdrModel*>(xTunnel->getSomething(SdrModel::getUnoTunnelId())));
            if( mpFormModel )
            {
                mpFormModel->InsertPage( mpFormModel->AllocPage( false ) );

svx/source/svdraw/svdmodel.cxx

diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index a833a85..eec87abc 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -2004,7 +2004,7 @@
    class theSdrModelUnoTunnelImplementationId : public rtl::Static< UnoTunnelIdInit, theSdrModelUnoTunnelImplementationId > {};
}

const css::uno::Sequence< sal_Int8 >& SdrModel::getUnoTunnelImplementationId()
const css::uno::Sequence< sal_Int8 >& SdrModel::getUnoTunnelId()
{
    return theSdrModelUnoTunnelImplementationId::get().getSeq();
}