From 99d5297d0b97bd3265d3c550134d7aa0e914172f Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 12 Sep 2011 14:55:28 +0300 Subject: Drop Win9x code --- svl/Library_svl.mk | 1 - svl/source/svdde/ddeimp.hxx | 1 - svl/source/svdde/ddewrap.cxx | 102 ------------------------------------------- svl/source/svdde/ddewrap.hxx | 27 ------------ 4 files changed, 131 deletions(-) delete mode 100644 svl/source/svdde/ddewrap.cxx delete mode 100644 svl/source/svdde/ddewrap.hxx (limited to 'svl') diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index b091d71efc69..6302f3850c52 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -157,7 +157,6 @@ $(eval $(call gb_Library_add_exception_objects,svl,\ svl/source/svdde/ddeinf \ svl/source/svdde/ddestrg \ svl/source/svdde/ddesvr \ - svl/source/svdde/ddewrap \ )) $(eval $(call gb_Library_add_linked_libs,svl,\ diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx index bf9bb50fde1f..d3b7d84221bd 100644 --- a/svl/source/svdde/ddeimp.hxx +++ b/svl/source/svdde/ddeimp.hxx @@ -31,7 +31,6 @@ #include #include -#include "ddewrap.hxx" #include #include diff --git a/svl/source/svdde/ddewrap.cxx b/svl/source/svdde/ddewrap.cxx deleted file mode 100644 index 8673dfbab4d1..000000000000 --- a/svl/source/svdde/ddewrap.cxx +++ /dev/null @@ -1,102 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svl.hxx" -#define _SVTOOLS_SVDDE_DDEWRAP_CXX_ - -#if defined _MSC_VER -#pragma warning(push, 1) -#endif -#include -#if defined _MSC_VER -#pragma warning(pop) -#endif -#include "ddewrap.hxx" - -//------------------------------------------------------------------------ - -HSZ WINAPI DdeCreateStringHandleW_9x( DWORD idInst, LPCWSTR pszString, int ) -{ - HSZ hszResult; - LPSTR pszANSIString; - int nSize; - - nSize = pszString ? WideCharToMultiByte( CP_ACP, 0, pszString, -1, NULL, 0, NULL, NULL ) : 0; - pszANSIString = nSize ? (LPSTR)HeapAlloc( GetProcessHeap(), 0, nSize * sizeof(CHAR) ) : NULL; - - if ( pszANSIString ) - WideCharToMultiByte( CP_ACP, 0, pszString, -1, pszANSIString, nSize, NULL, NULL ); - - hszResult = DdeCreateStringHandleA( idInst, pszANSIString, CP_WINANSI ); - - if ( pszANSIString ) - HeapFree( GetProcessHeap(), 0, pszANSIString ); - - return hszResult; -} - -//------------------------------------------------------------------------ - -DWORD WINAPI DdeQueryStringW_9x( DWORD idInst, HSZ hsz, LPWSTR pszString, DWORD cchMax, int ) -{ - DWORD dwResult; - LPSTR pszANSIString; - - pszANSIString = cchMax ? (LPSTR)HeapAlloc( GetProcessHeap(), 0, cchMax * sizeof(CHAR) ) : NULL; - - dwResult = DdeQueryStringA( idInst, hsz, pszANSIString, cchMax, CP_WINANSI ); - - if ( dwResult && pszANSIString ) - MultiByteToWideChar( CP_ACP, 0, pszANSIString, -1, pszString, cchMax ); - - if ( pszANSIString ) - HeapFree( GetProcessHeap(), 0, pszANSIString ); - - return dwResult; -} - -//------------------------------------------------------------------------ - -UINT WINAPI DdeInitializeW_9x( LPDWORD pidInst, PFNCALLBACK pfnCallback, DWORD afCmd, DWORD ulRes ) -{ - return DdeInitializeA( pidInst, pfnCallback, afCmd, ulRes ); -} - -//------------------------------------------------------------------------ - -#define DEFINE_WAPI_FUNC(func) \ -func##_PROC lpfn##func = (LONG)GetVersion() >= 0 ? func : func##_9x; - - -DEFINE_WAPI_FUNC( DdeCreateStringHandleW ); -DEFINE_WAPI_FUNC( DdeQueryStringW ); -DEFINE_WAPI_FUNC( DdeInitializeW ); - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/svdde/ddewrap.hxx b/svl/source/svdde/ddewrap.hxx deleted file mode 100644 index 75945383a55b..000000000000 --- a/svl/source/svdde/ddewrap.hxx +++ /dev/null @@ -1,27 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -#ifndef _SVTOOLS_SVDDE_DDEWRAP_HXX_ -#define _SVTOOLS_SVDDE_DDEWRAP_HXX_ - -#define DECLARE_WAPI_FUNC(func) \ - extern func##_PROC lpfn##func; - -typedef HSZ (WINAPI *DdeCreateStringHandleW_PROC)( DWORD idInst, LPCWSTR pszString, int iCodePage ); -typedef DWORD (WINAPI *DdeQueryStringW_PROC)( DWORD idInst, HSZ hsz, LPWSTR pszString, DWORD cchMax, int iCodePage ); -typedef UINT (WINAPI *DdeInitializeW_PROC)( LPDWORD pidInst, PFNCALLBACK pfnCallback, DWORD afCmd, DWORD ulRes ); - - -DECLARE_WAPI_FUNC( DdeCreateStringHandleW ); -DECLARE_WAPI_FUNC( DdeQueryStringW ); -DECLARE_WAPI_FUNC( DdeInitializeW ); - - -#ifndef _SVTOOLS_SVDDE_DDEWRAP_CXX_ -#define DdeCreateStringHandleW lpfnDdeCreateStringHandleW -#define DdeQueryStringW lpfnDdeQueryStringW -#define DdeInitializeW lpfnDdeInitializeW -#endif - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit