summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2011-09-12 14:40:51 +0300
committerTor Lillqvist <tlillqvist@suse.com>2011-09-12 15:30:29 +0300
commit2d1454a81b4fd59abadcb57bd53e6f506747350d (patch)
tree8074d58ce8bcf91b6ddc6ac37da645f513665485
parent83dbf6887908932cfdc0e30d28019e3367e0434b (diff)
Drop Win9x code
-rw-r--r--desktop/win32/source/lwrapa.cxx35
-rwxr-xr-xdesktop/win32/source/main.h1
-rwxr-xr-xdesktop/win32/source/makefile.mk3
-rw-r--r--desktop/win32/source/rwrapa.cxx35
-rw-r--r--desktop/win32/source/sowrapper.cxx5
-rw-r--r--desktop/win32/source/wrappera.cxx34
6 files changed, 1 insertions, 112 deletions
diff --git a/desktop/win32/source/lwrapa.cxx b/desktop/win32/source/lwrapa.cxx
deleted file mode 100644
index eba3059da517..000000000000
--- a/desktop/win32/source/lwrapa.cxx
+++ /dev/null
@@ -1,35 +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.
- *
- ************************************************************************/
-
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_desktop.hxx"
-#define LOCAL
-#include "wrapper.h"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/main.h b/desktop/win32/source/main.h
index 9e3039da1884..1beb8b933a3e 100755
--- a/desktop/win32/source/main.h
+++ b/desktop/win32/source/main.h
@@ -5,7 +5,6 @@
extern "C" {
#endif
-int MainA();
int MainW();
#ifdef __cplusplus
diff --git a/desktop/win32/source/makefile.mk b/desktop/win32/source/makefile.mk
index 564ba319eb56..b74ffc8f3213 100755
--- a/desktop/win32/source/makefile.mk
+++ b/desktop/win32/source/makefile.mk
@@ -41,11 +41,8 @@ UWINAPILIB =
# --- Files --------------------------------------------------------
OBJFILES = \
- $(OBJ)$/wrappera.obj \
$(OBJ)$/wrapperw.obj \
- $(OBJ)$/lwrapa.obj \
$(OBJ)$/lwrapw.obj \
- $(OBJ)$/rwrapa.obj \
$(OBJ)$/rwrapw.obj \
$(OBJ)$/sowrapper.obj \
$(OBJ)$/extendloaderenvironment.obj \
diff --git a/desktop/win32/source/rwrapa.cxx b/desktop/win32/source/rwrapa.cxx
deleted file mode 100644
index 080cb4e4be05..000000000000
--- a/desktop/win32/source/rwrapa.cxx
+++ /dev/null
@@ -1,35 +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.
- *
- ************************************************************************/
-
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_desktop.hxx"
-#define REMOTE
-#include "wrapper.h"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/sowrapper.cxx b/desktop/win32/source/sowrapper.cxx
index f62536a86525..7533679690cc 100644
--- a/desktop/win32/source/sowrapper.cxx
+++ b/desktop/win32/source/sowrapper.cxx
@@ -41,10 +41,7 @@
int APIENTRY WinMain( HINSTANCE, HINSTANCE, LPSTR, int )
{
- if ( (LONG)GetVersion() < 0 )
- return MainA();
- else
- return MainW();
+ return MainW();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/wrappera.cxx b/desktop/win32/source/wrappera.cxx
deleted file mode 100644
index 0a74b1030a3a..000000000000
--- a/desktop/win32/source/wrappera.cxx
+++ /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.
- *
- ************************************************************************/
-
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_desktop.hxx"
-#include "wrapper.h"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */