diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-04-20 09:07:25 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-04-20 11:16:34 +0200 |
commit | ac4ea366ec040cdb68f93d42045cba5780852d9f (patch) | |
tree | 5be6a2ecac320004551fd4bd50b66271cf5322a9 /writerperfect/source/writer/EPUBExportDialog.cxx | |
parent | 66c02d16dd078613e754dcc775f366413fad13f0 (diff) |
writerperfect: astyle -> clang-format
< vmiklos> dtardon: are you strongly attached to astyle usage in
core.git writerperfect/? my problem is that 1) when less regular
contributors touch it, they don't run astyle 2) core.git has git hooks
in place to enforce consistent style for selected files, but that uses
clang-format. i wonder if switching to the standard core.git
clang-format would be an option to stop this reformat game
<@dtardon> vmiklos, clang-format is okay. we started to use astyle years
ago, before there were even any serious talk about automatic formatting
for the whole libreoffice
Change-Id: I844fc9c2e8560e54a49f26064cc0b3c55a5f034c
Reviewed-on: https://gerrit.libreoffice.org/53184
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'writerperfect/source/writer/EPUBExportDialog.cxx')
-rw-r--r-- | writerperfect/source/writer/EPUBExportDialog.cxx | 61 |
1 files changed, 31 insertions, 30 deletions
diff --git a/writerperfect/source/writer/EPUBExportDialog.cxx b/writerperfect/source/writer/EPUBExportDialog.cxx index bf1f4a0e4cfd..fa9bc9193992 100644 --- a/writerperfect/source/writer/EPUBExportDialog.cxx +++ b/writerperfect/source/writer/EPUBExportDialog.cxx @@ -31,15 +31,15 @@ sal_Int32 VersionToPosition(sal_Int32 nVersion) switch (nVersion) { - case 30: - nPosition = 0; - break; - case 20: - nPosition = 1; - break; - default: - assert(false); - break; + case 30: + nPosition = 0; + break; + case 20: + nPosition = 1; + break; + default: + assert(false); + break; } return nPosition; @@ -52,15 +52,15 @@ sal_Int32 PositionToVersion(sal_Int32 nPosition) switch (nPosition) { - case 0: - nVersion = 30; - break; - case 1: - nVersion = 20; - break; - default: - assert(false); - break; + case 0: + nVersion = 30; + break; + case 1: + nVersion = 20; + break; + default: + assert(false); + break; } return nVersion; @@ -69,8 +69,10 @@ sal_Int32 PositionToVersion(sal_Int32 nPosition) namespace writerperfect { - -EPUBExportDialog::EPUBExportDialog(weld::Window *pParent, comphelper::SequenceAsHashMap &rFilterData, uno::Reference<uno::XComponentContext> xContext, css::uno::Reference<css::lang::XComponent> xDocument) +EPUBExportDialog::EPUBExportDialog(weld::Window* pParent, + comphelper::SequenceAsHashMap& rFilterData, + uno::Reference<uno::XComponentContext> xContext, + css::uno::Reference<css::lang::XComponent> xDocument) : GenericDialogController(pParent, "writerperfect/ui/exportepub.ui", "EpubDialog") , m_xContext(std::move(xContext)) , m_rFilterData(rFilterData) @@ -158,19 +160,19 @@ EPUBExportDialog::EPUBExportDialog(weld::Window *pParent, comphelper::SequenceAs m_xOKButton->connect_clicked(LINK(this, EPUBExportDialog, OKClickHdl)); } -IMPL_LINK_NOARG(EPUBExportDialog, VersionSelectHdl, weld::ComboBoxText &, void) +IMPL_LINK_NOARG(EPUBExportDialog, VersionSelectHdl, weld::ComboBoxText&, void) { m_rFilterData["EPUBVersion"] <<= PositionToVersion(m_xVersion->get_active()); } -IMPL_LINK_NOARG(EPUBExportDialog, SplitSelectHdl, weld::ComboBoxText &, void) +IMPL_LINK_NOARG(EPUBExportDialog, SplitSelectHdl, weld::ComboBoxText&, void) { // No conversion, 1:1 mapping between entry positions and // libepubgen::EPUBSplitMethod. m_rFilterData["EPUBSplitMethod"] <<= static_cast<sal_Int32>(m_xSplit->get_active()); } -IMPL_LINK_NOARG(EPUBExportDialog, LayoutSelectHdl, weld::ComboBoxText &, void) +IMPL_LINK_NOARG(EPUBExportDialog, LayoutSelectHdl, weld::ComboBoxText&, void) { // No conversion, 1:1 mapping between entry positions and // libepubgen::EPUBLayoutMethod. @@ -178,7 +180,7 @@ IMPL_LINK_NOARG(EPUBExportDialog, LayoutSelectHdl, weld::ComboBoxText &, void) m_xSplit->set_sensitive(m_xLayout->get_active() != libepubgen::EPUB_LAYOUT_METHOD_FIXED); } -IMPL_LINK_NOARG(EPUBExportDialog, CoverClickHdl, weld::Button &, void) +IMPL_LINK_NOARG(EPUBExportDialog, CoverClickHdl, weld::Button&, void) { SvxOpenGraphicDialog aDlg("Import", m_xDialog.get()); aDlg.EnableLink(false); @@ -186,16 +188,17 @@ IMPL_LINK_NOARG(EPUBExportDialog, CoverClickHdl, weld::Button &, void) m_xCoverPath->set_text(aDlg.GetPath()); } -IMPL_LINK_NOARG(EPUBExportDialog, MediaClickHdl, weld::Button &, void) +IMPL_LINK_NOARG(EPUBExportDialog, MediaClickHdl, weld::Button&, void) { - uno::Reference<ui::dialogs::XFolderPicker2> xFolderPicker = ui::dialogs::FolderPicker::create(m_xContext); + uno::Reference<ui::dialogs::XFolderPicker2> xFolderPicker + = ui::dialogs::FolderPicker::create(m_xContext); if (xFolderPicker->execute() != ui::dialogs::ExecutableDialogResults::OK) return; m_xMediaDir->set_text(xFolderPicker->getDirectory()); } -IMPL_LINK_NOARG(EPUBExportDialog, OKClickHdl, weld::Button &, void) +IMPL_LINK_NOARG(EPUBExportDialog, OKClickHdl, weld::Button&, void) { // General if (!m_xCoverPath->get_text().isEmpty()) @@ -218,9 +221,7 @@ IMPL_LINK_NOARG(EPUBExportDialog, OKClickHdl, weld::Button &, void) m_xDialog->response(RET_OK); } -EPUBExportDialog::~EPUBExportDialog() -{ -} +EPUBExportDialog::~EPUBExportDialog() {} } // namespace writerperfect |