User: hr Date: 06/06/19 20:05:29 Modified: /dba/dbaccess/source/ui/dlg/ adminpages.hxx
Log: INTEGRATION: CWS warnings01 (1.29.48); FILE MERGED 2006/06/01 07:22:01 fs 1.29.48.3: removed include which is not needed heer 2006/05/12 16:25:13 sb 1.29.48.2: #i53898# Made code warning-free and/or compile at all after resync to SRC680m162 (and in some cases reverted previous, problematic changes). 2006/03/24 15:36:10 fs 1.29.48.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro) File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: adminpages.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/adminpages.hxx?r1=1.29&r2=1.30 Delta lines: +2 -5 ------------------- --- adminpages.hxx 8 Sep 2005 14:52:10 -0000 1.29 +++ adminpages.hxx 20 Jun 2006 03:05:26 -0000 1.30 @@ -42,9 +42,6 @@ #ifndef _DBAUI_DSNTYPES_HXX_ #include "dsntypes.hxx" #endif -#ifndef _DBAUI_CHARSETS_HXX_ -#include "charsets.hxx" -#endif #ifndef _DBAUI_COMMON_TYPES_HXX_ #include "commontypes.hxx" #endif @@ -224,6 +221,7 @@ protected: /// default implementation: call FillItemSet, call checkItems, virtual int DeactivatePage(SfxItemSet* pSet); + using SfxTabPage::DeactivatePage; /// default implementation: call implInitControls with the given item set and _bSaveValue = sal_False virtual void Reset(const SfxItemSet& _rCoreAttrs); /// default implementation: call implInitControls with the given item set and _bSaveValue = sal_True @@ -300,7 +298,7 @@ void SetControlFontWeight(Window* _pWindow, FontWeight _eWeight = WEIGHT_BOLD); void SetHeaderText( Window* _parent, USHORT _nFTResId, USHORT _StringResId); - Point MovePoint(Point _aPixelBasePoint, sal_uInt32 _XShift, sal_uInt32 _YShift); + Point MovePoint(Point _aPixelBasePoint, sal_Int32 _XShift, sal_Int32 _YShift); protected: @@ -315,7 +313,6 @@ private: void postInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); - }; //......................................................................... --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
