Kaydet (Commit) c234d4c2 authored tarafından Caolán McNamara's avatar Caolán McNamara

swap arguments around to smooth .ui conversions

Change-Id: Ifa2a1b30db70063521c156a1d416fbad45890546
üst 8bc81f6f
...@@ -62,7 +62,7 @@ namespace dbaui ...@@ -62,7 +62,7 @@ namespace dbaui
sal_uInt16 nHelpId, sal_uInt16 nHelpId,
short nPosition, short nPosition,
WinBits nWinStyle) WinBits nWinStyle)
:OSQLNameEdit(pParent, _rAllowedChars,nWinStyle) :OSQLNameEdit(pParent, nWinStyle, _rAllowedChars)
,m_nPos(nPosition) ,m_nPos(nPosition)
{ {
m_strHelpText = ModuleRes(nHelpId); m_strHelpText = ModuleRes(nHelpId);
......
...@@ -56,7 +56,7 @@ namespace dbaui ...@@ -56,7 +56,7 @@ namespace dbaui
,public OSQLNameChecker ,public OSQLNameChecker
{ {
public: public:
OSQLNameEdit(Window* _pParent,const OUString& _rAllowedChars, WinBits nStyle = WB_BORDER) OSQLNameEdit(Window* _pParent,WinBits nStyle = WB_BORDER, const OUString& _rAllowedChars = OUString())
: Edit(_pParent,nStyle) : Edit(_pParent,nStyle)
,OSQLNameChecker(_rAllowedChars) ,OSQLNameChecker(_rAllowedChars)
{ {
...@@ -77,14 +77,14 @@ namespace dbaui ...@@ -77,14 +77,14 @@ namespace dbaui
,public OSQLNameChecker ,public OSQLNameChecker
{ {
public: public:
OSQLNameComboBox(Window* _pParent,const OUString& _rAllowedChars, WinBits nStyle = WB_BORDER) OSQLNameComboBox(Window* _pParent,WinBits nStyle = WB_BORDER, const OUString& _rAllowedChars = OUString())
: ComboBox(_pParent,nStyle) : ComboBox(_pParent,nStyle)
,OSQLNameChecker(_rAllowedChars) , OSQLNameChecker(_rAllowedChars)
{ {
} }
OSQLNameComboBox(Window* _pParent,const ResId& _rRes,const OUString& _rAllowedChars = OUString()) OSQLNameComboBox(Window* _pParent,const ResId& _rRes,const OUString& _rAllowedChars = OUString())
: ComboBox(_pParent,_rRes) : ComboBox(_pParent,_rRes)
,OSQLNameChecker(_rAllowedChars) , OSQLNameChecker(_rAllowedChars)
{ {
} }
......
...@@ -229,7 +229,7 @@ void OTableEditorCtrl::InitCellController() ...@@ -229,7 +229,7 @@ void OTableEditorCtrl::InitCellController()
OSL_FAIL("getMaxColumnNameLength"); OSL_FAIL("getMaxColumnNameLength");
} }
pNameCell = new OSQLNameEdit( &GetDataWindow(), sExtraNameChars,WB_LEFT ); pNameCell = new OSQLNameEdit(&GetDataWindow(), WB_LEFT, sExtraNameChars);
pNameCell->SetMaxTextLen( nMaxTextLen ); pNameCell->SetMaxTextLen( nMaxTextLen );
pNameCell->setCheck( isSQL92CheckEnabled(xCon) ); pNameCell->setCheck( isSQL92CheckEnabled(xCon) );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment