diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-08-13 11:48:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-13 14:02:29 +0200 |
| commit | f70e978f4bf223d7edbb4c3a981f46938a3b3ed1 (patch) | |
| tree | f5af3e54af9a56c526321410dc611240b5f64c6b /sw | |
| parent | 0b133fdb67cc56fba46ec355283144e611e8bf83 (diff) | |
cppcheck: variableScope
Change-Id: I4dfbd80cf06acb4968556a78d3eaf394757073dc
Reviewed-on: https://gerrit.libreoffice.org/41110
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/app/docsh2.cxx | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 7dc36f163a1e..c0c662b9d9aa 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -887,34 +887,36 @@ void SwDocShell::Execute(SfxRequest& rReq) 0 }; - const char* aHTMLHelpIds[] = - { - HID_SEND_HTML_CTRL_PUSHBUTTON_OK, - HID_SEND_HTML_CTRL_PUSHBUTTON_CANCEL, - HID_SEND_HTML_CTRL_LISTBOX_FILTER, - HID_SEND_HTML_CTRL_CONTROL_FILEVIEW, - HID_SEND_HTML_CTRL_EDIT_FILEURL, - HID_SEND_HTML_CTRL_CHECKBOX_AUTOEXTENSION, - HID_SEND_HTML_CTRL_LISTBOX_TEMPLATE, - "" - }; - - const char* aMasterHelpIds[] = - { - HID_SEND_MASTER_CTRL_PUSHBUTTON_OK, - HID_SEND_MASTER_CTRL_PUSHBUTTON_CANCEL, - HID_SEND_MASTER_CTRL_LISTBOX_FILTER, - HID_SEND_MASTER_CTRL_CONTROL_FILEVIEW, - HID_SEND_MASTER_CTRL_EDIT_FILEURL, - HID_SEND_MASTER_CTRL_CHECKBOX_AUTOEXTENSION, - HID_SEND_MASTER_CTRL_LISTBOX_TEMPLATE, - "" - }; - if (bCreateHtml) + { + const char* aHTMLHelpIds[] = + { + HID_SEND_HTML_CTRL_PUSHBUTTON_OK, + HID_SEND_HTML_CTRL_PUSHBUTTON_CANCEL, + HID_SEND_HTML_CTRL_LISTBOX_FILTER, + HID_SEND_HTML_CTRL_CONTROL_FILEVIEW, + HID_SEND_HTML_CTRL_EDIT_FILEURL, + HID_SEND_HTML_CTRL_CHECKBOX_AUTOEXTENSION, + HID_SEND_HTML_CTRL_LISTBOX_TEMPLATE, + "" + }; aDlgHelper.SetControlHelpIds( nControlIds, aHTMLHelpIds ); + } else + { + const char* aMasterHelpIds[] = + { + HID_SEND_MASTER_CTRL_PUSHBUTTON_OK, + HID_SEND_MASTER_CTRL_PUSHBUTTON_CANCEL, + HID_SEND_MASTER_CTRL_LISTBOX_FILTER, + HID_SEND_MASTER_CTRL_CONTROL_FILEVIEW, + HID_SEND_MASTER_CTRL_EDIT_FILEURL, + HID_SEND_MASTER_CTRL_CHECKBOX_AUTOEXTENSION, + HID_SEND_MASTER_CTRL_LISTBOX_TEMPLATE, + "" + }; aDlgHelper.SetControlHelpIds( nControlIds, aMasterHelpIds ); + } uno::Reference < XFilePicker2 > xFP = aDlgHelper.GetFilePicker(); std::shared_ptr<const SfxFilter> pFlt; |