INTEGRATION: CWS warnings01 (1.4.74); FILE MERGED

2006/03/24 15:36:09 fs 1.4.74.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro)
This commit is contained in:
Jens-Heiner Rechtien 2006-06-20 02:03:28 +00:00
parent 51fd11a550
commit 91b56d9d14

View file

@ -4,9 +4,9 @@
* *
* $RCSfile: DBSetupConnectionPages.hxx,v $ * $RCSfile: DBSetupConnectionPages.hxx,v $
* *
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* last change: $Author: hr $ $Date: 2005-09-23 12:26:45 $ * last change: $Author: hr $ $Date: 2006-06-20 03:03:28 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -157,10 +157,10 @@ namespace dbaui
, const SfxItemSet& _rCoreAttrs , const SfxItemSet& _rCoreAttrs
, USHORT _nPortId , USHORT _nPortId
, USHORT _nDefaultPortResId , USHORT _nDefaultPortResId
, char* _pDriverName , const sal_Char* _pDriverName
, USHORT _nHelpTextResId , USHORT _nHelpTextResId
, USHORT _nHeaderTextResId , USHORT _nHeaderTextResId
, USHORT _nDriverClassId = -1); , USHORT _nDriverClassId );
static OGenericAdministrationPage* CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); static OGenericAdministrationPage* CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
static OGenericAdministrationPage* CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); static OGenericAdministrationPage* CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
virtual Link getControlModifiedLink() { return LINK(this, OGeneralSpecialJDBCConnectionPageSetup, OnEditModified); } virtual Link getControlModifiedLink() { return LINK(this, OGeneralSpecialJDBCConnectionPageSetup, OnEditModified); }
@ -201,10 +201,8 @@ namespace dbaui
class OJDBCConnectionPageSetup : public OConnectionTabPageSetup class OJDBCConnectionPageSetup : public OConnectionTabPageSetup
{ {
public: public:
OJDBCConnectionPageSetup( Window* pParent OJDBCConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs );
, USHORT _nResId static OGenericAdministrationPage* CreateJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
, const SfxItemSet& _rCoreAttrs);
static OGenericAdministrationPage* CreateJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
protected: protected:
virtual bool checkTestConnection(); virtual bool checkTestConnection();