CWS gnumake4: remove annoying dependency of sfx2 on setup_native [hg:be9aeca025a2]

5 files changed, 52 insertions, 3 deletions

diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk
index 57317629323b..6ecf5f368d27 100644
--- a/sfx2/Package_inc.mk
+++ b/sfx2/Package_inc.mk
@@ -135,3 +135,4 @@ $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/userinputinterception.hxx,sf
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfac.hxx,sfx2/viewfac.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfrm.hxx,sfx2/viewfrm.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewsh.hxx,sfx2/viewsh.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/qswin32.h,sfx2/qswin32.h))
diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx
index 45755cdd8799..86b9c9841fa0 100644
--- a/sfx2/inc/pch/precompiled_sfx2.hxx
+++ b/sfx2/inc/pch/precompiled_sfx2.hxx
@@ -480,7 +480,6 @@
 #include "rtl/ustring.hxx"
 #include "sal/config.h"
 #include "sal/types.h"
-#include "setup_native/qswin32.h"
 #include "sot/clsids.hxx"
 #include "sot/exchange.hxx"
 #include "sot/factory.hxx"
diff --git a/sfx2/inc/sfx2/qswin32.h b/sfx2/inc/sfx2/qswin32.h
new file mode 100644
index 000000000000..a7d82975b0b2
--- /dev/null
+++ b/sfx2/inc/sfx2/qswin32.h
@@ -0,0 +1,49 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _QSWIN32_H
+#define _QSWIN32_H
+
+#define QUICKSTART_CLASSNAMEA           "SO Listener Class"
+#define QUICKSTART_WINDOWNAMEA          "SO Listener Window"
+#define SHUTDOWN_QUICKSTART_MESSAGEA    "SO KillTray"
+
+#define QUICKSTART_CLASSNAMEW           L##QUICKSTART_CLASSNAMEA
+#define QUICKSTART_WINDOWNAMEW          L##QUICKSTART_WINDOWNAMEA
+#define SHUTDOWN_QUICKSTART_MESSAGEW    L##SHUTDOWN_QUICKSTART_MESSAGEA
+
+#ifdef UNICODE
+#   define QUICKSTART_CLASSNAME             QUICKSTART_CLASSNAMEW
+#   define QUICKSTART_WINDOWNAME            QUICKSTART_WINDOWNAMEW
+#   define SHUTDOWN_QUICKSTART_MESSAGE      SHUTDOWN_QUICKSTART_MESSAGEW
+#else
+#   define QUICKSTART_CLASSNAME             QUICKSTART_CLASSNAMEA
+#   define QUICKSTART_WINDOWNAME            QUICKSTART_WINDOWNAMEA
+#   define SHUTDOWN_QUICKSTART_MESSAGE      SHUTDOWN_QUICKSTART_MESSAGEA
+#endif
+
+#endif /* _QSWIN32_H */
diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst
index f25e991f84f4..6e13fe666d83 100644
--- a/sfx2/prj/build.lst
+++ b/sfx2/prj/build.lst
@@ -1,3 +1,3 @@
-sf      sfx2    :    L10N:l10n idl basic xmlscript framework readlicense_oo shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 LIBXSLT:libxslt NULL
+sf      sfx2    :    L10N:l10n idl basic xmlscript framework readlicense_oo shell sax SYSTRAY_GTK:libegg LIBXML2:libxml2 LIBXSLT:libxslt NULL
 sf	sfx2\prj								nmake	-	all	sf_prj NULL
 
diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx
index 26fd35272a51..3f1b49d6d0e4 100644
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@ -53,7 +53,7 @@
 #include <stdio.h>
 #include <io.h>
 #include <osl/thread.h>
-#include <setup_native/qswin32.h>
+#include <sfx2/qswin32.h>
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/uno/Reference.h>