commit 0fb67dfdb6493cb7f6fc3b97af938300f1891af4
author Tor Lillqvist <tml@collabora.com> Thu Dec 05 14:46:03 2013 +0200
committer Tor Lillqvist <tml@collabora.com> Thu Dec 05 14:46:44 2013 +0200
tree ab180111e191675880e05baabc5cd012a374fee1
parent be7d87bea2611eb316b9b379aebc031179d4f794

Fix fallout from 461e0f9eaf9895ecd0eba67b35a4d2cec8a5e5c5

Change-Id: Ic4dc1c106ebcce7d27844551efca43cabb31c4ae

extensions/source/plugin/aqua/sysplug.mm

diff --git a/extensions/source/plugin/aqua/sysplug.mm b/extensions/source/plugin/aqua/sysplug.mm
index 366c8d5..304e716 100644
--- a/extensions/source/plugin/aqua/sysplug.mm
+++ b/extensions/source/plugin/aqua/sysplug.mm
@@ -82,7 +82,7 @@ struct SysPlugData

void XPlugin_Impl::SetSysPlugDataParentView(SystemEnvData const& rEnvData)
{
    m_pSysPlugData->m_pParentView = rEnvData.pView;
    m_pSysPlugData->m_pParentView = rEnvData.mpNSView;
}

extern "C" {

extensions/source/plugin/base/xplugin.cxx

diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx
index 3702813..924af39 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -528,7 +528,7 @@ void XPlugin_Impl::loadPlugin()
#if defined MACOSX
            PluginComm* pComm = new MacPluginComm( m_aDescription.Mimetype,
                                                   m_aDescription.PluginName,
                                                   pEnvData->pView );
                                                   pEnvData->mpNSView );
#elif defined UNX
            // need a new PluginComm
            PluginComm* pComm = NULL;