Move the header that made setup_native depending on sfx2.

3 files changed, 1 insertions, 55 deletions

diff --git a/setup_native/inc/setup_native/qswin32.h b/setup_native/inc/setup_native/qswin32.h
deleted file mode 100644
index 6953ded36afb..000000000000
--- a/setup_native/inc/setup_native/qswin32.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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 */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/setup_native/prj/d.lst b/setup_native/prj/d.lst
index 6221f738c123..ed5abf6c89e1 100644
--- a/setup_native/prj/d.lst
+++ b/setup_native/prj/d.lst
@@ -50,5 +50,3 @@ mkdir: %_DEST%\bin\osolsmf
 ..\scripts\osx_install_patch.applescript %_DEST%\bin\osx_install_patch.applescript
 
 ..\%__SRC%\lib\getuid.so %_DEST%\bin\getuid.so
-
-..\inc\setup_native\qswin32.h %_DEST%\inc\setup_native\qswin32.h
diff --git a/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx b/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx
index 0a313946e0d6..aa9316c5cb01 100644
--- a/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx
+++ b/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx
@@ -27,7 +27,7 @@
  ************************************************************************/
 
 #include "quickstarter.hxx"
-#include <sfx2/qswin32.h>
+#include <systools/win32/qswin32.h>
 
 static BOOL CALLBACK EnumWindowsProc( HWND hWnd, LPARAM lParam )
 {