diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-01-10 10:32:51 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-01-10 10:38:41 +0100 |
| commit | bec239e847da2b8112de79f18c6f62eb52b47bc1 (patch) | |
| tree | 87cf50eda901c1befc2c4fdc4e1d5e5f0a4de874 /extensions | |
| parent | Fix npshell build on Windows. (diff) | |
| download | core-bec239e847da2b8112de79f18c6f62eb52b47bc1.tar.gz core-bec239e847da2b8112de79f18c6f62eb52b47bc1.zip | |
extensions: plugin: fix build a bit more on Mac
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/Library_pl.mk | 4 | ||||
| -rw-r--r-- | extensions/source/plugin/aqua/sysplug.mm | 4 | ||||
| -rw-r--r-- | extensions/source/plugin/base/xplugin.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/plugin/inc/plugin/impl.hxx | 6 | ||||
| -rw-r--r-- | extensions/source/plugin/unx/nppapi.cxx | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index b6a3700cce46..96bcdb5c74a6 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -104,7 +104,7 @@ $(eval $(call gb_Library_set_include,pl,\ -I$(FRAMEWORKSHOME)/Carbon.framework/Versions/Current/Frameworks/HIToolbox.framework/Versions/Current/Headers \ )) -endif # GUIBASE=aqua +else # GUIBASE!=aqua ifeq ($(ENABLE_GTK),TRUE) $(eval $(call gb_Library_add_defs,pl,\ @@ -126,6 +126,8 @@ $(eval $(call gb_Library_add_libs,pl,\ -lX11 \ )) +endif # GUIBASE=aqua + endif # GUI=UNX $(eval $(call gb_Library_add_linked_libs,pl,\ diff --git a/extensions/source/plugin/aqua/sysplug.mm b/extensions/source/plugin/aqua/sysplug.mm index 8db2dceecc00..1696a7a7edbb 100644 --- a/extensions/source/plugin/aqua/sysplug.mm +++ b/extensions/source/plugin/aqua/sysplug.mm @@ -77,9 +77,9 @@ struct SysPlugData return ::boost::shared_ptr<SysPlugData>(new SysPlugData); } -void XPlugin_Impl::SetSysPlugDataParentView(SystemEnvData* pEnvData) +void XPlugin_Impl::SetSysPlugDataParentView(SystemEnvData const& rEnvData) { - m_pSysPlugData.m_pParentView = pEnvData->pView; + m_pSysPlugData->m_pParentView = rEnvData.pView; } extern "C" { diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index 4cce131d93e7..0a9618d79d92 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -566,7 +566,7 @@ void XPlugin_Impl::loadPlugin() NULL ); #ifdef QUARTZ // m_aNPWindow is set up in the MacPluginComm from the view - SetSysPlugDataParentView(pEnvData); + SetSysPlugDataParentView(*pEnvData); #elif defined( UNX ) XSync( (Display*)pEnvData->pDisplay, False ); m_aNPWindow.window = (void*)pEnvData->aWindow; diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx index 4ba1b9a3d512..5316fbe4eed7 100644 --- a/extensions/source/plugin/inc/plugin/impl.hxx +++ b/extensions/source/plugin/inc/plugin/impl.hxx @@ -72,10 +72,6 @@ #include <list> #ifdef WNT -#include "plugin/win/sysplug.hxx" -#endif - -#ifdef WNT #include <plugin/win/sysplug.hxx> #elif defined(QUARTZ) #include "plugin/aqua/sysplug.hxx" @@ -157,7 +153,7 @@ private: sal_Bool m_bIsDisposed; #ifdef QUARTZ - void SetSysPlugDataParentView(SystemEnvData* pEnvData); + void SetSysPlugDataParentView(SystemEnvData const& rEnvData); #endif void prependArg( const char* pName, const char* pValue ); // arguments will be strdup'ed diff --git a/extensions/source/plugin/unx/nppapi.cxx b/extensions/source/plugin/unx/nppapi.cxx index 15aeba528684..04c3778b9f04 100644 --- a/extensions/source/plugin/unx/nppapi.cxx +++ b/extensions/source/plugin/unx/nppapi.cxx @@ -35,9 +35,11 @@ #include <cstdarg> -#include <plugin/impl.hxx> #include <vcl/svapp.hxx> +#include <plugin/unx/plugcon.hxx> +#include <plugin/impl.hxx> + std::vector<PluginConnector*> PluginConnector::allConnectors; PluginConnector::PluginConnector( int nSocket ) : |