summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/control/FieldDescControl.cxx
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2010-07-10 18:21:24 +0200
committerMathias Bauer <mba@openoffice.org>2010-07-10 18:21:24 +0200
commitd1f6ae4254c5f3b6047551d95fe341ac8d6dd56b (patch)
tree72e848a53a340208396efb60ac98793c3afb9698 /dbaccess/source/ui/control/FieldDescControl.cxx
parent2310854cdad328a9a964ea4a09daeba4ec8b1741 (diff)
CWS changehid: #i111874#: change code to support HelpIds as byte strings
Diffstat (limited to 'dbaccess/source/ui/control/FieldDescControl.cxx')
-rw-r--r--dbaccess/source/ui/control/FieldDescControl.cxx13
1 files changed, 4 insertions, 9 deletions
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 95fcbf5e150d..c5c2a084b64a 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -1070,14 +1070,9 @@ void OFieldDescControl::ActivateAggregate( EControlType eType )
}
}
// -----------------------------------------------------------------------------
-void OFieldDescControl::InitializeControl(Control* _pControl,ULONG _nHelpId,bool _bAddChangeHandler)
+void OFieldDescControl::InitializeControl(Control* _pControl,const ::rtl::OString& _sHelpId,bool _bAddChangeHandler)
{
- // FIXME: HELPID
- #if 0
- _pControl->SetHelpId(_nHelpId);
- #else
- (void)_nHelpId;
- #endif
+ _pControl->SetHelpId(_sHelpId);
if ( _bAddChangeHandler )
((OPropListBoxCtrl*)_pControl)->SetSelectHdl(LINK(this,OFieldDescControl,ChangeHdl));
@@ -1094,7 +1089,7 @@ FixedText* OFieldDescControl::CreateText(USHORT _nTextRes)
return pFixedText;
}
// -----------------------------------------------------------------------------
-OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(USHORT _nHelpStr,short _nProperty,ULONG _nHelpId)
+OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(USHORT _nHelpStr,short _nProperty,const rtl::OString& _sHelpId)
{
OPropNumericEditCtrl* pControl = new OPropNumericEditCtrl( this, _nHelpStr, _nProperty, WB_BORDER );
pControl->SetDecimalDigits(0);
@@ -1102,7 +1097,7 @@ OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(USHORT _nHelpStr,s
pControl->SetMax(0x7FFFFFFF); // soll draussen geaendert werden, wenn noetig
pControl->SetStrictFormat(TRUE);
- InitializeControl(pControl,_nHelpId,false);
+ InitializeControl(pControl,_sHelpId,false);
return pControl;
}