diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-12-07 10:53:02 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-12-07 10:53:02 +0000 |
| commit | a56a678751079b91fe94a2b4eef6d02661b2c48c (patch) | |
| tree | 9b097399e3f6951ae95e30832b05c7ff565fb958 | |
| parent | 9b24b6be6cb88508c695ee11310af51348f819b2 (diff) | |
INTEGRATION: CWS macosxquicktime01 (1.21.58); FILE MERGED
2007/10/27 09:00:18 pl 1.21.58.1: #i82621# changed SystemEnvData and SystemParentData for QUARTZ
| -rw-r--r-- | extensions/source/plugin/base/xplugin.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index e63b5093ec64..b944d1b9ad82 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xplugin.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: rt $ $Date: 2007-07-05 08:50:51 $ + * last change: $Author: vg $ $Date: 2007-12-07 11:53:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -542,7 +542,7 @@ void XPlugin_Impl::loadPlugin() #ifdef QUARTZ pComm = new MacPluginComm( m_aDescription.Mimetype, m_aDescription.PluginName, - (WindowRef)pEnvData->rWindow, + pEnvData->pView, sv[0], sv[1] ); @@ -583,7 +583,8 @@ void XPlugin_Impl::loadPlugin() m_aNPWindow.window = (void*)pEnvData->aWindow; m_aNPWindow.ws_info = NULL; #else - m_aNPWindow.window = (void*)pEnvData->rWindow; + // FIXME: this is untested and possiblz wrong + m_aNPWindow.window = (void*)pEnvData->pView; m_aNPWindow.type = NPWindowTypeWindow; #endif //QUARTZ #else |