User: hr Date: 06/06/19 20:11:24 Modified: /dba/dbaccess/source/ui/inc/ FieldControls.hxx
Log: INTEGRATION: CWS warnings01 (1.5.50); FILE MERGED 2006/03/24 15:36:14 fs 1.5.50.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro) File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: FieldControls.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/FieldControls.hxx?r1=1.5&r2=1.6 Delta lines: +18 -24 --------------------- --- FieldControls.hxx 8 Sep 2005 15:16:49 -0000 1.5 +++ FieldControls.hxx 20 Jun 2006 03:11:22 -0000 1.6 @@ -54,29 +54,26 @@ namespace dbaui { - class OSpecialReadOnly + namespace { - protected: - void SetSpecialReadOnly(BOOL _bReadOnly,Window *pWin) + void lcl_setSpecialReadOnly( BOOL _bReadOnly, Window* _pWin ) { StyleSettings aSystemStyle = Application::GetSettings().GetStyleSettings(); const Color& rNewColor = _bReadOnly ? aSystemStyle.GetDialogColor() : aSystemStyle.GetFieldColor(); - pWin->SetBackground(Wallpaper(rNewColor)); - pWin->SetControlBackground(rNewColor); + _pWin->SetBackground(Wallpaper(rNewColor)); + _pWin->SetControlBackground(rNewColor); } - public: - virtual void SetSpecialReadOnly(BOOL _bReadOnly) = 0; - }; + } + //================================================================== class OPropColumnEditCtrl : public OSQLNameEdit - ,public OSpecialReadOnly { short m_nPos; String m_strHelpText; public: inline OPropColumnEditCtrl(Window* pParent, ::rtl::OUString& _rAllowedChars, USHORT nHelpId, short nPosition = -1, WinBits nWinStyle = 0); - inline BOOL IsModified() { return GetText() != GetSavedValue(); } + inline BOOL IsModified() const { return GetText() != GetSavedValue(); } short GetPos() const { return m_nPos; } String GetHelp() const { return m_strHelpText; } @@ -84,7 +81,7 @@ virtual void SetSpecialReadOnly(BOOL _bReadOnly) { SetReadOnly(_bReadOnly); - OSpecialReadOnly::SetSpecialReadOnly(_bReadOnly,this); + lcl_setSpecialReadOnly(_bReadOnly,this); } }; inline OPropColumnEditCtrl::OPropColumnEditCtrl(Window* pParent, @@ -99,7 +96,6 @@ } //================================================================== class OPropEditCtrl : public Edit - ,public OSpecialReadOnly { short m_nPos; String m_strHelpText; @@ -108,7 +104,7 @@ inline OPropEditCtrl(Window* pParent, USHORT nHelpId, short nPosition = -1, WinBits nWinStyle = 0); inline OPropEditCtrl(Window* pParent, USHORT nHelpId, const ResId& _rRes,short nPosition = -1); - inline BOOL IsModified() { return GetText() != GetSavedValue(); } + inline BOOL IsModified() const { return GetText() != GetSavedValue(); } short GetPos() const { return m_nPos; } String GetHelp() const { return m_strHelpText; } @@ -116,7 +112,7 @@ virtual void SetSpecialReadOnly(BOOL _bReadOnly) { SetReadOnly(_bReadOnly); - OSpecialReadOnly::SetSpecialReadOnly(_bReadOnly,this); + lcl_setSpecialReadOnly(_bReadOnly,this); } }; @@ -135,7 +131,6 @@ //================================================================== class OPropNumericEditCtrl : public NumericField - ,public OSpecialReadOnly { short m_nPos; String m_strHelpText; @@ -144,7 +139,7 @@ inline OPropNumericEditCtrl(Window* pParent, USHORT nHelpId, short nPosition = -1, WinBits nWinStyle = 0); inline OPropNumericEditCtrl(Window* pParent, USHORT nHelpId, const ResId& _rRes,short nPosition = -1); - inline BOOL IsModified() { return GetText() != GetSavedValue(); } + inline BOOL IsModified() const { return GetText() != GetSavedValue(); } short GetPos() const { return m_nPos; } String GetHelp() const { return m_strHelpText; } @@ -152,7 +147,7 @@ virtual void SetSpecialReadOnly(BOOL _bReadOnly) { SetReadOnly(_bReadOnly); - OSpecialReadOnly::SetSpecialReadOnly(_bReadOnly,this); + lcl_setSpecialReadOnly(_bReadOnly,this); } }; @@ -171,7 +166,6 @@ //================================================================== class OPropListBoxCtrl : public ListBox - ,public OSpecialReadOnly { short m_nPos; String m_strHelpText; @@ -180,7 +174,7 @@ inline OPropListBoxCtrl(Window* pParent, USHORT nHelpId, short nPosition = -1, WinBits nWinStyle = 0); inline OPropListBoxCtrl(Window* pParent, USHORT nHelpId, const ResId& _rRes,short nPosition = -1); - inline BOOL IsModified() { return GetSelectEntryPos() != GetSavedValue(); } + inline BOOL IsModified() const { return GetSelectEntryPos() != GetSavedValue(); } short GetPos() const { return m_nPos; } String GetHelp() const { return m_strHelpText; } @@ -188,7 +182,7 @@ virtual void SetSpecialReadOnly(BOOL _bReadOnly) { SetReadOnly(_bReadOnly); - OSpecialReadOnly::SetSpecialReadOnly(_bReadOnly,this); + lcl_setSpecialReadOnly(_bReadOnly,this); } }; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
