Tag: cws_src680_codecleanup01 User: mt Date: 05/07/26 05:40:57 Modified: /dba/dbaccess/source/ui/dlg/ ConnectionHelper.cxx, ConnectionPage.cxx, adodatalinks.cxx, dlgattr.cxx, dsselect.cxx, odbcconfig.cxx, odbcconfig.hxx /dba/dbaccess/source/ui/misc/ TokenWriter.cxx
Log: #i51441# Removed old code... File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: ConnectionHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ConnectionHelper.cxx?r1=1.6&r2=1.6.68.1 Delta lines: +4 -4 ------------------- --- ConnectionHelper.cxx 10 Mar 2005 16:47:00 -0000 1.6 +++ ConnectionHelper.cxx 26 Jul 2005 12:40:47 -0000 1.6.68.1 @@ -2,9 +2,9 @@ * * $RCSfile: ConnectionHelper.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.6.68.1 $ * - * last change: $Author: vg $ $Date: 2005/03/10 16:47:00 $ + * last change: $Author: mt $ $Date: 2005/07/26 12:40:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -177,7 +177,7 @@ #ifndef _SFX_DOCFILT_HACK_HXX #include <sfx2/docfilt.hxx> #endif -#if defined(WIN) || defined(WNT) +#if defined(WNT) #define _ADO_DATALINK_BROWSE_ #endif File [changed]: ConnectionPage.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ConnectionPage.cxx?r1=1.10&r2=1.10.64.1 Delta lines: +4 -4 ------------------- --- ConnectionPage.cxx 18 Mar 2005 10:09:18 -0000 1.10 +++ ConnectionPage.cxx 26 Jul 2005 12:40:48 -0000 1.10.64.1 @@ -2,9 +2,9 @@ * * $RCSfile: ConnectionPage.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.10.64.1 $ * - * last change: $Author: obo $ $Date: 2005/03/18 10:09:18 $ + * last change: $Author: mt $ $Date: 2005/07/26 12:40:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -183,7 +183,7 @@ #ifndef _SFX_DOCFILT_HACK_HXX #include <sfx2/docfilt.hxx> #endif -#if defined(WIN) || defined(WNT) +#if defined(WNT) #define _ADO_DATALINK_BROWSE_ #endif File [changed]: adodatalinks.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/adodatalinks.cxx?r1=1.2&r2=1.2.222.1 Delta lines: +3 -3 ------------------- --- adodatalinks.cxx 17 Mar 2004 10:44:03 -0000 1.2 +++ adodatalinks.cxx 26 Jul 2005 12:40:50 -0000 1.2.222.1 @@ -2,9 +2,9 @@ * * $RCSfile: adodatalinks.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.222.1 $ * - * last change: $Author: obo $ $Date: 2004/03/17 10:44:03 $ + * last change: $Author: mt $ $Date: 2005/07/26 12:40:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ -#if defined(WIN) || defined(WNT) +#if defined(WNT) #include "msdasc.h" // OLE DB Service Component header #include "stdio.h" File [changed]: dlgattr.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dlgattr.cxx?r1=1.5&r2=1.5.170.1 Delta lines: +3 -9 ------------------- --- dlgattr.cxx 2 Aug 2004 17:18:09 -0000 1.5 +++ dlgattr.cxx 26 Jul 2005 12:40:50 -0000 1.5.170.1 @@ -2,9 +2,9 @@ * * $RCSfile: dlgattr.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.5.170.1 $ * - * last change: $Author: hr $ $Date: 2004/08/02 17:18:09 $ + * last change: $Author: mt $ $Date: 2005/07/26 12:40:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,12 +59,6 @@ * ************************************************************************/ - -#ifdef MAC -#ifdef ITEMID_NUMBERINFO -#undef ITEMID_NUMBERINFO -#endif -#endif #define ITEMID_NUMBERINFO 0 File [changed]: dsselect.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dsselect.cxx?r1=1.13&r2=1.13.70.1 Delta lines: +4 -4 ------------------- --- dsselect.cxx 10 Mar 2005 16:50:10 -0000 1.13 +++ dsselect.cxx 26 Jul 2005 12:40:51 -0000 1.13.70.1 @@ -2,9 +2,9 @@ * * $RCSfile: dsselect.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.13.70.1 $ * - * last change: $Author: vg $ $Date: 2005/03/10 16:50:10 $ + * last change: $Author: mt $ $Date: 2005/07/26 12:40:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,7 +85,7 @@ #include <tools/rcid.h> #endif -#if defined( WIN ) || defined( WNT ) +#if defined( WNT ) #define HWND void* #define HMENU void* typedef void* HDC; File [changed]: odbcconfig.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/odbcconfig.cxx?r1=1.12&r2=1.12.160.1 Delta lines: +7 -11 -------------------- --- odbcconfig.cxx 8 Sep 2004 16:30:07 -0000 1.12 +++ odbcconfig.cxx 26 Jul 2005 12:40:52 -0000 1.12.160.1 @@ -2,9 +2,9 @@ * * $RCSfile: odbcconfig.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.12.160.1 $ * - * last change: $Author: rt $ $Date: 2004/09/08 16:30:07 $ + * last change: $Author: mt $ $Date: 2005/07/26 12:40:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,10 +75,6 @@ #ifdef HAVE_ODBC_SUPPORT -#ifdef WIN -#define ODBC_LIBRARY "ODBC.DLL" -#define ODBC_UI_LIBRARY "ODBCINST.DLL" -#endif #if defined WNT #define ODBC_LIBRARY "ODBC32.DLL" #define ODBC_UI_LIBRARY "ODBCCP32.DLL" @@ -97,9 +93,9 @@ // just to go with calling convention of windows // so don't touch this -#if defined(WIN) || defined(WNT) +#if defined(WNT) #define SQL_API __stdcall -#endif // defined(WIN) || defined(WNT) +#endif // defined(WNT) #ifdef SYSTEM_ODBC_HEADERS #include <sqlext.h> @@ -109,10 +105,10 @@ #endif #endif -#if defined(WIN) || defined(WNT) +#if defined(WNT) #undef SQL_API #define SQL_API __stdcall -#endif // defined(WIN) || defined(WNT) +#endif // defined(WNT) // from here on you can do what you want to File [changed]: odbcconfig.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/odbcconfig.hxx?r1=1.4&r2=1.4.352.1 Delta lines: +5 -5 ------------------- --- odbcconfig.hxx 6 Jun 2003 10:48:52 -0000 1.4 +++ odbcconfig.hxx 26 Jul 2005 12:40:52 -0000 1.4.352.1 @@ -2,9 +2,9 @@ * * $RCSfile: odbcconfig.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.4.352.1 $ * - * last change: $Author: vg $ $Date: 2003/06/06 10:48:52 $ + * last change: $Author: mt $ $Date: 2005/07/26 12:40:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,10 +62,10 @@ #ifndef _DBAUI_ODBC_CONFIG_HXX_ #define _DBAUI_ODBC_CONFIG_HXX_ -#if defined(WIN) || defined(WNT) || defined (UNX) +#if defined(WNT) || defined (UNX) #define HAVE_ODBC_SUPPORT #endif -#if ( defined(WIN) || defined(WNT) ) && defined(HAVE_ODBC_SUPPORT) +#if ( defined(WNT) ) && defined(HAVE_ODBC_SUPPORT) #define HAVE_ODBC_ADMINISTRATION #endif Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: TokenWriter.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/TokenWriter.cxx?r1=1.25&r2=1.25.48.1 Delta lines: +4 -11 -------------------- --- TokenWriter.cxx 13 Apr 2005 08:35:45 -0000 1.25 +++ TokenWriter.cxx 26 Jul 2005 12:40:54 -0000 1.25.48.1 @@ -2,9 +2,9 @@ * * $RCSfile: TokenWriter.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.25.48.1 $ * - * last change: $Author: obo $ $Date: 2005/04/13 08:35:45 $ + * last change: $Author: mt $ $Date: 2005/07/26 12:40:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -158,9 +158,7 @@ using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::awt; -#if defined(MAC) -const char __FAR_DATA ODatabaseImportExport::sNewLine = '\015'; -#elif defined(UNX) +#if defined(UNX) const char __FAR_DATA ODatabaseImportExport::sNewLine = '\012'; #else const char __FAR_DATA ODatabaseImportExport::sNewLine[] = "\015\012"; @@ -426,13 +424,8 @@ BOOL ORTFImportExport::Write() { (*m_pStream) << '{' << sRTF_RTF; -#ifdef MAC - (*m_pStream) << sRTF_MAC << ODatabaseImportExport::sNewLine; - rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_APPLE_ROMAN; -#else (*m_pStream) << sRTF_ANSI << ODatabaseImportExport::sNewLine; rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252; -#endif /* // Access RTF Export Beispiel --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
