diff options
| author | Tor Lillqvist <tml@collabora.com> | 2019-04-25 19:15:50 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2019-04-26 08:20:09 +0200 |
| commit | e1a75c1c3069efa303c480d0e50928c0761f468f (patch) | |
| tree | d383a590c41f00e93ce4f7245c6d1fc5f34f58ad | |
| parent | 8e3f4aeb401cb478374928d78bcbfc737bfd4d97 (diff) | |
There is no ImplSVMainHook()
Change-Id: Ief2636425712f60cfc6e8f68ee0d3fb01608d8ba
Reviewed-on: https://gerrit.libreoffice.org/71317
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
| -rw-r--r-- | compilerplugins/clang/store/constantfunction.cxx | 4 | ||||
| -rw-r--r-- | compilerplugins/clang/unusedmethods.results | 2 | ||||
| -rw-r--r-- | include/vcl/svmain.hxx | 1 | ||||
| -rw-r--r-- | vcl/osx/salinst.cxx | 2 |
4 files changed, 1 insertions, 8 deletions
diff --git a/compilerplugins/clang/store/constantfunction.cxx b/compilerplugins/clang/store/constantfunction.cxx index a1b795d63ea7..0673df7a2521 100644 --- a/compilerplugins/clang/store/constantfunction.cxx +++ b/compilerplugins/clang/store/constantfunction.cxx @@ -179,10 +179,6 @@ bool ConstantFunction::VisitFunctionDecl(const FunctionDecl * pFunctionDecl) { if (aFunctionName == "ExceptionThrower_acquire_release_nop") { return true; } - // different hook function is called on different platforms, /vcl/source/app/svmainhook.cxx - if (aFunctionName == "ImplSVMainHook") { - return true; - } // used as a callback, /vcl/source/filter/jpeg/JpegReader.cxx if (aFunctionName == "term_source") { return true; diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results index 02bb0d181978..fec68affafdc 100644 --- a/compilerplugins/clang/unusedmethods.results +++ b/compilerplugins/clang/unusedmethods.results @@ -688,8 +688,6 @@ include/vcl/svapp.hxx:169 ApplicationEvent::ApplicationEvent(enum ApplicationEvent::Type,const class std::__debug::vector<class rtl::OUString, class std::allocator<class rtl::OUString> > &) include/vcl/svapp.hxx:798 void Application::AppEvent(const class ApplicationEvent &) -include/vcl/svmain.hxx:27 - _Bool ImplSVMainHook(int *) include/vcl/syswin.hxx:172 void SystemWindow::SetIdleDebugName(const char *) include/vcl/tabdlg.hxx:49 diff --git a/include/vcl/svmain.hxx b/include/vcl/svmain.hxx index 6305c090d289..ca6010784490 100644 --- a/include/vcl/svmain.hxx +++ b/include/vcl/svmain.hxx @@ -24,7 +24,6 @@ #include <vcl/dllapi.h> // #i47888# allow for alternative initialization as required for e.g. MacOSX -bool ImplSVMainHook( int* ); VCL_DLLPUBLIC int ImplSVMain(); VCL_DLLPUBLIC int SVMain(); diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index 089b1e438b66..b31f870d9e12 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -979,7 +979,7 @@ bool AquaSalInstance::SVMainHook(int* pnInit) NSApplicationMain( 1, pArgv ); #endif - return true; // indicate that ImplSVMainHook is implemented + return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |