[Libreoffice-commits] .: binfilter/bf_so3 binfilter/bf_sw xmerge/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Mon Feb 7 07:02:54 PST 2011
binfilter/bf_so3/source/ole/soole.h | 11 --
binfilter/bf_sw/source/core/except/sw_dbgloop.cxx | 119 ----------------------
xmerge/source/activesync/XMergeSync.rc | 14 --
3 files changed, 144 deletions(-)
New commits:
commit b41eb4e522730fd375a71d9efbc307fb72978616
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Feb 7 16:02:46 2011 +0100
Remove dead code and one unused file
diff --git a/binfilter/bf_so3/source/ole/soole.h b/binfilter/bf_so3/source/ole/soole.h
index 0c94dc9..73b894d 100644
--- a/binfilter/bf_so3/source/ole/soole.h
+++ b/binfilter/bf_so3/source/ole/soole.h
@@ -45,18 +45,11 @@
#define WIN32ANSI
#endif
-//#ifdef INC_OLEUI
#ifdef WIN32
-/*
- * Comment the next line and remove the comment from the
- * line after it to compile for Windows NT 3.5.
- */
#include <oledlg.h>
-//#include <ole2ui.h>
#else
#include <ole2ui.h>
#endif
-//#endif
#ifdef INC_CONTROLS
#define INC_AUTOMATION
@@ -424,7 +417,6 @@ STDAPI StarObject_OleCreateFromFile(REFCLSID, LPCSTR, REFIID
, DWORD, LPFORMATETC, LPOLECLIENTSITE, LPSTORAGE, LPVOID *);
#ifdef skbdkbasdfbasbjdas
-//#ifndef NOMACROREDIRECT
#undef StringFromCLSID
#define StringFromCLSID(c, pp) StarObject_StringFromCLSID(c, pp)
@@ -452,9 +444,6 @@ STDAPI StarObject_OleCreateFromFile(REFCLSID, LPCSTR, REFIID
#undef CreateFileMoniker
#define CreateFileMoniker(p, i) StarObject_CreateFileMoniker(p, i)
-//#undef CreateItemMoniker
-//#define CreateItemMoniker(p1, p2, i) StarObject_CreateItemMoniker(p1, p2, i)
-
#undef MkParseDisplayName
#define MkParseDisplayName(b, p, u, i) StarObject_MkParseDisplayName(b, p, u, i)
diff --git a/binfilter/bf_sw/source/core/except/sw_dbgloop.cxx b/binfilter/bf_sw/source/core/except/sw_dbgloop.cxx
deleted file mode 100644
index 68a46a7..0000000
--- a/binfilter/bf_sw/source/core/except/sw_dbgloop.cxx
+++ /dev/null
@@ -1,119 +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.
- *
- ************************************************************************/
-
-namespace binfilter {
-
-//DbgLoopStack DbgLoop::aDbgLoopStack;
-
-/*************************************************************************
- * class DbgLoopStack
- *************************************************************************/
-
-///*N*/ DbgLoopStack::DbgLoopStack()
-///*N*/ {
-///*N*/ Reset();
-///*N*/ }
-
-///*N*/ void DbgLoopStack::Reset()
-///*N*/ {
-///*N*/ nPtr = 0;
-///*N*/ pDbg = 0;
-///*N*/ for( USHORT i = 0; i < DBG_MAX_STACK; ++i )
-///*N*/ aCount[i] = 0;
-///*N*/ }
-
-/*************************************************************************
- * DbgLoopStack::Push()
- *************************************************************************/
-
-///*N*/ void DbgLoopStack::Push( const void *pThis )
-///*N*/ {
-///*N*/ // Wir muessen irgendwie mitbekommen, wann die erste Stackposition
-///*N*/ // resettet werden soll, z.B. wenn wir einen Nullpointer uebergeben
-///*N*/ if( !nPtr && ( pDbg != pThis || !pThis ) )
-///*N*/ {
-///*N*/ aCount[1] = 0;
-///*N*/ pDbg = pThis;
-///*N*/ }
-///*N*/
-///*N*/ ++nPtr;
-///*N*/ if( DBG_MAX_STACK > nPtr )
-///*N*/ {
-///*N*/ // Wenn eine loop entdeckt wird, wird der counter wieder zurueckgesetzt.
-///*N*/ ASSERT( DBG_MAX_LOOP > aCount[nPtr], "DbgLoopStack::Push: loop detected" );
-///*N*/ if( DBG_MAX_LOOP > aCount[nPtr] )
-///*N*/ ++(aCount[nPtr]);
-///*N*/ else
-///*N*/ aCount[nPtr] = 0;
-///*N*/ }
-///*N*/ }
-
-/*************************************************************************
- * DbgLoopStack::Pop()
- *************************************************************************/
-
-///*N*/ void DbgLoopStack::Pop()
-///*N*/ {
-///*N*/ if( DBG_MAX_STACK > nPtr )
-///*N*/ {
-///*N*/ ASSERT( nPtr, "DbgLoopStack::Pop: can't pop the stack" );
-///*N*/
-///*N*/ ASSERT( aCount[nPtr], "DbgLoopStack::Pop: can't dec the count" );
-///*N*/ if( DBG_MAX_STACK > nPtr + 1 )
-///*N*/ aCount[nPtr + 1] = 0;
-///*N*/ }
-///*N*/ --nPtr;
-///*N*/ }
-
-/*************************************************************************
- * DbgLoopStack::Print()
- *************************************************************************/
-
-
-//#ifdef STAND_ALONE
-// compile with: cl /AL /DSTAND_ALONE dbgloop.cxx
-
-/*************************************************************************
- * main()
- *************************************************************************/
-
-//#include <stdlib.h>
-
-///*N*/ void AssertFail( const char *pErr, const char *pFile, USHORT nLine )
-///*N*/ {
-///*N*/ cout << pErr << '\n';
-/////*N*/ PrintLoopStack( cout );
-///*N*/ exit(0);
-///*N*/ }
-
-//#endif
-
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmerge/source/activesync/XMergeSync.rc b/xmerge/source/activesync/XMergeSync.rc
index b355bca..3e9d24d 100644
--- a/xmerge/source/activesync/XMergeSync.rc
+++ b/xmerge/source/activesync/XMergeSync.rc
@@ -2,20 +2,6 @@
//
#include "resource.h"
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-<<<<<<< XMergeSync.rc
-// #include "afxres.h"
-=======
-//#include "afxres.h"
->>>>>>> 1.1.12.1
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
/////////////////////////////////////////////////////////////////////////////
// English (Ireland) resources
More information about the Libreoffice-commits
mailing list