diff options
author | Muhammet Kara <muhammet.kara@collabora.com> | 2020-03-07 12:30:12 +0300 |
---|---|---|
committer | Muhammet Kara <muhammet.kara@collabora.com> | 2020-03-07 11:36:26 +0100 |
commit | 7c48277b1c54ea30fa1a13db1b3e45d2269bd7ec (patch) | |
tree | f948f4b414496a5901ba2c891073639532be5f40 | |
parent | be22ca7cc69ba905c86e05f0413c05ca0bd42556 (diff) |
clang-format svx with under 5-percent lines of change
Files which could become clang-format conformant with
under 5-percent lines of change relative to the total
count of lines in the file are found by using bin/find-clang-format.py,
and fixed with /opt/lo/bin/clang-format -i <path-of-the-file>
There will be follow-up patches to fix all 'under-5-percent' files.
Change-Id: I89062f4846e0ba4de7fbe799a1515665fe4449a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90146
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
-rw-r--r-- | solenv/clang-format/blacklist | 12 | ||||
-rw-r--r-- | svx/inc/CommonStylePreviewRenderer.hxx | 4 | ||||
-rw-r--r-- | svx/inc/xftshtit.hxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/SafeModeDialog.hxx | 1 | ||||
-rw-r--r-- | svx/source/dialog/hexcolorcontrol.cxx | 8 | ||||
-rw-r--r-- | svx/source/dialog/linkwarn.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/txenctab.cxx | 1 | ||||
-rw-r--r-- | svx/source/inc/clonelist.hxx | 1 | ||||
-rw-r--r-- | svx/source/inc/svdobjuserdatalist.hxx | 2 | ||||
-rw-r--r-- | svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx | 7 | ||||
-rw-r--r-- | svx/source/sidebar/paragraph/ParaSpacingWindow.hxx | 5 | ||||
-rw-r--r-- | svx/source/sidebar/text/TextUnderlineControl.hxx | 5 | ||||
-rw-r--r-- | svx/source/unodraw/UnoGraphicExporter.hxx | 2 |
13 files changed, 16 insertions, 36 deletions
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 5e874dc1fe9e..9caa70d31144 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -13229,7 +13229,6 @@ svtools/source/uno/wizard/wizardshell.cxx svtools/source/uno/wizard/wizardshell.hxx svx/inc/AccessibleTableShape.hxx svx/inc/AffineMatrixItem.hxx -svx/inc/CommonStylePreviewRenderer.hxx svx/inc/DescriptionGenerator.hxx svx/inc/GalleryControl.hxx svx/inc/XPropertyTable.hxx @@ -13359,7 +13358,6 @@ svx/inc/textchaincursor.hxx svx/inc/textchainflow.hxx svx/inc/uiobject.hxx svx/inc/unomlstr.hxx -svx/inc/xftshtit.hxx svx/inc/xpolyimp.hxx svx/qa/unit/svdraw/test_SdrTextObject.cxx svx/qa/unit/svx-dialogs-test.cxx @@ -13405,7 +13403,6 @@ svx/source/dialog/ClassificationDialog.cxx svx/source/dialog/ClassificationEditView.cxx svx/source/dialog/ClassificationEditView.hxx svx/source/dialog/SafeModeDialog.cxx -svx/source/dialog/SafeModeDialog.hxx svx/source/dialog/SafeModeUI.cxx svx/source/dialog/SpellDialogChildWindow.cxx svx/source/dialog/SvxNumOptionsTabPageHelper.cxx @@ -13436,14 +13433,12 @@ svx/source/dialog/frmsel.cxx svx/source/dialog/graphctl.cxx svx/source/dialog/grfflt.cxx svx/source/dialog/hdft.cxx -svx/source/dialog/hexcolorcontrol.cxx svx/source/dialog/hyperdlg.cxx svx/source/dialog/imapdlg.cxx svx/source/dialog/imapimp.hxx svx/source/dialog/imapwnd.cxx svx/source/dialog/imapwnd.hxx svx/source/dialog/langbox.cxx -svx/source/dialog/linkwarn.cxx svx/source/dialog/measctrl.cxx svx/source/dialog/optgrid.cxx svx/source/dialog/pagectrl.cxx @@ -13469,7 +13464,6 @@ svx/source/dialog/svxruler.cxx svx/source/dialog/swframeexample.cxx svx/source/dialog/swframeposstrings.cxx svx/source/dialog/txencbox.cxx -svx/source/dialog/txenctab.cxx svx/source/engine3d/camera3d.cxx svx/source/engine3d/cube3d.cxx svx/source/engine3d/deflt3d.cxx @@ -13568,7 +13562,6 @@ svx/source/inc/ShapesUtil.hxx svx/source/inc/cell.hxx svx/source/inc/celltypes.hxx svx/source/inc/charmapacc.hxx -svx/source/inc/clonelist.hxx svx/source/inc/datalistener.hxx svx/source/inc/datanavi.hxx svx/source/inc/delayedevent.hxx @@ -13605,7 +13598,6 @@ svx/source/inc/gridcols.hxx svx/source/inc/sdbdatacolumn.hxx svx/source/inc/sqlparserclient.hxx svx/source/inc/svdobjplusdata.hxx -svx/source/inc/svdobjuserdatalist.hxx svx/source/inc/svdoutlinercache.hxx svx/source/inc/svxpixelctlaccessiblecontext.hxx svx/source/inc/svxrectctaccessiblecontext.hxx @@ -13776,13 +13768,11 @@ svx/source/sidebar/media/MediaPlaybackPanel.hxx svx/source/sidebar/nbdtmg.cxx svx/source/sidebar/nbdtmgfact.cxx svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx -svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx svx/source/sidebar/paragraph/ParaPropertyPanel.cxx svx/source/sidebar/paragraph/ParaPropertyPanel.hxx svx/source/sidebar/paragraph/ParaSpacingControl.cxx svx/source/sidebar/paragraph/ParaSpacingWindow.cxx -svx/source/sidebar/paragraph/ParaSpacingWindow.hxx svx/source/sidebar/possize/PosSizePropertyPanel.cxx svx/source/sidebar/possize/PosSizePropertyPanel.hxx svx/source/sidebar/shadow/ShadowPropertyPanel.cxx @@ -13797,7 +13787,6 @@ svx/source/sidebar/text/TextCharacterSpacingPopup.cxx svx/source/sidebar/text/TextPropertyPanel.cxx svx/source/sidebar/text/TextPropertyPanel.hxx svx/source/sidebar/text/TextUnderlineControl.cxx -svx/source/sidebar/text/TextUnderlineControl.hxx svx/source/sidebar/text/TextUnderlinePopup.cxx svx/source/sidebar/tools/ValueSetWithTextControl.cxx svx/source/smarttags/SmartTagMgr.cxx @@ -13958,7 +13947,6 @@ svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx svx/source/unodialogs/textconversiondlgs/services.cxx svx/source/unodraw/UnoGraphicExporter.cxx -svx/source/unodraw/UnoGraphicExporter.hxx svx/source/unodraw/UnoNameItemTable.cxx svx/source/unodraw/UnoNameItemTable.hxx svx/source/unodraw/UnoNamespaceMap.cxx diff --git a/svx/inc/CommonStylePreviewRenderer.hxx b/svx/inc/CommonStylePreviewRenderer.hxx index 88e3d6ddeb0c..3cb6bf0441d0 100644 --- a/svx/inc/CommonStylePreviewRenderer.hxx +++ b/svx/inc/CommonStylePreviewRenderer.hxx @@ -23,7 +23,6 @@ class SvxFont; namespace svx { - class CommonStylePreviewRenderer final : public sfx2::StylePreviewRenderer { std::unique_ptr<SvxFont> m_pFont; @@ -39,7 +38,8 @@ public: virtual bool recalculate() override; virtual Size getRenderSize() override; - virtual bool render(const tools::Rectangle& aRectangle, RenderAlign eRenderAlign = RenderAlign::CENTER) override; + virtual bool render(const tools::Rectangle& aRectangle, + RenderAlign eRenderAlign = RenderAlign::CENTER) override; }; } // end namespace svx diff --git a/svx/inc/xftshtit.hxx b/svx/inc/xftshtit.hxx index e8f223e6b820..aaefab95143f 100644 --- a/svx/inc/xftshtit.hxx +++ b/svx/inc/xftshtit.hxx @@ -30,7 +30,7 @@ class XFormTextShadowTranspItem final : public SfxUInt16Item { public: - XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence = 0); + XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence = 0); virtual XFormTextShadowTranspItem* Clone(SfxItemPool* pPool = nullptr) const override; }; diff --git a/svx/source/dialog/SafeModeDialog.hxx b/svx/source/dialog/SafeModeDialog.hxx index 713a95f4a310..daba66caffce 100644 --- a/svx/source/dialog/SafeModeDialog.hxx +++ b/svx/source/dialog/SafeModeDialog.hxx @@ -21,7 +21,6 @@ public: virtual ~SafeModeDialog() override; private: - std::unique_ptr<weld::Button> mxBtnContinue; std::unique_ptr<weld::Button> mxBtnRestart; std::unique_ptr<weld::Button> mxBtnApply; diff --git a/svx/source/dialog/hexcolorcontrol.cxx b/svx/source/dialog/hexcolorcontrol.cxx index e6ee8b699dbc..b9a4cd645222 100644 --- a/svx/source/dialog/hexcolorcontrol.cxx +++ b/svx/source/dialog/hexcolorcontrol.cxx @@ -23,8 +23,8 @@ #include <vcl/svapp.hxx> #include <vcl/weld.hxx> -namespace weld { - +namespace weld +{ HexColorControl::HexColorControl(std::unique_ptr<weld::Entry> pEntry) : m_xEntry(std::move(pEntry)) , m_nAsyncModifyEvent(nullptr) @@ -76,7 +76,7 @@ Color HexColorControl::GetColor() const if (nLen < 7) { static const char* const pNullStr = "000000"; - aStr += OUString::createFromAscii( &pNullStr[nLen-1] ); + aStr += OUString::createFromAscii(&pNullStr[nLen - 1]); } sax::Converter::convertColor(nColor, aStr); @@ -107,8 +107,6 @@ IMPL_STATIC_LINK(HexColorControl, ImplProcessInputHdl, OUString&, rTest, bool) rTest = aFilter.makeStringAndClear(); return true; } - - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/linkwarn.cxx b/svx/source/dialog/linkwarn.cxx index 0d8e53f7c14c..7df6f472ff21 100644 --- a/svx/source/dialog/linkwarn.cxx +++ b/svx/source/dialog/linkwarn.cxx @@ -28,7 +28,7 @@ SvxLinkWarningDialog::SvxLinkWarningDialog(weld::Widget* pParent, const OUString // replace filename OUString sInfoText = m_xDialog->get_primary_text(); OUString aPath; - if ( osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL( _rFileName, aPath ) ) + if (osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL(_rFileName, aPath)) aPath = _rFileName; sInfoText = sInfoText.replaceAll("%FILENAME", aPath); m_xDialog->set_primary_text(sInfoText); diff --git a/svx/source/dialog/txenctab.cxx b/svx/source/dialog/txenctab.cxx index b2d5cde4a359..791b8f735f89 100644 --- a/svx/source/dialog/txenctab.cxx +++ b/svx/source/dialog/txenctab.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svx/dialmgr.hxx> #include <svx/txenctab.hxx> #include <txenctab.hrc> diff --git a/svx/source/inc/clonelist.hxx b/svx/source/inc/clonelist.hxx index 18e9bb54c801..5ed3e4d8c127 100644 --- a/svx/source/inc/clonelist.hxx +++ b/svx/source/inc/clonelist.hxx @@ -34,7 +34,6 @@ class CloneList std::vector<SdrObject*> maCloneList; public: - void AddPair(const SdrObject* pOriginal, SdrObject* pClone); const SdrObject* GetOriginal(sal_uInt32 nIndex) const; diff --git a/svx/source/inc/svdobjuserdatalist.hxx b/svx/source/inc/svdobjuserdatalist.hxx index 19d25e175d0a..d2cb0e16ab6d 100644 --- a/svx/source/inc/svdobjuserdatalist.hxx +++ b/svx/source/inc/svdobjuserdatalist.hxx @@ -19,7 +19,7 @@ class SdrObjUserData; class SdrObjUserDataList { - typedef std::vector<std::unique_ptr<SdrObjUserData> > ListType; + typedef std::vector<std::unique_ptr<SdrObjUserData>> ListType; ListType maList; public: diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx index 673840c65144..6904b9fcd696 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx @@ -23,8 +23,8 @@ class SvxLineSpacingItem; -namespace svx { - +namespace svx +{ class SvxLineSpacingToolBoxControl; class ParaLineSpacingControl : public WeldToolbarPopup @@ -41,7 +41,7 @@ public: private: rtl::Reference<SvxLineSpacingToolBoxControl> mxControl; - MapUnit meLNSpaceUnit; + MapUnit meLNSpaceUnit; std::unique_ptr<weld::Button> mxSpacing1Button; std::unique_ptr<weld::Button> mxSpacing115Button; @@ -75,7 +75,6 @@ private: DECL_LINK(LineSPDistAtHdl_Impl, weld::MetricSpinButton&, void); DECL_LINK(PredefinedValuesHandler, weld::Button&, void); }; - } #endif diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx index fad11830f100..22caf2a9e0b9 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx +++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx @@ -26,8 +26,8 @@ using namespace com::sun::star; -namespace svx { - +namespace svx +{ class ParaULSpacingWindow : public InterimItemWindow { public: @@ -111,7 +111,6 @@ public: explicit ParaFirstLineSpacingWindow(vcl::Window* pParent); virtual void GetFocus() override; }; - } #endif diff --git a/svx/source/sidebar/text/TextUnderlineControl.hxx b/svx/source/sidebar/text/TextUnderlineControl.hxx index 00d3a714d0a4..631b5c874d3c 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.hxx +++ b/svx/source/sidebar/text/TextUnderlineControl.hxx @@ -22,8 +22,8 @@ #include <svtools/toolbarmenu.hxx> -namespace svx { - +namespace svx +{ class TextUnderlinePopup; class TextUnderlineControl final : public WeldToolbarPopup @@ -55,7 +55,6 @@ private: }; } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/UnoGraphicExporter.hxx b/svx/source/unodraw/UnoGraphicExporter.hxx index cbfd3f2f7d84..ace0db252919 100644 --- a/svx/source/unodraw/UnoGraphicExporter.hxx +++ b/svx/source/unodraw/UnoGraphicExporter.hxx @@ -26,7 +26,7 @@ class SdrObject; -Graphic SvxGetGraphicForShape( SdrObject& rShape ); +Graphic SvxGetGraphicForShape(SdrObject& rShape); #endif |