diff options
author | Xiaofei Zhang <Zhangxiaofei@openoffice.org> | 2010-11-10 13:50:33 +0800 |
---|---|---|
committer | Xiaofei Zhang <Zhangxiaofei@openoffice.org> | 2010-11-10 13:50:33 +0800 |
commit | fa1f3c352c6126b24ab5af87ea4ebea742c546c2 (patch) | |
tree | 5a5240e4969fee626bb060bd386fceb957081f90 /idl/source/prj | |
parent | d0097a3f35e5e2c68d293d604a2f6f51b2d822a5 (diff) | |
parent | 3c21373571fd0cf89391502aa132c5f420cd75c6 (diff) |
removetooltypes01: #i112600# resync to DEV300_m92; remove tooltypes from xmloff, linguistic, vcl, svtools, accessibility, fpicker, uui and framework
Diffstat (limited to 'idl/source/prj')
-rwxr-xr-x | idl/source/prj/database.cxx | 6 | ||||
-rwxr-xr-x | idl/source/prj/globals.cxx | 10 | ||||
-rw-r--r-- | idl/source/prj/idldll.cxx | 79 | ||||
-rw-r--r-- | idl/source/prj/makefile.mk | 1 |
4 files changed, 0 insertions, 96 deletions
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx index 4050e593d870..9f3be2ccea86 100755 --- a/idl/source/prj/database.cxx +++ b/idl/source/prj/database.cxx @@ -698,10 +698,8 @@ SvMetaClass * SvIdlDataBase::ReadKnownClass( SvTokenStream & rInStm ) *************************************************************************/ void SvIdlDataBase::Write( const ByteString & rText ) { -#ifndef W31 if( nVerbosity != 0 ) fprintf( stdout, "%s", rText.GetBuffer() ); -#endif } /************************************************************************* @@ -715,7 +713,6 @@ void SvIdlDataBase::WriteError( const ByteString & rErrWrn, sal_uIntPtr nRow, sal_uIntPtr nColumn ) const { //Fehlerbehandlung -#ifndef W31 fprintf( stderr, "\n%s --- %s: ( %ld, %ld )\n", rFileName.GetBuffer(), rErrWrn.GetBuffer(), nRow, nColumn ); @@ -723,7 +720,6 @@ void SvIdlDataBase::WriteError( const ByteString & rErrWrn, { // Fehler gesetzt fprintf( stderr, "\t%s\n", rErrorText.GetBuffer() ); } -#endif } /************************************************************************* @@ -734,7 +730,6 @@ void SvIdlDataBase::WriteError( const ByteString & rErrWrn, void SvIdlDataBase::WriteError( SvTokenStream & rInStm ) { //Fehlerbehandlung -#ifndef W31 String aFileName( rInStm.GetFileName() ); ByteString aErrorText; sal_uIntPtr nRow = 0, nColumn = 0; @@ -794,7 +789,6 @@ void SvIdlDataBase::WriteError( SvTokenStream & rInStm ) if( aN.Len() ) fprintf( stderr, "%s versus %s\n", pTok->GetString().GetBuffer(), aN.GetBuffer() ); } -#endif } /****************** SvIdlWorkingBase ****************************************/ diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx index 9966b85fb344..d213fc06b16a 100755 --- a/idl/source/prj/globals.cxx +++ b/idl/source/prj/globals.cxx @@ -35,15 +35,6 @@ #include <database.hxx> /****************** G L O B A L S ****************************************/ -#ifdef DOS -static IdlDll * pApp = NULL; -IdlDll * GetIdlApp() -{ - if( !pApp ) - pApp = new IdlDll(); - return pApp; -} -#else IdlDll * GetIdlApp() { if( !(*(IdlDll**)GetAppData(SHL_IDL)) ) @@ -55,7 +46,6 @@ IdlDll * GetIdlApp() } return (*(IdlDll**)GetAppData(SHL_IDL)); } -#endif IdlDll::IdlDll() : pHashTable( NULL ) diff --git a/idl/source/prj/idldll.cxx b/idl/source/prj/idldll.cxx deleted file mode 100644 index 607cc91e1bf6..000000000000 --- a/idl/source/prj/idldll.cxx +++ /dev/null @@ -1,79 +0,0 @@ -/************************************************************************* - * - * 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_idl.hxx" - -#ifdef WIN -#include <svwin.h> - -#ifndef _SYSDEP_HXX -#include <sysdep.hxx> -#endif - -// Statische DLL-Verwaltungs-Variablen -static HINSTANCE hDLLInst = 0; // HANDLE der DLL - - -/*************************************************************************** -|* -|* LibMain() -|* -|* Beschreibung Initialisierungsfunktion der DLL -|* Ersterstellung TH 05.05.93 -|* Letzte Aenderung TH 05.05.93 -|* -***************************************************************************/ - -extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR ) -{ -#ifndef WNT - if ( nHeap ) - UnlockData( 0 ); -#endif - - hDLLInst = hDLL; - - return TRUE; -} - -/*************************************************************************** -|* -|* WEP() -|* -|* Beschreibung DLL-Deinitialisierung -|* Ersterstellung TH 05.05.93 -|* Letzte Aenderung TH 05.05.93 -|* -***************************************************************************/ - -extern "C" int CALLBACK WEP( int ) -{ - return 1; -} - -#endif diff --git a/idl/source/prj/makefile.mk b/idl/source/prj/makefile.mk index 3e0a55a7fd05..c33d2e9f3d7a 100644 --- a/idl/source/prj/makefile.mk +++ b/idl/source/prj/makefile.mk @@ -41,7 +41,6 @@ CDEFS+=-DIDL_COMPILER OBJFILES= $(OBJ)$/command.obj \ $(OBJ)$/svidl.obj \ $(OBJ)$/globals.obj \ - $(OBJ)$/idldll.obj \ $(OBJ)$/database.obj # --- Targets ------------------------------------------------------------ |