[Libreoffice-commits] .: tools/inc tools/Package_inc.mk tools/source

Fridrich Strba fridrich at kemper.freedesktop.org
Fri Mar 25 16:00:53 PDT 2011


 tools/Package_inc.mk           |    1 -
 tools/inc/tools/svwin.h        |   34 ----------------------------------
 tools/source/fsys/filecopy.cxx |    4 +---
 3 files changed, 1 insertion(+), 38 deletions(-)

New commits:
commit 884461275d748ae60e2571958cacbce3917d4acd
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Sat Mar 26 00:00:36 2011 +0100

    Remove completely the empty tools/svwin.h

diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk
index 3ee8689..5062bd0 100644
--- a/tools/Package_inc.mk
+++ b/tools/Package_inc.mk
@@ -88,7 +88,6 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/stream.hxx,tools/stream.hx
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/string.hxx,tools/string.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/svborder.hxx,tools/svborder.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/svlibrary.hxx,tools/svlibrary.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/svwin.h,tools/svwin.h))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/table.hxx,tools/table.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/tempfile.hxx,tools/tempfile.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/tenccvt.hxx,tools/tenccvt.hxx))
diff --git a/tools/inc/tools/svwin.h b/tools/inc/tools/svwin.h
deleted file mode 100644
index e1d8d55..0000000
--- a/tools/inc/tools/svwin.h
+++ /dev/null
@@ -1,34 +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 _SVWIN_H
-#define _SVWIN_H
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/source/fsys/filecopy.cxx b/tools/source/fsys/filecopy.cxx
index 697a778..a0caeef 100755
--- a/tools/source/fsys/filecopy.cxx
+++ b/tools/source/fsys/filecopy.cxx
@@ -30,10 +30,8 @@
 #include "precompiled_tools.hxx"
 
 #if defined WNT
-#ifndef _SVWIN_H
+#include <windows.h>
 #include <io.h>
-#include <tools/svwin.h>
-#endif
 
 #elif defined(OS2)
 #include <sys/types.h>


More information about the Libreoffice-commits mailing list