summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/dlg/ConnectionHelper.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-10-24 13:34:39 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-10-25 09:53:40 +0200
commit660cace2a15bd863e0c85d61533cc52e9fa07e27 (patch)
tree013fa7cfc429401a898b079c1d68d6ec8d668205 /dbaccess/source/ui/dlg/ConnectionHelper.cxx
parent808dcac5f733ab5addcec0d3b3dcf5637aebd352 (diff)
weld OTextConnectionPageSetup
Change-Id: Iaa4fdc97be23ccd50471c26923745fd565e10653 Reviewed-on: https://gerrit.libreoffice.org/62298 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dbaccess/source/ui/dlg/ConnectionHelper.cxx')
-rw-r--r--dbaccess/source/ui/dlg/ConnectionHelper.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 7642114af693..000daa908ede 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -1315,7 +1315,7 @@ namespace dbaui
_rControlList.emplace_back( new OSaveValueWidgetWrapper<DBOConnectionURLEdit>( m_xConnectionURL.get() ) );
}
- void DBOConnectionHelper::commitURL()
+ bool DBOConnectionHelper::commitURL()
{
OUString sURL;
OUString sOldPath;
@@ -1344,7 +1344,7 @@ namespace dbaui
setURLNoPrefix(sOldPath);
SetRoadmapStateValue(false);
callModifiedHdl();
- return;
+ return false;
}
}
else
@@ -1355,10 +1355,11 @@ namespace dbaui
m_bUserGrabFocus = false;
m_xConnectionURL->grab_focus();
m_bUserGrabFocus = true;
- return;
+ return false;
+
case RET_CANCEL:
setURLNoPrefix(sOldPath);
- return;
+ return false;
}
}
}
@@ -1366,6 +1367,7 @@ namespace dbaui
setURLNoPrefix(sURL);
m_xConnectionURL->SaveValueNoPrefix();
+ return true;
}
void DBOConnectionHelper::askForFileName(::sfx2::FileDialogHelper& _aFileOpen)