diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-01-05 17:23:15 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-01-05 17:25:51 +0100 |
| commit | f627c122461de4dd4e75a995145e8838b1d9bf34 (patch) | |
| tree | b4cef5f8b7471707110a527d6c15c0c14912a4c2 /sfx2 | |
| parent | 64ccf3ff3059f81532c88f974bad7399cddc9898 (diff) | |
No need for declarations in include file
...of functions only accessed via dlopen
Change-Id: I6b9998298fc6df68fb0d3003cef77a62ecef8976
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/shutdownicon.hxx | 3 | ||||
| -rw-r--r-- | sfx2/source/appl/shutdowniconunx.cxx | 11 |
2 files changed, 9 insertions, 5 deletions
diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx index a36547e11381..6965f42b06b2 100644 --- a/sfx2/source/appl/shutdownicon.hxx +++ b/sfx2/source/appl/shutdownicon.hxx @@ -170,9 +170,6 @@ extern "C" { void aqua_init_systray(); void aqua_shutdown_systray(); # endif - // external plugin systray impl. - void plugin_init_sys_tray(); - void plugin_shutdown_sys_tray(); } #endif diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx index 746819d6fd20..199674f13909 100644 --- a/sfx2/source/appl/shutdowniconunx.cxx +++ b/sfx2/source/appl/shutdowniconunx.cxx @@ -55,6 +55,13 @@ using namespace ::osl; +extern "C" { + +void SAL_DLLPUBLIC_EXPORT plugin_init_sys_tray(); +void SAL_DLLPUBLIC_EXPORT plugin_shutdown_sys_tray(); + +} + static ResMgr *pVCLResMgr; static GtkStatusIcon* pTrayIcon; static GtkWidget *pExitMenuItem = NULL; @@ -360,7 +367,7 @@ static void notify_file_changed(GFileMonitor * /*gfilemonitor*/, GFile * /*arg1* } #endif -void SAL_DLLPUBLIC_EXPORT plugin_init_sys_tray() +void plugin_init_sys_tray() { ::SolarMutexGuard aGuard; @@ -411,7 +418,7 @@ void SAL_DLLPUBLIC_EXPORT plugin_init_sys_tray() #endif } -void SAL_DLLPUBLIC_EXPORT plugin_shutdown_sys_tray() +void plugin_shutdown_sys_tray() { ::SolarMutexGuard aGuard; if( !pTrayIcon ) |