summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dbaccess/source/ui/inc/FieldControls.hxx2
-rw-r--r--dbaccess/source/ui/inc/SqlNameEdit.hxx8
-rw-r--r--dbaccess/source/ui/tabledesign/TEditControl.cxx2
3 files changed, 6 insertions, 6 deletions
diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx
index b0392e8d802d..0fb95c02d8e3 100644
--- a/dbaccess/source/ui/inc/FieldControls.hxx
+++ b/dbaccess/source/ui/inc/FieldControls.hxx
@@ -62,7 +62,7 @@ namespace dbaui
sal_uInt16 nHelpId,
short nPosition,
WinBits nWinStyle)
- :OSQLNameEdit(pParent, _rAllowedChars,nWinStyle)
+ :OSQLNameEdit(pParent, nWinStyle, _rAllowedChars)
,m_nPos(nPosition)
{
m_strHelpText = ModuleRes(nHelpId);
diff --git a/dbaccess/source/ui/inc/SqlNameEdit.hxx b/dbaccess/source/ui/inc/SqlNameEdit.hxx
index d192fde38f49..b3c32fe3015b 100644
--- a/dbaccess/source/ui/inc/SqlNameEdit.hxx
+++ b/dbaccess/source/ui/inc/SqlNameEdit.hxx
@@ -56,7 +56,7 @@ namespace dbaui
,public OSQLNameChecker
{
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)
,OSQLNameChecker(_rAllowedChars)
{
@@ -77,14 +77,14 @@ namespace dbaui
,public OSQLNameChecker
{
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)
- ,OSQLNameChecker(_rAllowedChars)
+ , OSQLNameChecker(_rAllowedChars)
{
}
OSQLNameComboBox(Window* _pParent,const ResId& _rRes,const OUString& _rAllowedChars = OUString())
: ComboBox(_pParent,_rRes)
- ,OSQLNameChecker(_rAllowedChars)
+ , OSQLNameChecker(_rAllowedChars)
{
}
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 2a5cd9a90ca1..7f5cc4474f28 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -229,7 +229,7 @@ void OTableEditorCtrl::InitCellController()
OSL_FAIL("getMaxColumnNameLength");
}
- pNameCell = new OSQLNameEdit( &GetDataWindow(), sExtraNameChars,WB_LEFT );
+ pNameCell = new OSQLNameEdit(&GetDataWindow(), WB_LEFT, sExtraNameChars);
pNameCell->SetMaxTextLen( nMaxTextLen );
pNameCell->setCheck( isSQL92CheckEnabled(xCon) );