sal/inc/sal/main.h | 17 -----------------
vcl/source/salmain/salmain.cxx | 2 +-
vcl/workben/svdem.cxx | 2 +-
vcl/workben/vcldemo.cxx | 2 +-
4 files changed, 3 insertions(+), 20 deletions(-)
New commits:
commit 9c69984f8bf4830c6c0831bc66b128f86143d98f
Author: Tor Lillqvist <t...@iki.fi>
Date: Sat Apr 28 08:32:51 2012 +0300
Bin the unused vague SAL_IMPLEMENT_MAIN_WITH_GUI idea
Change-Id: I66dae812f3aea0534907316a7fb41b35ad37be48
diff --git a/sal/inc/sal/main.h b/sal/inc/sal/main.h
index 0f68012..c85bc5a 100644
--- a/sal/inc/sal/main.h
+++ b/sal/inc/sal/main.h
@@ -63,8 +63,6 @@ __attribute__ ((visibility("default"))) void lo_main(int
argc, char **argv) \
sal_detail_deinitialize(); \
}
-#define SAL_MAIN_WITH_GUI_IMPL SAL_MAIN_IMPL
-
#else
#define SAL_MAIN_WITH_ARGS_IMPL \
@@ -87,8 +85,6 @@ int SAL_CALL main(int argc, char ** argv) \
return ret; \
}
-#define SAL_MAIN_WITH_GUI_IMPL SAL_MAIN_IMPL
-
#endif
@@ -149,19 +145,6 @@ int WINAPI WinMain( HINSTANCE _hinst, HINSTANCE _dummy,
char* _cmdline, int _nsh
SAL_WIN_WinMain \
static int SAL_CALL sal_main(void)
-/* Use SAL_IMPLEMENT_MAIN_WITH_GUI in programs that actually have a
- * VCL GUI. The difference is meaningful only for iOS support, which
- * of course is a highly experimental work in progress. So actually,
- * don't bother, just let developers who care for iOS take care of it
- * when/if necessary.
- */
-
-#define SAL_IMPLEMENT_MAIN_WITH_GUI() \
- static int SAL_CALL sal_main(void); \
- SAL_MAIN_WITH_GUI_IMPL \
- SAL_WIN_WinMain \
- static int SAL_CALL sal_main(void)
-
/*
"How to use" Examples:
diff --git a/vcl/source/salmain/salmain.cxx b/vcl/source/salmain/salmain.cxx
index d3c38c8..1a8c4d8 100644
--- a/vcl/source/salmain/salmain.cxx
+++ b/vcl/source/salmain/salmain.cxx
@@ -35,7 +35,7 @@
#include "salinst.hxx"
-SAL_IMPLEMENT_MAIN_WITH_GUI() {
+SAL_IMPLEMENT_MAIN() {
tools::extendApplicationEnvironment();
return SVMain();
}
diff --git a/vcl/workben/svdem.cxx b/vcl/workben/svdem.cxx
index 53f3353..8e9baa7 100644
--- a/vcl/workben/svdem.cxx
+++ b/vcl/workben/svdem.cxx
@@ -49,7 +49,7 @@ void Main();
// -----------------------------------------------------------------------
-SAL_IMPLEMENT_MAIN_WITH_GUI()
+SAL_IMPLEMENT_MAIN()
{
tools::extendApplicationEnvironment();
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index d0caa00..7df524a 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -52,7 +52,7 @@ void Main();
// -----------------------------------------------------------------------
-SAL_IMPLEMENT_MAIN_WITH_GUI()
+SAL_IMPLEMENT_MAIN()
{
tools::extendApplicationEnvironment();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
