diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-08-26 23:46:41 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-08-26 23:46:41 +0200 |
commit | 9c7e4d87c327ad929992b0a0ff2e70f156de5ff8 (patch) | |
tree | 7f5fdd890a07869394badb73d03a2365061456e5 /sfx2 | |
parent | translate some comments in ScPrintFunc::DoPrint (diff) | |
download | core-9c7e4d87c327ad929992b0a0ff2e70f156de5ff8.tar.gz core-9c7e4d87c327ad929992b0a0ff2e70f156de5ff8.zip |
Move the header that made setup_native depending on sfx2.
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/Package_inc.mk | 1 | ||||
-rw-r--r-- | sfx2/inc/sfx2/qswin32.h | 52 | ||||
-rw-r--r-- | sfx2/source/appl/shutdowniconw32.cxx | 2 |
3 files changed, 1 insertions, 54 deletions
diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk index 86eaa6509168..e308d1bde626 100644 --- a/sfx2/Package_inc.mk +++ b/sfx2/Package_inc.mk @@ -137,6 +137,5 @@ $(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)) # vim: set noet sw=4 ts=4: diff --git a/sfx2/inc/sfx2/qswin32.h b/sfx2/inc/sfx2/qswin32.h deleted file mode 100644 index 6953ded36afb..000000000000 --- a/sfx2/inc/sfx2/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/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx index f3bc6f0b47ef..319283caeb21 100644 --- a/sfx2/source/appl/shutdowniconw32.cxx +++ b/sfx2/source/appl/shutdowniconw32.cxx @@ -51,7 +51,7 @@ #include <shlobj.h> #include <objidl.h> #include <osl/thread.h> -#include <sfx2/qswin32.h> +#include <systools/win32/qswin32.h> #include <comphelper/sequenceashashmap.hxx> #include <set> |